From 583cb0aca0720215d109918e0307a2c33be2ea25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20B=C3=B6ckelmann?= Date: Wed, 17 Apr 2024 18:15:23 +0200 Subject: [PATCH 1/4] Fix Deleting Taskgroup when Taskgroup has parent --- backend/src/main/java/core/entities/timemanager/Taskgroup.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/core/entities/timemanager/Taskgroup.java b/backend/src/main/java/core/entities/timemanager/Taskgroup.java index ffea384..5effc3f 100644 --- a/backend/src/main/java/core/entities/timemanager/Taskgroup.java +++ b/backend/src/main/java/core/entities/timemanager/Taskgroup.java @@ -25,7 +25,7 @@ public class Taskgroup { @JoinColumn(name = "taskgroupuser", nullable = false) private User user; - @OneToMany(mappedBy = "parent", cascade = CascadeType.ALL, fetch = FetchType.EAGER, orphanRemoval = true) + @OneToMany(mappedBy = "parent", cascade = CascadeType.REMOVE, fetch = FetchType.EAGER, orphanRemoval = true) private Set children; @ManyToOne -- 2.34.1 From 8342d1ef2c74cc141da2b60390c2b91ce16469b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20B=C3=B6ckelmann?= Date: Wed, 17 Apr 2024 18:19:04 +0200 Subject: [PATCH 2/4] Fix deleting Tasks --- backend/src/main/java/core/entities/timemanager/Taskgroup.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/core/entities/timemanager/Taskgroup.java b/backend/src/main/java/core/entities/timemanager/Taskgroup.java index 5effc3f..cc16b99 100644 --- a/backend/src/main/java/core/entities/timemanager/Taskgroup.java +++ b/backend/src/main/java/core/entities/timemanager/Taskgroup.java @@ -33,7 +33,7 @@ public class Taskgroup { private Taskgroup parent; - @OneToMany(mappedBy = "taskgroup", cascade = CascadeType.ALL, fetch = FetchType.EAGER, orphanRemoval = true) + @OneToMany(mappedBy = "taskgroup", cascade = CascadeType.REMOVE, fetch = FetchType.EAGER, orphanRemoval = true) private Set tasks; public Taskgroup(String taskgroupName, User user) { -- 2.34.1 From aa6eb9bfb27ba12cf60ad9ff00434244ad2b7c22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20B=C3=B6ckelmann?= Date: Wed, 17 Apr 2024 18:20:04 +0200 Subject: [PATCH 3/4] Fix deleting Subtasks --- backend/src/main/java/core/entities/timemanager/Task.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/core/entities/timemanager/Task.java b/backend/src/main/java/core/entities/timemanager/Task.java index 52d38cd..41e68a9 100644 --- a/backend/src/main/java/core/entities/timemanager/Task.java +++ b/backend/src/main/java/core/entities/timemanager/Task.java @@ -34,7 +34,7 @@ public class Task { @OneToOne(mappedBy = "task", cascade = CascadeType.ALL, orphanRemoval = true) private TaskSerieItem taskSerieItem; - @OneToMany(mappedBy = "parent", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER) + @OneToMany(mappedBy = "parent", cascade = CascadeType.REMOVE, orphanRemoval = true, fetch = FetchType.EAGER) private Set subtasks; @ManyToOne -- 2.34.1 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 4/4] 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()); } -- 2.34.1