Merge branch 'dev' into feature_gardenplan-model_M2

Plant Controller Filter to hardiness zone and season

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

@@ -19,7 +19,7 @@ public class MainFXMLController implements Initializable {
     /**
      * Caching the panes
      */
-    private final Map<String, Node> panes = new HashMap<>();
+    private final Map<String, AnchorPane> panes = new HashMap<>();
 
     @FXML
     private Button home_button;
@@ -68,20 +68,22 @@ public class MainFXMLController implements Initializable {
      * @throws IOException exception when file does not exist
      */
     public void loadPane(String fxmlFile) throws IOException {
-        //ToDo HGrow and VGrow of new node
-        Node node = panes.get(fxmlFile);
-        System.out.println(node);
-        if (node == null) {
+
+        AnchorPane anchorPane = panes.get(fxmlFile);
+        if (anchorPane == null) {
             FXMLLoader loader = new FXMLLoader(Objects.requireNonNull(HelloApplication.class.getResource(fxmlFile)));
-            node = loader.load();
-            panes.put(fxmlFile, node);
+            anchorPane = loader.load();
+            panes.put(fxmlFile, anchorPane);
 
             if(fxmlFile.equals("MyPlants.fxml")) {
                 MyPlantsController myPlantsController = loader.getController();
                 myPlantsController.getMainController(this);
             }
         }
-        mainPane.getChildren().setAll(node);
+        mainPane.getChildren().setAll(anchorPane);
+        anchorPane.prefWidthProperty().bind(mainPane.widthProperty());
+        anchorPane.prefHeightProperty().bind(mainPane.heightProperty());
+
     }
 
     private void styleChangeButton(Button button) {

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

@@ -4,6 +4,7 @@ import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException;
 import ch.zhaw.gartenverwaltung.plantList.PlantListModel;
 import ch.zhaw.gartenverwaltung.types.HardinessZone;
 import ch.zhaw.gartenverwaltung.types.Plant;
+import ch.zhaw.gartenverwaltung.types.Seasons;
 import javafx.application.Platform;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleListProperty;
@@ -13,8 +14,10 @@ import javafx.collections.FXCollections;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
+import javafx.geometry.Insets;
 import javafx.geometry.Bounds;
 import javafx.scene.control.*;
+import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.VBox;
@@ -30,10 +33,11 @@ public class PlantsController implements Initializable {
     private final HardinessZone DEFAULT_HARDINESS_ZONE = HardinessZone.ZONE_8A;
 
     // TODO: move to model
+
     private final ListProperty<Plant> plantListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
 
     @FXML
-    private CheckBox autum_filter;
+    private VBox seasons;
 
     @FXML
     private VBox climate_zones;
@@ -53,81 +57,44 @@ public class PlantsController implements Initializable {
     @FXML
     private TextField search_plants;
 
-    @FXML
-    private CheckBox sommer_filter;
-
-    @FXML
-    private CheckBox spring_filter;
-
-    @FXML
-    private CheckBox winter_filter;
-
-    @FXML
-    void filterAutum(ActionEvent event) {
-        //ToDo
-
-    }
-
-    @FXML
-    void filterSommer(ActionEvent event) {
-        //ToDo
-
-    }
-
-    @FXML
-    void filterSpring(ActionEvent event) {
-        //ToDo
-
-    }
-
-    @FXML
-    void filterWinter(ActionEvent event) {
-        //ToDo
-
-    }
-
+    /**
+     * saves the current selected plant in new JSON database
+     * @param event event
+     */
     @FXML
     void saveToMyPlant(ActionEvent event) {
         //ToDo model save selectedPlant to mySelectedPlant(IO)
     }
 
-    @FXML
-    void searchForPlant(KeyEvent event) {
-        viewFilteredListBySearch(search_plants.getText());
-    }
-
     /**
+     * fill list view with current hardiness zone
+     * set default values
+     * create filter of season and hardiness zone
+     * create event listener for selected list entry and search by query
      * {@inheritDoc}
      */
     @Override
     public void initialize(URL url, ResourceBundle resourceBundle) {
         setListCellFactory();
-        try {
-            plantListProperty.addAll(plantListModel.getPlantList(DEFAULT_HARDINESS_ZONE));
-        } catch (HardinessZoneNotSetException | IOException e) {
-            e.printStackTrace();
-        }
-
+        fillPlantListWithHardinessZone();
         list_plants.itemsProperty().bind(plantListProperty);
-        list_plants.getSelectionModel().selectedItemProperty()
-                .addListener((observable, oldPlant, newPlant) -> {
-                    if (newPlant != null) {
-                        img_plant.setImage(newPlant.image());
-                    }
-                });
 
         description_plant.setText("");
         saveToMyPlant_button.setDisable(true);
 
+        createFilterSeasons();
         createFilterHardinessZone();
         lookForSelectedListEntry();
+        try {
+            viewFilteredListBySearch();
+        } catch (HardinessZoneNotSetException | IOException e) {
+            e.printStackTrace();
+        }
     }
 
-    private void centerImage() {
-
-        //img_plant.setX(0.3);
-        //img_plant.setX(-100);
-    }
+    /**
+     *  set text of list view to plant name
+     */
     private void setListCellFactory() {
         list_plants.setCellFactory(param -> new ListCell<Plant>() {
             @Override
@@ -144,62 +111,138 @@ public class PlantsController implements Initializable {
     }
 
     /**
-     * update the ListView according to the plant list provided
-     * Entry in ListView is plant name
-     * @param list plantList which fill the ListView
+     * get plant list according to param season and hardiness zone
+     * fill list view with plant list
+     * @param season enum of seasons
+     * @throws HardinessZoneNotSetException throws exception
+     * @throws IOException throws exception
      */
-    private void fillListViewWithData(List<Plant> list) {
+    private void viewFilteredListBySeason(Seasons season) throws HardinessZoneNotSetException, IOException {
         clearListView();
-        for (Plant plant : list) {
-            list_plants.getItems().add(plant);
-        }
-
+        plantListProperty.addAll(plantListModel.getFilteredPlantListBySaisonWithoutGrowthPhase(plantListModel.getCurrentZone(), season.getStartDate(), season.getEndDate()));
     }
 
-    private void viewFilteredListByFilters() {
-        boolean springValue = spring_filter.isSelected();
-        boolean sommerValue = sommer_filter.isSelected();
-        boolean autumValue = autum_filter.isSelected();
-        boolean winterValue = winter_filter.isSelected();
-        //ToDo getFilteredPlantList with (plantListModel.getFilteredPlantList(DEFAULT_HARDINESS_ZONE, <predicate>))
-        //List<Plant> plantList = new LinkedList<>();
-        //fillListViewWithData(plantList);
+    /**
+     * get plant list filtered by search plant entry and hardiness zone
+     * fill list view with plant list
+     * @throws HardinessZoneNotSetException throws exception when no hardiness zone is defined
+     * @throws IOException throws exception
+     */
+    private void viewFilteredListBySearch() throws HardinessZoneNotSetException, IOException {
+        search_plants.textProperty().addListener((observable, oldValue, newValue) -> {
+            if (newValue.isEmpty()) {
+                fillPlantListWithHardinessZone();
+            }else {
+                try {
+                    List<Plant> filteredPlants = plantListModel.getFilteredPlantListByString(DEFAULT_HARDINESS_ZONE, newValue);
+                    clearListView();
+                    plantListProperty.addAll(filteredPlants);
+                } catch (HardinessZoneNotSetException | IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        });
     }
 
-    private void viewFilteredListBySearch(String query) {
-        //ToDo getFilteredPlantList with (plantListModel.getFilteredPlantList(DEFAULT_HARDINESS_ZONE, <predicate>))
+    /**
+     * get plant list of current hardiness zone
+     * fill list view with plant list
+     */
+    private void fillPlantListWithHardinessZone() {
         try {
-            List<Plant> filteredPlants = plantListModel.getFilteredPlantListByString(DEFAULT_HARDINESS_ZONE, query);
             clearListView();
-            plantListProperty.addAll(filteredPlants);
-
+            plantListProperty.addAll(plantListModel.getPlantList(plantListModel.getCurrentZone()));
         } catch (HardinessZoneNotSetException | IOException e) {
             e.printStackTrace();
         }
     }
 
+    /**
+     * creates radio buttons for the hardiness zones defined in enum HardinessZone
+     * defines default value as selected
+     * when selected filter viewList according to hardiness zone
+     */
     private void createFilterHardinessZone() {
-        //ToDo create radioList of hardinessZone in VBox climate_zones
+        ToggleGroup hardinessGroup = new ToggleGroup();
+        for (HardinessZone zone : HardinessZone.values()) {
+            RadioButton radioButton = new RadioButton(zone.name());
+            radioButton.setToggleGroup(hardinessGroup);
+            radioButton.setPadding(new Insets(0,0,10,0));
+            if (zone.equals(DEFAULT_HARDINESS_ZONE)) {
+                radioButton.setSelected(true);
+            }
+            radioButton.selectedProperty().addListener(new ChangeListener<Boolean>() {
+                @Override
+                public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
+                    plantListModel.setCurrentZone(zone);
+                    fillPlantListWithHardinessZone();
+                }
+            });
+            climate_zones.getChildren().add(radioButton);
+        }
     }
 
     /**
-     * observes changes in the selectedProperty of ListView and updates the description label
+     * creates radio buttons for the seasons defined in enum Seasons
+     * defines default value as selected
+     * when selected filter viewList according to seasons
+     */
+    private void createFilterSeasons() {
+        ToggleGroup seasonGroup = new ToggleGroup();
+        for (Seasons season : Seasons.values()) {
+            RadioButton radioButton = new RadioButton(season.name());
+            radioButton.setToggleGroup(seasonGroup);
+            radioButton.setPadding(new Insets(0,0,10,0));
+            if (season.equals(Seasons.AllSEASONS)) {
+                radioButton.setSelected(true);
+            }
+            radioButton.selectedProperty().addListener(new ChangeListener<Boolean>() {
+                @Override
+                public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
+                    if (season.equals(Seasons.AllSEASONS)) {
+                        fillPlantListWithHardinessZone();
+                    } else {
+                        try {
+                            viewFilteredListBySeason(season);
+                        } catch (HardinessZoneNotSetException | IOException e) {
+                            e.printStackTrace();
+                        }
+                    }
+
+                }
+            });
+            seasons.getChildren().add(radioButton);
+        }
+    }
+
+    /**
+     * observes changes in the selectedProperty of ListView and updates:
+     * the description label
+     * image of the plant
      */
     private void lookForSelectedListEntry() {
         list_plants.getSelectionModel().selectedItemProperty().addListener(new ChangeListener<Plant>() {
             @Override
             public void changed(ObservableValue<? extends Plant> observable, Plant oldValue, Plant newValue) {
-                //ToDo
                 if(newValue != null) {
                     selectedPlant = newValue;
                     description_plant.setText(selectedPlant.description());
                     saveToMyPlant_button.setDisable(false);
-                    //update img plant
+                    Image img;
+                    if(selectedPlant.image() != null) {
+                        img = selectedPlant.image();
+                    } else {
+                        img = new Image(String.valueOf(PlantsController.class.getResource("placeholder.png")));
+                    }
+                    img_plant.setImage(img);
+
+
                 } else {
                     selectedPlant = null;
                     description_plant.setText("");
                     saveToMyPlant_button.setDisable(true);
-                    //update img when null placeholder PNG
+                    Image img = new Image(String.valueOf(PlantsController.class.getResource("placeholder.png")));
+                    img_plant.setImage(img);
                 }
             }
         });

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

@@ -3,7 +3,6 @@ package ch.zhaw.gartenverwaltung.gardenplan;
 import ch.zhaw.gartenverwaltung.io.GardenPlan;
 import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException;
 import ch.zhaw.gartenverwaltung.io.JsonGardenPlan;
-import ch.zhaw.gartenverwaltung.io.TaskDatabase;
 import ch.zhaw.gartenverwaltung.taskList.PlantNotFoundException;
 import ch.zhaw.gartenverwaltung.taskList.TaskListModel;
 import ch.zhaw.gartenverwaltung.types.Crop;
@@ -12,9 +11,12 @@ import ch.zhaw.gartenverwaltung.types.Task;
 
 import java.io.IOException;
 import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
+
 /**
  * The Gardenplan model manages the crops in the gardenplan.
  */
@@ -31,6 +33,7 @@ public class Gardenplanmodel {
     public Gardenplanmodel(TaskListModel taskListModel) throws IOException {
         this.taskListModel = taskListModel;
         gardenPlan = new JsonGardenPlan();
+        cropList = new ArrayList<>();
         cropList = gardenPlan.getCrops();
     }
 
@@ -47,11 +50,10 @@ public class Gardenplanmodel {
     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.add(crop);
+        //crop.withArea(0);
         gardenPlan.saveCrop(crop);
         taskListModel.planTasksForCrop(crop);
+        cropList = gardenPlan.getCrops();
     }
 
     /**
@@ -62,9 +64,9 @@ public class Gardenplanmodel {
      */
     public void removeCrop(Crop crop) throws IOException {
 
-        cropList.remove(crop);
         gardenPlan.removeCrop(crop);
         taskListModel.removeTasksForCrop(crop);
+        cropList = gardenPlan.getCrops();
     }
     /**
      * Returns a list of {@link Crop}s which are currently in the gardenplan.
@@ -72,7 +74,7 @@ public class Gardenplanmodel {
      * @throws IOException If the database cannot be accessed
      */
     public List<Crop> getCrops() throws IOException {
-        if(cropList.isEmpty()){
+        if(!cropList.isEmpty()){
                 cropList = gardenPlan.getCrops();
         }
         return cropList;

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

@@ -18,11 +18,11 @@ public interface GardenPlan {
     /**
      * Attempts to retrieve the {@link Crop} with the specified cropId.
      *
-     * @param id The {@link Crop#cropId} to look for
+     * @param cropId The {@link Crop} to look for
      * @return {@link Optional} of the found {@link Crop}, {@link Optional#empty()} if no entry matched the criteria
      * @throws IOException If there is a problem reading from or writing to the database
      */
-    Optional<Crop> getCropById(long id) throws IOException;
+    Optional<Crop> getCropById(long cropId) throws IOException;
 
     /**
      * Saves a Crop to the Database.

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

@@ -167,4 +167,17 @@ public class PlantListModel {
     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)));
+    }
 }

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

@@ -0,0 +1,26 @@
+package ch.zhaw.gartenverwaltung.types;
+
+import java.time.MonthDay;
+
+public enum Seasons {
+    AllSEASONS("--01-01", "--12-31"),
+    SPRING("--03-01", "--05-30"),
+    SOMMER("--06-01", "--08-30"),
+    AUTUM("--09-01", "--11-30"),
+    WINTER("--12-01", "--02-28");
+
+    public final String startDate;
+    public final String endDate;
+
+    Seasons(String startDate, String endDate) {
+        this.startDate = startDate;
+        this.endDate = endDate;
+    }
+
+    public MonthDay getStartDate() {
+        return MonthDay.parse(this.startDate);
+    }
+    public MonthDay getEndDate() {
+        return MonthDay.parse(this.endDate);
+    }
+}

src/main/resources/ch/zhaw/gartenverwaltung/Plants.fxml

@@ -3,7 +3,6 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.geometry.Rectangle2D?>
 <?import javafx.scene.control.Button?>
-<?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ListView?>
 <?import javafx.scene.control.SplitPane?>
@@ -16,8 +15,9 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane maxHeight="-Infinity" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="1000.0" prefHeight="853.0" prefWidth="1219.0"
-            xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.PlantsController">
+<AnchorPane maxHeight="-Infinity" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="1000.0" prefHeight="853.0"
+            prefWidth="1219.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1"
+            fx:controller="ch.zhaw.gartenverwaltung.PlantsController">
    <children>
       <SplitPane dividerPositions="0.7377363661277062" layoutX="539.0" layoutY="266.0" prefHeight="853.0" prefWidth="1219.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
         <items>
@@ -30,7 +30,7 @@
                               <Font name="System Bold" size="30.0" />
                            </font>
                         </Label>
-                        <TextField fx:id="search_plants" onKeyTyped="#searchForPlant" promptText="Search for Plant Name" />
+                        <TextField fx:id="search_plants" promptText="Search for Plant Name" />
                         <HBox alignment="CENTER_LEFT" prefHeight="480.0" prefWidth="881.0" VBox.vgrow="ALWAYS">
                            <children>
                               <ListView fx:id="list_plants" maxWidth="1.7976931348623157E308" prefHeight="497.0" prefWidth="580.0" HBox.hgrow="ALWAYS" />
@@ -75,30 +75,7 @@
                           <content>
                             <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
                                  <children>
-                                    <VBox layoutX="37.0" layoutY="-19.0" prefHeight="180.66666666666666" prefWidth="310.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                                       <children>
-                                          <CheckBox fx:id="spring_filter" mnemonicParsing="false" onAction="#filterSpring" text="Spring">
-                                             <padding>
-                                                <Insets top="10.0" />
-                                             </padding>
-                                          </CheckBox>
-                                          <CheckBox fx:id="sommer_filter" mnemonicParsing="false" onAction="#filterSommer" text="Sommer">
-                                             <padding>
-                                                <Insets top="10.0" />
-                                             </padding>
-                                          </CheckBox>
-                                          <CheckBox fx:id="autum_filter" mnemonicParsing="false" onAction="#filterAutum" text="Autum">
-                                             <padding>
-                                                <Insets top="10.0" />
-                                             </padding>
-                                          </CheckBox>
-                                          <CheckBox fx:id="winter_filter" mnemonicParsing="false" onAction="#filterWinter" text="Winter">
-                                             <padding>
-                                                <Insets top="10.0" />
-                                             </padding>
-                                          </CheckBox>
-                                       </children>
-                                    </VBox>
+                                    <VBox fx:id="seasons" layoutX="37.0" layoutY="-19.0" prefHeight="180.66666666666666" prefWidth="310.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
                                  </children>
                               </AnchorPane>
                           </content>

src/test/java/ch/zhaw/gartenverwaltung/gardenplan/GardenPlanModelTest.java

@@ -0,0 +1,109 @@
+package ch.zhaw.gartenverwaltung.gardenplan;
+
+import ch.zhaw.gartenverwaltung.io.*;
+import ch.zhaw.gartenverwaltung.taskList.PlantNotFoundException;
+import ch.zhaw.gartenverwaltung.taskList.TaskListModel;
+import ch.zhaw.gartenverwaltung.types.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.internal.stubbing.answers.DoesNothing;
+
+import java.io.IOException;
+import java.time.LocalDate;
+import java.time.MonthDay;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.*;
+
+public class GardenPlanModelTest {
+    GardenPlan gardenPlan;
+    List<Crop> cropList;
+    Crop exampleCropOnion;
+    Crop exampleCropCarrot;
+    Crop exampleCrop1;
+    Crop exampleCrop2;
+    Crop exampleCrop3;
+    Plant examplePlantOnion;
+    Plant examplePlantCarrot;
+    Gardenplanmodel model;
+
+    @BeforeEach
+    void setUp() throws IOException {
+        examplePlantOnion = new Plant(
+                0,
+                "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",
+                new ArrayList<>(),
+                List.of(new GrowthPhase(MonthDay.of(6, 4), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.HARVEST, HardinessZone.ZONE_8A, new ArrayList<>()),
+                        new GrowthPhase(MonthDay.of(4, 3), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()),
+                        new GrowthPhase(MonthDay.of(8, 5), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()),
+                        new GrowthPhase(MonthDay.of(2, 8), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()),
+                        new GrowthPhase(MonthDay.of(10, 2), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>())));
+
+        exampleCropOnion = new Crop(examplePlantOnion.id(), LocalDate.now());
+        exampleCropOnion.withId(13);
+        examplePlantCarrot = new Plant(
+                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",
+                new ArrayList<>(),
+                List.of(new GrowthPhase(MonthDay.of(4, 4), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>())));
+        exampleCropCarrot = new Crop(examplePlantCarrot.id(), LocalDate.now());
+        exampleCropCarrot.withId(5);
+
+        exampleCrop1 = new Crop(1, LocalDate.of(2023,2,25));
+        exampleCrop1.withId(0);
+        exampleCrop1.withArea(0.5);
+        exampleCrop2 = new Crop(1,LocalDate.of(2023,3,1));
+        exampleCrop2.withId(1);
+        exampleCrop2.withArea(0.5);
+        exampleCrop3 = new Crop(0,LocalDate.of(2023,3,25));
+        exampleCrop3.withId(2);
+        exampleCrop3.withArea(1.5);
+
+        cropList = new ArrayList<>();
+        cropList.add(exampleCrop1);
+        cropList.add(exampleCrop2);
+        cropList.add(exampleCrop3);
+        gardenPlan = mockGardenPlan(cropList);
+
+        TaskListModel taskListModel = new TaskListModel(new JsonTaskDatabase(), new JsonPlantDatabase());
+        model = new Gardenplanmodel(taskListModel);
+    }
+
+    GardenPlan mockGardenPlan(List<Crop> cropList) throws IOException {
+        GardenPlan gardenPlan = mock(GardenPlan.class);
+        when(gardenPlan.getCrops()).thenReturn(cropList);
+        when(gardenPlan.getCropById(5)).thenReturn(java.util.Optional.ofNullable(exampleCropCarrot));
+        when(gardenPlan.getCropById(13)).thenReturn(java.util.Optional.ofNullable(exampleCropOnion));
+        return gardenPlan;
+    }
+
+    @Test
+    void plantAsCrop() throws HardinessZoneNotSetException, IOException, PlantNotFoundException {
+
+        model.plantAsCrop(examplePlantOnion, LocalDate.of(2023,3,1));
+        assertTrue(model.getCrops().contains(exampleCropOnion));
+    }
+
+    @Test
+    void removeCrop() throws IOException {
+        exampleCrop1.withId(2);
+        exampleCrop1.withArea(1.500000);
+        model.removeCrop(exampleCrop1);
+        assertEquals(2,model.getCrops().size());
+    }
+}