Revert "Added modules to Database"

This reverts commit 1da2f5be41.

backend/src/main/java/com/example/backend/anwprj/DataBaseHandler.java

@@ -312,7 +312,7 @@ public class DataBaseHandler
     {
         try
         {
-            st.executeUpdate("DELETE FROM modules WHERE semesterId = " + id);
+            //st.executeUpdate("DELETE FROM module WHERE semesterId = " + id);
 
             st.executeUpdate("delete from semester where id=" + id);
         }
@@ -346,10 +346,10 @@ public class DataBaseHandler
      MODULE
      */
 
-    //get a module object by its id
+    //get a module object by its name
-    public Module getModule(int id) {
+    public Module getModule(String name) {
         try {
-            ResultSet rs = st.executeQuery("SELECT * FROM modules WHERE id=" + id);
+            ResultSet rs = st.executeQuery("SELECT * FROM modules WHERE name = '" + name + "'");
             return resultSetToModule(rs);
         }
         catch (Exception ex){
@@ -357,20 +357,11 @@ public class DataBaseHandler
         }
     }
 
-    //get module objects by its semester and its lecturer
+    //get a module object by its id
-    public Module[] getModules(int semesterId, int lecturerId) {
+    public Module getModule(int id) {
         try {
-            ResultSet rs = st.executeQuery("SELECT * FROM modules WHERE lecturerId = " + lecturerId +
+            ResultSet rs = st.executeQuery("SELECT * FROM modules WHERE id=" + id);
-                    "AND semesterId = " + semesterId);
+            return  resultSetToModule(rs);
-            List<Module> moduleList = new ArrayList<>();
-            Module m = null;
-            while((m = resultSetToModule(rs)) != null)
-            {
-                moduleList.add(m);
-            }
-
-            return moduleList.toArray(new Module[0]);
-
         }
         catch (Exception ex) {
             return null;

backend/src/main/java/com/example/backend/anwprj/Module/Module.java

@@ -3,22 +3,22 @@ package com.example.backend.anwprj.Module;
 //module data class
 public class Module {
     private final int id;
-    private final int lecturer_id;
+    private final int lecturerId;
-    private final int semester_id;
+    private final int semesterId;
     private final String name;
 
-    public Module(int id, int lecturer_id, int semester_id, String name){
+    public Module(int id, int lecturerId, int semesterId, String name){
         this.id = id;
-        this.lecturer_id = lecturer_id;
+        this.lecturerId = lecturerId;
-        this.semester_id = semester_id;semester_id
+        this.semesterId = semesterId;
         this.name = name;
     }
 
     public int getId() { return id; }
 
-    public int getLecturerId() { return lecturer_id; }
+    public int getLecturerId() { return lecturerId; }
 
-    public int getSemesterId() { return semester_id; }
+    public int getSemesterId() { return semesterId; }
 
     public String getName() { return name; }
 

backend/src/main/java/com/example/backend/anwprj/controller/ModuleController.java

@@ -39,18 +39,17 @@ public class ModuleController {
 
     @CrossOrigin
     @GetMapping("/module/id")
-    public ResponseEntity<Module[]> getModules(
+    public ResponseEntity<Module> getModule(
-            @RequestParam(name= "semester_id") int semesterId,
+            @RequestParam(name="name") String name,
-            @RequestParam(name="lecturer_id") int lecturerId,
             @RequestParam(name="sessionid") String sessionID) {
 
         User user = UserSessionIDHandler.getUserBySessionID(sessionID);
 
         if(user != null)
         {
-            Module[] modules = db.getModules(semesterId, lecturerId);
+            Module module = db.getModule(name);
-            if (modules != null) {
+            if (module != null) {
-                return new ResponseEntity<>(modules, HttpStatus.OK);
+                return new ResponseEntity<>(module, HttpStatus.OK);
             }
 
             return new ResponseEntity<>(HttpStatus.NOT_FOUND);