Compare commits

...
6 Commits
Author SHA1 Message Date
Elias Csomor 3f02bedd1d remove duplicate filtering 2022-11-21 11:02:57 +01:00
Elias Csomor 62fb3869e6 fixed failing tests 2022-11-21 10:27:31 +01:00
Elias Csomor 3c70c8ac48 Update JsonTaskList.java 2022-11-21 10:08:12 +01:00
Elias Csomor 5229c03fd5 Update JsonTaskList.java 2022-11-21 10:08:03 +01:00
Elias Csomor 6dea42dd1f fixed removeTasksForCrop 2022-11-21 10:07:43 +01:00
Elias Csomor 11a1a63345 Create mini commit for rebase 2022-11-21 09:50:44 +01:00
2 changed files with 11 additions and 6 deletions
@@ -86,7 +86,13 @@ public class JsonTaskList implements TaskList {
if(taskMap.isEmpty()) { if(taskMap.isEmpty()) {
loadTaskListFromFile(); loadTaskListFromFile();
} }
taskMap.values().removeIf(task -> task.getCropId() == cropId);
List<Task> temptasks = taskMap.values().stream().
filter(task -> { return task.getCropId() == cropId;}).toList();
for (Task task : temptasks ) {
taskMap.remove(task.getId());
}
writeTaskListToFile();
} }
/** /**
@@ -106,6 +112,7 @@ public class JsonTaskList implements TaskList {
if(task.getId() == 0) { if(task.getId() == 0) {
task.withId(idProvider.incrementAndGet()); task.withId(idProvider.incrementAndGet());
} }
taskMap.put(task.getId(),task);
writeTaskListToFile(); writeTaskListToFile();
} }
@@ -47,17 +47,16 @@ public class JsonTaskListTest {
} }
@Disabled("disabled until adding works.")
@Test @Test
@DisplayName("Add task.") @DisplayName("Add task.")
void addTask() { void addTask() {
Task task = new Task("Testtask", "This is a test Task.", LocalDate.parse("01.05.2022", formatter), 1); Task task = new Task("Testtask", "This is a test Task.", LocalDate.parse("2022-05-01", formatter), 1);
try { try {
testDatabase.saveTask(task); testDatabase.saveTask(task);
List<Task> taskList; List<Task> taskList;
try { try {
taskList = testDatabase.getTaskList(LocalDate.parse("30.04.2022", formatter), taskList = testDatabase.getTaskList(LocalDate.parse("2022-04-30", formatter),
LocalDate.parse("31.05.2022", formatter)); LocalDate.parse("2022-05-31", formatter));
} catch (IOException e) { } catch (IOException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
@@ -101,7 +100,6 @@ public class JsonTaskListTest {
} }
@Disabled("Disabled until removing works")
@Test @Test
void removeTasksForCrop() { void removeTasksForCrop() {
List<Task> taskList; List<Task> taskList;