From 4f80a0a3e08f09f4f73bd541d43eb9b162e84958 Mon Sep 17 00:00:00 2001 From: David Guler Date: Mon, 14 Nov 2022 13:47:22 +0100 Subject: [PATCH] refactor: renamed everything --- .../java/ch/zhaw/gartenverwaltung/Config.java | 19 ------- .../CropDetailController.java | 14 ++--- .../gartenverwaltung/MyPlantsController.java | 16 +++--- .../MyScheduleController.java | 18 +++---- .../gartenverwaltung/PlantsController.java | 2 +- .../SelectSowDayController.java | 34 +++++------- .../ch/zhaw/gartenverwaltung/Settings.java | 26 +++++++++ .../io/{GardenPlan.java => CropList.java} | 2 +- ...{JsonGardenPlan.java => JsonCropList.java} | 6 +-- ...nPlantDatabase.java => JsonPlantList.java} | 8 +-- ...sonTaskDatabase.java => JsonTaskList.java} | 11 ++-- .../io/{PlantDatabase.java => PlantList.java} | 2 +- .../io/{TaskDatabase.java => TaskList.java} | 6 +-- .../json/PlantImageDeserializer.java | 4 +- .../Garden.java} | 53 +++++++++---------- .../GardenSchedule.java} | 37 +++++++------ .../{plantList => models}/PlantListModel.java | 20 +++---- .../PlantNotFoundException.java | 2 +- ...denPlanTest.java => JsonCropListTest.java} | 6 +-- ...tabaseTest.java => JsonPlantListTest.java} | 6 +-- ...atabaseTest.java => JsonTaskListTest.java} | 10 ++-- .../GardenPlanModelTest.java | 34 ++++++------ .../PlantListModelTest.java | 17 +++--- ...ModelTest.java => GardenScheduleTest.java} | 51 +++++++++--------- 24 files changed, 193 insertions(+), 211 deletions(-) delete mode 100644 src/main/java/ch/zhaw/gartenverwaltung/Config.java create mode 100644 src/main/java/ch/zhaw/gartenverwaltung/Settings.java rename src/main/java/ch/zhaw/gartenverwaltung/io/{GardenPlan.java => CropList.java} (97%) rename src/main/java/ch/zhaw/gartenverwaltung/io/{JsonGardenPlan.java => JsonCropList.java} (97%) rename src/main/java/ch/zhaw/gartenverwaltung/io/{JsonPlantDatabase.java => JsonPlantList.java} (93%) rename src/main/java/ch/zhaw/gartenverwaltung/io/{JsonTaskDatabase.java => JsonTaskList.java} (94%) rename src/main/java/ch/zhaw/gartenverwaltung/io/{PlantDatabase.java => PlantList.java} (97%) rename src/main/java/ch/zhaw/gartenverwaltung/io/{TaskDatabase.java => TaskList.java} (89%) rename src/main/java/ch/zhaw/gartenverwaltung/{gardenplan/Gardenplanmodel.java => models/Garden.java} (61%) rename src/main/java/ch/zhaw/gartenverwaltung/{taskList/TaskListModel.java => models/GardenSchedule.java} (84%) rename src/main/java/ch/zhaw/gartenverwaltung/{plantList => models}/PlantListModel.java (93%) rename src/main/java/ch/zhaw/gartenverwaltung/{taskList => models}/PlantNotFoundException.java (79%) rename src/test/java/ch/zhaw/gartenverwaltung/io/{JsonGardenPlanTest.java => JsonCropListTest.java} (96%) rename src/test/java/ch/zhaw/gartenverwaltung/io/{JsonPlantDatabaseTest.java => JsonPlantListTest.java} (96%) rename src/test/java/ch/zhaw/gartenverwaltung/io/{JsonTaskDatabaseTest.java => JsonTaskListTest.java} (93%) rename src/test/java/ch/zhaw/gartenverwaltung/{gardenplan => models}/GardenPlanModelTest.java (85%) rename src/test/java/ch/zhaw/gartenverwaltung/{plantList => models}/PlantListModelTest.java (95%) rename src/test/java/ch/zhaw/gartenverwaltung/taskList/{TaskListModelTest.java => GardenScheduleTest.java} (68%) diff --git a/src/main/java/ch/zhaw/gartenverwaltung/Config.java b/src/main/java/ch/zhaw/gartenverwaltung/Config.java deleted file mode 100644 index 2fa0117..0000000 --- a/src/main/java/ch/zhaw/gartenverwaltung/Config.java +++ /dev/null @@ -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; - } -} diff --git a/src/main/java/ch/zhaw/gartenverwaltung/CropDetailController.java b/src/main/java/ch/zhaw/gartenverwaltung/CropDetailController.java index 6e5d792..622992c 100644 --- a/src/main/java/ch/zhaw/gartenverwaltung/CropDetailController.java +++ b/src/main/java/ch/zhaw/gartenverwaltung/CropDetailController.java @@ -1,9 +1,9 @@ package ch.zhaw.gartenverwaltung; -import ch.zhaw.gartenverwaltung.gardenplan.Gardenplanmodel; +import ch.zhaw.gartenverwaltung.models.Garden; import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException; -import ch.zhaw.gartenverwaltung.plantList.PlantListModel; -import ch.zhaw.gartenverwaltung.taskList.TaskListModel; +import ch.zhaw.gartenverwaltung.models.PlantListModel; +import ch.zhaw.gartenverwaltung.models.GardenSchedule; import ch.zhaw.gartenverwaltung.types.Crop; import ch.zhaw.gartenverwaltung.types.Pest; import ch.zhaw.gartenverwaltung.types.Plant; @@ -24,8 +24,8 @@ import java.util.List; public class CropDetailController { private Crop crop = null; private final PlantListModel plantListModel = new PlantListModel(); - private final TaskListModel taskListModel = new TaskListModel(); - private final Gardenplanmodel gardenplanmodel = new Gardenplanmodel(taskListModel); + private final GardenSchedule gardenSchedule = new GardenSchedule(); + private final Garden garden = new Garden(gardenSchedule); @FXML private ImageView imageView; @@ -89,7 +89,7 @@ public class CropDetailController { public void setPlantFromCrop(Crop crop) throws HardinessZoneNotSetException, IOException { this.crop = crop; - Plant plant = plantListModel.getFilteredPlantListById(Config.getCurrentHardinessZone(), crop.getPlantId()).get(0); + Plant plant = plantListModel.getFilteredPlantListById(Settings.getInstance().getCurrentHardinessZone(), crop.getPlantId()).get(0); cropName_label.setText(plant.name()); description_label.setText(plant.description()); light_label.setText(String.valueOf(plant.light())); @@ -105,7 +105,7 @@ public class CropDetailController { } private void createTaskLists(Crop crop) throws IOException { - List taskList = taskListModel.getTaskListForCrop(crop.getCropId().get()); + List taskList = gardenSchedule.getTaskListForCrop(crop.getCropId().get()); for (Task task : taskList) { Label label = new Label(task.getDescription()); growthPhases_vbox.getChildren().add(label); diff --git a/src/main/java/ch/zhaw/gartenverwaltung/MyPlantsController.java b/src/main/java/ch/zhaw/gartenverwaltung/MyPlantsController.java index 3d9d82c..1639134 100644 --- a/src/main/java/ch/zhaw/gartenverwaltung/MyPlantsController.java +++ b/src/main/java/ch/zhaw/gartenverwaltung/MyPlantsController.java @@ -1,9 +1,9 @@ package ch.zhaw.gartenverwaltung; -import ch.zhaw.gartenverwaltung.gardenplan.Gardenplanmodel; +import ch.zhaw.gartenverwaltung.models.Garden; import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException; -import ch.zhaw.gartenverwaltung.plantList.PlantListModel; -import ch.zhaw.gartenverwaltung.taskList.TaskListModel; +import ch.zhaw.gartenverwaltung.models.PlantListModel; +import ch.zhaw.gartenverwaltung.models.GardenSchedule; import ch.zhaw.gartenverwaltung.types.Crop; import ch.zhaw.gartenverwaltung.types.Plant; import javafx.event.ActionEvent; @@ -30,8 +30,8 @@ import java.util.*; public class MyPlantsController implements Initializable { MainFXMLController mainController; - private final TaskListModel taskListModel = new TaskListModel(); - private final Gardenplanmodel gardenplanmodel = new Gardenplanmodel(taskListModel); + private final GardenSchedule gardenSchedule = new GardenSchedule(); + private final Garden garden = new Garden(gardenSchedule); private final PlantListModel plantListModel = new PlantListModel(); @FXML @@ -79,13 +79,13 @@ public class MyPlantsController implements Initializable { private List getCropList() throws IOException { List cropList; - cropList = gardenplanmodel.getCrops(); + cropList = garden.getCrops(); return cropList; } private HBox createPlantView(Crop crop) throws HardinessZoneNotSetException, IOException { //ToDo add better design - Plant plant = plantListModel.getFilteredPlantListById(Config.getCurrentHardinessZone(), crop.getPlantId()).get(0); + Plant plant = plantListModel.getFilteredPlantListById(Settings.getInstance().getCurrentHardinessZone(), crop.getPlantId()).get(0); HBox hBox = new HBox(10); ImageView imageView = new ImageView(); imageView.setPreserveRatio(false); @@ -153,7 +153,7 @@ public class MyPlantsController implements Initializable { Optional option = alert.showAndWait(); if (option.get() == ButtonType.OK) { - gardenplanmodel.removeCrop(crop); + garden.removeCrop(crop); loadCropList(); } } diff --git a/src/main/java/ch/zhaw/gartenverwaltung/MyScheduleController.java b/src/main/java/ch/zhaw/gartenverwaltung/MyScheduleController.java index a73052c..a763754 100644 --- a/src/main/java/ch/zhaw/gartenverwaltung/MyScheduleController.java +++ b/src/main/java/ch/zhaw/gartenverwaltung/MyScheduleController.java @@ -1,9 +1,9 @@ package ch.zhaw.gartenverwaltung; -import ch.zhaw.gartenverwaltung.gardenplan.Gardenplanmodel; +import ch.zhaw.gartenverwaltung.models.Garden; import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException; -import ch.zhaw.gartenverwaltung.plantList.PlantListModel; -import ch.zhaw.gartenverwaltung.taskList.TaskListModel; +import ch.zhaw.gartenverwaltung.models.PlantListModel; +import ch.zhaw.gartenverwaltung.models.GardenSchedule; import ch.zhaw.gartenverwaltung.types.Crop; import ch.zhaw.gartenverwaltung.types.Task; import javafx.beans.property.ListProperty; @@ -28,8 +28,8 @@ import java.util.ResourceBundle; public class MyScheduleController implements Initializable { private Crop selectedCrop = null; - private final TaskListModel taskListModel = new TaskListModel(); - private final Gardenplanmodel gardenplanmodel = new Gardenplanmodel(taskListModel); + private final GardenSchedule gardenSchedule = new GardenSchedule(); + private final Garden garden = new Garden(gardenSchedule); private final PlantListModel plantListModel = new PlantListModel(); private final ListProperty cropListProperty = new SimpleListProperty<>(FXCollections.observableArrayList()); @@ -89,7 +89,7 @@ public class MyScheduleController implements Initializable { public void initialize(URL location, ResourceBundle resources) { List cropList; try { - cropList = gardenplanmodel.getCrops(); + cropList = garden.getCrops(); cropListProperty.addAll(cropList); } catch (IOException e) { e.printStackTrace(); @@ -141,7 +141,7 @@ public class MyScheduleController implements Initializable { setText(null); } else { try { - setText(plantListModel.getFilteredPlantListById(Config.getCurrentHardinessZone(), crop.getPlantId()).get(0).name()); + setText(plantListModel.getFilteredPlantListById(Settings.getInstance().getCurrentHardinessZone(), crop.getPlantId()).get(0).name()); } catch (HardinessZoneNotSetException | IOException e) { e.printStackTrace(); } @@ -153,9 +153,9 @@ public class MyScheduleController implements Initializable { private void loadTaskList() throws IOException { List> taskLists = new LinkedList<>(); if (selectedCrop != null) { - taskLists = taskListModel.getTasksUpcomingWeekForCrop(selectedCrop.getCropId().get()); + taskLists = gardenSchedule.getTasksUpcomingWeekForCrop(selectedCrop.getCropId().get()); } else { - taskLists = taskListModel.getTasksUpcomingWeek(); + taskLists = gardenSchedule.getTasksUpcomingWeek(); } if (!taskLists.isEmpty()) { viewTaskListOfDay(day1_pane, taskLists.get(0)); diff --git a/src/main/java/ch/zhaw/gartenverwaltung/PlantsController.java b/src/main/java/ch/zhaw/gartenverwaltung/PlantsController.java index c8ff333..1d832ef 100644 --- a/src/main/java/ch/zhaw/gartenverwaltung/PlantsController.java +++ b/src/main/java/ch/zhaw/gartenverwaltung/PlantsController.java @@ -1,7 +1,7 @@ package ch.zhaw.gartenverwaltung; import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException; -import ch.zhaw.gartenverwaltung.plantList.PlantListModel; +import ch.zhaw.gartenverwaltung.models.PlantListModel; import ch.zhaw.gartenverwaltung.types.HardinessZone; import ch.zhaw.gartenverwaltung.types.Plant; import ch.zhaw.gartenverwaltung.types.Seasons; diff --git a/src/main/java/ch/zhaw/gartenverwaltung/SelectSowDayController.java b/src/main/java/ch/zhaw/gartenverwaltung/SelectSowDayController.java index c5445e1..f00ba59 100644 --- a/src/main/java/ch/zhaw/gartenverwaltung/SelectSowDayController.java +++ b/src/main/java/ch/zhaw/gartenverwaltung/SelectSowDayController.java @@ -1,13 +1,11 @@ package ch.zhaw.gartenverwaltung; -import ch.zhaw.gartenverwaltung.gardenplan.Gardenplanmodel; +import ch.zhaw.gartenverwaltung.models.Garden; import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException; -import ch.zhaw.gartenverwaltung.taskList.PlantNotFoundException; -import ch.zhaw.gartenverwaltung.taskList.TaskListModel; +import ch.zhaw.gartenverwaltung.models.PlantNotFoundException; +import ch.zhaw.gartenverwaltung.models.GardenSchedule; import ch.zhaw.gartenverwaltung.types.GrowthPhaseType; import ch.zhaw.gartenverwaltung.types.Plant; -import javafx.beans.value.ChangeListener; -import javafx.beans.value.ObservableValue; import javafx.event.ActionEvent; import javafx.fxml.FXML; import javafx.fxml.Initializable; @@ -23,8 +21,8 @@ import java.util.ResourceBundle; public class SelectSowDayController implements Initializable { private Plant selectedPlant = null; - private final TaskListModel taskListModel = new TaskListModel(); - private final Gardenplanmodel gardenplanmodel = new Gardenplanmodel(taskListModel); + private final GardenSchedule gardenSchedule = new GardenSchedule(); + private final Garden garden = new Garden(gardenSchedule); @FXML private DatePicker datepicker; @@ -63,7 +61,7 @@ public class SelectSowDayController implements Initializable { //ToDo method to get current lifecycle group in plant sowDate = selectedPlant.sowDateFromHarvestDate(datepicker.getValue(), 0); } - gardenplanmodel.plantAsCrop(selectedPlant, sowDate); + garden.plantAsCrop(selectedPlant, sowDate); closeWindow(); } @@ -97,12 +95,7 @@ public class SelectSowDayController implements Initializable { * clear date picker editor when radio button is changed */ private void clearDatePickerEntries() { - sow_radio.selectedProperty().addListener(new ChangeListener() { - @Override - public void changed(ObservableValue observable, Boolean oldValue, Boolean isNowSelected) { - datepicker.getEditor().clear(); - } - }); + sow_radio.selectedProperty().addListener((observable, oldValue, isNowSelected) -> datepicker.getEditor().clear()); } /** @@ -160,14 +153,11 @@ public class SelectSowDayController implements Initializable { */ private void enableDisableSaveButton() { save_button.setDisable(true); - datepicker.getEditor().textProperty().addListener(new ChangeListener() { - @Override - public void changed(ObservableValue observable, String oldValue, String newValue) { - if (newValue == null || newValue.equals("")) { - save_button.setDisable(true); - } else { - save_button.setDisable(false); - } + datepicker.getEditor().textProperty().addListener((observable, oldValue, newValue) -> { + if (newValue == null || newValue.equals("")) { + save_button.setDisable(true); + } else { + save_button.setDisable(false); } }); } diff --git a/src/main/java/ch/zhaw/gartenverwaltung/Settings.java b/src/main/java/ch/zhaw/gartenverwaltung/Settings.java new file mode 100644 index 0000000..792f5c0 --- /dev/null +++ b/src/main/java/ch/zhaw/gartenverwaltung/Settings.java @@ -0,0 +1,26 @@ +package ch.zhaw.gartenverwaltung; + +import ch.zhaw.gartenverwaltung.types.HardinessZone; + +public class Settings { + private HardinessZone currentHardinessZone = HardinessZone.ZONE_8A; + private static Settings instance; + + static { + instance = new Settings(); + } + + public static Settings getInstance() { + return Settings.instance; + } + + private Settings() {} + + public HardinessZone getCurrentHardinessZone() { + return currentHardinessZone; + } + + public void setCurrentHardinessZone(HardinessZone currentHardinessZone) { + this.currentHardinessZone = currentHardinessZone; + } +} diff --git a/src/main/java/ch/zhaw/gartenverwaltung/io/GardenPlan.java b/src/main/java/ch/zhaw/gartenverwaltung/io/CropList.java similarity index 97% rename from src/main/java/ch/zhaw/gartenverwaltung/io/GardenPlan.java rename to src/main/java/ch/zhaw/gartenverwaltung/io/CropList.java index 38d0598..7b9fd47 100644 --- a/src/main/java/ch/zhaw/gartenverwaltung/io/GardenPlan.java +++ b/src/main/java/ch/zhaw/gartenverwaltung/io/CropList.java @@ -6,7 +6,7 @@ import java.io.IOException; import java.util.List; import java.util.Optional; -public interface GardenPlan { +public interface CropList { /** * Yields a list of all {@link Crop}s in the database. * diff --git a/src/main/java/ch/zhaw/gartenverwaltung/io/JsonGardenPlan.java b/src/main/java/ch/zhaw/gartenverwaltung/io/JsonCropList.java similarity index 97% rename from src/main/java/ch/zhaw/gartenverwaltung/io/JsonGardenPlan.java rename to src/main/java/ch/zhaw/gartenverwaltung/io/JsonCropList.java index cfe2663..f9ddc3e 100644 --- a/src/main/java/ch/zhaw/gartenverwaltung/io/JsonGardenPlan.java +++ b/src/main/java/ch/zhaw/gartenverwaltung/io/JsonCropList.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; -public class JsonGardenPlan implements GardenPlan { +public class JsonCropList implements CropList { private final URL dataSource; private IdProvider idProvider; @@ -42,7 +42,7 @@ public class JsonGardenPlan implements GardenPlan { /** * Default constructor */ - public JsonGardenPlan() { + public JsonCropList() { this.dataSource = getClass().getResource("user-crops.json"); } @@ -50,7 +50,7 @@ public class JsonGardenPlan implements GardenPlan { * Constructor to use a specified {@link URL} as a {@link #dataSource} * @param dataSource A {@link URL} to the file to be used as a data source */ - public JsonGardenPlan(URL dataSource) { + public JsonCropList(URL dataSource) { this.dataSource = dataSource; } /** diff --git a/src/main/java/ch/zhaw/gartenverwaltung/io/JsonPlantDatabase.java b/src/main/java/ch/zhaw/gartenverwaltung/io/JsonPlantList.java similarity index 93% rename from src/main/java/ch/zhaw/gartenverwaltung/io/JsonPlantDatabase.java rename to src/main/java/ch/zhaw/gartenverwaltung/io/JsonPlantList.java index f09d90e..6132477 100644 --- a/src/main/java/ch/zhaw/gartenverwaltung/io/JsonPlantDatabase.java +++ b/src/main/java/ch/zhaw/gartenverwaltung/io/JsonPlantList.java @@ -20,11 +20,11 @@ import java.util.Map; import java.util.Optional; /** - * Implements the {@link PlantDatabase} interface for loading {@link Plant} objects + * Implements the {@link PlantList} interface for loading {@link Plant} objects * from a JSON file. * The reads are cached to minimize file-io operations. */ -public class JsonPlantDatabase implements PlantDatabase { +public class JsonPlantList implements PlantList { private final URL dataSource = getClass().getResource("plantdb.json"); private HardinessZone currentZone; @@ -49,7 +49,7 @@ public class JsonPlantDatabase implements PlantDatabase { * from the {@link #currentZone}, data is loaded from {@link #dataSource}. * In any case, the values of {@link #plantMap} are returned. * - * @see PlantDatabase#getPlantList(HardinessZone) + * @see PlantList#getPlantList(HardinessZone) */ @Override public List getPlantList(HardinessZone zone) throws IOException, HardinessZoneNotSetException { @@ -60,7 +60,7 @@ public class JsonPlantDatabase implements PlantDatabase { } /** - * @see PlantDatabase#getPlantById(long) + * @see PlantList#getPlantById(long) */ @Override public Optional getPlantById(HardinessZone zone, long id) throws HardinessZoneNotSetException, IOException { diff --git a/src/main/java/ch/zhaw/gartenverwaltung/io/JsonTaskDatabase.java b/src/main/java/ch/zhaw/gartenverwaltung/io/JsonTaskList.java similarity index 94% rename from src/main/java/ch/zhaw/gartenverwaltung/io/JsonTaskDatabase.java rename to src/main/java/ch/zhaw/gartenverwaltung/io/JsonTaskList.java index be0d2ab..bda9aa8 100644 --- a/src/main/java/ch/zhaw/gartenverwaltung/io/JsonTaskDatabase.java +++ b/src/main/java/ch/zhaw/gartenverwaltung/io/JsonTaskList.java @@ -1,6 +1,5 @@ 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; @@ -20,11 +19,11 @@ import java.util.List; import java.util.Map; /** - * Implements the {@link TaskDatabase} interface for loading and writing {@link Task} objects + * Implements the {@link TaskList} 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{ +public class JsonTaskList implements TaskList { IdProvider idProvider; private final URL dataSource = getClass().getResource("taskdb.json"); private final static String INVALID_DATASOURCE_MSG = "Invalid datasource specified!"; @@ -48,7 +47,7 @@ public class JsonTaskDatabase implements TaskDatabase{ * 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) + * @see TaskList#getTaskList(LocalDate, LocalDate) */ @Override public List getTaskList(LocalDate start, LocalDate end) throws IOException{ @@ -90,7 +89,7 @@ public class JsonTaskDatabase implements TaskDatabase{ * it to the {@link #taskMap}. In any case, the {@link #taskMap} is written * to the {@link #dataSource}. * - * @see TaskDatabase#saveTask(Task) + * @see TaskList#saveTask(Task) */ @Override public void saveTask(Task task) throws IOException { @@ -108,7 +107,7 @@ public class JsonTaskDatabase implements TaskDatabase{ * 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) + * @see TaskList#removeTask(Task) */ @Override public void removeTask(Task task) throws IOException { diff --git a/src/main/java/ch/zhaw/gartenverwaltung/io/PlantDatabase.java b/src/main/java/ch/zhaw/gartenverwaltung/io/PlantList.java similarity index 97% rename from src/main/java/ch/zhaw/gartenverwaltung/io/PlantDatabase.java rename to src/main/java/ch/zhaw/gartenverwaltung/io/PlantList.java index 455791e..8650429 100644 --- a/src/main/java/ch/zhaw/gartenverwaltung/io/PlantDatabase.java +++ b/src/main/java/ch/zhaw/gartenverwaltung/io/PlantList.java @@ -11,7 +11,7 @@ import java.util.Optional; * A database of {@link Plant}s. * The interface specifies the minimal required operations. */ -public interface PlantDatabase { +public interface PlantList { /** * Yields a list of all {@link Plant}s in the database with only data relevant to the specfied {@link HardinessZone} * diff --git a/src/main/java/ch/zhaw/gartenverwaltung/io/TaskDatabase.java b/src/main/java/ch/zhaw/gartenverwaltung/io/TaskList.java similarity index 89% rename from src/main/java/ch/zhaw/gartenverwaltung/io/TaskDatabase.java rename to src/main/java/ch/zhaw/gartenverwaltung/io/TaskList.java index 02bef7a..97ef3a7 100644 --- a/src/main/java/ch/zhaw/gartenverwaltung/io/TaskDatabase.java +++ b/src/main/java/ch/zhaw/gartenverwaltung/io/TaskList.java @@ -1,20 +1,16 @@ 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 { +public interface TaskList { /** * Yields a list of all {@link Task}s in the database with the start and end date of a period of time. * diff --git a/src/main/java/ch/zhaw/gartenverwaltung/json/PlantImageDeserializer.java b/src/main/java/ch/zhaw/gartenverwaltung/json/PlantImageDeserializer.java index 14da20c..d40b882 100644 --- a/src/main/java/ch/zhaw/gartenverwaltung/json/PlantImageDeserializer.java +++ b/src/main/java/ch/zhaw/gartenverwaltung/json/PlantImageDeserializer.java @@ -1,6 +1,6 @@ package ch.zhaw.gartenverwaltung.json; -import ch.zhaw.gartenverwaltung.io.PlantDatabase; +import ch.zhaw.gartenverwaltung.io.PlantList; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; @@ -18,7 +18,7 @@ public class PlantImageDeserializer extends JsonDeserializer { @Override public Image deserialize(JsonParser parser, DeserializationContext context) throws IOException { Image result = null; - URL imageUrl = PlantDatabase.class.getResource(String.format("images/%s", parser.getText())); + URL imageUrl = PlantList.class.getResource(String.format("images/%s", parser.getText())); if (imageUrl != null) { try (InputStream is = new FileInputStream(new File(imageUrl.toURI()))) { result = new Image(is); diff --git a/src/main/java/ch/zhaw/gartenverwaltung/gardenplan/Gardenplanmodel.java b/src/main/java/ch/zhaw/gartenverwaltung/models/Garden.java similarity index 61% rename from src/main/java/ch/zhaw/gartenverwaltung/gardenplan/Gardenplanmodel.java rename to src/main/java/ch/zhaw/gartenverwaltung/models/Garden.java index 00ebd44..3d6032a 100644 --- a/src/main/java/ch/zhaw/gartenverwaltung/gardenplan/Gardenplanmodel.java +++ b/src/main/java/ch/zhaw/gartenverwaltung/models/Garden.java @@ -1,41 +1,37 @@ -package ch.zhaw.gartenverwaltung.gardenplan; +package ch.zhaw.gartenverwaltung.models; -import ch.zhaw.gartenverwaltung.io.GardenPlan; +import ch.zhaw.gartenverwaltung.io.CropList; import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException; -import ch.zhaw.gartenverwaltung.io.JsonGardenPlan; -import ch.zhaw.gartenverwaltung.taskList.PlantNotFoundException; -import ch.zhaw.gartenverwaltung.taskList.TaskListModel; +import ch.zhaw.gartenverwaltung.io.JsonCropList; import ch.zhaw.gartenverwaltung.types.Crop; import ch.zhaw.gartenverwaltung.types.Plant; import ch.zhaw.gartenverwaltung.types.Task; +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; import java.io.IOException; import java.time.LocalDate; -import java.util.ArrayList; import java.util.List; import java.util.Optional; -import java.util.function.Supplier; /** * The Gardenplan model manages the crops in the gardenplan. */ -public class Gardenplanmodel { - private GardenPlan gardenPlan; - private List cropList; - private TaskListModel taskListModel; - private Object IllegalArgumentException; +public class Garden { + private CropList cropList; + private final ObservableList plantedCrops = FXCollections.observableArrayList(); + private GardenSchedule gardenSchedule; /** * Constructor of Gardenplan model * - * @param taskListModel holds a reference to the task list object. + * @param gardenSchedule holds a reference to the task list object. */ - public Gardenplanmodel(TaskListModel taskListModel) throws IOException { - this.taskListModel = taskListModel; - gardenPlan = new JsonGardenPlan(); - cropList = new ArrayList<>(); - cropList = gardenPlan.getCrops(); + public Garden(GardenSchedule gardenSchedule) throws IOException { + this.gardenSchedule = gardenSchedule; + cropList = new JsonCropList(); + plantedCrops.addAll(cropList.getCrops()); } /** @@ -52,9 +48,10 @@ public class Gardenplanmodel { Crop crop = new Crop(plant.id(), plantingDate); //TODO Add Area to Plant //crop.withArea(0); - gardenPlan.saveCrop(crop); - taskListModel.planTasksForCrop(crop); - cropList = gardenPlan.getCrops(); + cropList.saveCrop(crop); + gardenSchedule.planTasksForCrop(crop); + plantedCrops.clear(); + plantedCrops.addAll(cropList.getCrops()); } /** @@ -64,9 +61,10 @@ public class Gardenplanmodel { * @throws IOException If the database cannot be accessed */ public void removeCrop(Crop crop) throws IOException { - gardenPlan.removeCrop(crop); - taskListModel.removeTasksForCrop(crop.getCropId().orElseThrow(IllegalArgumentException::new)); - cropList = gardenPlan.getCrops(); + cropList.removeCrop(crop); + gardenSchedule.removeTasksForCrop(crop.getCropId().orElseThrow(IllegalArgumentException::new)); + plantedCrops.clear(); + plantedCrops.addAll(cropList.getCrops()); } /** * Returns a list of {@link Crop}s which are currently in the gardenplan. @@ -74,10 +72,7 @@ public class Gardenplanmodel { * @throws IOException If the database cannot be accessed */ public List getCrops() throws IOException { - if(!cropList.isEmpty()){ - cropList = gardenPlan.getCrops(); - } - return cropList; + return cropList.getCrops(); } /** @@ -87,6 +82,6 @@ public class Gardenplanmodel { * @throws IOException If the database cannot be accessed */ public Optional getCrop(Long cropId) throws IOException { - return gardenPlan.getCropById(cropId); + return cropList.getCropById(cropId); } } diff --git a/src/main/java/ch/zhaw/gartenverwaltung/taskList/TaskListModel.java b/src/main/java/ch/zhaw/gartenverwaltung/models/GardenSchedule.java similarity index 84% rename from src/main/java/ch/zhaw/gartenverwaltung/taskList/TaskListModel.java rename to src/main/java/ch/zhaw/gartenverwaltung/models/GardenSchedule.java index af0ca00..30a0a50 100644 --- a/src/main/java/ch/zhaw/gartenverwaltung/taskList/TaskListModel.java +++ b/src/main/java/ch/zhaw/gartenverwaltung/models/GardenSchedule.java @@ -1,6 +1,6 @@ -package ch.zhaw.gartenverwaltung.taskList; +package ch.zhaw.gartenverwaltung.models; -import ch.zhaw.gartenverwaltung.Config; +import ch.zhaw.gartenverwaltung.Settings; import ch.zhaw.gartenverwaltung.io.*; import ch.zhaw.gartenverwaltung.types.*; @@ -9,29 +9,28 @@ 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; +public class GardenSchedule { + private TaskList taskList; + private PlantList plantList; /** * Comparators to create sorted Task List */ static final Comparator sortByStartDate = Comparator.comparing(Task::getStartDate); - public TaskListModel(){ - taskDatabase = new JsonTaskDatabase(); - plantDatabase = new JsonPlantDatabase(); + public GardenSchedule(){ + taskList = new JsonTaskList(); + plantList = new JsonPlantList(); } /** * Constructor to create Database Objects. */ - public TaskListModel(TaskDatabase taskDatabase, PlantDatabase plantDatabase) { - this.taskDatabase = taskDatabase; - this.plantDatabase = plantDatabase; + public GardenSchedule(TaskList taskList, PlantList plantList) { + this.taskList = taskList; + this.plantList = plantList; } /** @@ -40,7 +39,7 @@ public class TaskListModel { * @throws IOException If the database cannot be accessed */ public void addTask(Task task) throws IOException { - taskDatabase.saveTask(task); + taskList.saveTask(task); } /** @@ -51,7 +50,7 @@ public class TaskListModel { * @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); + Plant plant = plantList.getPlantById(Settings.getInstance().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))); @@ -65,7 +64,7 @@ public class TaskListModel { * @throws IOException If the database cannot be accessed */ public void removeTasksForCrop(long cropId) throws IOException { - taskDatabase.removeTasksForCrop(cropId); + taskList.removeTasksForCrop(cropId); } /** @@ -74,7 +73,7 @@ public class TaskListModel { * @throws IOException If the database cannot be accessed */ public void removeTask(Task task) throws IOException { - taskDatabase.removeTask(task); + taskList.removeTask(task); } private List filterListByCrop(List taskList, Long cropId) { @@ -144,7 +143,7 @@ public class TaskListModel { List> dayTaskList = new ArrayList<>(); for(int i = 0; i < 7; i++) { LocalDate date = LocalDate.now().plusDays(i); - dayTaskList.add(taskDatabase.getTaskList(date, date)); + dayTaskList.add(taskList.getTaskList(date, date)); } return dayTaskList; } @@ -158,7 +157,7 @@ public class TaskListModel { List> dayTaskList = new ArrayList<>(); for(int i = 0; i < 7; i++) { LocalDate date = LocalDate.now().plusDays(i); - dayTaskList.add(filterListByCrop(taskDatabase.getTaskList(date, date), cropId)); + dayTaskList.add(filterListByCrop(taskList.getTaskList(date, date), cropId)); } return dayTaskList; } @@ -171,7 +170,7 @@ public class TaskListModel { * @throws IOException If the database cannot be accessed */ public List getFilteredTaskList(LocalDate start, LocalDate end) throws IOException { - return getSortedTaskList(taskDatabase.getTaskList(start, end), sortByStartDate); + return getSortedTaskList(taskList.getTaskList(start, end), sortByStartDate); } /** diff --git a/src/main/java/ch/zhaw/gartenverwaltung/plantList/PlantListModel.java b/src/main/java/ch/zhaw/gartenverwaltung/models/PlantListModel.java similarity index 93% rename from src/main/java/ch/zhaw/gartenverwaltung/plantList/PlantListModel.java rename to src/main/java/ch/zhaw/gartenverwaltung/models/PlantListModel.java index ffccb30..6b96bee 100644 --- a/src/main/java/ch/zhaw/gartenverwaltung/plantList/PlantListModel.java +++ b/src/main/java/ch/zhaw/gartenverwaltung/models/PlantListModel.java @@ -1,8 +1,8 @@ -package ch.zhaw.gartenverwaltung.plantList; +package ch.zhaw.gartenverwaltung.models; import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException; -import ch.zhaw.gartenverwaltung.io.JsonPlantDatabase; -import ch.zhaw.gartenverwaltung.io.PlantDatabase; +import ch.zhaw.gartenverwaltung.io.JsonPlantList; +import ch.zhaw.gartenverwaltung.io.PlantList; import ch.zhaw.gartenverwaltung.types.GrowthPhaseType; import ch.zhaw.gartenverwaltung.types.HardinessZone; import ch.zhaw.gartenverwaltung.types.Plant; @@ -16,7 +16,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; public class PlantListModel { - private PlantDatabase plantDatabase; + private PlantList plantList; private HardinessZone currentZone; /** @@ -29,17 +29,17 @@ public class PlantListModel { * Constructor to create Database Object. */ public PlantListModel() { - plantDatabase = new JsonPlantDatabase(); + plantList = new JsonPlantList(); setDefaultZone(); } - public PlantListModel(PlantDatabase plantDatabase) { - this.plantDatabase = plantDatabase; + public PlantListModel(PlantList plantList) { + this.plantList = plantList; setDefaultZone(); } private void setDefaultZone() { - currentZone = HardinessZone.ZONE_8A; // TODO: get Default Zone from Config + currentZone = HardinessZone.ZONE_8A; // TODO: get Default Zone from Settings } public void setCurrentZone(HardinessZone currentZone) { @@ -72,7 +72,7 @@ public class PlantListModel { */ public List getSortedPlantList(HardinessZone zone, Comparator comparator) throws HardinessZoneNotSetException, IOException { setCurrentZone(zone); - return plantDatabase.getPlantList(zone).stream().sorted(comparator).collect(Collectors.toList()); + return plantList.getPlantList(zone).stream().sorted(comparator).collect(Collectors.toList()); } /** @@ -101,7 +101,7 @@ public class PlantListModel { public List getFilteredPlantListById(HardinessZone zone, Long id) throws HardinessZoneNotSetException, IOException { setCurrentZone(zone); List plantList = new ArrayList<>(); - plantDatabase.getPlantById(zone, id).ifPresent(plantList::add); + this.plantList.getPlantById(zone, id).ifPresent(plantList::add); return plantList; } diff --git a/src/main/java/ch/zhaw/gartenverwaltung/taskList/PlantNotFoundException.java b/src/main/java/ch/zhaw/gartenverwaltung/models/PlantNotFoundException.java similarity index 79% rename from src/main/java/ch/zhaw/gartenverwaltung/taskList/PlantNotFoundException.java rename to src/main/java/ch/zhaw/gartenverwaltung/models/PlantNotFoundException.java index 149e1ef..62035a8 100644 --- a/src/main/java/ch/zhaw/gartenverwaltung/taskList/PlantNotFoundException.java +++ b/src/main/java/ch/zhaw/gartenverwaltung/models/PlantNotFoundException.java @@ -1,4 +1,4 @@ -package ch.zhaw.gartenverwaltung.taskList; +package ch.zhaw.gartenverwaltung.models; public class PlantNotFoundException extends Exception { public PlantNotFoundException() { diff --git a/src/test/java/ch/zhaw/gartenverwaltung/io/JsonGardenPlanTest.java b/src/test/java/ch/zhaw/gartenverwaltung/io/JsonCropListTest.java similarity index 96% rename from src/test/java/ch/zhaw/gartenverwaltung/io/JsonGardenPlanTest.java rename to src/test/java/ch/zhaw/gartenverwaltung/io/JsonCropListTest.java index ea22b3b..44291b6 100644 --- a/src/test/java/ch/zhaw/gartenverwaltung/io/JsonGardenPlanTest.java +++ b/src/test/java/ch/zhaw/gartenverwaltung/io/JsonCropListTest.java @@ -22,8 +22,8 @@ import java.util.stream.Collectors; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -public class JsonGardenPlanTest { - private GardenPlan testDatabase; +public class JsonCropListTest { + private CropList testDatabase; private final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); /** * Files to isolate the test-units @@ -36,7 +36,7 @@ public class JsonGardenPlanTest { assertNotNull(testFile); assertNotNull(dbDataSource); Files.copy(Path.of(testFile.toURI()), Path.of(dbDataSource.toURI()), StandardCopyOption.REPLACE_EXISTING); - testDatabase = new JsonGardenPlan(dbDataSource); + testDatabase = new JsonCropList(dbDataSource); } diff --git a/src/test/java/ch/zhaw/gartenverwaltung/io/JsonPlantDatabaseTest.java b/src/test/java/ch/zhaw/gartenverwaltung/io/JsonPlantListTest.java similarity index 96% rename from src/test/java/ch/zhaw/gartenverwaltung/io/JsonPlantDatabaseTest.java rename to src/test/java/ch/zhaw/gartenverwaltung/io/JsonPlantListTest.java index b8bbeb3..7c62c0c 100644 --- a/src/test/java/ch/zhaw/gartenverwaltung/io/JsonPlantDatabaseTest.java +++ b/src/test/java/ch/zhaw/gartenverwaltung/io/JsonPlantListTest.java @@ -13,12 +13,12 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collectors; -public class JsonPlantDatabaseTest { - PlantDatabase testDatabase; +public class JsonPlantListTest { + PlantList testDatabase; @BeforeEach void connectToDb() { - testDatabase = new JsonPlantDatabase(); + testDatabase = new JsonPlantList(); } diff --git a/src/test/java/ch/zhaw/gartenverwaltung/io/JsonTaskDatabaseTest.java b/src/test/java/ch/zhaw/gartenverwaltung/io/JsonTaskListTest.java similarity index 93% rename from src/test/java/ch/zhaw/gartenverwaltung/io/JsonTaskDatabaseTest.java rename to src/test/java/ch/zhaw/gartenverwaltung/io/JsonTaskListTest.java index 255117e..9f585d4 100644 --- a/src/test/java/ch/zhaw/gartenverwaltung/io/JsonTaskDatabaseTest.java +++ b/src/test/java/ch/zhaw/gartenverwaltung/io/JsonTaskListTest.java @@ -9,19 +9,15 @@ import java.net.URL; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardCopyOption; -import java.text.ParseException; -import java.text.SimpleDateFormat; import java.time.LocalDate; import java.time.format.DateTimeFormatter; -import java.util.Date; import java.util.List; -import java.util.Optional; import static org.junit.jupiter.api.Assertions.assertNotNull; -public class JsonTaskDatabaseTest { +public class JsonTaskListTest { - TaskDatabase testDatabase; + TaskList testDatabase; DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yyyy"); private final URL dbDataSource = this.getClass().getResource("taskdb.json"); @@ -32,7 +28,7 @@ public class JsonTaskDatabaseTest { assertNotNull(testFile); assertNotNull(dbDataSource); Files.copy(Path.of(testFile.toURI()), Path.of(dbDataSource.toURI()), StandardCopyOption.REPLACE_EXISTING); - testDatabase = new JsonTaskDatabase(); + testDatabase = new JsonTaskList(); } @Test diff --git a/src/test/java/ch/zhaw/gartenverwaltung/gardenplan/GardenPlanModelTest.java b/src/test/java/ch/zhaw/gartenverwaltung/models/GardenPlanModelTest.java similarity index 85% rename from src/test/java/ch/zhaw/gartenverwaltung/gardenplan/GardenPlanModelTest.java rename to src/test/java/ch/zhaw/gartenverwaltung/models/GardenPlanModelTest.java index 16ece04..02c3f35 100644 --- a/src/test/java/ch/zhaw/gartenverwaltung/gardenplan/GardenPlanModelTest.java +++ b/src/test/java/ch/zhaw/gartenverwaltung/models/GardenPlanModelTest.java @@ -1,16 +1,14 @@ -package ch.zhaw.gartenverwaltung.gardenplan; +package ch.zhaw.gartenverwaltung.models; import ch.zhaw.gartenverwaltung.io.*; -import ch.zhaw.gartenverwaltung.taskList.PlantNotFoundException; -import ch.zhaw.gartenverwaltung.taskList.TaskListModel; +import ch.zhaw.gartenverwaltung.models.Garden; +import ch.zhaw.gartenverwaltung.models.PlantNotFoundException; +import ch.zhaw.gartenverwaltung.models.GardenSchedule; import ch.zhaw.gartenverwaltung.types.*; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import java.io.File; import java.io.IOException; -import java.net.URL; -import java.nio.file.Files; import java.time.LocalDate; import java.time.MonthDay; import java.util.ArrayList; @@ -21,8 +19,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.*; public class GardenPlanModelTest { - GardenPlan gardenPlan; - List cropList; + CropList cropList; + List exampleCrops; Crop exampleCropOnion; Crop exampleCropCarrot; Crop exampleCrop1; @@ -30,7 +28,7 @@ public class GardenPlanModelTest { Crop exampleCrop3; Plant examplePlantOnion; Plant examplePlantCarrot; - Gardenplanmodel model; + Garden model; @BeforeEach void setUp() throws IOException { @@ -76,18 +74,18 @@ public class GardenPlanModelTest { exampleCrop3.withId(2); exampleCrop3.withArea(1.0); - cropList = new ArrayList<>(); - cropList.add(exampleCrop1); - cropList.add(exampleCrop2); - cropList.add(exampleCrop3); - gardenPlan = mockGardenPlan(cropList); + exampleCrops = new ArrayList<>(); + exampleCrops.add(exampleCrop1); + exampleCrops.add(exampleCrop2); + exampleCrops.add(exampleCrop3); + cropList = mockGardenPlan(exampleCrops); - TaskListModel taskListModel = new TaskListModel(new JsonTaskDatabase(), new JsonPlantDatabase()); - model = new Gardenplanmodel(taskListModel); + GardenSchedule gardenSchedule = new GardenSchedule(new JsonTaskList(), new JsonPlantList()); + model = new Garden(gardenSchedule); } - GardenPlan mockGardenPlan(List cropList) throws IOException { - GardenPlan gardenPlan = mock(GardenPlan.class); + CropList mockGardenPlan(List cropList) throws IOException { + CropList gardenPlan = mock(CropList.class); when(gardenPlan.getCrops()).thenReturn(cropList); when(gardenPlan.getCropById(5)).thenReturn(java.util.Optional.ofNullable(exampleCropCarrot)); when(gardenPlan.getCropById(3)).thenReturn(java.util.Optional.ofNullable(exampleCropOnion)); diff --git a/src/test/java/ch/zhaw/gartenverwaltung/plantList/PlantListModelTest.java b/src/test/java/ch/zhaw/gartenverwaltung/models/PlantListModelTest.java similarity index 95% rename from src/test/java/ch/zhaw/gartenverwaltung/plantList/PlantListModelTest.java rename to src/test/java/ch/zhaw/gartenverwaltung/models/PlantListModelTest.java index 9ed857d..0033299 100644 --- a/src/test/java/ch/zhaw/gartenverwaltung/plantList/PlantListModelTest.java +++ b/src/test/java/ch/zhaw/gartenverwaltung/models/PlantListModelTest.java @@ -1,8 +1,9 @@ -package ch.zhaw.gartenverwaltung.plantList; +package ch.zhaw.gartenverwaltung.models; import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException; -import ch.zhaw.gartenverwaltung.io.JsonPlantDatabase; -import ch.zhaw.gartenverwaltung.io.PlantDatabase; +import ch.zhaw.gartenverwaltung.io.JsonPlantList; +import ch.zhaw.gartenverwaltung.io.PlantList; +import ch.zhaw.gartenverwaltung.models.PlantListModel; import ch.zhaw.gartenverwaltung.types.*; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -22,15 +23,15 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; class PlantListModelTest { - PlantDatabase plantDatabase; + PlantList plantList; List examplePlantList; PlantListModel model; @BeforeEach void setUp() throws HardinessZoneNotSetException, IOException { createExamplePlantList(); - plantDatabase = mockPlantDatabase(examplePlantList); - model = new PlantListModel(plantDatabase); + plantList = mockPlantDatabase(examplePlantList); + model = new PlantListModel(plantList); } @AfterEach @@ -79,8 +80,8 @@ class PlantListModelTest { ); } - PlantDatabase mockPlantDatabase(List plantList) throws HardinessZoneNotSetException, IOException { - PlantDatabase plantDatabase = mock(JsonPlantDatabase.class); + PlantList mockPlantDatabase(List plantList) throws HardinessZoneNotSetException, IOException { + PlantList plantDatabase = mock(JsonPlantList.class); when(plantDatabase.getPlantList(HardinessZone.ZONE_8A)).thenReturn(plantList); when(plantDatabase.getPlantList(HardinessZone.ZONE_1A)).thenReturn(new ArrayList<>()); when(plantDatabase.getPlantById(HardinessZone.ZONE_8A, 0)).thenReturn(Optional.of(plantList.get(1))); diff --git a/src/test/java/ch/zhaw/gartenverwaltung/taskList/TaskListModelTest.java b/src/test/java/ch/zhaw/gartenverwaltung/taskList/GardenScheduleTest.java similarity index 68% rename from src/test/java/ch/zhaw/gartenverwaltung/taskList/TaskListModelTest.java rename to src/test/java/ch/zhaw/gartenverwaltung/taskList/GardenScheduleTest.java index 9caf65a..cf354de 100644 --- a/src/test/java/ch/zhaw/gartenverwaltung/taskList/TaskListModelTest.java +++ b/src/test/java/ch/zhaw/gartenverwaltung/taskList/GardenScheduleTest.java @@ -1,6 +1,7 @@ package ch.zhaw.gartenverwaltung.taskList; import ch.zhaw.gartenverwaltung.io.*; +import ch.zhaw.gartenverwaltung.models.GardenSchedule; import ch.zhaw.gartenverwaltung.types.HardinessZone; import ch.zhaw.gartenverwaltung.types.Plant; import ch.zhaw.gartenverwaltung.types.Task; @@ -14,47 +15,47 @@ import java.util.*; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; -class TaskListModelTest { - TaskDatabase taskDatabase; - PlantDatabase plantDatabase; +class GardenScheduleTest { + TaskList taskList; + PlantList plantList; List exampleTaskList; Map examplePlantMap; - TaskListModel model; + GardenSchedule model; @BeforeEach void setUp() throws IOException { createExampleTaskList(); - taskDatabase = mockTaskDatabase(exampleTaskList); - plantDatabase = mockPlantDatabase(examplePlantMap); - model = new TaskListModel(taskDatabase, plantDatabase); + taskList = mockTaskDatabase(exampleTaskList); + plantList = mockPlantDatabase(examplePlantMap); + model = new GardenSchedule(taskList, plantList); } - private TaskDatabase mockTaskDatabase(List exampleTaskList) throws IOException { - TaskDatabase taskDatabase = mock(JsonTaskDatabase.class); - when(taskDatabase.getTaskList(LocalDate.MIN, LocalDate.MAX)).thenReturn(exampleTaskList); + private TaskList mockTaskDatabase(List exampleTaskList) throws IOException { + TaskList taskList = mock(JsonTaskList.class); + when(taskList.getTaskList(LocalDate.MIN, LocalDate.MAX)).thenReturn(exampleTaskList); - when(taskDatabase.getTaskList(LocalDate.now(), LocalDate.MAX)).thenReturn((exampleTaskList.subList(1, 4))); + when(taskList.getTaskList(LocalDate.now(), LocalDate.MAX)).thenReturn((exampleTaskList.subList(1, 4))); List 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(taskList.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()); + when(taskList.getTaskList(LocalDate.now(), LocalDate.now())).thenReturn(List.of(exampleTaskList.get(2))); + when(taskList.getTaskList(LocalDate.now().plusDays(1L), LocalDate.now().plusDays(1L))).thenReturn(List.of(exampleTaskList.get(1))); + when(taskList.getTaskList(LocalDate.now().plusDays(2L), LocalDate.now().plusDays(2L))).thenReturn(List.of()); + when(taskList.getTaskList(LocalDate.now().plusDays(3L), LocalDate.now().plusDays(3L))).thenReturn(List.of()); + when(taskList.getTaskList(LocalDate.now().plusDays(4L), LocalDate.now().plusDays(4L))).thenReturn(List.of()); + when(taskList.getTaskList(LocalDate.now().plusDays(5L), LocalDate.now().plusDays(5L))).thenReturn(List.of()); + when(taskList.getTaskList(LocalDate.now().plusDays(6L), LocalDate.now().plusDays(6L))).thenReturn(List.of()); - return taskDatabase; + return taskList; } - private PlantDatabase mockPlantDatabase(Map examplePlantMap) { - return new PlantDatabase() { + private PlantList mockPlantDatabase(Map examplePlantMap) { + return new PlantList() { @Override public List getPlantList(HardinessZone zone) { return null; @@ -86,14 +87,14 @@ class TaskListModelTest { void addTask() throws IOException { Task taskToAdd = new Task("name", "description", LocalDate.now(), 1L); model.addTask(taskToAdd); - verify(taskDatabase, times(1)).saveTask(taskToAdd); + verify(taskList, 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); + verify(taskList, times(1)).removeTask(taskToRemove); } @Test @@ -153,6 +154,6 @@ class TaskListModelTest { @Test void removeTasksForCrop() throws IOException { model.removeTasksForCrop(1L); - verify(taskDatabase, times(1)).removeTasksForCrop(1L); + verify(taskList, times(1)).removeTasksForCrop(1L); } } \ No newline at end of file