From 0e4e2075812ced796143bac31b3341c16474d4bc Mon Sep 17 00:00:00 2001 From: schrom01 Date: Mon, 31 Oct 2022 15:57:19 +0100 Subject: [PATCH 1/4] completed Methods created Config Class --- .../java/ch/zhaw/gartenverwaltung/Config.java | 19 +++++++++++++++++++ .../taskList/TaskListModel.java | 18 ++++++++---------- .../ch/zhaw/gartenverwaltung/types/Task.java | 13 ++++++------- .../gartenverwaltung/types/TaskTemplate.java | 4 ++-- 4 files changed, 35 insertions(+), 19 deletions(-) create mode 100644 src/main/java/ch/zhaw/gartenverwaltung/Config.java diff --git a/src/main/java/ch/zhaw/gartenverwaltung/Config.java b/src/main/java/ch/zhaw/gartenverwaltung/Config.java new file mode 100644 index 0000000..2fa0117 --- /dev/null +++ b/src/main/java/ch/zhaw/gartenverwaltung/Config.java @@ -0,0 +1,19 @@ +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; + } +} diff --git a/src/main/java/ch/zhaw/gartenverwaltung/taskList/TaskListModel.java b/src/main/java/ch/zhaw/gartenverwaltung/taskList/TaskListModel.java index a42738d..a285723 100644 --- a/src/main/java/ch/zhaw/gartenverwaltung/taskList/TaskListModel.java +++ b/src/main/java/ch/zhaw/gartenverwaltung/taskList/TaskListModel.java @@ -1,19 +1,16 @@ 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.Crop; -import ch.zhaw.gartenverwaltung.types.HardinessZone; -import ch.zhaw.gartenverwaltung.types.Plant; -import ch.zhaw.gartenverwaltung.types.Task; +import ch.zhaw.gartenverwaltung.types.*; import java.io.IOException; import java.time.LocalDate; import java.util.Comparator; import java.util.List; -import java.util.function.Supplier; import java.util.stream.Collectors; public class TaskListModel { @@ -36,14 +33,15 @@ public class TaskListModel { } public void planTasksForCrop(Crop crop) throws PlantNotFoundException, HardinessZoneNotSetException, IOException { - Plant plant = plantDatabase.getPlantById(HardinessZone.ZONE_8A, crop.getPlantId()).orElseThrow(PlantNotFoundException::new); - // TODO new exception - // TODO HArdiness Zone - return; + 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))); + } + } } public void removeTasksForCrop(Crop crop) { - //TODO implement taskDatabase.removeTasksForCrop(crop); } diff --git a/src/main/java/ch/zhaw/gartenverwaltung/types/Task.java b/src/main/java/ch/zhaw/gartenverwaltung/types/Task.java index dabaf58..8d3db25 100644 --- a/src/main/java/ch/zhaw/gartenverwaltung/types/Task.java +++ b/src/main/java/ch/zhaw/gartenverwaltung/types/Task.java @@ -15,22 +15,24 @@ public class Task { private final LocalDate startDate; private Integer interval; private LocalDate endDate; - private Crop cropId; + private long cropId; /** * default constructor * (used by Json deserializer) */ - public Task(){ + public Task(long cropId){ name= ""; description= ""; startDate = LocalDate.now(); + this.cropId = cropId; } - public Task(String name, String description, LocalDate startDate) { + public Task(String name, String description, LocalDate startDate, long cropId) { this.name = name; this.description = description; this.startDate = startDate; + this.cropId = cropId; } public Task(String name, String description, LocalDate startDate, LocalDate endDate, int interval) { @@ -56,10 +58,7 @@ public class Task { } public boolean isInTimePeriode(LocalDate searchStartDate, LocalDate searchEndDate){ - if(startDate.isAfter(searchStartDate) &&startDate.isBefore(searchEndDate)){ - return true; - } - return false; + return startDate.isAfter(searchStartDate) && startDate.isBefore(searchEndDate); } // Getters diff --git a/src/main/java/ch/zhaw/gartenverwaltung/types/TaskTemplate.java b/src/main/java/ch/zhaw/gartenverwaltung/types/TaskTemplate.java index 290175e..8ae7862 100644 --- a/src/main/java/ch/zhaw/gartenverwaltung/types/TaskTemplate.java +++ b/src/main/java/ch/zhaw/gartenverwaltung/types/TaskTemplate.java @@ -44,8 +44,8 @@ public class TaskTemplate { this.relativeStartDate = relativeStartDate; } - public Task generateTask(LocalDate realStartDate) { - Task task = new Task(name, description, realStartDate.plusDays(relativeStartDate)); + public Task generateTask(LocalDate realStartDate, long cropId) { + Task task = new Task(name, description, realStartDate.plusDays(relativeStartDate), cropId); if (relativeEndDate != null) { task.withEndDate(realStartDate.plusDays(relativeEndDate)); } From 5bfebdc92c7ef93d541aa3cd49c3dc70a614101b Mon Sep 17 00:00:00 2001 From: schrom01 Date: Mon, 31 Oct 2022 16:23:49 +0100 Subject: [PATCH 2/4] implemented Methods removeTasksForCrop and getTaskForCrop in JsonTaskDatabase --- .../gartenverwaltung/io/JsonTaskDatabase.java | 23 +++++++++++++--- .../gartenverwaltung/io/TaskDatabase.java | 15 +++++++++-- .../taskList/TaskListModel.java | 26 +++++++++++++++++-- .../ch/zhaw/gartenverwaltung/types/Task.java | 4 ++- 4 files changed, 59 insertions(+), 9 deletions(-) diff --git a/src/main/java/ch/zhaw/gartenverwaltung/io/JsonTaskDatabase.java b/src/main/java/ch/zhaw/gartenverwaltung/io/JsonTaskDatabase.java index 62c18ba..dd885d4 100644 --- a/src/main/java/ch/zhaw/gartenverwaltung/io/JsonTaskDatabase.java +++ b/src/main/java/ch/zhaw/gartenverwaltung/io/JsonTaskDatabase.java @@ -52,14 +52,29 @@ public class JsonTaskDatabase implements TaskDatabase{ 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 getTaskForCrop(Crop crop) { - return null; //TODO implement + public List 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(Crop crop) { - // TODO implement + public void removeTasksForCrop(long cropId) throws IOException { + if(taskMap.isEmpty()) { + loadTaskListFromFile(); + } + taskMap.values().removeIf(task -> task.getCropId() == cropId); } /** diff --git a/src/main/java/ch/zhaw/gartenverwaltung/io/TaskDatabase.java b/src/main/java/ch/zhaw/gartenverwaltung/io/TaskDatabase.java index 02ca54d..02bef7a 100644 --- a/src/main/java/ch/zhaw/gartenverwaltung/io/TaskDatabase.java +++ b/src/main/java/ch/zhaw/gartenverwaltung/io/TaskDatabase.java @@ -25,9 +25,20 @@ public interface TaskDatabase { */ List getTaskList(LocalDate start, LocalDate end) throws IOException; - List getTaskForCrop(Crop crop); //TODO Javadoc + /** + * 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 getTaskForCrop(long cropId) throws IOException; - void removeTasksForCrop(Crop crop); // TODO Javadoc + /** + * 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. diff --git a/src/main/java/ch/zhaw/gartenverwaltung/taskList/TaskListModel.java b/src/main/java/ch/zhaw/gartenverwaltung/taskList/TaskListModel.java index a285723..abd49bd 100644 --- a/src/main/java/ch/zhaw/gartenverwaltung/taskList/TaskListModel.java +++ b/src/main/java/ch/zhaw/gartenverwaltung/taskList/TaskListModel.java @@ -17,21 +17,39 @@ public class TaskListModel { private TaskDatabase taskDatabase; private PlantDatabase plantDatabase; + /** + * Comparators to create sorted Task List + */ static final Comparator 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()) { @@ -41,8 +59,12 @@ public class TaskListModel { } } - public void removeTasksForCrop(Crop crop) { - taskDatabase.removeTasksForCrop(crop); + /** + * Method to remove all Tasks for a specific Crop + * @param cropId The crop which is removed + */ + public void removeTasksForCrop(long cropId) throws IOException { + taskDatabase.removeTasksForCrop(cropId); } public void removeTask(Task task) throws IOException { diff --git a/src/main/java/ch/zhaw/gartenverwaltung/types/Task.java b/src/main/java/ch/zhaw/gartenverwaltung/types/Task.java index 8d3db25..02d6480 100644 --- a/src/main/java/ch/zhaw/gartenverwaltung/types/Task.java +++ b/src/main/java/ch/zhaw/gartenverwaltung/types/Task.java @@ -35,12 +35,13 @@ public class Task { this.cropId = cropId; } - public Task(String name, String description, LocalDate startDate, LocalDate endDate, int interval) { + public Task(String name, String description, LocalDate startDate, LocalDate endDate, int interval, long cropId) { this.name = name; this.description = description; this.startDate = startDate; this.endDate = endDate; this.interval = interval; + this.cropId = cropId; } // Builder-pattern-style setters @@ -66,6 +67,7 @@ public class Task { public String getName() { return name; } public String getDescription() { return description; } public LocalDate getStartDate() { return startDate; } + public long getCropId() { return cropId; } public Optional getInterval() { return Optional.ofNullable(interval); From bf5c5c8439bc4b179f2374093183cf006a85e998 Mon Sep 17 00:00:00 2001 From: schrom01 Date: Mon, 31 Oct 2022 16:31:59 +0100 Subject: [PATCH 3/4] javadocs in TaskListModel --- .../taskList/TaskListModel.java | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/src/main/java/ch/zhaw/gartenverwaltung/taskList/TaskListModel.java b/src/main/java/ch/zhaw/gartenverwaltung/taskList/TaskListModel.java index abd49bd..4f9384d 100644 --- a/src/main/java/ch/zhaw/gartenverwaltung/taskList/TaskListModel.java +++ b/src/main/java/ch/zhaw/gartenverwaltung/taskList/TaskListModel.java @@ -62,27 +62,53 @@ public class TaskListModel { /** * 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); } + /** + * Method to get all Tasks + * @return List of all Tasks + * @throws IOException If the database cannot be accessed + */ public List getTaskList() throws IOException { return getFilteredTaskList(LocalDate.MIN, LocalDate.MAX); } + /** + * 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 getFutureTasks() throws IOException { return getFilteredTaskList(LocalDate.now(), LocalDate.MAX); } + /** + * 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 getPastTasks() throws IOException { return getFilteredTaskList(LocalDate.MIN, LocalDate.now()); } + /** + * Method to get an Array of 7 Tasklists for the next 7 days. Index 0 is Tasklist for Today. + * @return Array with length 7 (List[]) + * @throws IOException If the database cannot be accessed + */ public List[] getTasksUpcomingWeek() throws IOException { List[] listArray = new List[7]; for(int i = 0; i < 7; i++) { @@ -92,10 +118,23 @@ public class TaskListModel { return listArray; } + /** + * 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 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 getSortedTaskList(List taskList, Comparator comparator) { return taskList.stream().sorted(comparator).collect(Collectors.toList()); } From 541217c2810a1ba389305ea16f73c7d7023334cd Mon Sep 17 00:00:00 2001 From: schrom01 Date: Mon, 31 Oct 2022 16:36:24 +0100 Subject: [PATCH 4/4] prepaired Tests for new Methods in JsonTaskDatabase --- .../zhaw/gartenverwaltung/io/JsonTaskDatabaseTest.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/test/java/ch/zhaw/gartenverwaltung/io/JsonTaskDatabaseTest.java b/src/test/java/ch/zhaw/gartenverwaltung/io/JsonTaskDatabaseTest.java index e75ea40..d3710ab 100644 --- a/src/test/java/ch/zhaw/gartenverwaltung/io/JsonTaskDatabaseTest.java +++ b/src/test/java/ch/zhaw/gartenverwaltung/io/JsonTaskDatabaseTest.java @@ -34,4 +34,14 @@ public class JsonTaskDatabaseTest { Assertions.assertTrue(taskList.size()>0); */ } + + @Test + void getTaskForCrop() { + // TODO implement Test + } + + @Test + void removeTasksForCrop() { + // TODO implement Test + } }