Merge branch 'dev' into feature_json-task-db_M2

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

@@ -56,9 +56,9 @@ public class JsonPlantDatabase implements PlantDatabase {
      * @see PlantDatabase#getPlantById(long)
      */
     @Override
-    public Optional<Plant> getPlantById(long id) throws HardinessZoneNotSetException, IOException {
+    public Optional<Plant> getPlantById(HardinessZone zone, long id) throws HardinessZoneNotSetException, IOException {
         if (plantMap.isEmpty()) {
-            loadPlantList(currentZone);
+            loadPlantList(zone);
         }
         return Optional.ofNullable(plantMap.get(id));
     }

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

@@ -30,5 +30,5 @@ public interface PlantDatabase {
      * @throws IOException If the database cannot be accessed
      * @throws HardinessZoneNotSetException If no {@link HardinessZone} was specified
      */
-    Optional<Plant> getPlantById(long id) throws IOException, HardinessZoneNotSetException;
+    Optional<Plant> getPlantById(HardinessZone zone, long id) throws IOException, HardinessZoneNotSetException;
 }

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

@@ -0,0 +1,100 @@
+package ch.zhaw.gartenverwaltung.plantList;
+
+import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException;
+import ch.zhaw.gartenverwaltung.io.JsonPlantDatabase;
+import ch.zhaw.gartenverwaltung.io.PlantDatabase;
+import ch.zhaw.gartenverwaltung.types.HardinessZone;
+import ch.zhaw.gartenverwaltung.types.Plant;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.function.Predicate;
+
+public class PlantListModel {
+    private PlantDatabase plantDatabase;
+    private HardinessZone currentZone;
+
+    /**
+     * Comparators to create sorted Plant List
+     */
+    static final Comparator<Plant> sortByName = (Plant o1, Plant o2) -> o1.name().compareTo(o2.name());
+    static final Comparator<Plant> SortById = (Plant o1, Plant o2) -> Long.compare(o1.id(), o2.id());
+
+    /**
+     * Constructor to create Database Object.
+     */
+    public PlantListModel() {
+        plantDatabase = new JsonPlantDatabase();
+        setDefaultZone();
+    }
+
+    public PlantListModel(PlantDatabase plantDatabase){
+        this.plantDatabase = plantDatabase;
+        setDefaultZone();
+    }
+
+    private void setDefaultZone(){
+        currentZone = HardinessZone.ZONE_8A; // TODO: get Default Zone from Config
+    }
+
+    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 plantDatabase.getPlantList(zone).stream().sorted(comparator).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).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<>();
+        plantDatabase.getPlantById(zone, id).ifPresent(plantList::add);
+        return plantList;
+    }
+}

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

@@ -5,5 +5,6 @@ package ch.zhaw.gartenverwaltung.types;
  * (Subject to later expansion)
  */
 public enum HardinessZone {
+    ZONE_1A,
     ZONE_8A
 }

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

@@ -251,4 +251,4 @@
       }
     ]
   }
-]
+]