More Modularization

build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 
 group = "igs-landstuhl"
 
-version = "v1.1.0-SNAPSHOT-0"
+version = "v2.0.0-SNAPSHOT-0"
 
 application {
     mainClass.set("de.igslandstuhl.database.Application")

src/main/java/de/igslandstuhl/database/Application.java

@@ -17,6 +17,7 @@
 import de.igslandstuhl.database.server.webserver.WebPath;
 import de.igslandstuhl.database.server.webserver.handlers.GetRequestHandler;
 import de.igslandstuhl.database.server.webserver.handlers.PostRequestHandler;
+import de.igslandstuhl.database.server.webserver.handlers.get.SQLRequestHandler;
 import de.igslandstuhl.database.utils.CommandLineUtils;
 
 /**
@@ -110,6 +111,7 @@ public static void main(String[] args) throws Exception {
 
         Holiday.setupCurrentSchoolYear();
         PostRequestHandler.registerHandlers();
+        SQLRequestHandler.register();
         PluginLoader.getInstance().registerPlugins();
 
         WebPath.registerPaths();

src/main/java/de/igslandstuhl/database/Registry.java

@@ -8,13 +8,15 @@
 import java.util.stream.Stream;
 
 import de.igslandstuhl.database.client.HTMLTemplate;
+import de.igslandstuhl.database.client.dynamic.DynamicFieldType;
 import de.igslandstuhl.database.client.navigation.NavigationElement;
 import de.igslandstuhl.database.client.navigation.NavigationType;
 import de.igslandstuhl.database.plugins.Plugin;
 import de.igslandstuhl.database.server.commands.Command;
 import de.igslandstuhl.database.server.commands.CommandDescription;
 import de.igslandstuhl.database.server.webserver.WebPath;
 import de.igslandstuhl.database.server.webserver.handlers.HttpHandler;
+import de.igslandstuhl.database.server.webserver.handlers.get.SQLRequestHandler;
 import de.igslandstuhl.database.server.webserver.requests.APIPostRequest;
 import de.igslandstuhl.database.server.webserver.requests.GetRequest;
 import de.igslandstuhl.database.utils.RegistryEnum;
@@ -24,10 +26,12 @@ public class Registry<K, V> implements Closeable {
     private static final Registry<String,CommandDescription> COMMAND_DESCRIPTION_REGISTRY = new Registry<>();
     private static final Registry<String,HttpHandler<APIPostRequest>> POST_HANDLER_REGISTRY = new Registry<>();
     private static final Registry<String,HttpHandler<GetRequest>> GET_HANDLER_REGISTRY = new Registry<>();
+    private static final Registry<String,SQLRequestHandler> SQL_REQUEST_HANDLER_REGISTRY = new Registry<>();
     private static final Registry<String,Plugin> PLUGIN_REGISTRY = new Registry<>();
     private static final Registry<String,WebPath> WEB_PATH_REGISTRY = new Registry<>();
 
     private static final EnumRegistry<NavigationType,NavigationElement> NAVIGATION_REGISTRY = new EnumRegistry<>(NavigationType.class);
+    private static final EnumRegistry<DynamicFieldType,String> DYNAMIC_TEMPLATES_REGISTRY = new EnumRegistry<>(DynamicFieldType.class);
     private static final Registry<String,HTMLTemplate> TEMPLATE_REGISTRY = new Registry<>();
 
     public static Registry<String,Command> commandRegistry() {
@@ -39,6 +43,9 @@ public static Registry<String, HttpHandler<APIPostRequest>> postRequestHandlerRe
     public static Registry<String, HttpHandler<GetRequest>> getRequestHandlerRegistry() {
         return GET_HANDLER_REGISTRY;
     }
+    public static Registry<String, SQLRequestHandler> sqlRequestHandlerRegistry() {
+        return SQL_REQUEST_HANDLER_REGISTRY;
+    }
     public static Registry<String, Plugin> pluginRegistry() {
         return PLUGIN_REGISTRY;
     }
@@ -51,6 +58,9 @@ public static Registry<String, WebPath> webPathRegistry() {
     public static EnumRegistry<NavigationType, NavigationElement> navigationRegistry() {
         return NAVIGATION_REGISTRY;
     }
+    public static EnumRegistry<DynamicFieldType, String> dynamicTemplatesRegistry() {
+        return DYNAMIC_TEMPLATES_REGISTRY;
+    }
     public static Registry<String, HTMLTemplate> templateRegistry() {
         return TEMPLATE_REGISTRY;
     }

src/main/java/de/igslandstuhl/database/api/Student.java

@@ -87,11 +87,6 @@ public class Student extends User {
      */
     private final Map<Subject, Topic> currentTopics = new ConcurrentHashMap<>();
 
-    /**
-     * The current room of the student.
-     */
-    private Room currentRoom = null;
-
     /**
      * Constructs a new Student.
      *
@@ -223,10 +218,6 @@ public static List<Student> getAll() {
             .collect(Collectors.toList());
     }
 
-    public static List<Student> getByRoom(Room room) {
-        return students.values().stream().filter((s) -> room.equals(s.getCurrentRoom())).toList();
-    }
-
     /**
      * Registers a new student with a password.
      * This method creates a new student in the database and returns the created Student object.
@@ -352,18 +343,6 @@ public String getUsername() {
      */
     public GraduationLevel getGraduationLevel() { return graduationLevel; }
 
-    /**
-     * Returns the student's current room.
-     * @return the current room
-     */
-    public Room getCurrentRoom() { return currentRoom; }
-
-    /**
-     * Sets the student's current room.
-     * @param currentRoom the new room
-     */
-    public void setCurrentRoom(Room currentRoom) { this.currentRoom = currentRoom; }
-
     /**
      * Returns the set of selected tasks.
      * @return selected tasks
@@ -553,7 +532,6 @@ public String toJSON() {
         .append("\"selectedTasks\": ").append(selectedTasks).append(",\n")
         .append("\"completedTasks\": ").append(completedTasks).append(",\n")
         .append("\"lockedTasks\": ").append(lockedTasks).append(",\n")
-        .append("\"currentRoom\": ").append(String.valueOf(currentRoom)).append(",\n")
         .append("\"currentRequests\": {").append(currentRequests.entrySet().stream()
             .map(entry -> "\"" + entry.getKey() + "\": " + entry.getValue().stream().map((r) -> '"' + r.getGermanTranslation() + '"').toList())
             .reduce((a, b) -> a + ", " + b).orElse("")).append("},\n")

src/main/java/de/igslandstuhl/database/client/HTMLTemplate.java

@@ -4,6 +4,8 @@
 import java.util.Map;
 
 import de.igslandstuhl.database.Registry;
+import de.igslandstuhl.database.client.dynamic.DynamicFieldType;
+import de.igslandstuhl.database.client.dynamic.DynamicHTMLTemplate;
 import de.igslandstuhl.database.client.navigation.HTMLNavigationTemplate;
 import de.igslandstuhl.database.client.navigation.NavigationAppearance;
 import de.igslandstuhl.database.client.navigation.NavigationElement;
@@ -19,6 +21,7 @@ private static void register(HTMLTemplate template, String key) {
     }
     public static void registerAll() {
         NavigationElement.registerAll();
+        DynamicHTMLTemplate.registerDynamicElements();
         Map<String, ?> json = Server.getInstance().getResourceManager().readJsonResourceMerged(meta);
         json.keySet().forEach((key) -> {
             @SuppressWarnings("unchecked")
@@ -36,6 +39,9 @@ public static void registerAll() {
                     break;
                 case "HTMLNavigationTemplate":
                     register(new HTMLNavigationTemplate(NavigationAppearance.valueOf((String) template.get("appearance")), NavigationType.valueOf((String) template.get("navigation_type"))), key);
+                    break;
+                case "DynamicHTMLTemplate":
+                    register(new DynamicHTMLTemplate(DynamicFieldType.valueOf((String) template.get("dynamic_field_type"))), key);
                 default:
                     break;
             }