Feature/search level

src/main/java/ru/scarletredman/gd2spring/config/TestConfig.java

@@ -1,12 +1,15 @@
 package ru.scarletredman.gd2spring.config;
 
+import java.sql.Timestamp;
+import java.time.Instant;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
 import ru.scarletredman.gd2spring.model.Level;
 import ru.scarletredman.gd2spring.model.User;
 import ru.scarletredman.gd2spring.model.UserComment;
+import ru.scarletredman.gd2spring.model.embedable.LevelRateInfo;
 import ru.scarletredman.gd2spring.service.LevelService;
 import ru.scarletredman.gd2spring.service.MessageService;
 import ru.scarletredman.gd2spring.service.UserCommentService;
@@ -44,8 +47,10 @@ void createTestUser(boolean debugMode) {
             userCommentService.writeComment(new UserComment(u, "Hello world!!!"));
         }
 
-        var level = createTestLevel(user, "Test level");
-        levelService.uploadLevel(level);
+        for (int i = 0; i < 30; i++) {
+            var level = createTestLevel(user, "Test level " + i, i, i * 2, i % 4, i % 3 == 0);
+            levelService.uploadLevel(level);
+        }
 
         var user2 = userService.findUserById(2).get();
         for (int i = 0; i < 30; i++) {
@@ -54,11 +59,14 @@ void createTestUser(boolean debugMode) {
         }
     }
 
