Added a clause to the add shift method that checks the availability and makes...

Added a clause to the add shift method that checks the availability and makes sure that the start is later than the end.

SchedulerApp/src/main/java/com/example/schedulerapp/Model.java

@@ -244,15 +244,21 @@ public class Model {
         if (id <= 0){
             return "Invalid ID";
         }
-        if (start < 0 || end < 0 || start > 2359 || end > 2359){
+        if (start < 0 || end < 0 || end > 2359 || start >= end){
             return "Invalid start or end time";
         }
+
+        int[] dayOfTheWeekAvailability = this.employees.get(id).getAvailabilityForDay(LocalDate.parse(date)
+                .getDayOfWeek().getValue()%7);
+        if (dayOfTheWeekAvailability[0] > start || dayOfTheWeekAvailability[1] < start || dayOfTheWeekAvailability[1] < end) {
+            return "Shift time conflicts with employees availability";
+        }
         for (Shift shift : getShiftsByDay(date)){
             if (shift.getEmployeeID() == id){
                 int otherShiftStart = Integer.parseInt(shift.getStart().toLocalTime().toString().replace(":", ""));
                 int otherShiftEnd = Integer.parseInt(shift.getEnd().toLocalTime().toString().replace(":", ""));
                 if (start <= otherShiftEnd && !(end <= otherShiftStart)){
-                    return "Shift time conflict for employee";
+                    return "Shift time conflict with existing shift";
                 }
             }
         }