From a66a72eb68f70bebd214ef6e2c764c9d8f0de8a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20B=C3=B6ckelmann?= Date: Wed, 13 Mar 2024 18:26:47 +0100 Subject: [PATCH] Fix taskgroup and task deletion (issue-99) --- backend/src/main/java/core/entities/timemanager/Task.java | 2 +- .../src/main/java/core/entities/timemanager/Taskgroup.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/src/main/java/core/entities/timemanager/Task.java b/backend/src/main/java/core/entities/timemanager/Task.java index 89562c6..b6bf550 100644 --- a/backend/src/main/java/core/entities/timemanager/Task.java +++ b/backend/src/main/java/core/entities/timemanager/Task.java @@ -33,7 +33,7 @@ public class Task { private boolean finishable; - @OneToMany(mappedBy = "task", cascade = CascadeType.ALL, fetch = FetchType.EAGER) + @OneToMany(mappedBy = "task", cascade = CascadeType.ALL, fetch = FetchType.EAGER, orphanRemoval = true) private List basicTaskSchedules; private int workTime; diff --git a/backend/src/main/java/core/entities/timemanager/Taskgroup.java b/backend/src/main/java/core/entities/timemanager/Taskgroup.java index 016c607..ffea384 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) + @OneToMany(mappedBy = "parent", cascade = CascadeType.ALL, fetch = FetchType.EAGER, orphanRemoval = true) private Set children; @ManyToOne @@ -33,7 +33,7 @@ public class Taskgroup { private Taskgroup parent; - @OneToMany(mappedBy = "taskgroup", cascade = CascadeType.ALL, fetch = FetchType.EAGER) + @OneToMany(mappedBy = "taskgroup", cascade = CascadeType.ALL, fetch = FetchType.EAGER, orphanRemoval = true) private Set tasks; public Taskgroup(String taskgroupName, User user) {