-    Level createTestLevel(User owner, String name) {
+    Level createTestLevel(User owner, String name, int likes, int downloads, int stars, boolean featured) {
         var level = new Level(owner, name);
         level.setDescription("Hello world!");
         level.setObjects(4);
 
+        level.setLikes(likes);
+        level.setDownloads(downloads);
+
         var data = level.getData();
         data.setExtra(
                 "0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0");
@@ -68,6 +76,13 @@ Level createTestLevel(User owner, String name) {
 
         var rate = level.getRate();
         rate.setRequestedStars(10);
+        rate.setStars(stars);
+        rate.setDifficulty(LevelRateInfo.Difficulty.values()[stars]);
+        rate.setFeatured(featured);
+        rate.setEpic(featured);
+        if (stars != 0 || featured) {
+            rate.setRateTime(Timestamp.from(Instant.now()));
+        }
 
         return level;
     }

src/main/java/ru/scarletredman/gd2spring/controller/LevelController.java

@@ -6,9 +6,12 @@
 import org.springframework.web.bind.annotation.RestController;
 import ru.scarletredman.gd2spring.controller.annotation.GeometryDashAPI;
 import ru.scarletredman.gd2spring.controller.response.GetLevelsResponse;
+import ru.scarletredman.gd2spring.model.embedable.LevelFilters;
+import ru.scarletredman.gd2spring.model.embedable.LevelRateInfo;
 import ru.scarletredman.gd2spring.security.annotation.GDAuthorizedOnly;
 import ru.scarletredman.gd2spring.service.LevelService;
 import ru.scarletredman.gd2spring.service.type.LevelListPage;
+import ru.scarletredman.gd2spring.service.type.LevelSearchType;
 import ru.scarletredman.gd2spring.util.ResponseLogger;
 
 @GeometryDashAPI
@@ -52,24 +55,40 @@ String uploadLevel(
     GetLevelsResponse getLevels(
             @RequestParam(name = "type") int type,
             @RequestParam(name = "str") String levelName,
-            @RequestParam(name = "diff") String difficulty, // "-" or number
-            @RequestParam(name = "len") String length, // "-" or number
+            @RequestParam(name = "diff") String difficulty, // "-" or numbers
+            @RequestParam(name = "len") String length, // "-" or numbers
             @RequestParam(name = "page") int page,
             @RequestParam(name = "total") int total,
-            @RequestParam(name = "uncompleted", required = false, defaultValue = "0") int isUncompleted,
+            @RequestParam(name = "uncompleted", required = false, defaultValue = "0") int isOnlyUncompleted,
             @RequestParam(name = "onlyCompleted", required = false, defaultValue = "0") int isOnlyCompleted,
             @RequestParam(name = "featured", required = false, defaultValue = "0") int isFeatured,
             @RequestParam(name = "original", required = false, defaultValue = "0") int isOriginal,
             @RequestParam(name = "twoPlayer", required = false, defaultValue = "0") int isForTwoPlayers,
             @RequestParam(name = "coins", required = false, defaultValue = "0") int hasCoins,
             @RequestParam(name = "epic", required = false, defaultValue = "0") int isEpic,
             @RequestParam(name = "noStar", required = false, defaultValue = "0") int noStar,
-            @RequestParam(name = "demonFilter", required = false, defaultValue = "-1") int demonFilter,
-            @RequestParam(name = "song", required = false, defaultValue = "0") int song,
-            @RequestParam(name = "customSong", required = false, defaultValue = "0") int customSong) {
+            @RequestParam(name = "star", required = false, defaultValue = "0") int hasStar,
+            @RequestParam(name = "demonFilter", required = false, defaultValue = "0") int demonFilter,
+            @RequestParam(name = "song", required = false, defaultValue = "-1") int song,
+            @RequestParam(name = "customSong", required = false, defaultValue = "0") int isCustomSong) {
 
         var filters = new LevelListPage.Filters(
-                levelName, null, null, page, false, false, false, false, false, false, false, false, 0, 0, 0);
+                levelName,
+                LevelRateInfo.Difficulty.parseGDSearch(difficulty, demonFilter),
+                LevelFilters.Length.parseGDSearch(length),
+                page,
+                isOnlyCompleted == 1,
+                isOnlyUncompleted == 1,
+                isFeatured == 1,
+                isOriginal == 1,
+                isForTwoPlayers == 1,
+                hasCoins == 1,
+                isEpic == 1,
+                noStar == 1,
+                hasStar == 1,
+                song,
+                isCustomSong == 1,
+                LevelSearchType.find(type));
 
         var levels = levelService.getLevels(filters);
         return responseLogger.result(new GetLevelsResponse(levels));

src/main/java/ru/scarletredman/gd2spring/controller/response/GetLevelsResponse.java

@@ -56,7 +56,7 @@ public String getResponse() {
         String songs = String.join(
                 DELIMITER_SONGS, songStats.stream().map(SongStat::getResponse).toList());
 
-        String pageInfo = total + ":" + offset + ":10";
+        String pageInfo = total + ":" + (offset * 10) + ":10";
         String hash = generateHash();
 
         return levels + "#" + users + "#" + songs + "#" + pageInfo + "#" + hash;

src/main/java/ru/scarletredman/gd2spring/model/Level.java

@@ -12,7 +12,11 @@
 @Entity
 @Table(
         name = "levels",
-        indexes = {@Index(name = "level_name_index", columnList = "name")})
+        indexes = {
+            @Index(name = "level_name_index", columnList = "name"),
+            @Index(name = "level_rate_time_index", columnList = "rate_time"),
+            @Index(name = "level_difficulty_index", columnList = "difficulty")
+        })
 public class Level {
 
     @Id
@@ -30,9 +34,8 @@ public class Level {
     @JoinColumn(name = "owner", nullable = false)
     private User owner;
 
-    @ManyToOne
-    @JoinColumn(name = "original")
-    private Level original = null;
+    @Column(name = "original")
+    private Long original = null;
 
     @Embedded
     private LevelRateInfo rate = new LevelRateInfo();

src/main/java/ru/scarletredman/gd2spring/model/embedable/LevelFilters.java

@@ -2,6 +2,8 @@
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
+import java.util.LinkedList;
+import java.util.List;
 import lombok.*;
 
 @Getter
@@ -30,5 +32,21 @@ public enum Length {
         XL(4);
 
         private final int code;
+
+        public static List<Length> parseGDSearch(String input) {
+            var list = new LinkedList<Length>();
+            if (input.equals("-")) return list;
+
+            var nums = input.split(",");
+            for (var num : nums) {
+                try {
+                    var len = values()[Integer.parseInt(num)];
+                    list.add(len);
+                } catch (NumberFormatException | IndexOutOfBoundsException ignore) {
+                }
+            }
+
+            return list;
+        }
     }
 }

src/main/java/ru/scarletredman/gd2spring/model/embedable/LevelRateInfo.java

@@ -3,6 +3,8 @@
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
 import java.sql.Timestamp;
+import java.util.LinkedList;
+import java.util.List;
 import lombok.*;
 
 @Getter
@@ -71,5 +73,42 @@ public enum Difficulty {
         public boolean isAuto() {
             return this == AUTO;
         }
+
+        public static List<Difficulty> parseGDSearch(String input, int demonFilter) {
+            var list = new LinkedList<Difficulty>();
+            if (input.equals("-")) return list;
+
+            var nums = input.split(",");
+            for (var num : nums) {
+                int diff;
+                try {
+                    diff = Integer.parseInt(num);
+                } catch (NumberFormatException ignore) {
+                    continue;
+                }
+
+                switch (diff) {
+                    case -1 -> list.add(NONE);
+                    case 1 -> list.add(EASY);
+                    case 2 -> list.add(NORMAL);
+                    case 3 -> list.add(HARD);
+                    case 4 -> list.add(HARDER);
+                    case 5 -> list.add(INSANE);
+                    case -3 -> list.add(AUTO);
+                    case -2 -> {
+                        switch (demonFilter) {
+                            case 0 -> list.add(DEMON);
+                            case 1 -> list.add(EASY_DEMON);
+                            case 2 -> list.add(MEDIUM_DEMON);
+                            case 3 -> list.add(HARD_DEMON);
+                            case 4 -> list.add(INSANE_DEMON);
+                            case 5 -> list.add(EXTREME_DEMON);
+                        }
+                    }
+                }
+            }
+
+            return list;
+        }
     }
 }