fixed Method getFilteredPlantListByString for case if SearchString is empty.

doc/Classdiagramm/layer-diagram.uxf

@@ -1,7 +0,0 @@
-<diagram program="umletino" version="15.0.0"><zoom_level>10</zoom_level><element><id>UMLPackage</id><coordinates><x>390</x><y>60</y><w>340</w><h>100</h></coordinates><panel_attributes>UI</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLPackage</id><coordinates><x>390</x><y>180</y><w>460</w><h>120</h></coordinates><panel_attributes>Domain</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLPackage</id><coordinates><x>390</x><y>330</y><w>460</w><h>120</h></coordinates><panel_attributes>Technical Services</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLPackage</id><coordinates><x>400</x><y>90</y><w>100</w><h>60</h></coordinates><panel_attributes>Views (JFX)</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLPackage</id><coordinates><x>400</x><y>220</y><w>100</w><h>60</h></coordinates><panel_attributes>IO</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLPackage</id><coordinates><x>400</x><y>370</y><w>100</w><h>60</h></coordinates><panel_attributes>Jackson</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLPackage</id><coordinates><x>510</x><y>220</y><w>100</w><h>60</h></coordinates><panel_attributes>Types</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLPackage</id><coordinates><x>620</x><y>220</y><w>100</w><h>60</h></coordinates><panel_attributes>Models</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLPackage</id><coordinates><x>510</x><y>90</y><w>110</w><h>60</h></coordinates><panel_attributes>Controllers (JFX)</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLPackage</id><coordinates><x>510</x><y>370</y><w>100</w><h>60</h></coordinates><panel_attributes>Logging</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLPackage</id><coordinates><x>620</x><y>370</y><w>100</w><h>60</h></coordinates><panel_attributes>JavaFX</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLPackage</id><coordinates><x>730</x><y>220</y><w>110</w><h>60</h></coordinates><panel_attributes>Services</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLPackage</id><coordinates><x>730</x><y>370</y><w>110</w><h>60</h></coordinates><panel_attributes>HTTP/API</panel_attributes><additional_attributes></additional_attributes></element><element><id>Relation</id><coordinates><x>570</x><y>150</y><w>90</w><h>70</h></coordinates><panel_attributes>lt=.&gt;
-</panel_attributes><additional_attributes>70;10;10;50</additional_attributes></element><element><id>Relation</id><coordinates><x>570</x><y>290</y><w>110</w><h>80</h></coordinates><panel_attributes>lt=.&gt;
-</panel_attributes><additional_attributes>90;10;10;60</additional_attributes></element><element><id>Relation</id><coordinates><x>340</x><y>120</y><w>350</w><h>400</h></coordinates><panel_attributes>lt=.&gt;
-</panel_attributes><additional_attributes>60;10;10;10;10;380;330;380;330;310</additional_attributes></element><element><id>Relation</id><coordinates><x>770</x><y>270</y><w>30</w><h>120</h></coordinates><panel_attributes>lt=.&gt;
-</panel_attributes><additional_attributes>10;10;10;100</additional_attributes></element><element><id>Relation</id><coordinates><x>360</x><y>250</y><w>60</w><h>180</h></coordinates><panel_attributes>lt=.&gt;
-</panel_attributes><additional_attributes>40;10;10;10;10;160;40;160</additional_attributes></element><element><id>Relation</id><coordinates><x>610</x><y>120</y><w>70</w><h>120</h></coordinates><panel_attributes>lt=.&gt;
-</panel_attributes><additional_attributes>10;10;50;10;50;100</additional_attributes></element></diagram>

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

@@ -1,19 +0,0 @@
-package ch.zhaw.gartenverwaltung;
-
-import ch.zhaw.gartenverwaltung.types.HardinessZone;
-
-public class Config {
-    private static HardinessZone currentHardinessZone;
-
-    static {
-        currentHardinessZone = HardinessZone.ZONE_8A;
-    }
-
-    public static HardinessZone getCurrentHardinessZone() {
-        return currentHardinessZone;
-    }
-
-    public static void setCurrentHardinessZone(HardinessZone currentHardinessZone) {
-        Config.currentHardinessZone = currentHardinessZone;
-    }
-}

src/main/java/ch/zhaw/gartenverwaltung/gardenplan/Gardenplanmodel.java

@@ -1,8 +0,0 @@
-package ch.zhaw.gartenverwaltung.gardenplan;
-
-public class Gardenplanmodel {
-//    private JasonGardenplan gardenplan;
-    // liste von crops
-    //task generieren
-    //plant holen, task template mit tasktemplateklasse tasks erstellen
-}

src/main/java/ch/zhaw/gartenverwaltung/io/JsonPlantDatabase.java

@@ -1,13 +1,10 @@
 package ch.zhaw.gartenverwaltung.io;
 
-import ch.zhaw.gartenverwaltung.json.PlantImageDeserializer;
 import ch.zhaw.gartenverwaltung.types.HardinessZone;
 import ch.zhaw.gartenverwaltung.types.Plant;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.fasterxml.jackson.datatype.jsr310.deser.MonthDayDeserializer;
-import javafx.scene.image.Image;
 
 import java.io.IOException;
 import java.net.URL;
