SEBSERV-652 debug

Author: anhefti

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

@@ -97,10 +97,13 @@ static Predicate<QuizData> quizFilterPredicate(final FilterMap filterMap) {
         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)));
+
+            System.out.println("************ filter quiz.name: " + q.name + " contains: " + nameFilter);
+            
+            final boolean startTimeFilter = from == null || (q.startTime != null && (q.startTime.isEqual(from) || q.startTime.isAfter(from)));
             final DateTime endTime = now.isAfter(from) ? now : from;
             final boolean fromTimeFilter = (endTime == null || q.endTime == null || endTime.isBefore(q.endTime));
             return nameFilter && (startTimeFilter || fromTimeFilter);

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

@@ -152,15 +152,18 @@ private AsyncLookup getAsyncLookup(
             final FilterMap filterMap,
             final Function<String, Result<LmsAPITemplate>> lmsAPITemplateSupplier) {
 
+        // check if there is already a lookup for the user in the cache, if not create one
         if (!this.lookups.containsKey(userId)) {
             this.createNewAsyncLookup(userId, filterMap, lmsAPITemplateSupplier);
         }
-
+        
+        // get the users lookup from the cache
         final AsyncLookup asyncLookup = this.lookups.get(userId);
         if (asyncLookup == null) {
             return null;
         }
 
+        // if the lookup still valid use it otherwise, create new empty one and use this
         if (!asyncLookup.isValid(filterMap)) {
             final AsyncLookup removed = this.lookups.remove(userId);
             if (removed != null) {
@@ -333,7 +336,9 @@ boolean isValid(final FilterMap filterMap) {
                 return false;
             }
 
-            return this.lookupFilterCriteria.equals(filterMap);
+            boolean valid = this.lookupFilterCriteria.equals(filterMap);
+            System.out.println("******************** valid: " + valid + "    filterMap: " + filterMap);
+            return valid;
         }
 
         boolean isRunning() {
@@ -342,17 +347,15 @@ boolean isRunning() {
             }
             final boolean running = this.asyncBuffers
                     .stream()
-                    .filter(b -> !b.finished)
-                    .findFirst()
-                    .isPresent();
+                    .anyMatch(b -> !b.finished);
             if (!running) {
                 this.timeCompleted = Utils.getMillisecondsNow();
             }
             return running;
         }
 
         void cancel() {
-            this.asyncBuffers.stream().forEach(AsyncQuizFetchBuffer::cancel);
+            this.asyncBuffers.forEach(AsyncQuizFetchBuffer::cancel);
         }
     }