diff --git a/backend/src/main/java/com/example/backend/anwprj/DataBaseHandler.java b/backend/src/main/java/com/example/backend/anwprj/DataBaseHandler.java index 2e82714..bc95bd7 100644 --- a/backend/src/main/java/com/example/backend/anwprj/DataBaseHandler.java +++ b/backend/src/main/java/com/example/backend/anwprj/DataBaseHandler.java @@ -112,18 +112,17 @@ public class DataBaseHandler /** DAYS */ - public Day addDay(Day day) - { - try + public Day addDay(Day day) { - st.executeUpdate("insert into days (dayinweek, weekid) values (" + day.getDayinweek() + ", " + day.getWeekid() + ")"); - Week w = getWeek(day.getWeekid()); - return getDay(day.getDayinweek(), w.getWeeknumber(), w.getSemesterid()); - } catch (SQLException e) - { - return null; + try + { + st.executeUpdate("insert into days (dayinyear, yearnumber, semesterid) values (" + day.getDayinyear() + ", " + day.getYearnumber() + ", " + day.getSemesterid() + ")"); + return getDay(day.getDayinyear(), day.getYearnumber(), day.getSemesterid()); + } catch (SQLException e) + { + 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 " + - "where d.weekid = w.id and " + - "w.semesterid = s.id and " + - "d.dayinweek = " + dayinweek + " and " + - "w.weeknumber = " + weeknumber + " and " + - "s.id = " + semesterid); + ResultSet rs = st.executeQuery("select * from days where dayinyear =" + dayinyear + " and yearnumber =" + yearnumber + " and semesterid =" + semesterid); return resultSetToDay(rs); } @@ -166,8 +160,9 @@ public class DataBaseHandler return new Day( rs.getInt("id"), - rs.getInt("dayinweek"), - rs.getInt("weekid") + rs.getInt("dayinyear"), + rs.getInt("yearnumber"), + rs.getInt("semesterid") ); } catch (SQLException e) { diff --git a/backend/src/main/java/com/example/backend/anwprj/Days/Day.java b/backend/src/main/java/com/example/backend/anwprj/Days/Day.java index e17c635..1c986d3 100644 --- a/backend/src/main/java/com/example/backend/anwprj/Days/Day.java +++ b/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 weekid; + private int dayinyear; + 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.weekid = weekid; + this.dayinyear = dayinyear; + this.yearnumber = yearnumber; + this.semesterid = semesterid; } - public int getId() - { + public int getId() { return id; } - public int getDayinweek() - { - return dayinweek; + public int getDayinyear() { + return dayinyear; } - public int getWeekid() - { - return weekid; + public int getYearnumber() { + return yearnumber; + } + + public int getSemesterid() { + return semesterid; } } diff --git a/backend/src/main/java/com/example/backend/anwprj/controller/DayController.java b/backend/src/main/java/com/example/backend/anwprj/controller/DayController.java index 462da91..9a23c03 100644 --- a/backend/src/main/java/com/example/backend/anwprj/controller/DayController.java +++ b/backend/src/main/java/com/example/backend/anwprj/controller/DayController.java @@ -23,15 +23,15 @@ public class DayController @GetMapping("/days") public ResponseEntity getDay( @RequestParam(name="sessionid") String sessionID, - @RequestParam(name="dayinweek") int dayInWeek, - @RequestParam(name="weeknumber") int weekNumber, + @RequestParam(name="dayinyear") int dayinyear, + @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) {