From 79f1eba26beef1e6f7e04652bfe08ea10c3d1d3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20B=C3=B6ckelmann?= Date: Wed, 17 Apr 2024 20:19:38 +0200 Subject: [PATCH] Formatting TaskSerie and Fix Deleting of TaskSerie --- .../src/main/java/core/entities/timemanager/TaskSerie.java | 3 --- backend/src/main/java/core/services/TaskSeriesService.java | 6 +----- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/backend/src/main/java/core/entities/timemanager/TaskSerie.java b/backend/src/main/java/core/entities/timemanager/TaskSerie.java index 87df8cd..1cf48e9 100644 --- a/backend/src/main/java/core/entities/timemanager/TaskSerie.java +++ b/backend/src/main/java/core/entities/timemanager/TaskSerie.java @@ -15,9 +15,6 @@ public class TaskSerie { @OneToMany(fetch = FetchType.EAGER, mappedBy = "taskSerie", orphanRemoval = true) List tasks = new ArrayList<>(); - - - public long getTaskSerieID() { return taskSerieID; } diff --git a/backend/src/main/java/core/services/TaskSeriesService.java b/backend/src/main/java/core/services/TaskSeriesService.java index 4d99d09..fbfbf22 100644 --- a/backend/src/main/java/core/services/TaskSeriesService.java +++ b/backend/src/main/java/core/services/TaskSeriesService.java @@ -135,11 +135,7 @@ public class TaskSeriesService { task.setTaskSerieItem(null); taskSerieItemRepository.delete(item); if(taskSerie.getTasks().isEmpty()) { - for(TaskSerieItem taskSerieItem : taskSerie.getTasks()) { - taskSerieItem.setTaskSerie(null); - } - taskSerie.getTasks().clear(); - taskSeriesRepository.delete(taskSerie); + taskSeriesRepository.deleteUnreferenced(); } else if(task.getParent() == null){ repearIndexing(taskSerie, item.getSeriesIndex()); }