zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SEBSERV-75 fixed Moodle request API with form URL encoded array values

Browse source
This commit is contained in:
anhefti 2020-07-16 10:50:47 +02:00
parent e6272058e6
commit 7bbe6386a3
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/ch/ethz/seb/sebserver/gbl/util/Utils.java
View file

@ -618,7 +618,7 @@ public final class Utils {
} }
public static String toAppFormUrlEncodedBody(final String name, final Collection<String> array) { public static String toAppFormUrlEncodedBody(final String name, final Collection<String> array) {
final String _name = name.contains(String.valueOf(Constants.SQUARE_BRACE_OPEN)) final String _name = name.contains(String.valueOf(Constants.SQUARE_BRACE_OPEN)) || array.size() <= 1
? name ? name
: name + Constants.SQUARE_BRACE_OPEN + Constants.SQUARE_BRACE_CLOSE; : name + Constants.SQUARE_BRACE_OPEN + Constants.SQUARE_BRACE_CLOSE;

6
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/CourseAccess.java
View file

@ -18,6 +18,9 @@ import java.util.function.Function;
import java.util.function.Supplier; import java.util.function.Supplier;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import ch.ethz.seb.sebserver.gbl.Constants; import ch.ethz.seb.sebserver.gbl.Constants;
import ch.ethz.seb.sebserver.gbl.async.AsyncService; import ch.ethz.seb.sebserver.gbl.async.AsyncService;
import ch.ethz.seb.sebserver.gbl.async.CircuitBreaker; import ch.ethz.seb.sebserver.gbl.async.CircuitBreaker;
@ -31,6 +34,8 @@ import ch.ethz.seb.sebserver.webservice.servicelayer.lms.LmsAPIService;
public abstract class CourseAccess { public abstract class CourseAccess {
private static final Logger log = LoggerFactory.getLogger(CourseAccess.class);
protected final MemoizingCircuitBreaker<List<QuizData>> allQuizzesRequest; protected final MemoizingCircuitBreaker<List<QuizData>> allQuizzesRequest;
protected final CircuitBreaker<Chapters> chaptersRequest; protected final CircuitBreaker<Chapters> chaptersRequest;
protected final CircuitBreaker<ExamineeAccountDetails> accountDetailRequest; protected final CircuitBreaker<ExamineeAccountDetails> accountDetailRequest;
@ -103,6 +108,7 @@ public abstract class CourseAccess {
public String getExamineeName(final String examineeSessionId) { public String getExamineeName(final String examineeSessionId) {
return getExamineeAccountDetails(examineeSessionId) return getExamineeAccountDetails(examineeSessionId)
.map(ExamineeAccountDetails::getDisplayName) .map(ExamineeAccountDetails::getDisplayName)
.onError(error -> log.warn("Failed to request Moodle user-name for ID: {}", error.getMessage(), error))
.getOr(examineeSessionId); .getOr(examineeSessionId);
} }