Merge branch 'dev-2.1' into development

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

Author: anhefti

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

@@ -629,11 +629,13 @@ public static String toColorFractionString(final int fraction) {
     }
 
     public static String toAppFormUrlEncodedBody(final MultiValueMap<String, String> attributes) {
-        if (attributes == null) {
-            return StringUtils.EMPTY;
-        }
-
-        return reduceFormUrlAttributes(attributes);
+        return toAppFormUrlEncodedBodyForSPService(attributes);
+        // TODO do it all the same with toAppFormUrlEncodedBody
+//        if (attributes == null) {
+//            return StringUtils.EMPTY;
+//        }
+//
+//        return reduceFormUrlAttributes(attributes);
     }
 
     public static String toAppFormUrlEncodedBodyForSPService(final MultiValueMap<String, String> attributes) {

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

@@ -12,6 +12,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -57,6 +58,7 @@
 import ch.ethz.seb.sebserver.webservice.servicelayer.lms.impl.moodle.MoodleRestTemplateFactory;
 import ch.ethz.seb.sebserver.webservice.servicelayer.lms.impl.moodle.MoodleUtils;
 import ch.ethz.seb.sebserver.webservice.servicelayer.lms.impl.moodle.MoodleUtils.CourseData;
+import ch.ethz.seb.sebserver.webservice.servicelayer.lms.impl.moodle.MoodleUtils.Courses;
 import ch.ethz.seb.sebserver.webservice.servicelayer.lms.impl.moodle.MoodleUtils.CoursesPlugin;
 import ch.ethz.seb.sebserver.webservice.servicelayer.lms.impl.moodle.MoodleUtils.MoodleUserDetails;
 import io.micrometer.core.instrument.util.StringUtils;
@@ -84,12 +86,7 @@ public class MoodlePluginCourseAccess extends AbstractCachedCourseAccess impleme
     public static final String SQL_COURSE_NAME = "shortname";
 
     public static final String SQL_CONDITION_TEMPLATE =
-            "(startdate is null OR startdate = 0 OR startdate >= %s) AND (enddate is null or enddate = 0 OR enddate >= %s)";
-
-    public static final String FROM_DATE_CONDITION_TEMPLATE =
-            "(startdate is null OR startdate = 0 OR startdate >= %s) AND (startdate is null OR startdate = 0 OR startdate <= %s)";
-
-    public static final String CUTOFF_DATE_CONDITION_TEMPLATE =
+            //"(startdate >= %s or timecreated >=%s) and (enddate is null or enddate = 0 or enddate >= %s)";
             "(startdate is null OR startdate = 0 OR startdate >= %s) AND (enddate is null or enddate = 0 OR enddate >= %s)";
 
     private final JSONMapper jsonMapper;
@@ -406,7 +403,7 @@ private void fetchQuizzesPage(
                         MoodleUtils.quizDataOf(lmsSetup, c, urlPrefix, this.prependShortCourseName)
                                 .stream()
                                 .filter(quizFilter)
-                                .toList()));
+                                .collect(Collectors.toList())));
 
         // check thresholds
         if (asyncQuizFetchBuffer.buffer.size() > this.maxSize) {
@@ -433,32 +430,14 @@ private Collection<CourseData> fetchCoursesPage(
             final long defaultCutOff = Utils.toUnixTimeInSeconds(
                     DateTime.now(DateTimeZone.UTC).minusYears(this.cutoffTimeOffset));
             final long cutoffDate = Math.min(filterDate, defaultCutOff);
-            String sqlCondition = String.format(SQL_CONDITION_TEMPLATE, cutoffDate, filterDate);
-            
-//            String sqlCondition = null;
-//            if (quizFromTime != null) {
-//                final long dayStart = Utils.toUnixTimeInSeconds(quizFromTime.withTime(0, 0, 0, 0));
-//                final long dayEnd = Utils.toUnixTimeInSeconds(quizFromTime.withTime(23, 59, 59, 999));
-//                 sqlCondition = String.format(FROM_DATE_CONDITION_TEMPLATE, dayStart, dayEnd);
-//            } else {
-//                final DateTime now = DateTime.now(DateTimeZone.UTC);
-//                final long defaultCutOff = Utils.toUnixTimeInSeconds(now.minusYears(this.cutoffTimeOffset));
-//                final long new_sec = Utils.toUnixTimeInSeconds(now );
-//                sqlCondition = String.format(CUTOFF_DATE_CONDITION_TEMPLATE, defaultCutOff, new_sec);
-//            }
+            String sqlCondition = String.format(
+                    SQL_CONDITION_TEMPLATE, cutoffDate, filterDate);
             final String fromElement = String.valueOf(page * size);
             final LinkedMultiValueMap<String, String> attributes = new LinkedMultiValueMap<>();
 
             if (this.applyNameCriteria && StringUtils.isNotBlank(nameCondition)) {
-                sqlCondition = sqlCondition + " AND (" +
-                        SQL_QUIZ_NAME +
-                        " LIKE '" +
-                        Utils.toSQLWildcard(nameCondition) +
-                        "' OR " +
-                        SQL_COURSE_NAME +
-                        " LIKE '" +
-                        Utils.toSQLWildcard(nameCondition) +
-                        "')";
+                final String n = Utils.toSQLWildcard(nameCondition);
+                sqlCondition = sqlCondition + " AND (" + SQL_QUIZ_NAME + " LIKE '" + n + "' OR " + SQL_COURSE_NAME + " LIKE '" + n + "')";
             }
 
             // Note: courseid[]=0 means all courses. Moodle don't like empty parameter

src/test/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/moodle/plugin/MoodlePluginCourseAccessTest.java

@@ -80,14 +80,7 @@ public void testFetchQuizzes() {
         assertNull(asyncQuizFetchBuffer.error);
 
         assertEquals(
-                "MoodlePluginCourseAccess [pageSize=500, maxSize=10000, cutoffTimeOffset=3, "
-                        + "restTemplate=MockupMoodleRestTemplate [accessToken=MockupMoodleRestTemplate-Test-Token, url=https://test.org/, "
-                        + "testLog=["
-                        + "callMoodleAPIFunction: quizaccess_sebserver_get_exams, "
-                        + "callMoodleAPIFunction: quizaccess_sebserver_get_exams], "
-                        + "callLog=["
-                        + "<courseid[]=0&conditions=(startdate is null OR startdate = 0 OR startdate >= -94694400) AND (enddate is null or enddate = 0 OR enddate >= -94694400)&startneedle=0&perpage=500,[Content-Type:\"application/x-www-form-urlencoded\"]>, "
-                        + "<courseid[]=0&conditions=(startdate is null OR startdate = 0 OR startdate >= -94694400) AND (enddate is null or enddate = 0 OR enddate >= -94694400)&startneedle=500&perpage=500,[Content-Type:\"application/x-www-form-urlencoded\"]>]]]",
+                "MoodlePluginCourseAccess [pageSize=500, maxSize=10000, cutoffTimeOffset=3, restTemplate=MockupMoodleRestTemplate [accessToken=MockupMoodleRestTemplate-Test-Token, url=https://test.org/, testLog=[callMoodleAPIFunction: quizaccess_sebserver_get_exams, callMoodleAPIFunction: quizaccess_sebserver_get_exams], callLog=[<courseid[]=0&conditions=%28startdate+is+null+OR+startdate+%3D+0+OR+startdate+%3E%3D+-94694400%29+AND+%28enddate+is+null+or+enddate+%3D+0+OR+enddate+%3E%3D+-94694400%29&startneedle=0&perpage=500,[Content-Type:\"application/x-www-form-urlencoded\"]>, <courseid[]=0&conditions=%28startdate+is+null+OR+startdate+%3D+0+OR+startdate+%3E%3D+-94694400%29+AND+%28enddate+is+null+or+enddate+%3D+0+OR+enddate+%3E%3D+-94694400%29&startneedle=500&perpage=500,[Content-Type:\"application/x-www-form-urlencoded\"]>]]]",
                 candidate.toTestString());
 
         final List<String> ids =
@@ -145,20 +138,7 @@ public void testFetchQuizzes_smallPaging() {
         assertNull(asyncQuizFetchBuffer.error);
 
         assertEquals(
-                "MoodlePluginCourseAccess [pageSize=5, maxSize=10000, cutoffTimeOffset=3, "
-                        + "restTemplate=MockupMoodleRestTemplate [accessToken=MockupMoodleRestTemplate-Test-Token, url=https://test.org/, "
-                        + "testLog=["
-                        + "callMoodleAPIFunction: quizaccess_sebserver_get_exams, "
-                        + "callMoodleAPIFunction: quizaccess_sebserver_get_exams, "
-                        + "callMoodleAPIFunction: quizaccess_sebserver_get_exams, "
-                        + "callMoodleAPIFunction: quizaccess_sebserver_get_exams, "
-                        + "callMoodleAPIFunction: quizaccess_sebserver_get_exams], "
-                        + "callLog=["
-                        + "<courseid[]=0&conditions=(startdate is null OR startdate = 0 OR startdate >= -94694400) AND (enddate is null or enddate = 0 OR enddate >= -94694400)&startneedle=0&perpage=5,[Content-Type:\"application/x-www-form-urlencoded\"]>, "
-                        + "<courseid[]=0&conditions=(startdate is null OR startdate = 0 OR startdate >= -94694400) AND (enddate is null or enddate = 0 OR enddate >= -94694400)&startneedle=5&perpage=5,[Content-Type:\"application/x-www-form-urlencoded\"]>, "
-                        + "<courseid[]=0&conditions=(startdate is null OR startdate = 0 OR startdate >= -94694400) AND (enddate is null or enddate = 0 OR enddate >= -94694400)&startneedle=10&perpage=5,[Content-Type:\"application/x-www-form-urlencoded\"]>, "
-                        + "<courseid[]=0&conditions=(startdate is null OR startdate = 0 OR startdate >= -94694400) AND (enddate is null or enddate = 0 OR enddate >= -94694400)&startneedle=15&perpage=5,[Content-Type:\"application/x-www-form-urlencoded\"]>, "
-                        + "<courseid[]=0&conditions=(startdate is null OR startdate = 0 OR startdate >= -94694400) AND (enddate is null or enddate = 0 OR enddate >= -94694400)&startneedle=20&perpage=5,[Content-Type:\"application/x-www-form-urlencoded\"]>]]]",
+                "MoodlePluginCourseAccess [pageSize=5, maxSize=10000, cutoffTimeOffset=3, restTemplate=MockupMoodleRestTemplate [accessToken=MockupMoodleRestTemplate-Test-Token, url=https://test.org/, testLog=[callMoodleAPIFunction: quizaccess_sebserver_get_exams, callMoodleAPIFunction: quizaccess_sebserver_get_exams, callMoodleAPIFunction: quizaccess_sebserver_get_exams, callMoodleAPIFunction: quizaccess_sebserver_get_exams, callMoodleAPIFunction: quizaccess_sebserver_get_exams], callLog=[<courseid[]=0&conditions=%28startdate+is+null+OR+startdate+%3D+0+OR+startdate+%3E%3D+-94694400%29+AND+%28enddate+is+null+or+enddate+%3D+0+OR+enddate+%3E%3D+-94694400%29&startneedle=0&perpage=5,[Content-Type:\"application/x-www-form-urlencoded\"]>, <courseid[]=0&conditions=%28startdate+is+null+OR+startdate+%3D+0+OR+startdate+%3E%3D+-94694400%29+AND+%28enddate+is+null+or+enddate+%3D+0+OR+enddate+%3E%3D+-94694400%29&startneedle=5&perpage=5,[Content-Type:\"application/x-www-form-urlencoded\"]>, <courseid[]=0&conditions=%28startdate+is+null+OR+startdate+%3D+0+OR+startdate+%3E%3D+-94694400%29+AND+%28enddate+is+null+or+enddate+%3D+0+OR+enddate+%3E%3D+-94694400%29&startneedle=10&perpage=5,[Content-Type:\"application/x-www-form-urlencoded\"]>, <courseid[]=0&conditions=%28startdate+is+null+OR+startdate+%3D+0+OR+startdate+%3E%3D+-94694400%29+AND+%28enddate+is+null+or+enddate+%3D+0+OR+enddate+%3E%3D+-94694400%29&startneedle=15&perpage=5,[Content-Type:\"application/x-www-form-urlencoded\"]>, <courseid[]=0&conditions=%28startdate+is+null+OR+startdate+%3D+0+OR+startdate+%3E%3D+-94694400%29+AND+%28enddate+is+null+or+enddate+%3D+0+OR+enddate+%3E%3D+-94694400%29&startneedle=20&perpage=5,[Content-Type:\"application/x-www-form-urlencoded\"]>]]]",
                 candidate.toTestString());
 
         final List<String> ids =