Fixed lesson sorting issue

webgoat-container/src/main/java/org/owasp/webgoat/lessons/LessonMenuItem.java

@@ -45,6 +45,7 @@ public class LessonMenuItem {
     private List<LessonMenuItem> children = new ArrayList<LessonMenuItem>();
     private boolean complete;
     private String link;
+    private int ranking;
 //    private boolean showSource = true;
 //    private boolean showHints = true;
 
@@ -156,6 +157,13 @@ public class LessonMenuItem {
         this.link = link;
     }
 
+    public void setRanking(int ranking) {
+        this.ranking = ranking;
+    }
+
+    public int getRanking() {
+        return this.ranking;
+    }
 
 
 }

webgoat-container/src/main/java/org/owasp/webgoat/service/LessonMenuService.java

@@ -43,6 +43,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -86,14 +87,23 @@ public class LessonMenuService {
                 LessonMenuItem lessonItem = new LessonMenuItem();
                 lessonItem.setName(lesson.getTitle());
                 lessonItem.setLink(lesson.getLink());
+                lessonItem.setRanking(lesson.getRanking());
                 lessonItem.setType(LessonMenuItemType.LESSON);
                 LessonTracker lessonTracker = userTracker.getLessonTracker(lesson);
                 lessonItem.setComplete(lessonTracker.isLessonSolved());
                 categoryItem.addChild(lessonItem);
             }
+            categoryItem.getChildren().sort((o1, o2) -> o1.getRanking() - o2.getRanking());
             menu.add(categoryItem);
         }
         return menu;
 
     }
+
+    public class CustomComparator implements java.util.Comparator<Integer> {
+        @Override
+        public int compare(Integer o1, Integer o2) {
+            return o1.compareTo(o2);
+        }
+    }
 }

webgoat-lessons/sql-injection/src/main/java/org/owasp/webgoat/plugin/advanced/SqlInjectionAdvanced.java

@@ -48,7 +48,7 @@ public class SqlInjectionAdvanced extends NewLesson {
 
     @Override
     public Integer getDefaultRanking() {
-        return 1;
+        return 2;
     }
 
     @Override

webgoat-lessons/sql-injection/src/main/java/org/owasp/webgoat/plugin/introduction/SqlInjection.java

@@ -55,7 +55,7 @@ public class SqlInjection extends NewLesson {
 
     @Override
     public Integer getDefaultRanking() {
-        return 1;
+        return 0;
     }
 
     @Override

webgoat-lessons/sql-injection/src/main/java/org/owasp/webgoat/plugin/mitigation/SqlInjectionMitigations.java

@@ -48,7 +48,7 @@ public class SqlInjectionMitigations extends NewLesson {
 
     @Override
     public Integer getDefaultRanking() {
-        return 1;
+        return 3;
     }
 
     @Override

webgoat-lessons/xxe/src/main/java/org/owasp/webgoat/plugin/XXE.java

@@ -53,7 +53,7 @@ public class XXE extends NewLesson {
 
     @Override
     public Integer getDefaultRanking() {
-        return 1;
+        return 4;
     }
 
     @Override