diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml index e0758ba..c7a54fb 100644 --- a/backend/.idea/workspace.xml +++ b/backend/.idea/workspace.xml @@ -6,7 +6,7 @@ - + diff --git a/backend/src/main/java/core/services/TaskScheduleService.java b/backend/src/main/java/core/services/TaskScheduleService.java index 85562b4..933dca4 100644 --- a/backend/src/main/java/core/services/TaskScheduleService.java +++ b/backend/src/main/java/core/services/TaskScheduleService.java @@ -82,7 +82,8 @@ public class TaskScheduleService { public ServiceResult scheduleTaskNow(Task task) { //Check if task has already an active schedule - if(task.hasActiveSchedule()) { + ServiceResult activeSchedule = getActiveSchedule(task.getTaskgroup().getUser().getUsername()); + if(task.hasActiveSchedule() || activeSchedule.getExitCode() != ServiceExitCode.MISSING_ENTITY) { return new ServiceResult<>(ServiceExitCode.ENTITY_ALREADY_EXIST); } else { BasicTaskSchedule basicTaskSchedule = new BasicTaskSchedule(task, LocalDate.now());