@@ -34,14 +31,10 @@ public class JsonPlantDatabase implements PlantDatabase {
      * Creating constant objects required to deserialize the {@link MonthDay} classes
      */
     private final static JavaTimeModule timeModule = new JavaTimeModule();
-    private final static SimpleModule imageModule = new SimpleModule();
-
     static {
         DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("MM-dd");
         MonthDayDeserializer dateDeserializer = new MonthDayDeserializer(dateFormat);
         timeModule.addDeserializer(MonthDay.class, dateDeserializer);
-
-        imageModule.addDeserializer(Image.class, new PlantImageDeserializer());
     }
 
     /**
@@ -82,9 +75,8 @@ public class JsonPlantDatabase implements PlantDatabase {
         }
         if (dataSource != null) {
             currentZone = zone;
-            ObjectMapper mapper = new ObjectMapper()
-                    .registerModule(timeModule)
-                    .registerModule(imageModule);
+            ObjectMapper mapper = new ObjectMapper();
+            mapper.registerModule(timeModule);
 
             List<Plant> result;
             result = mapper.readerForListOf(Plant.class).readValue(dataSource);

src/main/java/ch/zhaw/gartenverwaltung/io/JsonTaskDatabase.java

@@ -1,152 +0,0 @@
-package ch.zhaw.gartenverwaltung.io;
-
-import ch.zhaw.gartenverwaltung.types.Crop;
-import ch.zhaw.gartenverwaltung.types.Task;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Implements the {@link TaskDatabase} interface for loading and writing {@link Task} objects
- * from and to a JSON file.
- * The reads are cached to minimize file-io operations.
- */
-public class JsonTaskDatabase implements TaskDatabase{
-    IdProvider idProvider;
-    private final URL dataSource = getClass().getResource("taskdb.json");
-
-    private Map<Long, Task> taskMap = Collections.emptyMap();
-
-    /**
-     * Creating constant objects required to deserialize the {@link LocalDate} classes
-     */
-    private final static JavaTimeModule timeModule = new JavaTimeModule();
-    static {
-        DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-        LocalDateDeserializer dateDeserializer = new LocalDateDeserializer(dateFormat);
-        timeModule.addDeserializer(LocalDate.class, dateDeserializer);
-    }
-
-    /**
-     * If no data is currently loaded, data is loaded from {@link #dataSource}.
-     * In any case, the values of {@link #taskMap} are returned.
-     *
-     * @see TaskDatabase#getTaskList(LocalDate, LocalDate)
-     */
-    @Override
-    public List<Task> getTaskList(LocalDate start, LocalDate end) throws IOException{
-        if(taskMap.isEmpty()) {
-            loadTaskListFromFile();
-        }
-        return taskMap.values().stream().filter(task -> task.isInTimePeriode(start, end)).toList();
-    }
-
-    /**
-     * Method get all Tasks for a specific Crop
-     * @param cropId the cropId
-     * @return List of Tasks for given Crop
-     */
-    @Override
-    public List<Task> getTaskForCrop(long cropId) throws IOException {
-        if(taskMap.isEmpty()) {
-            loadTaskListFromFile();
-        }
-        return taskMap.values().stream().filter(task -> task.getCropId() == cropId).toList();
-    }
-
-    /**
-     * Method remove all Tasks for a specific Crop
-     * @param cropId the crop
-     */
-    @Override
-    public void removeTasksForCrop(long cropId) throws IOException {
-        if(taskMap.isEmpty()) {
-            loadTaskListFromFile();
-        }
-        taskMap.values().removeIf(task -> task.getCropId() == cropId);
-    }
-
-    /**
-     * If no data is currently loaded, data is loaded from {@link #dataSource}.
-     * If the {@link Task} has an id than the task is added to the {@link #taskMap}
-     * otherwise the id is generated with the {@link IdProvider} before adding
-     * it to the {@link #taskMap}. In any case, the {@link #taskMap} is written
-     * to the {@link #dataSource}.
-     *
-     * @see TaskDatabase#saveTask(Task)
-     */
-    @Override
-    public void saveTask(Task task) throws IOException {
-        if(taskMap.isEmpty()) {
-            loadTaskListFromFile();
-        }
-        if(task.getId() == 0) {
-            task.withId(idProvider.incrementAndGet());
-        }
-        writeTaskListToFile();
-    }
-
-    /**
-     * If no data is currently loaded, data is loaded from {@link #dataSource}.
-     * If the {@link Task}s id is found in the {@link #taskMap}, the Task is removed
-     * from the  {@link #taskMap}. Then the Task are written to the {@link #dataSource}.
-     *
-     * @see TaskDatabase#removeTask(Task)
-     */
-    @Override
-    public void removeTask(Task task) throws IOException {
-        if(taskMap.isEmpty()) {
-            loadTaskListFromFile();
-        }
-        if(taskMap.containsKey(task.getId())){
-            taskMap.remove(task.getId());
-            writeTaskListToFile();
-        }
-    }
-
-    /**
-     * Writes cached data to the {@link #dataSource}.
-     *
-     * @throws IOException If the database cannot be accessed
-     */
-    private void writeTaskListToFile() throws IOException {
-        ObjectMapper mapper = new ObjectMapper();
-        mapper.registerModule(timeModule)
-                .registerModule(new Jdk8Module());
-
-        if(dataSource != null) {
-            mapper.writeValue(new File(dataSource.getFile()), taskMap);
-        }
-    }
-
-    /**
-     * Loads the database from {@link #dataSource} and updates the cached data.
-     *
-     * @throws IOException If the database cannot be accessed
-     */
-    private void loadTaskListFromFile() throws IOException {
-        if (dataSource != null) {
-            ObjectMapper mapper = new ObjectMapper();
-            mapper.registerModule(timeModule);
-
-            List<Task> result;
-            result = mapper.readerForListOf(Task.class).readValue(dataSource);
-
-            taskMap = result.stream()
-                    .collect(HashMap::new,
-                        (res, task) -> res.put(task.getId(), task),
-                        (existing, replacement) -> {});
-        }
-    }
-}

src/main/java/ch/zhaw/gartenverwaltung/io/TaskDatabase.java

@@ -1,58 +1,13 @@
 package ch.zhaw.gartenverwaltung.io;
 
-import ch.zhaw.gartenverwaltung.types.Crop;
-import ch.zhaw.gartenverwaltung.types.HardinessZone;
-import ch.zhaw.gartenverwaltung.types.Plant;
 import ch.zhaw.gartenverwaltung.types.Task;
 
 import java.io.IOException;
-import java.time.LocalDate;
 import java.util.Date;
 import java.util.List;
 
-/**
- * A database of {@link Task}s.
- * The interface specifies the minimal required operations.
- */
 public interface TaskDatabase {
-    /**
-     * Yields a list of all {@link Task}s in the database with the start and end date of a period of time.
-     *
-     * @param start The start date of the wanted time period
-     * @param end The end date of the wanted time period
-     * @return A list of {@link Task}s planned in the specified time period
-     * @throws IOException If the database cannot be accessed
-     */
-    List<Task> getTaskList(LocalDate start, LocalDate end) throws IOException;
-
-    /**
-     * Method get all Tasks for a specific Crop
-     * @param cropId the cropId
-     * @return List of Tasks for given Crop
-     * @throws IOException If the database cannot be accessed
-     */
-    List<Task> getTaskForCrop(long cropId) throws IOException;
-
-    /**
-     * Method remove all Tasks for a specific Crop
-     * @param cropId the cropId
-     * @throws IOException If the database cannot be accessed
-     */
-    void removeTasksForCrop(long cropId) throws IOException;
-
-    /**
-     * Saves the {@link Task} in the Cache.
-     *
-     * @param task The {@link Task} which is wanted to be saved in the TaskList
-     * @throws IOException If the database cannot be accessed
-     */
+    List<Task> getTaskList(Date start, Date end);
     void saveTask(Task task) throws IOException;
-
-    /**
-     * Removes the {@link Task}from the Cache.
-     *
-     * @param task The {@link Task} which has to be removed from the {@link Task} list.
-     * @throws IOException If the database cannot be accessed
-     */
     void removeTask(Task task) throws IOException;
 }

src/main/java/ch/zhaw/gartenverwaltung/json/GrowthPhaseTypeDeserializer.java

@@ -17,12 +17,11 @@ public class GrowthPhaseTypeDeserializer extends StdDeserializer<GrowthPhaseType
     @Override
     public GrowthPhaseType deserialize(JsonParser parser, DeserializationContext context) throws IOException {
         GrowthPhaseType result = null;
-        String token = parser.getText();
         try {
-            result = GrowthPhaseType.valueOf(token.toUpperCase());
+            result = GrowthPhaseType.valueOf(parser.getText().toUpperCase());
         } catch (IllegalArgumentException e) {
             // TODO: Log
-            System.err.printf("Bad growth phase type \"%s\"\n", token);
+            System.err.println("bad growth phase type");
         }
         return result;
     }

src/main/java/ch/zhaw/gartenverwaltung/json/HardinessZoneDeserializer.java

@@ -18,12 +18,11 @@ public class HardinessZoneDeserializer extends StdDeserializer<HardinessZone> {
     @Override
     public HardinessZone deserialize(JsonParser parser, DeserializationContext context) throws IOException {
         HardinessZone result = null;
-        String token = parser.getText();
         try {
-            result = HardinessZone.valueOf(token.toUpperCase());
+            result = HardinessZone.valueOf(parser.getText().toUpperCase());
         } catch (IllegalArgumentException e) {
             // TODO: Log
-            System.err.printf("Unknown Hardiness Zone \"%s\"\n", token);
+            System.err.println("bad growth phase type");
         }
         return result;
     }

src/main/java/ch/zhaw/gartenverwaltung/json/PlantImageDeserializer.java

@@ -1,31 +0,0 @@
-package ch.zhaw.gartenverwaltung.json;
-
-import ch.zhaw.gartenverwaltung.io.PlantDatabase;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import javafx.scene.image.Image;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-public class PlantImageDeserializer extends JsonDeserializer<Image> {
-
-    @Override
-    public Image deserialize(JsonParser parser, DeserializationContext context) throws IOException {
-        Image result = null;
-        URL imageUrl = PlantDatabase.class.getResource(String.format("images/%s", parser.getText()));
-        if (imageUrl != null) {
-            try (InputStream is = new FileInputStream(imageUrl.getFile())) {
-                result = new Image(is);
-            } catch (IllegalArgumentException e) {
-                // TODO: Log
-                e.printStackTrace();
-                System.err.printf("Cannot find Image \"%s\"\n", imageUrl.getFile());
-            }
-        }
-        return result;
-    }
-}

src/main/java/ch/zhaw/gartenverwaltung/plantList/PlantListModel.java

@@ -110,7 +110,9 @@ public class PlantListModel {
      * @throws IOException If the database cannot be accessed
      */
     public List<Plant> getFilteredPlantListByString(HardinessZone zone, String searchString) throws HardinessZoneNotSetException, IOException {
-        if(searchString.charAt(0) == '#') {
+        if(searchString.length() == 0){
+            return getPlantList(zone);
+        } else if(searchString.charAt(0) == '#') {
             try {
                 return getFilteredPlantListById(zone, Long.parseLong(searchString.substring(1)));
             } catch (NumberFormatException e) {

src/main/java/ch/zhaw/gartenverwaltung/taskList/PlantNotFoundException.java

@@ -1,7 +0,0 @@
-package ch.zhaw.gartenverwaltung.taskList;
-
-public class PlantNotFoundException extends Exception {
-    public PlantNotFoundException() {
-        super("The selected Plant was not found in Database!");
-    }
-}

src/main/java/ch/zhaw/gartenverwaltung/taskList/TaskListModel.java

@@ -1,188 +0,0 @@
-package ch.zhaw.gartenverwaltung.taskList;
-
-import ch.zhaw.gartenverwaltung.Config;
-import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException;
-import ch.zhaw.gartenverwaltung.io.JsonTaskDatabase;
-import ch.zhaw.gartenverwaltung.io.PlantDatabase;
-import ch.zhaw.gartenverwaltung.io.TaskDatabase;
-import ch.zhaw.gartenverwaltung.types.*;
-
-import java.io.IOException;
-import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
-public class TaskListModel {
-    private TaskDatabase taskDatabase;
-    private PlantDatabase plantDatabase;
-
-    /**
-     * Comparators to create sorted Task List
-     */
-    static final Comparator<Task> sortByStartDate = Comparator.comparing(Task::getStartDate);
-
-    public TaskListModel(){
-        taskDatabase = new JsonTaskDatabase();
-    }
-
-    /**
-     * Constructor to create Database Objects.
-     */
-    public TaskListModel(TaskDatabase taskDatabase, PlantDatabase plantDatabase) {
-        this.taskDatabase = taskDatabase;
-        this.plantDatabase = plantDatabase;
-    }
-
-    /**
-     * Method to save a new Task to Task Database
-     * @param task the Task to save
-     * @throws IOException If the database cannot be accessed
-     */
-    public void addTask(Task task) throws IOException {
-        taskDatabase.saveTask(task);
-    }
-
-    /**
-     * Method to add all Tasks for a new crop
-     * @param crop the crop which is added
-     * @throws PlantNotFoundException if the plantId in the crop doesn't exist in Plant Database
-     * @throws HardinessZoneNotSetException If there is no Hardiness Zone Set in Plant Database
-     * @throws IOException If the database cannot be accessed
-     */
-    public void planTasksForCrop(Crop crop) throws PlantNotFoundException, HardinessZoneNotSetException, IOException {
-        Plant plant = plantDatabase.getPlantById(Config.getCurrentHardinessZone(), crop.getPlantId()).orElseThrow(PlantNotFoundException::new);
-        for (GrowthPhase growthPhase : plant.lifecycle()) {
-            for (TaskTemplate taskTemplate : growthPhase.taskTemplates()) {
-                addTask(taskTemplate.generateTask(crop.getStartDate(), crop.getCropId().orElse(0L)));
-            }
-        }
-    }
-
-    /**
-     * Method to remove all Tasks for a specific Crop
-     * @param cropId The crop which is removed
-     * @throws IOException If the database cannot be accessed
-     */
-    public void removeTasksForCrop(long cropId) throws IOException {
-        taskDatabase.removeTasksForCrop(cropId);
-    }
-
-    /**
-     * Method to remove a Task from Database
-     * @param task the Task to remove
-     * @throws IOException If the database cannot be accessed
-     */
-    public void removeTask(Task task) throws IOException {
-        taskDatabase.removeTask(task);
-    }
-
-    private List<Task> filterListByCrop(List<Task> taskList, Long cropId) {
-        return taskList.stream().filter(task -> task.getCropId() == cropId).collect(Collectors.toList());
-    }
-
-    /**
-     * Method to get all Tasks
-     * @return List of all Tasks
-     * @throws IOException If the database cannot be accessed
-     */
-    public List<Task> getTaskList() throws IOException {
-        return getFilteredTaskList(LocalDate.MIN, LocalDate.MAX);
-    }
-
-    /**
-     * Method to get all Tasks for specific Crop
-     * @return List of all Tasks for with given CropID
-     * @throws IOException If the database cannot be accessed
-     */
-    public List<Task> getTaskListForCrop(Long cropId) throws IOException {
-        return filterListByCrop(getTaskList(), cropId);
-    }
-
-    /**
-     * Method to get all Tasks which are today or in future
-     * @return List of Tasks
-     * @throws IOException If the database cannot be accessed
-     */
-    public List<Task> getFutureTasks() throws IOException {
-        return getFilteredTaskList(LocalDate.now(), LocalDate.MAX);
-    }
-
-    /**
-     * Method to get all Tasks which are today or in future for specific Crop
-     * @return List of Tasks with given crop ID
-     * @throws IOException If the database cannot be accessed
-     */
-    public List<Task> getFutureTasksForCrop(Long cropId) throws IOException {
-        return filterListByCrop(getFutureTasks(), cropId);
-    }
-
-    /**
-     * Method to get all Tasks which are today or in past
-     * @return List of Tasks
-     * @throws IOException If the database cannot be accessed
-     */
-    public List<Task> getPastTasks() throws IOException {
-        return getFilteredTaskList(LocalDate.MIN, LocalDate.now());
-    }
-
-    /**
-     * Method to get all Tasks which are today or in past for specifc crop
-     * @return List of Tasks with given grop id
-     * @throws IOException If the database cannot be accessed
-     */
-    public List<Task> getPastTasksForCrop(Long cropId) throws IOException {
-        return filterListByCrop(getPastTasks(), cropId);
-    }
-
-    /**
-     * Method to get an List of 7 Tasklists for the next 7 days. Index 0 is Tasklist for Today.
-     * @return List with length 7 (List<List<Task>>)
-     * @throws IOException If the database cannot be accessed
-     */
-    public List<List<Task>> getTasksUpcomingWeek() throws IOException {
-        List<List<Task>> dayTaskList = new ArrayList<>();
-        for(int i = 0; i < 7; i++) {
-            LocalDate date = LocalDate.now().plusDays(i);
-            dayTaskList.add(taskDatabase.getTaskList(date, date));
-        }
-        return dayTaskList;
-    }
-
-    /**
-     * Method to get an List of 7 Tasklists for the next 7 days. (Filtered Index 0 is Tasklist for Today.
-     * @return List with length 7 (List<List<Task>>)
-     * @throws IOException If the database cannot be accessed
-     */
-    public List<List<Task>> getTasksUpcomingWeekForCrop(Long cropId) throws IOException {
-        List<List<Task>> dayTaskList = new ArrayList<>();
-        for(int i = 0; i < 7; i++) {
-            LocalDate date = LocalDate.now().plusDays(i);
-            dayTaskList.add(filterListByCrop(taskDatabase.getTaskList(date, date), cropId));
-        }
-        return dayTaskList;
-    }
-
-    /**
-     * Method to get Tasklist filtered by date.
-     * @param start the start date for the filter
-     * @param end the end date for the filter
-     * @return List of Tasks matched by the filter
-     * @throws IOException If the database cannot be accessed
-     */
-    public List<Task> getFilteredTaskList(LocalDate start, LocalDate end) throws IOException {
-        return getSortedTaskList(taskDatabase.getTaskList(start, end), sortByStartDate);
-    }
-
-    /**
-     * Method to sort a Tasklist by a given Comparator
-     * @param taskList The Tasklist to sort
-     * @param comparator the comparator to sort
-     * @return a sorted coppy of the given Tasklist
-     */
-    private List<Task> getSortedTaskList(List<Task> taskList, Comparator<Task> comparator) {
-        return taskList.stream().sorted(comparator).collect(Collectors.toList());
-    }
-}

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

@@ -1,7 +1,5 @@
 package ch.zhaw.gartenverwaltung.types;
 
-import javafx.scene.image.Image;
-
 import java.time.LocalDate;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -12,7 +10,6 @@ public record Plant(
         long id,
         String name,
         String description,
-        Image image,
         String spacing,
         int light,
         String soil,

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

@@ -15,33 +15,18 @@ public class Task {
     private final LocalDate startDate;
     private Integer interval;
     private LocalDate endDate;
-    private long cropId;
 
-    /**
-     * default constructor
-     * (used by Json deserializer)
-     */
-    public Task(long cropId){
-        name= "";
-        description= "";
-        startDate = LocalDate.now();
-        this.cropId = cropId;
-    }
-
-    public Task(String name, String description, LocalDate startDate, long cropId) {
+    public Task(String name, String description, LocalDate startDate) {
         this.name = name;
         this.description = description;
         this.startDate = startDate;
-        this.cropId = cropId;
     }
-
-    public Task(String name, String description, LocalDate startDate, LocalDate endDate, int interval, long cropId) {
+    public Task(String name, String description, LocalDate startDate, LocalDate endDate, int interval) {
         this.name = name;
         this.description = description;
         this.startDate = startDate;
         this.endDate = endDate;
         this.interval = interval;
-        this.cropId = cropId;
     }
 
     // Builder-pattern-style setters
@@ -58,16 +43,11 @@ public class Task {
         return this;
     }
 
-    public boolean isInTimePeriode(LocalDate searchStartDate, LocalDate searchEndDate){
-        return startDate.isAfter(searchStartDate) && startDate.isBefore(searchEndDate);
-    }
-
     // Getters
     public long getId() { return id; }
     public String getName() { return name; }
     public String getDescription() { return description; }
     public LocalDate getStartDate() { return startDate; }
-    public long getCropId() { return cropId; }
 
     public Optional<Integer> getInterval() {
         return Optional.ofNullable(interval);

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

@@ -44,8 +44,8 @@ public class TaskTemplate {
         this.relativeStartDate = relativeStartDate;
     }
 
-    public Task generateTask(LocalDate realStartDate, long cropId) {
-        Task task = new Task(name, description, realStartDate.plusDays(relativeStartDate), cropId);
+    public Task generateTask(LocalDate realStartDate) {
+        Task task = new Task(name, description, realStartDate.plusDays(relativeStartDate));
         if (relativeEndDate != null) {
             task.withEndDate(realStartDate.plusDays(relativeEndDate));
         }

src/main/resources/ch/zhaw/gartenverwaltung/io/images/ATTRIBUTION

@@ -1,5 +0,0 @@
-Potato, Onion
-    Photos by Lars Blankers: https://unsplash.com/@lmablankers?utm_source=unsplash&utm_medium=referral&utm_content=creditCopyText
-
-Carrot
-    Photo by Maja Vujic: https://unsplash.com/@majavujic87?utm_source=unsplash&utm_medium=referral&utm_content=creditCopyText

src/main/resources/ch/zhaw/gartenverwaltung/io/plantdb.json

@@ -6,7 +6,6 @@
     "light": 6,
     "spacing": "35",
     "soil": "sandy",
-    "image": "potato.jpg",
     "pests": [
       {
         "name": "Rot",
@@ -87,7 +86,6 @@
     "id": 1,
     "name": "Early Carrot",
     "description": "Carrot, (Daucus carota), herbaceous, generally biennial plant of the Apiaceae family that produces an edible taproot. Among common varieties root shapes range from globular to long, with lower ends blunt to pointed. Besides the orange-coloured roots, white-, yellow-, and purple-fleshed varieties are known.",
-    "image": "carrot.jpg",
     "lifecycle": [
       {
         "startDate": "02-20",
@@ -169,7 +167,6 @@
     "id": 2,
     "name": "Summertime Onion",
     "description": "Onion, (Allium cepa), herbaceous biennial plant in the amaryllis family (Amaryllidaceae) grown for its edible bulb. The onion is likely native to southwestern Asia but is now grown throughout the world, chiefly in the temperate zones. Onions are low in nutrients but are valued for their flavour and are used widely in cooking. They add flavour to such dishes as stews, roasts, soups, and salads and are also served as a cooked vegetable.",
-    "image": "onion.jpg",
     "lifecycle": [
       {
         "startDate": "03-15",

src/main/resources/ch/zhaw/gartenverwaltung/io/taskdb.json

@@ -1,56 +0,0 @@
-[
-  {
-  "id" : 1,
-  "name" : "sow plant",
-  "description": "Plant the seeds, crops in de bed.",
-  "startDate" : "2022-05-01",
-  "endDate" : "2022-05-01",
-  "interval" : 0,
-    "cropID" : 0
-  },
-  {
-    "id" : 2,
-    "name" : "water plant",
-    "description": "water the plant, so that the soil is wet around the plant.",
-    "startDate" : "2022-05-01",
-    "endDate" : "2022-09-01",
-    "interval" : 2,
-    "cropID" : 0
-  },
-  {
-    "id" : 3,
-    "name" : "fertilize plant",
-    "description": "The fertilizer has to be mixed with water. Then fertilize the plants soil with the mixture",
-    "startDate" : "2022-06-01",
-    "endDate" : "2022-08-01",
-    "interval" : 28,
-    "cropID" : 0
-  },
-  {
-    "id" : 4,
-    "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",
-    "endDate" : "2022-07-01",
-    "interval" : 0,
-    "cropID" : 0
-  },
-  {
-    "id" : 5,
-    "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",
-    "endDate" : "2022-09-01",
-    "interval" : 5,
-    "cropID" : 0
-  },
-  {
-    "id" : 6,
-    "name" : "harvest plant",
-    "description": "Pull the ripe vegetables out from the soil. Clean them with clear, fresh water. ",
-    "startDate" : "2022-09-01",
-    "endDate" : "2022-09-01",
-    "interval" : 0,
-    "cropID" : 0
-  }
-]

src/test/java/ch/zhaw/gartenverwaltung/io/JsonPlantDatabaseTest.java

@@ -30,7 +30,9 @@ public class JsonPlantDatabaseTest {
         List<Plant> testList;
         try {
             testList = testDatabase.getPlantList(HardinessZone.ZONE_8A);
-        } catch (IOException | HardinessZoneNotSetException e) {
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        } catch (HardinessZoneNotSetException e) {
             throw new RuntimeException(e);
         }
         Assertions.assertEquals(3, testList.size());
@@ -45,8 +47,11 @@ public class JsonPlantDatabaseTest {
     void getPlantById() {
         Optional<Plant> testPlant;
         try {
-            testPlant = testDatabase.getPlantById(HardinessZone.ZONE_8A,1);
-        } catch (IOException | HardinessZoneNotSetException e) {
+            testDatabase.getPlantList(HardinessZone.ZONE_8A);
+            testPlant = testDatabase.getPlantById(1);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        } catch (HardinessZoneNotSetException e) {
             throw new RuntimeException(e);
         }
         Assertions.assertTrue(testPlant.isPresent());
@@ -58,8 +63,11 @@ public class JsonPlantDatabaseTest {
     void getPlantByIdMustFail() {
         Optional<Plant> testPlant;
         try {
-            testPlant = testDatabase.getPlantById(HardinessZone.ZONE_8A,99);
-        } catch (IOException | HardinessZoneNotSetException e) {
+            testDatabase.getPlantList(HardinessZone.ZONE_8A);
+            testPlant = testDatabase.getPlantById(99);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        } catch (HardinessZoneNotSetException e) {
             throw new RuntimeException(e);
         }
         Assertions.assertFalse(testPlant.isPresent());

src/test/java/ch/zhaw/gartenverwaltung/io/JsonTaskDatabaseTest.java

@@ -1,47 +0,0 @@
-package ch.zhaw.gartenverwaltung.io;
-
-import ch.zhaw.gartenverwaltung.types.Task;
-import org.junit.jupiter.api.*;
-
-import java.io.IOException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-public class JsonTaskDatabaseTest {
-
-    TaskDatabase testDatabase;
-    SimpleDateFormat formatter = new SimpleDateFormat("dd.MM.yyyy");
-    @BeforeEach
-    void connectToDb() {
-        // testDatabase = new JsonTaskDatabase();
-    }
-
-
-    @Test
-    @DisplayName("Check if results are retrieved completely")
-    void getTasks(){
-        /*
-        List<Task> taskList=null;
-        try {
-            taskList = testDatabase.getTaskList(formatter.parse("01.05.2022"), formatter.parse("01.08.2022"));
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        } catch (ParseException e) {
-            throw new RuntimeException(e);
-        }
-
-        Assertions.assertTrue(taskList.size()>0);
-        */
-    }
-
-    @Test
-    void getTaskForCrop() {
-        // TODO implement Test
-    }
-
-    @Test
-    void removeTasksForCrop() {
-        // TODO implement Test
-    }
-}

src/test/java/ch/zhaw/gartenverwaltung/plantList/PlantListModelTest.java

@@ -43,7 +43,6 @@ class PlantListModelTest {
                 20,
                 "summertime onion",
                 "Onion, (Allium cepa), herbaceous biennial plant in the amaryllis family (Amaryllidaceae) grown for its edible bulb. The onion is likely native to southwestern Asia but is now grown throughout the world, chiefly in the temperate zones. Onions are low in nutrients but are valued for their flavour and are used widely in cooking. They add flavour to such dishes as stews, roasts, soups, and salads and are also served as a cooked vegetable.",
-                null,
                 "15,30,2",
                 0,
                 "sandy to loamy, loose soil, free of stones",
@@ -58,7 +57,6 @@ class PlantListModelTest {
                 0,
                 "Potato",
                 "The potato is a tuber, round or oval, with small white roots called  'eyes', that are growth buds. The size varies depending on the variety; the colour of the skin can be white, yellow or even purple.",
-                null,
                 "35",
                 6,
                 "sandy",
@@ -70,7 +68,6 @@ class PlantListModelTest {
                 1,
                 "Early Carrot",
                 "Carrot, (Daucus carota), herbaceous, generally biennial plant of the Apiaceae family that produces an edible taproot. Among common varieties root shapes range from globular to long, with lower ends blunt to pointed. Besides the orange-coloured roots, white-, yellow-, and purple-fleshed varieties are known.",
-                null,
                 "5,35,2.5",
                 0,
                 "sandy to loamy, loose soil, free of stones",
@@ -173,6 +170,8 @@ class PlantListModelTest {
         assertEquals(examplePlantList.get(1), plantListResult.get(0));
         plantListResult = model.getFilteredPlantListByString(HardinessZone.ZONE_8A, "apple");
         assertEquals(0, plantListResult.size());
+        plantListResult = model.getFilteredPlantListByString(HardinessZone.ZONE_8A, "");
+        assertEquals(3, plantListResult.size());
     }
 
     @Test

src/test/java/ch/zhaw/gartenverwaltung/taskList/TaskListModelTest.java

@@ -1,158 +0,0 @@
-package ch.zhaw.gartenverwaltung.taskList;
-
-import ch.zhaw.gartenverwaltung.io.*;
-import ch.zhaw.gartenverwaltung.types.HardinessZone;
-import ch.zhaw.gartenverwaltung.types.Plant;
-import ch.zhaw.gartenverwaltung.types.Task;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import java.io.IOException;
-import java.time.LocalDate;
-import java.util.*;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
-
-class TaskListModelTest {
-    TaskDatabase taskDatabase;
-    PlantDatabase plantDatabase;
-    List<Task> exampleTaskList;
-    Map<Long, Plant> examplePlantMap;
-    TaskListModel model;
-
-    @BeforeEach
-    void setUp() throws IOException {
-        createExampleTaskList();
-        taskDatabase = mockTaskDatabase(exampleTaskList);
-        plantDatabase = mockPlantDatabase(examplePlantMap);
-        model = new TaskListModel(taskDatabase, plantDatabase);
-    }
-
-    private TaskDatabase mockTaskDatabase(List<Task> exampleTaskList) throws IOException {
-        TaskDatabase taskDatabase = mock(JsonTaskDatabase.class);
-        when(taskDatabase.getTaskList(LocalDate.MIN, LocalDate.MAX)).thenReturn(exampleTaskList);
-
-        when(taskDatabase.getTaskList(LocalDate.now(), LocalDate.MAX)).thenReturn((exampleTaskList.subList(1, 4)));
-
-        List<Task> pastTasks = new ArrayList<>();
-        pastTasks.add(exampleTaskList.get(0));
-        pastTasks.add(exampleTaskList.get(2));
-        pastTasks.add(exampleTaskList.get(4));
-        when(taskDatabase.getTaskList(LocalDate.MIN, LocalDate.now())).thenReturn(pastTasks);
-
-
-        when(taskDatabase.getTaskList(LocalDate.now(), LocalDate.now())).thenReturn(List.of(exampleTaskList.get(2)));
-        when(taskDatabase.getTaskList(LocalDate.now().plusDays(1L), LocalDate.now().plusDays(1L))).thenReturn(List.of(exampleTaskList.get(1)));
-        when(taskDatabase.getTaskList(LocalDate.now().plusDays(2L), LocalDate.now().plusDays(2L))).thenReturn(List.of());
-        when(taskDatabase.getTaskList(LocalDate.now().plusDays(3L), LocalDate.now().plusDays(3L))).thenReturn(List.of());
-        when(taskDatabase.getTaskList(LocalDate.now().plusDays(4L), LocalDate.now().plusDays(4L))).thenReturn(List.of());
-        when(taskDatabase.getTaskList(LocalDate.now().plusDays(5L), LocalDate.now().plusDays(5L))).thenReturn(List.of());
-        when(taskDatabase.getTaskList(LocalDate.now().plusDays(6L), LocalDate.now().plusDays(6L))).thenReturn(List.of());
-
-        return taskDatabase;
-    }
-
-    private PlantDatabase mockPlantDatabase(Map<Long, Plant> examplePlantMap) {
-        return new PlantDatabase() {
-            @Override
-            public List<Plant> getPlantList(HardinessZone zone) {
-                return null;
-            }
-
-            @Override
-            public Optional<Plant> getPlantById(HardinessZone zone, long id) {
-                return Optional.ofNullable(examplePlantMap.get(id));
-            }
-        };
-    }
-
-    void createExampleTaskList() {
-        exampleTaskList = new ArrayList<>();
-        exampleTaskList.add(new Task("name", "description", LocalDate.now().minusDays(1), 1L));
-        exampleTaskList.add(new Task("name", "description", LocalDate.now().plusDays(1), 2L));
-        exampleTaskList.add(new Task("name", "description", LocalDate.now(), 1L));
-        exampleTaskList.add(new Task("name", "description", LocalDate.of(9019, 5, 5), 1L));
-        exampleTaskList.add(new Task("name", "description", LocalDate.of(2019, 5, 5), 2L));
-    }
-
-    void createExamplePlantMap() {
-        examplePlantMap = new HashMap<>();
-    }
-
-
-
-    @Test
-    void addTask() throws IOException {
-        Task taskToAdd = new Task("name", "description", LocalDate.now(), 1L);
-        model.addTask(taskToAdd);
-        verify(taskDatabase, times(1)).saveTask(taskToAdd);
-    }
-
-    @Test
-    void removeTask() throws IOException {
-        Task taskToRemove = new Task("name", "description", LocalDate.now(), 1L);
-        model.removeTask(taskToRemove);
-        verify(taskDatabase, times(1)).removeTask(taskToRemove);
-    }
-
-    @Test
-    void getTaskList() throws IOException {
-        List<Task> listToCheck = model.getTaskList();
-        assertEquals(5, listToCheck.size());
-        assertEquals(exampleTaskList.get(4), listToCheck.get(0));
-        assertEquals(exampleTaskList.get(0), listToCheck.get(1));
-        assertEquals(exampleTaskList.get(2), listToCheck.get(2));
-        assertEquals(exampleTaskList.get(1), listToCheck.get(3));
-        assertEquals(exampleTaskList.get(3), listToCheck.get(4));
-    }
-
-    @Test
-    void getFutureTasks() throws IOException {
-        List<Task> listToCheck = model.getFutureTasks();
-        assertEquals(3, listToCheck.size());
-        assertEquals(exampleTaskList.get(2), listToCheck.get(0));
-        assertEquals(exampleTaskList.get(1), listToCheck.get(1));
-        assertEquals(exampleTaskList.get(3), listToCheck.get(2));
-    }
-
-    @Test
-    void getPastTasks() throws IOException {
-        List<Task> listToCheck = model.getPastTasks();
-        assertEquals(3, listToCheck.size());
-        assertEquals(exampleTaskList.get(4), listToCheck.get(0));
-        assertEquals(exampleTaskList.get(0), listToCheck.get(1));
-        assertEquals(exampleTaskList.get(2), listToCheck.get(2));
-    }
-
-    @Test
-    void getTasksUpcomingWeek() throws IOException {
-        List<List<Task>> dayList = model.getTasksUpcomingWeek();
-        assertEquals(7, dayList.size());
-
-        //Check day 0
-        assertEquals(1, dayList.get(0).size());
-        assertEquals(exampleTaskList.get(2), dayList.get(0).get(0));
-
-        //Check day 1
-        assertEquals(1, dayList.get(1).size());
-        assertEquals(exampleTaskList.get(1), dayList.get(1).get(0));
-
-        //Check day 2
-        assertEquals(0, dayList.get(2).size());
-        //Check day 3
-        assertEquals(0, dayList.get(3).size());
-        //Check day 4
-        assertEquals(0, dayList.get(4).size());
-        //Check day 5
-        assertEquals(0, dayList.get(5).size());
-        //Check day 6
-        assertEquals(0, dayList.get(6).size());
-    }
-
-    @Test
-    void removeTasksForCrop() throws IOException {
-        model.removeTasksForCrop(1L);
-        verify(taskDatabase, times(1)).removeTasksForCrop(1L);
-    }
-}

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

@@ -1,50 +0,0 @@
-[
-  {
-  "id" : "1",
-  "name" : "sow plant",
-  "description": "Plant the seeds/ crops in de bed.",
-  "startDate" : "01.05.2022",
-  "endDate" : "01.05.2022",
-  "interval" : "null"
-  },
-  {
-    "id" : "2",
-    "name" : "water plant",
-    "description": "water the plant, so that the soil is wet around the plant.",
-    "startDate" : "01.05.2022",
-    "endDate" : "01.09.2022",
-    "interval" : "2"
-  },
-  {
-    "id" : "3",
-    "name" : "fertilize plant",
-    "description": "The fertilizer has to be mixed with water. Then fertilize the plant's soil with the mixture",
-    "startDate" : "01.06.2022",
-    "endDate" : "01.08.2022",
-    "interval" : "28"
-  },
-  {
-    "id" : "4",
-    "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" : "15.07.2022",
-    "endDate" : "15.07.2022",
-    "interval" : "null"
-  },
-  {
-    "id" : "5",
-    "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" : "01.05.2022",
-    "endDate" : "01.09.2022",
-    "interval" : "5"
-  },
-  {
-    "id" : "6",
-    "name" : "harvest plant",
-    "description": "Pull the ripe vegetables out from the soil. Clean them with clear, fresh water. ",
-    "startDate" : "01.09.2022",
-    "endDate" : "01.09.2022",
-    "interval" : "null"
-  }
-]