sebastian/timemanager
1
0
Fork 0
Code Issues 11 Pull Requests Actions Packages Projects Releases Wiki Activity

issue-77 #105

Merged
sebastian merged 17 commits from issue-77 into master 2024-03-16 10:12:35 +01:00
Conversation 0 Commits 17 Files Changed 53 +3 -3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e102b91a1f - Show all commits

4
backend/src/main/java/core/entities/timemanager/TaskSerieItem.java
View File

@ -10,11 +10,11 @@ public class TaskSerieItem {
@GeneratedValue(strategy = GenerationType.AUTO) @GeneratedValue(strategy = GenerationType.AUTO)
private long itemID; private long itemID;
@ManyToOne() @ManyToOne
@JoinColumn(referencedColumnName = "taskSerieID") @JoinColumn(referencedColumnName = "taskSerieID")
private TaskSerie taskSerie; private TaskSerie taskSerie;
@OneToOne @OneToOne(cascade = CascadeType.ALL)
@JoinColumn(name = "task_id") @JoinColumn(name = "task_id")
private Task task; private Task task;

2
backend/src/main/java/core/services/TaskSeriesService.java
View File

@ -69,7 +69,7 @@ public class TaskSeriesService {
TaskSerie taskSerie = task.getTaskSerieItem().getTaskSerie(); TaskSerie taskSerie = task.getTaskSerieItem().getTaskSerie();
task.setTaskSerieItem(null); task.setTaskSerieItem(null);
taskSerieItemRepository.delete(item); taskSerieItemRepository.delete(item);
if(taskSerie.getTasks().size() == 1) { if(taskSerie.getTasks().size() <= 1) {
taskSeriesRepository.delete(taskSerie); taskSeriesRepository.delete(taskSerie);
} }
} }