created sortByNextExecution Comparator

src/main/java/ch/zhaw/gartenverwaltung/HelloApplication.java

@@ -1,23 +1,16 @@
 package ch.zhaw.gartenverwaltung;
 
 import ch.zhaw.gartenverwaltung.bootstrap.AppLoader;
-import ch.zhaw.gartenverwaltung.notifier.Notifier;
 import javafx.application.Application;
 import javafx.stage.Stage;
 
 import java.io.IOException;
 
 public class HelloApplication extends Application {
-
     @Override
     public void start(Stage stage) throws IOException {
         AppLoader appLoader = new AppLoader();
 
-        Notifier notifier = new Notifier(appLoader.getGardenSchedule());
-        Thread notificationThread = new Thread(notifier);
-        notificationThread.start();
-        notificationThread.interrupt();
-
         appLoader.loadSceneToStage("MainFXML.fxml", stage);
 
         stage.setTitle("Gartenverwaltung");

src/main/java/ch/zhaw/gartenverwaltung/bootstrap/AppLoader.java

@@ -10,7 +10,6 @@ import ch.zhaw.gartenverwaltung.io.TaskList;
 import ch.zhaw.gartenverwaltung.models.Garden;
 import ch.zhaw.gartenverwaltung.models.GardenSchedule;
 import ch.zhaw.gartenverwaltung.models.PlantListModel;
-import ch.zhaw.gartenverwaltung.notifier.Notifier;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
 import javafx.scene.control.DialogPane;
@@ -42,7 +41,6 @@ public class AppLoader {
 
 
     public AppLoader() throws IOException {
-
     }
 
 
@@ -156,8 +154,4 @@ public class AppLoader {
             default -> null;
         };
     }
-
-    public GardenSchedule getGardenSchedule() {
-        return gardenSchedule;
-    }
 }

src/main/java/ch/zhaw/gartenverwaltung/models/GardenSchedule.java

@@ -9,6 +9,7 @@ import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 public class GardenSchedule {
@@ -19,6 +20,7 @@ public class GardenSchedule {
      * Comparators to create sorted Task List
      */
     static final Comparator<Task> sortByStartDate = Comparator.comparing(Task::getStartDate);
+    static final Comparator<Task> sortByNextExecution = Comparator.comparing(Task::getNextExecution);
 
     /**
      * Constructor to create Database Objects.
@@ -175,7 +177,7 @@ public class GardenSchedule {
      * @throws IOException If the database cannot be accessed
      */
     public List<Task> getFilteredTaskList(LocalDate start, LocalDate end) throws IOException {
-        return getSortedTaskList(taskList.getTaskList(start, end), sortByStartDate);
+        return getSortedTaskList(taskList.getTaskList(start, end), sortByNextExecution);
     }
 
     /**

src/main/java/ch/zhaw/gartenverwaltung/notifier/Notifier.java

@@ -1,48 +0,0 @@
-package ch.zhaw.gartenverwaltung.notifier;
-
-import ch.zhaw.gartenverwaltung.models.GardenSchedule;
-import ch.zhaw.gartenverwaltung.types.Task;
-
-import java.io.IOException;
-import java.time.LocalDate;
-import java.util.function.Consumer;
-
-public class Notifier implements Runnable{
-    private final GardenSchedule gardenSchedule;
-    private boolean interrupted = false;
-
-    public Notifier(GardenSchedule gardenSchedule) {
-        this.gardenSchedule = gardenSchedule;
-    }
-
-    private void sendNotification(Task task){
-        // TODO implement
-    }
-
-    private void sendNotifications(){
-        System.out.println("sending Notifications");
-        try {
-            gardenSchedule.getTaskList().forEach(task -> {
-                if(task.getNextNotification() != null && task.getNextNotification().isBefore(LocalDate.now().minusDays(1))){
-                    sendNotification(task);
-                    task.setNextNotification(task.getNextExecution());
-                }
-            });
-        } catch (IOException e) {
-            // TODO Logger
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    public void run() {
-        while(!interrupted){
-            try {
-                sendNotifications();
-                Thread.sleep(3000);
-            } catch (InterruptedException e) {
-                interrupted = true;
-            }
-        }
-    }
-}

src/main/java/ch/zhaw/gartenverwaltung/types/Task.java

@@ -71,10 +71,8 @@ public class Task {
     public void done(){
         if(interval != null && !nextExecution.plusDays(interval).isAfter(endDate)){
             nextExecution = nextExecution.plusDays(interval);
-            nextNotification = nextExecution;
         } else {
             nextExecution = null;
-            nextNotification = null;
         }
     }
 

src/main/java/module-info.java

@@ -13,6 +13,4 @@ module ch.zhaw.gartenverwaltung {
     exports ch.zhaw.gartenverwaltung.types;
     exports ch.zhaw.gartenverwaltung.models;
     exports ch.zhaw.gartenverwaltung.json;
-    exports ch.zhaw.gartenverwaltung.notifier;
-    opens ch.zhaw.gartenverwaltung.notifier to javafx.fxml;
 }

src/test/resources/ch/zhaw/gartenverwaltung/io/template-taskdb.json

@@ -4,8 +4,6 @@
     "name" : "sow plant",
     "description": "Plant the seeds, crops in de bed.",
     "startDate" : "2022-05-01",
-    "nextExecution": "2022-05-01",
-    "nextNotification": "2022-05-01",
     "endDate" : "2022-05-01",
     "interval" : 0,
     "cropId" : 0
@@ -15,8 +13,6 @@
     "name" : "water plant",
     "description": "water the plant, so that the soil is wet around the plant.",
     "startDate" : "2022-05-01",
-    "nextExecution": "2022-05-01",
-    "nextNotification": "2022-05-01",
     "endDate" : "2022-09-01",
     "interval" : 2,
     "cropId" : 0
@@ -26,8 +22,6 @@
     "name" : "fertilize plant",
     "description": "The fertilizer has to be mixed with water. Then fertilize the plants soil with the mixture",
     "startDate" : "2022-06-01",
-    "nextExecution": "2022-05-01",
-    "nextNotification": "2022-05-01",
     "endDate" : "2022-08-01",
     "interval" : 28,
     "cropId" : 0
@@ -37,8 +31,6 @@
     "name" : "covering plant",
     "description": "Take a big enough coverage for the plants. Cover the whole plant with a bit space between the plant and the coverage",
     "startDate" : "2022-07-01",
-    "nextExecution": "2022-05-01",
-    "nextNotification": "2022-05-01",
     "endDate" : "2022-07-01",
     "interval" : 0,
     "cropId" : 0
@@ -48,8 +40,6 @@
     "name" : "look after plant",
     "description": "Look for pest or illness at the leaves of the plant. Check the soil around the plant, if the roots are enough covered with soil",
     "startDate" : "2022-05-01",
-    "nextExecution": "2022-05-01",
-    "nextNotification": "2022-05-01",
     "endDate" : "2022-09-01",
     "interval" : 5,
     "cropId" : 0
@@ -59,8 +49,6 @@
     "name" : "harvest plant",
     "description": "Pull the ripe vegetables out from the soil. Clean them with clear, fresh water. ",
     "startDate" : "2022-09-01",
-    "nextExecution": "2022-05-01",
-    "nextNotification": "2022-05-01",
     "endDate" : "2022-09-01",
     "interval" : 0,
     "cropId" : 0