SEBSERV-652 mitigate Moodle bug by retry failed moodle calls with no name filter

Author: anhefti

src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/LmsAPIService.java

@@ -94,10 +94,11 @@ static Predicate<QuizData> quizFilterPredicate(final FilterMap filterMap) {
         if (filterMap == null) {
             return q -> true;
         }
+        
         final String name = filterMap.getQuizName();
         final DateTime from = filterMap.getQuizFromTime();
         final DateTime now = DateTime.now(DateTimeZone.UTC);
-        System.out.println("************ name filter: " + name);
+
         return q -> {
             final boolean nameFilter = StringUtils.isBlank(name) || (q.name != null && q.name.contains(name));
             final boolean startTimeFilter = from == null || (q.startTime != null && (q.startTime.isEqual(from) || q.startTime.isAfter(from)));

src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/moodle/MoodleRestTemplateFactoryImpl.java

@@ -478,16 +478,20 @@ private String doRequest(
                 final UriComponentsBuilder queryParam,
                 final boolean usePOST,
                 final HttpEntity<?> functionReqEntity) {
-
-            log.info("*** Call Moodle: {} BODY: {}", queryParam, functionReqEntity.getBody());
+            
+            if (log.isDebugEnabled()) {
+                log.debug("*** Call Moodle: {} BODY: {}", queryParam.toUriString(), functionReqEntity.getBody());
+            }
 
             final ResponseEntity<String> response = super.exchange(
                     queryParam.toUriString(),
                     usePOST ? HttpMethod.POST : HttpMethod.GET,
                     functionReqEntity,
                     String.class);
-            
-            log.info("*** Moodle Response: {}", response);
+
+            if (log.isDebugEnabled()) {
+                log.debug("*** Moodle Response: {}", response);
+            }
 
             final LmsSetup lmsSetup = this.apiTemplateDataSupplier.getLmsSetup();
             if (response.getStatusCode() != HttpStatus.OK) {

src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/moodle/plugin/MoodlePluginCourseAccess.java

@@ -509,6 +509,10 @@ private String getCoursePageFromMoodle(
 
         // SEBSERV-652 mitigation (can be removed when Moodle bug is fixed
         if (responseBody == null) {
+            
+            log.warn("*** Moodle respond with empty body on request with attributes: {}", attributes);
+            log.info("*** Apply SEBSERV-652 mitigation...");
+            
             attributes.remove(PARAM_SQL_CONDITIONS);
             attributes.add(PARAM_SQL_CONDITIONS, getSQLCondition(null, cutoffDate, filterDate));
             responseBody = restTemplate.callMoodleAPIFunction(COURSES_API_FUNCTION_NAME, attributes);