#17 taskdb.json changed to the right variable types, ad isIntimePeriode to , JasonTaskDatabase

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

@@ -1,16 +1,17 @@
 package ch.zhaw.gartenverwaltung.io;
 
-import ch.zhaw.gartenverwaltung.types.Plant;
+import ch.zhaw.gartenverwaltung.types.HardinessZone;
 import ch.zhaw.gartenverwaltung.types.Task;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.YearMonthDeserializer;
 
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
 import java.time.LocalDate;
-import java.time.MonthDay;
+import java.time.YearMonth;
 import java.time.format.DateTimeFormatter;
 import java.util.Collections;
 import java.util.HashMap;
@@ -22,26 +23,20 @@ public class JsonTaskDatabase implements TaskDatabase{
 
     private Map<Long, Task> taskMap = Collections.emptyMap();
 
-
-
     private final static JavaTimeModule timeModule = new JavaTimeModule();
     static {
-        DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yy-MM-dd");
-        LocalDateDeserializer dateDeserializer = new LocalDateDeserializer(dateFormat);
-        timeModule.addDeserializer(LocalDate.class, dateDeserializer);
+        DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yy-MM");
+        YearMonthDeserializer dateDeserializer = new YearMonthDeserializer(dateFormat);
+        timeModule.addDeserializer(YearMonth.class, dateDeserializer);
     }
 
     @Override
     public List<Task> getTaskList(LocalDate start, LocalDate end) throws IOException{
-        List<Task> taskList = Collections.emptyList();
 
-        if (dataSource != null) {
-            ObjectMapper mapper = new ObjectMapper();
-            mapper.registerModule(timeModule);
-
-            taskList = mapper.readerForListOf(Task.class).readValue(dataSource);
+        if(taskMap.isEmpty()) {
+            loadTaskListFromFile();
         }
-        return taskList;
+        return taskMap.values().stream().filter(task -> task.isInTimePeriode(start, end)).toList();
     }
 
     @Override
@@ -54,18 +49,8 @@ public class JsonTaskDatabase implements TaskDatabase{
 
     @Override
     public void removeTask(Task task) throws IOException {
-        List<Task> taskList;
-
-        if(dataSource != null) {
-            ObjectMapper mapper = new ObjectMapper();
-            taskList = mapper.readerForListOf(Task.class).readValue(dataSource);
-
-            for (int index = 0; index < taskList.size(); index++){
-                if(task.equals(taskList.get(index))){
-                    taskList.remove(task);
-                    break;
-                }
-            }
+        if(!taskMap.isEmpty() && taskMap.containsKey(task.getId())){
+            taskMap.remove(task.getId());
         }
     }
 
@@ -76,29 +61,39 @@ public class JsonTaskDatabase implements TaskDatabase{
         mapper.writeValue(new File(dataSource.getFile()), taskMap);
     }
 
+
     private void loadTaskListFromFile() throws IOException {
+        if (dataSource != null) {
+            ObjectMapper mapper = new ObjectMapper();
+            mapper.registerModule(timeModule);
 
-        ObjectMapper mapper = new ObjectMapper();
-        mapper.registerModule(timeModule);
+            List<Task> result;
+            result = mapper.readerForListOf(Task.class).readValue(dataSource);
 
-        List<Task> result;
-        result = mapper.readerForListOf(Task.class).readValue(dataSource);
-
-        //taskMap = result.stream().collect(HashMap::new,
+            taskMap = result.stream()
+                    .collect(HashMap::new,
+                        (res, task) -> res.put(task.getId(), task),
+                        (existing, replacement) -> {});
+            System.out.println(taskMap);
+        }
     }
 
+    //Test main method
     public static void main(String[] args) {
         LocalDate date = LocalDate.now();
         LocalDate yesterday = LocalDate.now();
-        yesterday.minusDays(1);
-
+        yesterday = yesterday.minusDays(1);
         Task testTask = new Task("water", "apply water", date);
         JsonTaskDatabase jsonTaskDatabase = new JsonTaskDatabase();
+        JsonPlantDatabase jsonPlantDatabase = new JsonPlantDatabase();
+
         try {
-            jsonTaskDatabase.saveTask(testTask);
-            System.out.println(jsonTaskDatabase.getTaskList(yesterday,date));
+            //test load file
+            jsonPlantDatabase.getPlantList(HardinessZone.ZONE_8A);
+            jsonTaskDatabase.loadTaskListFromFile();
+
         } catch (Exception e){
-            System.out.println("Task saving failed!");
+            System.out.println("Task load failed!: " + e.getMessage());
         }
     }
 }