refactor: renamed everything
This commit is contained in:
David Guler
@@ -0,0 +1,87 @@
|
||||
package ch.zhaw.gartenverwaltung.models;
|
||||
|
||||
import ch.zhaw.gartenverwaltung.io.CropList;
|
||||
import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException;
|
||||
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.List;
|
||||
import java.util.Optional;
|
||||
|
||||
|
||||
/**
|
||||
* The Gardenplan model manages the crops in the gardenplan.
|
||||
*/
|
||||
public class Garden {
|
||||
private CropList cropList;
|
||||
private final ObservableList<Crop> plantedCrops = FXCollections.observableArrayList();
|
||||
private GardenSchedule gardenSchedule;
|
||||
|
||||
/**
|
||||
* Constructor of Gardenplan model
|
||||
*
|
||||
* @param gardenSchedule holds a reference to the task list object.
|
||||
*/
|
||||
public Garden(GardenSchedule gardenSchedule) throws IOException {
|
||||
this.gardenSchedule = gardenSchedule;
|
||||
cropList = new JsonCropList();
|
||||
plantedCrops.addAll(cropList.getCrops());
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a Crop with a {@link Plant} and the planting date of the plant. Then let the Tasklistmodel create the
|
||||
* gardening {@link Task} for the crop. Store the crop in the gardenplan file and the cache.
|
||||
*
|
||||
* @param plant The plant which is wnated to be planted
|
||||
* @param plantingDate The date, when the plant is planted
|
||||
* @throws IOException If the database cannot be accessed
|
||||
* @throws HardinessZoneNotSetException If the hardinesszone could not be added
|
||||
* @throws PlantNotFoundException If the plant is not found in the database.
|
||||
*/
|
||||
public void plantAsCrop(Plant plant, LocalDate plantingDate) throws IOException, HardinessZoneNotSetException, PlantNotFoundException {
|
||||
Crop crop = new Crop(plant.id(), plantingDate);
|
||||
//TODO Add Area to Plant
|
||||
//crop.withArea(0);
|
||||
cropList.saveCrop(crop);
|
||||
gardenSchedule.planTasksForCrop(crop);
|
||||
plantedCrops.clear();
|
||||
plantedCrops.addAll(cropList.getCrops());
|
||||
}
|
||||
|
||||
/**
|
||||
* Removes a {@link Crop} from the file and the cache
|
||||
*
|
||||
* @param crop The plant which is wnated to be planted
|
||||
* @throws IOException If the database cannot be accessed
|
||||
*/
|
||||
public void removeCrop(Crop crop) throws IOException {
|
||||
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.
|
||||
*
|
||||
* @throws IOException If the database cannot be accessed
|
||||
*/
|
||||
public List<Crop> getCrops() throws IOException {
|
||||
return cropList.getCrops();
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns an Optional of {@link Crop} if the crop is the gardenplan
|
||||
*
|
||||
* @param cropId The date, when the plant is planted
|
||||
* @throws IOException If the database cannot be accessed
|
||||
*/
|
||||
public Optional<Crop> getCrop(Long cropId) throws IOException {
|
||||
return cropList.getCropById(cropId);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,185 @@
|
||||
package ch.zhaw.gartenverwaltung.models;
|
||||
|
||||
import ch.zhaw.gartenverwaltung.Settings;
|
||||
import ch.zhaw.gartenverwaltung.io.*;
|
||||
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.stream.Collectors;
|
||||
|
||||
public class GardenSchedule {
|
||||
private TaskList taskList;
|
||||
private PlantList plantList;
|
||||
|
||||
/**
|
||||
* Comparators to create sorted Task List
|
||||
*/
|
||||
static final Comparator<Task> sortByStartDate = Comparator.comparing(Task::getStartDate);
|
||||
|
||||
public GardenSchedule(){
|
||||
taskList = new JsonTaskList();
|
||||
plantList = new JsonPlantList();
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructor to create Database Objects.
|
||||
*/
|
||||
public GardenSchedule(TaskList taskList, PlantList plantList) {
|
||||
this.taskList = taskList;
|
||||
this.plantList = plantList;
|
||||
}
|
||||
|
||||
/**
|
||||
* 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 {
|
||||
taskList.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 = 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)));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 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 {
|
||||
taskList.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 {
|
||||
taskList.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(taskList.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(taskList.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(taskList.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());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,193 @@
|
||||
package ch.zhaw.gartenverwaltung.models;
|
||||
|
||||
import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException;
|
||||
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;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.time.MonthDay;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import java.util.function.Predicate;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public class PlantListModel {
|
||||
private PlantList plantList;
|
||||
private HardinessZone currentZone;
|
||||
|
||||
/**
|
||||
* Comparators to create sorted Plant List
|
||||
*/
|
||||
static final Comparator<Plant> sortByName = Comparator.comparing(Plant::name);
|
||||
static final Comparator<Plant> SortById = Comparator.comparingLong(Plant::id);
|
||||
|
||||
/**
|
||||
* Constructor to create Database Object.
|
||||
*/
|
||||
public PlantListModel() {
|
||||
plantList = new JsonPlantList();
|
||||
setDefaultZone();
|
||||
}
|
||||
|
||||
public PlantListModel(PlantList plantList) {
|
||||
this.plantList = plantList;
|
||||
setDefaultZone();
|
||||
}
|
||||
|
||||
private void setDefaultZone() {
|
||||
currentZone = HardinessZone.ZONE_8A; // TODO: get Default Zone from Settings
|
||||
}
|
||||
|
||||
public void setCurrentZone(HardinessZone currentZone) {
|
||||
this.currentZone = currentZone;
|
||||
}
|
||||
|
||||
public HardinessZone getCurrentZone() {
|
||||
return currentZone;
|
||||
}
|
||||
|
||||
/**
|
||||
* Method to get actual Plant List in alphabetic Order
|
||||
*
|
||||
* @return actual Plant List in alphabetic Order
|
||||
*/
|
||||
public List<Plant> getPlantList(HardinessZone zone) throws HardinessZoneNotSetException, IOException {
|
||||
setCurrentZone(zone);
|
||||
return getSortedPlantList(zone, sortByName);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Method to get the actual Plant list in custom Order
|
||||
*
|
||||
* @param zone selected hardiness zone
|
||||
* @param comparator comparator to sort the list
|
||||
* @return sorted list with plants in the given hardiness zone
|
||||
* @throws IOException If the database cannot be accessed
|
||||
* @throws HardinessZoneNotSetException If no {@link HardinessZone} was specified
|
||||
*/
|
||||
public List<Plant> getSortedPlantList(HardinessZone zone, Comparator<Plant> comparator) throws HardinessZoneNotSetException, IOException {
|
||||
setCurrentZone(zone);
|
||||
return plantList.getPlantList(zone).stream().sorted(comparator).collect(Collectors.toList());
|
||||
}
|
||||
|
||||
/**
|
||||
* Method to get Filtered plant list
|
||||
*
|
||||
* @param predicate predicate to filter the list
|
||||
* @param zone selected hardiness zone
|
||||
* @return filterd list with plants in the hardinness zone
|
||||
* @throws IOException If the database cannot be accessed
|
||||
* @throws HardinessZoneNotSetException If no {@link HardinessZone} was specified
|
||||
*/
|
||||
public List<Plant> getFilteredPlantList(HardinessZone zone, Predicate<Plant> predicate) throws HardinessZoneNotSetException, IOException {
|
||||
setCurrentZone(zone);
|
||||
return getPlantList(zone).stream().filter(predicate).collect(Collectors.toList());
|
||||
}
|
||||
|
||||
/**
|
||||
* Method to get Filtered plant list by id by exact match
|
||||
*
|
||||
* @param zone selected hardiness zone
|
||||
* @param id id of plant
|
||||
* @return if id doesn't exist: empty List, else list with 1 plant entry.
|
||||
* @throws IOException If the database cannot be accessed
|
||||
* @throws HardinessZoneNotSetException If no {@link HardinessZone} was specified
|
||||
*/
|
||||
public List<Plant> getFilteredPlantListById(HardinessZone zone, Long id) throws HardinessZoneNotSetException, IOException {
|
||||
setCurrentZone(zone);
|
||||
List<Plant> plantList = new ArrayList<>();
|
||||
this.plantList.getPlantById(zone, id).ifPresent(plantList::add);
|
||||
return plantList;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param zone selected hardiness zone
|
||||
* @param searchString the string to search plant List, set '#' as first char the search by id.
|
||||
* @return List of plants found in Plant List which contain the search String in the name or description
|
||||
* @throws HardinessZoneNotSetException If no {@link HardinessZone} was specified
|
||||
* @throws IOException If the database cannot be accessed
|
||||
*/
|
||||
public List<Plant> getFilteredPlantListByString(HardinessZone zone, String searchString) throws HardinessZoneNotSetException, IOException {
|
||||
if (searchString.length() == 0) {
|
||||
return getPlantList(zone);
|
||||
} else if (searchString.charAt(0) == '#') {
|
||||
if (isPositiveIntegral(searchString.substring(1))) {
|
||||
Long searchId = Long.parseLong(searchString.substring(1));
|
||||
return getFilteredPlantListById(zone, searchId);
|
||||
} else {
|
||||
return new ArrayList<>();
|
||||
}
|
||||
} else {
|
||||
String caseInsensitiveSearchString = searchString.toLowerCase();
|
||||
return getFilteredPlantList(zone, plant ->
|
||||
plant.name().toLowerCase().contains(caseInsensitiveSearchString) ||
|
||||
plant.description().toLowerCase().contains(caseInsensitiveSearchString)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @param type GrowPhaseType to filter
|
||||
* @param zone selected hardiness zone
|
||||
* @param from the earliest date to for the filter
|
||||
* @param to the lastest date for the filter
|
||||
* @return List of Plants with selected saison
|
||||
* @throws HardinessZoneNotSetException If no {@link HardinessZone} was specified
|
||||
* @throws IOException If the database cannot be accessed
|
||||
*/
|
||||
private List<Plant> getFilteredPlantListBySaison(GrowthPhaseType type, HardinessZone zone, MonthDay from, MonthDay to) throws HardinessZoneNotSetException, IOException {
|
||||
return getFilteredPlantList(zone, plant -> plant.lifecycle().stream().anyMatch(growthPhase -> growthPhase.startDate().compareTo(from) >= 0 && (growthPhase.startDate().compareTo(to) <= 0) && growthPhase.type() == type));
|
||||
}
|
||||
|
||||
/**
|
||||
* @param zone selected hardiness zone
|
||||
* @param from the earliest date to for the filter
|
||||
* @param to the lastest date for the filter
|
||||
* @return List of Plants with selected saison
|
||||
* @throws HardinessZoneNotSetException If no {@link HardinessZone} was specified
|
||||
* @throws IOException If the database cannot be accessed
|
||||
*/
|
||||
public List<Plant> getFilteredPlantListByPlantingSaison(HardinessZone zone, MonthDay from, MonthDay to) throws HardinessZoneNotSetException, IOException {
|
||||
return getFilteredPlantListBySaison(GrowthPhaseType.PLANT, zone, from, to);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param zone selected hardiness zone
|
||||
* @param from the earliest date to for the filter
|
||||
* @param to the lastest date for the filter
|
||||
* @return List of Plants with selected saison
|
||||
* @throws HardinessZoneNotSetException If no {@link HardinessZone} was specified
|
||||
* @throws IOException If the database cannot be accessed
|
||||
*/
|
||||
public List<Plant> getFilteredPlantListByHarvestSaison(HardinessZone zone, MonthDay from, MonthDay to) throws HardinessZoneNotSetException, IOException {
|
||||
return getFilteredPlantListBySaison(GrowthPhaseType.HARVEST, zone, from, to);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param zone selected hardiness zone
|
||||
* @param from the earliest date to for the filter
|
||||
* @param to the lastest date for the filter
|
||||
* @return List of Plants with selected saison
|
||||
* @throws HardinessZoneNotSetException If no {@link HardinessZone} was specified
|
||||
* @throws IOException If the database cannot be accessed
|
||||
*/
|
||||
public List<Plant> getFilteredPlantListBySaisonWithoutGrowthPhase(HardinessZone zone, MonthDay from, MonthDay to) throws HardinessZoneNotSetException, IOException {
|
||||
return getFilteredPlantList(zone, plant -> plant.lifecycle().stream().anyMatch(growthPhase -> growthPhase.startDate().compareTo(from) >= 0 && (growthPhase.startDate().compareTo(to) <= 0)));
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if a string can safely be parsed as a positive Integral value (short/int/long)
|
||||
*
|
||||
* @param subject The string to be tested
|
||||
* @return Whether the string contains only digits
|
||||
*/
|
||||
private boolean isPositiveIntegral(String subject) {
|
||||
return subject != null && subject.matches("[0-9]+");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
package ch.zhaw.gartenverwaltung.models;
|
||||
|
||||
public class PlantNotFoundException extends Exception {
|
||||
public PlantNotFoundException() {
|
||||
super("The selected Plant was not found in Database!");
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user