Day Controller umgebogen

Day Controller wurde angepasst (wie Jonas sagen würde: umgebogen)

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

@@ -112,18 +112,17 @@ public class DataBaseHandler
         /**
         DAYS
          */
-    public Day addDay(Day day)
+        public Day addDay(Day day)
-    {
-        try
         {
-            st.executeUpdate("insert into days (dayinweek, weekid) values (" + day.getDayinweek() + ", " + day.getWeekid() + ")");
+            try
-            Week w = getWeek(day.getWeekid());
+            {
-            return getDay(day.getDayinweek(), w.getWeeknumber(), w.getSemesterid());
+                st.executeUpdate("insert into days (dayinyear, yearnumber, semesterid) values (" + day.getDayinyear() + ", " + day.getYearnumber() + ", " + day.getSemesterid() + ")");
-        } catch (SQLException e)
+                return getDay(day.getDayinyear(), day.getYearnumber(), day.getSemesterid());
-        {
+            } catch (SQLException e)
-            return null;
+            {
+                return null;
+            }
         }
-    }
 
     public Day getDay(int id)
     {
@@ -139,16 +138,11 @@ public class DataBaseHandler
         }
     }
 
-    public Day getDay(int dayinweek, int weeknumber, int semesterid)
+    public Day getDay(int dayinyear, int yearnumber, int semesterid)
     {
         try
         {
-            ResultSet rs = st.executeQuery("select d.* from days d, weeks w, semester s " +
+            ResultSet rs = st.executeQuery("select * from days where dayinyear =" + dayinyear + " and yearnumber =" + yearnumber + " and semesterid =" + semesterid);
-                    "where d.weekid = w.id and " +
-                    "w.semesterid = s.id and " +
-                    "d.dayinweek = " + dayinweek + " and " +
-                    "w.weeknumber = " + weeknumber + " and " +
-                    "s.id = " + semesterid);
 
             return resultSetToDay(rs);
         }
@@ -166,8 +160,9 @@ public class DataBaseHandler
 
             return new Day(
                     rs.getInt("id"),
-                    rs.getInt("dayinweek"),
+                    rs.getInt("dayinyear"),
-                    rs.getInt("weekid")
+                    rs.getInt("yearnumber"),
+                    rs.getInt("semesterid")
             );
         } catch (SQLException e)
         {

backend/src/main/java/com/example/backend/anwprj/Days/Day.java

@@ -3,28 +3,30 @@ package com.example.backend.anwprj.Days;
 public class Day
 {
     private int id;
-    private int dayinweek;
+    private int dayinyear;
-    private int weekid;
+    private int yearnumber;
+    private int semesterid;
 
-    public Day(int id, int dayinweek, int weekid)
+    public Day(int id, int dayinyear, int yearnumber, int semesterid) {
-    {
         this.id = id;
-        this.dayinweek = dayinweek;
+        this.dayinyear = dayinyear;
-        this.weekid = weekid;
+        this.yearnumber = yearnumber;
+        this.semesterid = semesterid;
     }
 
-    public int getId()
+    public int getId() {
-    {
         return id;
     }
 
-    public int getDayinweek()
+    public int getDayinyear() {
-    {
+        return dayinyear;
-        return dayinweek;
     }
 
-    public int getWeekid()
+    public int getYearnumber() {
-    {
+        return yearnumber;
-        return weekid;
+    }
+
+    public int getSemesterid() {
+        return semesterid;
     }
 }

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

@@ -23,15 +23,15 @@ public class DayController
     @GetMapping("/days")
     public ResponseEntity<Day> getDay(
             @RequestParam(name="sessionid") String sessionID,
-            @RequestParam(name="dayinweek") int dayInWeek,
+            @RequestParam(name="dayinyear") int dayinyear,
-            @RequestParam(name="weeknumber") int weekNumber,
+            @RequestParam(name="yearnumber") int yearnumber,
             @RequestParam(name="semesterid") int semesterID)
     {
         User u = UserSessionIDHandler.getUserBySessionID(sessionID);
 
         if(u != null)
         {
-            Day d = db.getDay(dayInWeek, weekNumber, semesterID);
+            Day d = db.getDay(dayinyear, yearnumber, semesterID);
 
             if (d != null)
             {