added tags filter

Author: FabiPunktExe

build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 apply(from = "spikedev.gradle.kts")
 
 group = "diruptio"
-version = "0.4.3"
+version = "0.4.4"
 
 repositories {
     mavenCentral()

src/main/java/diruptio/dynamite/Dynamite.java

@@ -3,7 +3,7 @@
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonStreamParser;
-import diruptio.dynamite.project.CreateServlet;
+import diruptio.dynamite.project.ProjectCreateServlet;
 import diruptio.dynamite.project.version.VerisonCreateServlet;
 import diruptio.dynamite.project.version.VersionDownloadServlet;
 import diruptio.dynamite.project.version.VersionUploadServlet;
@@ -51,7 +51,7 @@ public void onLoad(@NotNull Module self) {
 
         Spikedog.addServlet("/projects", new ProjectsServlet());
         Spikedog.addServlet("/project", new ProjectServlet());
-        Spikedog.addServlet("/project/create", new CreateServlet());
+        Spikedog.addServlet("/project/create", new ProjectCreateServlet());
         Spikedog.addServlet("/project/version/create", new VerisonCreateServlet());
         Spikedog.addServlet("/project/version/download", new VersionDownloadServlet());
         Spikedog.addServlet("/project/version/upload", new VersionUploadServlet());

src/main/java/diruptio/dynamite/Project.java

@@ -4,16 +4,25 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
+import java.util.function.Predicate;
 import org.jetbrains.annotations.NotNull;
 
 public record Project(@NotNull String name, @NotNull List<Version> versions) {
     public @NotNull JsonObject toJson() {
+        return toJson(version -> true);
+    }
+
+    public @NotNull JsonObject toJson(Predicate<Version> filter) {
         JsonObject json = new JsonObject();
         json.addProperty("name", name);
+        versions.sort(Comparator.comparing(Version::name));
         JsonArray versions = new JsonArray();
         for (Version version : this.versions) {
-            versions.add(version.toJson());
+            if (filter.test(version)) {
+                versions.add(version.toJson());
+            }
         }
         json.add("versions", versions);
         return json;

src/main/java/diruptio/dynamite/ProjectServlet.java

@@ -3,8 +3,11 @@
 import com.google.gson.JsonObject;
 import diruptio.spikedog.HttpRequest;
 import diruptio.spikedog.HttpResponse;
+import java.util.HashSet;
+import java.util.List;
 import java.util.Optional;
 import java.util.function.BiConsumer;
+import java.util.function.Predicate;
 
 public class ProjectServlet implements BiConsumer<HttpRequest, HttpResponse> {
     public void accept(HttpRequest request, HttpResponse response) {
@@ -33,8 +36,25 @@ public void accept(HttpRequest request, HttpResponse response) {
             return;
         }
 
+        // Get filter parameter
+        String filterParam = request.getParameter("filter");
+        Predicate<Project.Version> filter;
+        if (filterParam == null) {
+            filter = version -> true;
+        } else if (filterParam.startsWith("tags:")) {
+            filterParam = filterParam.replaceFirst("tags:", "");
+            List<String> tags = filterParam.isBlank() ? List.of() : List.of(filterParam.split(","));
+            filter = version -> new HashSet<>(version.tags()).containsAll(tags);
+        } else {
+            response.setStatus(400, "Bad Request");
+            JsonObject content = new JsonObject();
+            content.addProperty("error", "Invalid filter");
+            response.setContent(content.toString());
+            return;
+        }
+
         // Success
         response.setStatus(200, "OK");
-        response.setContent(project.get().toJson().toString());
+        response.setContent(project.get().toJson(filter).toString());
     }
 }

…ptio/dynamite/project/CreateServlet.java …namite/project/ProjectCreateServlet.javasrc/main/java/diruptio/dynamite/project/CreateServlet.java renamed to src/main/java/diruptio/dynamite/project/ProjectCreateServlet.java src/main/java/diruptio/dynamite/project/CreateServlet.java renamed to src/main/java/diruptio/dynamite/project/ProjectCreateServlet.java

@@ -10,7 +10,7 @@
 import java.util.Base64;
 import java.util.function.BiConsumer;
 
-public class CreateServlet implements BiConsumer<HttpRequest, HttpResponse> {
+public class ProjectCreateServlet implements BiConsumer<HttpRequest, HttpResponse> {
     public void accept(HttpRequest request, HttpResponse response) {
         response.setHeader("Content-Type", "application/json");