Merge branch '107-fix-for-enea-endpoint-to-retrieve-level-1-pre-and-post-requisites' into 'master'

Level 1 pre and postrequisites should no longer be left alone, but added to the final list

Closes #107

See merge request !107

src/main/java/webService/ReaderBenchServer.java

@@ -1502,11 +1502,6 @@ public class ReaderBenchServer {
                 eligibleLessons.put(new ResultEneaLesson(l.getLessonDescriptives(), l.getTitle(), l.getUri(), l.getTime(), l.getSimilarityScore(), ldpre, ldpost), l.getSimilarityScore());
             }
 
-            Map<ResultEneaLesson, Double> eligibleLessonsSorted = eligibleLessons.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e2, HashMap::new));
-
-            List<ResultEneaLesson> lessonsList = new ArrayList();
-            lessonsList.addAll(eligibleLessonsSorted.keySet());
-
             it = keptLessons.entrySet().iterator();
             List<String> recommendedList = new ArrayList<>();
             Integer time = 0;
@@ -1554,6 +1549,11 @@ public class ReaderBenchServer {
                 ldpost.add(l.getPostrequisites());
                 eligibleLessons.put(new ResultEneaLesson(l.getLessonDescriptives(), l.getTitle(), l.getUri(), l.getTime(), l.getSimilarityScore(), ldpre, ldpost), 0.0);
             }
+            
+            Map<ResultEneaLesson, Double> eligibleLessonsSorted = eligibleLessons.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e2, HashMap::new));
+
+            List<ResultEneaLesson> lessonsList = new ArrayList();
+            lessonsList.addAll(eligibleLessonsSorted.keySet());
 
             ResultEneaCustomisation result = new ResultEneaCustomisation(lessonsList, recommendedList, time, cmePoints);
             QueryResultEneaCustomisation queryResult = new QueryResultEneaCustomisation();