From 5e39cb1d535af57bb37af3c6cd8a484baa24dba5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20B=C3=B6ckelmann?= <uqpko@student.kit.edu>
Date: Sat, 11 Nov 2023 09:52:38 +0100
Subject: [PATCH 1/6] TaskService Test will fail

---
 backend/.idea/workspace.xml                   | 111 +++++-----
 .../timemanager/tasks/TaskFieldInfo.java      |  10 +
 .../java/core/entities/timemanager/Task.java  |  42 ++--
 .../core/entities/timemanager/Taskgroup.java  |   1 +
 .../java/core/services/ServiceExitCode.java   |   3 +-
 .../main/java/core/services/TaskService.java  |  25 ++-
 .../test/java/core/tasks/TaskServiceTest.java | 192 ++++++++++++++++++
 .../src/test/resources/application.properties |   3 +-
 .../test/resources/taskRepositoryEntries.sql  |   1 +
 9 files changed, 323 insertions(+), 65 deletions(-)
 create mode 100644 backend/src/test/java/core/tasks/TaskServiceTest.java

diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index 15eb121..e60b4fc 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -4,12 +4,16 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Use @Sql instead of persit()">
+    <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Testcases (and failing test fixes) of TaskgroupService">
+      <change afterPath="$PROJECT_DIR$/src/test/java/core/tasks/TaskServiceTest.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskgroup/TaskgroupFieldInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskgroup/TaskgroupFieldInfo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/tasks/TaskFieldInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/tasks/TaskFieldInfo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/Task.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/Task.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/Taskgroup.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/Taskgroup.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/core/services/TaskgroupService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/services/TaskgroupService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/core/taskgroups/TaskgroupServiceTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/core/taskgroups/TaskgroupServiceTest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/services/ServiceExitCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/services/ServiceExitCode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/services/TaskService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/services/TaskService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/test/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/resources/application.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/test/resources/taskRepositoryEntries.sql" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/resources/taskRepositoryEntries.sql" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -88,56 +92,71 @@
       <recent name="$PROJECT_DIR$/src/test/java/core/taskgroups" />
     </key>
   </component>
-  <component name="RunManager" selected="JUnit.TaskgroupServiceTest.deleteTaskgroupByUser">
-    <configuration name="TaskgroupServiceTest.addTaskgroup" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+  <component name="RunManager" selected="JUnit.TaskgroupServiceTest">
+    <configuration name="TaskRepositoryTest.deleteByTaskID" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="demo" />
       <extension name="coverage">
         <pattern>
-          <option name="PATTERN" value="core.taskgroups.*" />
+          <option name="PATTERN" value="core.tasks.*" />
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
-      <option name="PACKAGE_NAME" value="core.taskgroups" />
-      <option name="MAIN_CLASS_NAME" value="core.taskgroups.TaskgroupServiceTest" />
-      <option name="METHOD_NAME" value="addTaskgroup" />
+      <option name="PACKAGE_NAME" value="core.tasks" />
+      <option name="MAIN_CLASS_NAME" value="core.tasks.TaskRepositoryTest" />
+      <option name="METHOD_NAME" value="deleteByTaskID" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="TaskgroupServiceTest.deleteTaskgroup" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="TaskServiceTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="demo" />
       <extension name="coverage">
         <pattern>
-          <option name="PATTERN" value="core.taskgroups.*" />
+          <option name="PATTERN" value="core.tasks.*" />
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
-      <option name="PACKAGE_NAME" value="core.taskgroups" />
-      <option name="MAIN_CLASS_NAME" value="core.taskgroups.TaskgroupServiceTest" />
-      <option name="METHOD_NAME" value="deleteTaskgroup" />
+      <option name="PACKAGE_NAME" value="core.tasks" />
+      <option name="MAIN_CLASS_NAME" value="core.tasks.TaskServiceTest" />
+      <option name="TEST_OBJECT" value="class" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="TaskServiceTest.createTask" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <module name="demo" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="core.tasks.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <option name="PACKAGE_NAME" value="core.tasks" />
+      <option name="MAIN_CLASS_NAME" value="core.tasks.TaskServiceTest" />
+      <option name="METHOD_NAME" value="createTask" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="TaskgroupServiceTest.deleteTaskgroupByUser" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="TaskServiceTest.deleteTask" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="demo" />
       <extension name="coverage">
         <pattern>
-          <option name="PATTERN" value="core.taskgroups.*" />
+          <option name="PATTERN" value="core.tasks.*" />
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
-      <option name="PACKAGE_NAME" value="core.taskgroups" />
-      <option name="MAIN_CLASS_NAME" value="core.taskgroups.TaskgroupServiceTest" />
-      <option name="METHOD_NAME" value="deleteTaskgroupByUser" />
+      <option name="PACKAGE_NAME" value="core.tasks" />
+      <option name="MAIN_CLASS_NAME" value="core.tasks.TaskServiceTest" />
+      <option name="METHOD_NAME" value="deleteTask" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="TaskgroupServiceTest.editTaskgroup" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="TaskgroupServiceTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="demo" />
       <extension name="coverage">
         <pattern>
@@ -147,24 +166,7 @@
       </extension>
       <option name="PACKAGE_NAME" value="core.taskgroups" />
       <option name="MAIN_CLASS_NAME" value="core.taskgroups.TaskgroupServiceTest" />
-      <option name="METHOD_NAME" value="editTaskgroup" />
-      <option name="TEST_OBJECT" value="method" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="TaskgroupServiceTest.getTopTaskgroupsByUser" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <module name="demo" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="core.taskgroups.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <option name="PACKAGE_NAME" value="core.taskgroups" />
-      <option name="MAIN_CLASS_NAME" value="core.taskgroups.TaskgroupServiceTest" />
-      <option name="METHOD_NAME" value="getTopTaskgroupsByUser" />
-      <option name="TEST_OBJECT" value="method" />
+      <option name="TEST_OBJECT" value="class" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
@@ -178,11 +180,11 @@
     </configuration>
     <recent_temporary>
       <list>
-        <item itemvalue="JUnit.TaskgroupServiceTest.deleteTaskgroupByUser" />
-        <item itemvalue="JUnit.TaskgroupServiceTest.getTopTaskgroupsByUser" />
-        <item itemvalue="JUnit.TaskgroupServiceTest.deleteTaskgroup" />
-        <item itemvalue="JUnit.TaskgroupServiceTest.editTaskgroup" />
-        <item itemvalue="JUnit.TaskgroupServiceTest.addTaskgroup" />
+        <item itemvalue="JUnit.TaskgroupServiceTest" />
+        <item itemvalue="JUnit.TaskServiceTest" />
+        <item itemvalue="JUnit.TaskServiceTest.createTask" />
+        <item itemvalue="JUnit.TaskServiceTest.deleteTask" />
+        <item itemvalue="JUnit.TaskRepositoryTest.deleteByTaskID" />
       </list>
     </recent_temporary>
   </component>
@@ -220,7 +222,7 @@
       <workItem from="1699466564154" duration="6646000" />
       <workItem from="1699473376129" duration="1423000" />
       <workItem from="1699639316405" duration="9267000" />
-      <workItem from="1699684493731" duration="1121000" />
+      <workItem from="1699684493731" duration="7709000" />
     </task>
     <task id="LOCAL-00001" summary="Structure Taskgroups in Hierarchies">
       <option name="closed" value="true" />
@@ -454,14 +456,21 @@
       <option name="project" value="LOCAL" />
       <updated>1699646291964</updated>
     </task>
-    <option name="localTasksCounter" value="30" />
+    <task id="LOCAL-00030" summary="Testcases (and failing test fixes) of TaskgroupService">
+      <option name="closed" value="true" />
+      <created>1699685656297</created>
+      <option name="number" value="00030" />
+      <option name="presentableId" value="LOCAL-00030" />
+      <option name="project" value="LOCAL" />
+      <updated>1699685656297</updated>
+    </task>
+    <option name="localTasksCounter" value="31" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="3" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="Delete and clear Tasks (Frontend)" />
     <MESSAGE value="Define Entity BasicTaskSchedule and Taskcontroller" />
     <MESSAGE value="Delete Schedules" />
     <MESSAGE value="Deliver Schedule Path Info when fetching Schedules" />
@@ -486,7 +495,8 @@
     <MESSAGE value="Test TaskRepository" />
     <MESSAGE value="Initialize Testing of Testservice" />
     <MESSAGE value="Use @Sql instead of persit()" />
-    <option name="LAST_COMMIT_MESSAGE" value="Use @Sql instead of persit()" />
+    <MESSAGE value="Testcases (and failing test fixes) of TaskgroupService" />
+    <option name="LAST_COMMIT_MESSAGE" value="Testcases (and failing test fixes) of TaskgroupService" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -511,6 +521,11 @@
           <line>57</line>
           <option name="timeStamp" value="12" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/test/java/core/tasks/TaskServiceTest.java</url>
+          <line>188</line>
+          <option name="timeStamp" value="23" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
diff --git a/backend/src/main/java/core/api/models/timemanager/tasks/TaskFieldInfo.java b/backend/src/main/java/core/api/models/timemanager/tasks/TaskFieldInfo.java
index 9d2eb31..d4f2cf9 100644
--- a/backend/src/main/java/core/api/models/timemanager/tasks/TaskFieldInfo.java
+++ b/backend/src/main/java/core/api/models/timemanager/tasks/TaskFieldInfo.java
@@ -14,6 +14,16 @@ public class TaskFieldInfo {
     private LocalDate startDate;
     private LocalDate deadline;
 
+    public TaskFieldInfo() {
+    }
+
+    public TaskFieldInfo(String taskName, int eta, LocalDate startDate, LocalDate deadline) {
+        this.taskName = taskName;
+        this.eta = eta;
+        this.startDate = startDate;
+        this.deadline = deadline;
+    }
+
     public String getTaskName() {
         return taskName;
     }
diff --git a/backend/src/main/java/core/entities/timemanager/Task.java b/backend/src/main/java/core/entities/timemanager/Task.java
index 9154f0f..440f59b 100644
--- a/backend/src/main/java/core/entities/timemanager/Task.java
+++ b/backend/src/main/java/core/entities/timemanager/Task.java
@@ -12,7 +12,7 @@ import java.util.Set;
 public class Task {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private long taskID;
 
     @ManyToOne
@@ -113,19 +113,6 @@ public class Task {
         this.workTime += workTime;
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        Task task = (Task) o;
-        return taskID == task.taskID;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(taskID);
-    }
-
     public void setTaskID(long taskID) {
         this.taskID = taskID;
     }
@@ -150,4 +137,31 @@ public class Task {
     public void increaseActiveTime(int minutesSpent) {
         this.workTime += minutesSpent;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Task task = (Task) o;
+        return taskID == task.taskID && eta == task.eta && finished == task.finished && workTime == task.workTime && Objects.equals(taskgroup, task.taskgroup) && Objects.equals(taskName, task.taskName) && Objects.equals(startDate, task.startDate) && Objects.equals(deadline, task.deadline);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(taskID, taskgroup, taskName, startDate, deadline, eta, finished, workTime);
+    }
+
+    @Override
+    public String toString() {
+        return "Task{" +
+                "taskID=" + taskID +
+                ", taskgroup=" + taskgroup +
+                ", taskName='" + taskName + '\'' +
+                ", startDate=" + startDate +
+                ", deadline=" + deadline +
+                ", eta=" + eta +
+                ", finished=" + finished +
+                ", workTime=" + workTime +
+                '}';
+    }
 }
diff --git a/backend/src/main/java/core/entities/timemanager/Taskgroup.java b/backend/src/main/java/core/entities/timemanager/Taskgroup.java
index a832632..6fc92e1 100644
--- a/backend/src/main/java/core/entities/timemanager/Taskgroup.java
+++ b/backend/src/main/java/core/entities/timemanager/Taskgroup.java
@@ -29,6 +29,7 @@ public class Taskgroup {
     @JoinColumn(name = "parent_id")
     private Taskgroup parent;
 
+
     @OneToMany(mappedBy = "taskgroup", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
     private Set<Task> tasks;
 
diff --git a/backend/src/main/java/core/services/ServiceExitCode.java b/backend/src/main/java/core/services/ServiceExitCode.java
index 4282071..93cbddd 100644
--- a/backend/src/main/java/core/services/ServiceExitCode.java
+++ b/backend/src/main/java/core/services/ServiceExitCode.java
@@ -5,5 +5,6 @@ public enum ServiceExitCode {
     OK,
     ENTITY_ALREADY_EXIST,
     MISSING_ENTITY,
-    INVALID_OPERATION;
+    INVALID_OPERATION,
+    INVALID_PARAMETER;
 }
diff --git a/backend/src/main/java/core/services/TaskService.java b/backend/src/main/java/core/services/TaskService.java
index 843d3e1..63dd2f7 100644
--- a/backend/src/main/java/core/services/TaskService.java
+++ b/backend/src/main/java/core/services/TaskService.java
@@ -11,6 +11,9 @@ import core.repositories.timemanager.TaskgroupRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.transaction.Transactional;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.*;
@@ -20,12 +23,17 @@ public class TaskService {
 
     private final TaskRepository taskRepository;
     private final TaskScheduleService taskScheduleService;
+    private final TaskgroupRepository taskgroupRepository;
+    @PersistenceContext
+    private EntityManager entityManager;
 
 
     public TaskService(@Autowired TaskRepository taskRepository,
-                       @Autowired TaskScheduleService taskScheduleService) {
+                       @Autowired TaskScheduleService taskScheduleService,
+                       TaskgroupRepository taskgroupRepository) {
         this.taskRepository = taskRepository;
         this.taskScheduleService = taskScheduleService;
+        this.taskgroupRepository = taskgroupRepository;
     }
 
     public ServiceResult<Task> createTask(Taskgroup taskgroup, TaskFieldInfo taskFieldInfo) {
@@ -33,6 +41,11 @@ public class TaskService {
             return new ServiceResult<>(ServiceExitCode.ENTITY_ALREADY_EXIST);
         }
 
+        //Check for invalid date (deadline before start
+        if(taskFieldInfo.getStartDate() != null && taskFieldInfo.getDeadline() != null &&
+                taskFieldInfo.getDeadline().isBefore(taskFieldInfo.getStartDate())) {
+            return new ServiceResult<>(ServiceExitCode.INVALID_PARAMETER);
+        }
 
         Task task = new Task(taskgroup, taskFieldInfo.getTaskName(), taskFieldInfo.getStartDate(), taskFieldInfo.getDeadline(), taskFieldInfo.getEta());
         taskgroup.getTasks().add(task);
@@ -63,6 +76,12 @@ public class TaskService {
         } else if(!task.getTaskName().equals(taskFieldInfo.getTaskName()) && existTaskByName(task.getTaskgroup().getTasks(), taskFieldInfo.getTaskName())) {
             return new ServiceResult<>(ServiceExitCode.ENTITY_ALREADY_EXIST);
         }
+
+        //Check for invalid date (deadline before start
+        if(taskFieldInfo.getStartDate() != null && taskFieldInfo.getDeadline() != null &&
+                taskFieldInfo.getDeadline().isBefore(taskFieldInfo.getStartDate())) {
+            return new ServiceResult<>(ServiceExitCode.INVALID_PARAMETER);
+        }
         task.setEta(taskFieldInfo.getEta());
         task.setStartDate(taskFieldInfo.getStartDate());
         task.setDeadline(taskFieldInfo.getDeadline());
@@ -70,9 +89,13 @@ public class TaskService {
         return new ServiceResult<>(task);
     }
 
+    @Transactional
     public void deleteTask(Task task) {
         taskScheduleService.deleteScheduleByTask(task);
         taskRepository.deleteByTaskID(task.getTaskID());
+
+        entityManager.flush();
+        entityManager.detach(task);
     }
 
     public void clearTasks(Taskgroup taskgroup) {
diff --git a/backend/src/test/java/core/tasks/TaskServiceTest.java b/backend/src/test/java/core/tasks/TaskServiceTest.java
new file mode 100644
index 0000000..359653c
--- /dev/null
+++ b/backend/src/test/java/core/tasks/TaskServiceTest.java
@@ -0,0 +1,192 @@
+package core.tasks;
+
+import core.api.models.timemanager.tasks.TaskFieldInfo;
+import core.entities.timemanager.Task;
+import core.entities.timemanager.Taskgroup;
+import core.repositories.timemanager.TaskRepository;
+import core.repositories.timemanager.TaskgroupRepository;
+import core.services.*;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.Rollback;
+import org.springframework.test.context.jdbc.Sql;
+import org.springframework.test.context.jdbc.SqlGroup;
+
+import javax.persistence.EntityManager;
+import javax.transaction.Transactional;
+
+import java.time.LocalDate;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.junit.jupiter.api.Assertions.*;
+
+@SpringBootTest
+public class TaskServiceTest {
+
+
+    @Autowired
+    private TaskService taskService;
+    @Autowired
+    private EntityManager entityManager;
+
+    private static final String username = "Testuser1";
+    private static final String username2 = "Testuser2";
+    @Autowired
+    private TaskRepository taskRepository;
+    @Autowired
+    private TaskgroupRepository taskgroupRepository;
+
+    @Test
+    @SqlGroup({
+            @Sql("classpath:taskgroupRepositoryTestEntries.sql"),
+            @Sql("classpath:taskRepositoryEntries.sql")
+    })
+    @Rollback(value = true)
+    void createTask() {
+        //Situation 1: Task with that name already exists in a taskgroup
+        TaskFieldInfo taskFieldInfo_1 = new TaskFieldInfo(entityManager.find(Task.class, 1L).getTaskName(), 0, null, null);
+        ServiceResult<Task> situation_1 = taskService.createTask(entityManager.find(Taskgroup.class, 2L), taskFieldInfo_1);
+        assertEquals(ServiceExitCode.ENTITY_ALREADY_EXIST, situation_1.getExitCode());
+
+        //Situation 2: Task with that name exists in another taskgroup
+        TaskFieldInfo taskFieldInfo_2 = new TaskFieldInfo(entityManager.find(Task.class, 1L).getTaskName(), 0, null, null);
+        ServiceResult<Task> result_2 = taskService.createTask(entityManager.find(Taskgroup.class, 1L), taskFieldInfo_2);
+        assertEquals(ServiceExitCode.OK, result_2.getExitCode());
+        assertThat(entityManager.find(Task.class, result_2.getResult().getTaskID())).isNotNull();
+
+        //Situation 3: Normal, everything fine
+        TaskFieldInfo taskFieldInfo_3 = new TaskFieldInfo("Situation 3", 0, null, null);
+        ServiceResult<Task> result_3 = taskService.createTask(entityManager.find(Taskgroup.class, 1L), taskFieldInfo_3);
+        assertEquals(ServiceExitCode.OK, result_3.getExitCode());
+        assertThat(entityManager.find(Task.class, result_3.getResult().getTaskID())).isNotNull();
+
+        //Robustness - Test for invalid dates
+        //Situation 4: Deadline, no start
+        TaskFieldInfo taskFieldInfo_4 = new TaskFieldInfo("Situation 4", 0, null, LocalDate.now());
+        ServiceResult<Task> result_4 = taskService.createTask(entityManager.find(Taskgroup.class, 1L), taskFieldInfo_4);
+        assertEquals(ServiceExitCode.OK, result_4.getExitCode());
+        assertThat(entityManager.find(Task.class, result_4.getResult().getTaskID())).isNotNull();
+
+        //Situation 5: Start but no deadline
+        TaskFieldInfo taskFieldInfo_5 = new TaskFieldInfo("Situation 5", 0, LocalDate.now(),null);
+        ServiceResult<Task> result_5 = taskService.createTask(entityManager.find(Taskgroup.class, 1L), taskFieldInfo_5);
+        assertEquals(ServiceExitCode.OK, result_5.getExitCode());
+        assertThat(entityManager.find(Task.class, result_5.getResult().getTaskID())).isNotNull();
+
+        //Situation 6: Deadline before start (invalid)
+        TaskFieldInfo taskFieldInfo_6 = new TaskFieldInfo("Situation 6", 0, LocalDate.now(),LocalDate.of(2010, 3, 20));
+        ServiceResult<Task> result_6= taskService.createTask(entityManager.find(Taskgroup.class, 1L), taskFieldInfo_6);
+        assertEquals(ServiceExitCode.INVALID_PARAMETER, result_6.getExitCode());
+    }
+
+    @Test
+    @SqlGroup({
+            @Sql("classpath:taskgroupRepositoryTestEntries.sql"),
+            @Sql("classpath:taskRepositoryEntries.sql")
+    })
+    void getTaskPermissions() {
+        //Situation 1: correct task and username
+        PermissionResult<Task> permissionResult_1 = taskService.getTaskPermissions(1L, username);
+        assertEquals(ServiceExitCode.OK, permissionResult_1.getExitCode());
+        assertTrue(permissionResult_1.isHasPermissions());
+        assertEquals(entityManager.find(Task.class, 1L), permissionResult_1.getResult());
+
+        //Situation 2: invalid taskgroup
+        PermissionResult<Task> permissionResult_2 = taskService.getTaskPermissions(200L, username);
+        assertEquals(ServiceExitCode.MISSING_ENTITY, permissionResult_2.getExitCode());
+        assertFalse(permissionResult_2.isHasPermissions());
+        assertThat(permissionResult_2.getResult()).isNull();
+
+        //Situation 3: invalid user
+        PermissionResult<Task> permissionResult_3 = taskService.getTaskPermissions(1L, username2);
+        assertEquals(ServiceExitCode.OK, permissionResult_3.getExitCode());
+        assertFalse(permissionResult_2.isHasPermissions());
+        assertEquals(entityManager.find(Task.class, 1L), permissionResult_3.getResult());
+    }
+
+    @Test
+    @SqlGroup({
+            @Sql("classpath:taskgroupRepositoryTestEntries.sql"),
+            @Sql("classpath:taskRepositoryEntries.sql")
+    })
+    void editTask() {
+        //Situation 1: Nothing is updated
+        Task task_1 = entityManager.find(Task.class, 1L);
+        TaskFieldInfo taskFieldInfo_1 = new TaskFieldInfo(entityManager.find(Task.class, 1L).getTaskName(), 0, null, null);
+        ServiceResult<Task> result_1 = taskService.editTask(entityManager.find(Task.class, 1L), taskFieldInfo_1);
+        assertEquals(ServiceExitCode.OK, result_1.getExitCode());
+        assertEquals(task_1, result_1.getResult());
+
+        //Situation 2: Name is updated to name that already exists within another taskgroup
+        Task task_2 = entityManager.find(Task.class, 1L);
+        task_2.setTaskName(entityManager.find(Task.class, 2L).getTaskName());
+        TaskFieldInfo taskFieldInfo_2 = new TaskFieldInfo(entityManager.find(Task.class, 2L).getTaskName(), 0, null, null);
+        ServiceResult<Task> result_2 = taskService.editTask(entityManager.find(Task.class, 1L), taskFieldInfo_2);
+        assertEquals(ServiceExitCode.ENTITY_ALREADY_EXIST, result_2.getExitCode());
+        assertNotEquals(task_2, result_2.getResult());
+
+        //Situation 3: Name is updated to nonexistend Name
+        Task task_3 = entityManager.find(Task.class, 1L);
+        task_3.setTaskName("Situation 3");
+        TaskFieldInfo taskFieldInfo_3 = new TaskFieldInfo("Situation 3", 0, null, null);
+        ServiceResult<Task> result_3 = taskService.editTask(entityManager.find(Task.class, 1L), taskFieldInfo_3);
+        assertEquals(ServiceExitCode.OK, result_3.getExitCode());
+        assertEquals(task_3, result_3.getResult());
+
+        //Situation 4: eta is updated
+        Task task_4 = entityManager.find(Task.class, 1L);
+        task_4.setEta(90);
+        TaskFieldInfo taskFieldInfo_4 = new TaskFieldInfo(task_4.getTaskName(), 90, null, null);
+        ServiceResult<Task> result_4 = taskService.editTask(entityManager.find(Task.class, 1L), taskFieldInfo_4);
+        assertEquals(ServiceExitCode.OK, result_4.getExitCode());
+        assertEquals(task_4, result_4.getResult());
+
+        //Situation 5: deadline and start is updated in a valid way
+        Task task_5 = entityManager.find(Task.class, 1L);
+        task_5.setStartDate(LocalDate.of(2023,4,9));
+        task_5.setDeadline(LocalDate.of(2023,5,9));
+        TaskFieldInfo taskFieldInfo_5 = new TaskFieldInfo(task_5.getTaskName(), task_5.getEta(), LocalDate.of(2023, 4, 9), LocalDate.of(2023,5,9));
+        ServiceResult<Task> result_5 = taskService.editTask(entityManager.find(Task.class, 1L), taskFieldInfo_5);
+        assertEquals(ServiceExitCode.OK, result_5.getExitCode());
+        assertEquals(task_5, result_5.getResult());
+
+        //Situation 6: Deadline and start are updated in a not valid way
+        Task task_6 = entityManager.find(Task.class, 1L);
+        task_6.setStartDate(LocalDate.of(2023,5,9));
+        task_6.setDeadline(LocalDate.of(2023,4,9));
+        TaskFieldInfo taskFieldInfo_6 = new TaskFieldInfo(task_5.getTaskName(), task_5.getEta(), LocalDate.of(2023, 5, 9), LocalDate.of(2023,4,9));
+        ServiceResult<Task> result_6 = taskService.editTask(entityManager.find(Task.class, 1L), taskFieldInfo_6);
+        assertEquals(ServiceExitCode.INVALID_PARAMETER, result_6.getExitCode());
+        assertNotEquals(task_6, result_6.getResult());
+
+        //Situation 10 Startdate = null;
+        Task task_10 = entityManager.find(Task.class, 5L);
+        task_10.setStartDate(null);
+        TaskFieldInfo taskFieldInfo_10 = new TaskFieldInfo(task_10.getTaskName(), task_10.getEta(),null, task_10.getDeadline());
+        ServiceResult<Task> result_10 = taskService.editTask(entityManager.find(Task.class, 5L), taskFieldInfo_10);
+        assertEquals(ServiceExitCode.OK, result_10.getExitCode());
+        assertEquals(task_10, result_10.getResult());
+
+        //Situation 11 Deadline = null
+        Task task_11 = entityManager.find(Task.class, 5L);
+        task_11.setDeadline(null);
+        TaskFieldInfo taskFieldInfo_11 = new TaskFieldInfo(task_11.getTaskName(), task_11.getEta(),task_11.getStartDate(), null);
+        ServiceResult<Task> result_11 = taskService.editTask(entityManager.find(Task.class, 5L), taskFieldInfo_11);
+        assertEquals(ServiceExitCode.OK, result_11.getExitCode());
+        assertEquals(task_11, result_11.getResult());
+    }
+    @Test
+    @SqlGroup({
+            @Sql("classpath:taskgroupRepositoryTestEntries.sql"),
+            @Sql("classpath:taskRepositoryEntries.sql")
+    })
+    void deleteTask() {
+        Task task = entityManager.find(Task.class, 1L);
+        task.getTaskgroup().getTasks().remove(task);
+        taskgroupRepository.save(task.getTaskgroup());
+        Task updatedTask = entityManager.find(Task.class, 1L);
+        taskRepository.deleteByTaskID(entityManager.find(Task.class, 1L).getTaskID());
+        assertThat(entityManager.find(Task.class, 1L)).isNull();
+    }
+}
diff --git a/backend/src/test/resources/application.properties b/backend/src/test/resources/application.properties
index 512dbe3..0ad612c 100644
--- a/backend/src/test/resources/application.properties
+++ b/backend/src/test/resources/application.properties
@@ -9,4 +9,5 @@ spring.liquibase.enabled=false
 demo.webapp.jwtSecret=demoWebappSecretKey
 demo.webapp.jwtExpirationMS=86400000
 spring.sql.init.mode=always
-spring.jpa.hibernate.ddl-auto=create-drop
\ No newline at end of file
+spring.jpa.hibernate.ddl-auto=create-drop
+spring.jpa.show-sql=true
\ No newline at end of file
diff --git a/backend/src/test/resources/taskRepositoryEntries.sql b/backend/src/test/resources/taskRepositoryEntries.sql
index 697318c..f326ec1 100644
--- a/backend/src/test/resources/taskRepositoryEntries.sql
+++ b/backend/src/test/resources/taskRepositoryEntries.sql
@@ -16,3 +16,4 @@ INSERT INTO tasks (taskid, deadline, eta, start_date, task_name, taskgroup_id, f
 
 INSERT INTO tasks (taskid, deadline, eta, start_date, task_name, taskgroup_id, finished, work_time) VALUES (13, NULL, 0, '2022-03-20', 'Task 6', 2, true, 0);
 INSERT INTO tasks (taskid, deadline, eta, start_date, task_name, taskgroup_id, finished, work_time) VALUES (14, '2044-03-20', 0, '2022-03-20', 'Task 6', 2, true, 0);
+INSERT INTO tasks (taskid, deadline, eta, start_date, task_name, taskgroup_id, finished, work_time) VALUES (15, NULL, 0, NULL, 'Task 15', 2, false, 0);

From 01af822f068a0662323072e9d384b0b2568050f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20B=C3=B6ckelmann?= <uqpko@student.kit.edu>
Date: Sat, 11 Nov 2023 10:18:20 +0100
Subject: [PATCH 2/6] Fix Failind edittest and make tests transactional

---
 backend/.idea/workspace.xml                   | 123 ++++++++++--------
 .../main/java/core/services/TaskService.java  |  12 +-
 .../test/java/core/tasks/TaskServiceTest.java |  26 ++--
 3 files changed, 86 insertions(+), 75 deletions(-)

diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index c18727c..7fc67a8 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -4,8 +4,10 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Use @Sql instead of persit()">
+    <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Resolve Merge-Conflict">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/services/TaskService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/services/TaskService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/test/java/core/tasks/TaskServiceTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/core/tasks/TaskServiceTest.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -84,7 +86,54 @@
       <recent name="$PROJECT_DIR$/src/test/java/core/taskgroups" />
     </key>
   </component>
-  <component name="RunManager" selected="JUnit.TaskgroupServiceTest">
+  <component name="RunManager" selected="JUnit.TaskServiceTest">
+    <configuration name="TaskServiceTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <module name="demo" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="core.tasks.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <option name="PACKAGE_NAME" value="core.tasks" />
+      <option name="MAIN_CLASS_NAME" value="core.tasks.TaskServiceTest" />
+      <option name="TEST_OBJECT" value="class" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="TaskServiceTest.createTask" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <module name="demo" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="core.tasks.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <option name="PACKAGE_NAME" value="core.tasks" />
+      <option name="MAIN_CLASS_NAME" value="core.tasks.TaskServiceTest" />
+      <option name="METHOD_NAME" value="createTask" />
+      <option name="TEST_OBJECT" value="method" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="TaskServiceTest.editTask" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <module name="demo" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="core.tasks.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <option name="PACKAGE_NAME" value="core.tasks" />
+      <option name="MAIN_CLASS_NAME" value="core.tasks.TaskServiceTest" />
+      <option name="METHOD_NAME" value="editTask" />
+      <option name="TEST_OBJECT" value="method" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration name="TaskgroupServiceTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="demo" />
       <extension name="coverage">
@@ -100,38 +149,6 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="TaskgroupServiceTest.deleteTaskgroup" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <module name="demo" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="core.taskgroups.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <option name="PACKAGE_NAME" value="core.taskgroups" />
-      <option name="MAIN_CLASS_NAME" value="core.taskgroups.TaskgroupServiceTest" />
-      <option name="METHOD_NAME" value="deleteTaskgroup" />
-      <option name="TEST_OBJECT" value="method" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="TaskgroupServiceTest.deleteTaskgroupByUser" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <module name="demo" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="core.taskgroups.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <option name="PACKAGE_NAME" value="core.taskgroups" />
-      <option name="MAIN_CLASS_NAME" value="core.taskgroups.TaskgroupServiceTest" />
-      <option name="METHOD_NAME" value="deleteTaskgroupByUser" />
-      <option name="TEST_OBJECT" value="method" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
     <configuration name="TaskgroupServiceTest.getTaskgroupByIDAndUsername" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="demo" />
       <extension name="coverage">
@@ -148,22 +165,6 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="TaskgroupServiceTest.getTopTaskgroupsByUser" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <module name="demo" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="core.taskgroups.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <option name="PACKAGE_NAME" value="core.taskgroups" />
-      <option name="MAIN_CLASS_NAME" value="core.taskgroups.TaskgroupServiceTest" />
-      <option name="METHOD_NAME" value="getTopTaskgroupsByUser" />
-      <option name="TEST_OBJECT" value="method" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
     <configuration name="DemoApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
       <module name="demo" />
       <option name="SPRING_BOOT_MAIN_CLASS" value="core.DemoApplication" />
@@ -173,11 +174,11 @@
     </configuration>
     <recent_temporary>
       <list>
+        <item itemvalue="JUnit.TaskServiceTest" />
+        <item itemvalue="JUnit.TaskServiceTest.createTask" />
+        <item itemvalue="JUnit.TaskServiceTest.editTask" />
         <item itemvalue="JUnit.TaskgroupServiceTest" />
         <item itemvalue="JUnit.TaskgroupServiceTest.getTaskgroupByIDAndUsername" />
-        <item itemvalue="JUnit.TaskgroupServiceTest.deleteTaskgroupByUser" />
-        <item itemvalue="JUnit.TaskgroupServiceTest.getTopTaskgroupsByUser" />
-        <item itemvalue="JUnit.TaskgroupServiceTest.deleteTaskgroup" />
       </list>
     </recent_temporary>
   </component>
@@ -449,15 +450,21 @@
       <option name="project" value="LOCAL" />
       <updated>1699646291964</updated>
     </task>
-    <option name="localTasksCounter" value="30" />
+    <task id="LOCAL-00030" summary="Resolve Merge-Conflict">
+      <option name="closed" value="true" />
+      <created>1699693472182</created>
+      <option name="number" value="00030" />
+      <option name="presentableId" value="LOCAL-00030" />
+      <option name="project" value="LOCAL" />
+      <updated>1699693472182</updated>
+    </task>
+    <option name="localTasksCounter" value="31" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="3" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="Delete and clear Tasks (Frontend)" />
-    <MESSAGE value="Define Entity BasicTaskSchedule and Taskcontroller" />
     <MESSAGE value="Delete Schedules" />
     <MESSAGE value="Deliver Schedule Path Info when fetching Schedules" />
     <MESSAGE value="Removed unused TaskgroupShortInfo.java" />
@@ -481,7 +488,9 @@
     <MESSAGE value="Test TaskRepository" />
     <MESSAGE value="Initialize Testing of Testservice" />
     <MESSAGE value="Use @Sql instead of persit()" />
-    <option name="LAST_COMMIT_MESSAGE" value="Use @Sql instead of persit()" />
+    <MESSAGE value="Make the Test Transactional" />
+    <MESSAGE value="Resolve Merge-Conflict" />
+    <option name="LAST_COMMIT_MESSAGE" value="Resolve Merge-Conflict" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
diff --git a/backend/src/main/java/core/services/TaskService.java b/backend/src/main/java/core/services/TaskService.java
index 63dd2f7..278a69f 100644
--- a/backend/src/main/java/core/services/TaskService.java
+++ b/backend/src/main/java/core/services/TaskService.java
@@ -70,11 +70,13 @@ public class TaskService {
     }
 
     public ServiceResult<Task> editTask(Task task, TaskFieldInfo taskFieldInfo) {
-        if(!task.getTaskName().equals(taskFieldInfo.getTaskName()) && !existTaskByName(task.getTaskgroup().getTasks(), taskFieldInfo.getTaskName())) {
-            task.setTaskName(taskFieldInfo.getTaskName());
-
-        } else if(!task.getTaskName().equals(taskFieldInfo.getTaskName()) && existTaskByName(task.getTaskgroup().getTasks(), taskFieldInfo.getTaskName())) {
-            return new ServiceResult<>(ServiceExitCode.ENTITY_ALREADY_EXIST);
+        if(!task.getTaskName().equals(taskFieldInfo.getTaskName())) {
+            //taskname will be updated
+            if(existTaskByName(task.getTaskgroup().getTasks(), taskFieldInfo.getTaskName())) {
+                return new ServiceResult<>(ServiceExitCode.ENTITY_ALREADY_EXIST);
+            } else {
+                task.setTaskName(taskFieldInfo.getTaskName());
+            }
         }
 
         //Check for invalid date (deadline before start
diff --git a/backend/src/test/java/core/tasks/TaskServiceTest.java b/backend/src/test/java/core/tasks/TaskServiceTest.java
index 359653c..fed7515 100644
--- a/backend/src/test/java/core/tasks/TaskServiceTest.java
+++ b/backend/src/test/java/core/tasks/TaskServiceTest.java
@@ -22,6 +22,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
 
 @SpringBootTest
+@Transactional
 public class TaskServiceTest {
 
 
@@ -42,7 +43,6 @@ public class TaskServiceTest {
             @Sql("classpath:taskgroupRepositoryTestEntries.sql"),
             @Sql("classpath:taskRepositoryEntries.sql")
     })
-    @Rollback(value = true)
     void createTask() {
         //Situation 1: Task with that name already exists in a taskgroup
         TaskFieldInfo taskFieldInfo_1 = new TaskFieldInfo(entityManager.find(Task.class, 1L).getTaskName(), 0, null, null);
@@ -118,65 +118,65 @@ public class TaskServiceTest {
         assertEquals(ServiceExitCode.OK, result_1.getExitCode());
         assertEquals(task_1, result_1.getResult());
 
-        //Situation 2: Name is updated to name that already exists within another taskgroup
+        //Situation 2: Name is updated to name that already exists within the taskgroup
         Task task_2 = entityManager.find(Task.class, 1L);
-        task_2.setTaskName(entityManager.find(Task.class, 2L).getTaskName());
         TaskFieldInfo taskFieldInfo_2 = new TaskFieldInfo(entityManager.find(Task.class, 2L).getTaskName(), 0, null, null);
         ServiceResult<Task> result_2 = taskService.editTask(entityManager.find(Task.class, 1L), taskFieldInfo_2);
+        task_2.setTaskName(entityManager.find(Task.class, 2L).getTaskName());
         assertEquals(ServiceExitCode.ENTITY_ALREADY_EXIST, result_2.getExitCode());
         assertNotEquals(task_2, result_2.getResult());
 
         //Situation 3: Name is updated to nonexistend Name
         Task task_3 = entityManager.find(Task.class, 1L);
-        task_3.setTaskName("Situation 3");
         TaskFieldInfo taskFieldInfo_3 = new TaskFieldInfo("Situation 3", 0, null, null);
         ServiceResult<Task> result_3 = taskService.editTask(entityManager.find(Task.class, 1L), taskFieldInfo_3);
+        task_3.setTaskName("Situation 3");
         assertEquals(ServiceExitCode.OK, result_3.getExitCode());
         assertEquals(task_3, result_3.getResult());
 
         //Situation 4: eta is updated
         Task task_4 = entityManager.find(Task.class, 1L);
-        task_4.setEta(90);
         TaskFieldInfo taskFieldInfo_4 = new TaskFieldInfo(task_4.getTaskName(), 90, null, null);
         ServiceResult<Task> result_4 = taskService.editTask(entityManager.find(Task.class, 1L), taskFieldInfo_4);
+        task_4.setEta(90);
         assertEquals(ServiceExitCode.OK, result_4.getExitCode());
         assertEquals(task_4, result_4.getResult());
 
         //Situation 5: deadline and start is updated in a valid way
         Task task_5 = entityManager.find(Task.class, 1L);
-        task_5.setStartDate(LocalDate.of(2023,4,9));
-        task_5.setDeadline(LocalDate.of(2023,5,9));
         TaskFieldInfo taskFieldInfo_5 = new TaskFieldInfo(task_5.getTaskName(), task_5.getEta(), LocalDate.of(2023, 4, 9), LocalDate.of(2023,5,9));
         ServiceResult<Task> result_5 = taskService.editTask(entityManager.find(Task.class, 1L), taskFieldInfo_5);
+        task_5.setStartDate(LocalDate.of(2023,4,9));
+        task_5.setDeadline(LocalDate.of(2023,5,9));
         assertEquals(ServiceExitCode.OK, result_5.getExitCode());
         assertEquals(task_5, result_5.getResult());
 
         //Situation 6: Deadline and start are updated in a not valid way
         Task task_6 = entityManager.find(Task.class, 1L);
-        task_6.setStartDate(LocalDate.of(2023,5,9));
-        task_6.setDeadline(LocalDate.of(2023,4,9));
         TaskFieldInfo taskFieldInfo_6 = new TaskFieldInfo(task_5.getTaskName(), task_5.getEta(), LocalDate.of(2023, 5, 9), LocalDate.of(2023,4,9));
         ServiceResult<Task> result_6 = taskService.editTask(entityManager.find(Task.class, 1L), taskFieldInfo_6);
+        task_6.setStartDate(LocalDate.of(2023,5,9));
+        task_6.setDeadline(LocalDate.of(2023,4,9));
         assertEquals(ServiceExitCode.INVALID_PARAMETER, result_6.getExitCode());
         assertNotEquals(task_6, result_6.getResult());
 
         //Situation 10 Startdate = null;
         Task task_10 = entityManager.find(Task.class, 5L);
-        task_10.setStartDate(null);
         TaskFieldInfo taskFieldInfo_10 = new TaskFieldInfo(task_10.getTaskName(), task_10.getEta(),null, task_10.getDeadline());
         ServiceResult<Task> result_10 = taskService.editTask(entityManager.find(Task.class, 5L), taskFieldInfo_10);
+        task_10.setStartDate(null);
         assertEquals(ServiceExitCode.OK, result_10.getExitCode());
         assertEquals(task_10, result_10.getResult());
 
         //Situation 11 Deadline = null
         Task task_11 = entityManager.find(Task.class, 5L);
-        task_11.setDeadline(null);
         TaskFieldInfo taskFieldInfo_11 = new TaskFieldInfo(task_11.getTaskName(), task_11.getEta(),task_11.getStartDate(), null);
         ServiceResult<Task> result_11 = taskService.editTask(entityManager.find(Task.class, 5L), taskFieldInfo_11);
+        task_11.setDeadline(null);
         assertEquals(ServiceExitCode.OK, result_11.getExitCode());
         assertEquals(task_11, result_11.getResult());
     }
-    @Test
+    /*@Test
     @SqlGroup({
             @Sql("classpath:taskgroupRepositoryTestEntries.sql"),
             @Sql("classpath:taskRepositoryEntries.sql")
@@ -188,5 +188,5 @@ public class TaskServiceTest {
         Task updatedTask = entityManager.find(Task.class, 1L);
         taskRepository.deleteByTaskID(entityManager.find(Task.class, 1L).getTaskID());
         assertThat(entityManager.find(Task.class, 1L)).isNull();
-    }
+    }*/
 }

From 5936734cdaae8a558c8ed62e338f3d452eac89a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20B=C3=B6ckelmann?= <uqpko@student.kit.edu>
Date: Sat, 11 Nov 2023 10:19:59 +0100
Subject: [PATCH 3/6] Deleting Task test

---
 backend/.idea/workspace.xml                   | 36 +++++++++----------
 .../test/java/core/tasks/TaskServiceTest.java | 15 ++++----
 2 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index 7fc67a8..bac7f1a 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -86,7 +86,7 @@
       <recent name="$PROJECT_DIR$/src/test/java/core/taskgroups" />
     </key>
   </component>
-  <component name="RunManager" selected="JUnit.TaskServiceTest">
+  <component name="RunManager" selected="JUnit.TaskServiceTest.deleteTask">
     <configuration name="TaskServiceTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="demo" />
       <extension name="coverage">
@@ -118,6 +118,22 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <configuration name="TaskServiceTest.deleteTask" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <module name="demo" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="core.tasks.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <option name="PACKAGE_NAME" value="core.tasks" />
+      <option name="MAIN_CLASS_NAME" value="core.tasks.TaskServiceTest" />
+      <option name="METHOD_NAME" value="deleteTask" />
+      <option name="TEST_OBJECT" value="method" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration name="TaskServiceTest.editTask" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="demo" />
       <extension name="coverage">
@@ -149,22 +165,6 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="TaskgroupServiceTest.getTaskgroupByIDAndUsername" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <module name="demo" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="core.taskgroups.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <option name="PACKAGE_NAME" value="core.taskgroups" />
-      <option name="MAIN_CLASS_NAME" value="core.taskgroups.TaskgroupServiceTest" />
-      <option name="METHOD_NAME" value="getTaskgroupByIDAndUsername" />
-      <option name="TEST_OBJECT" value="method" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
     <configuration name="DemoApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
       <module name="demo" />
       <option name="SPRING_BOOT_MAIN_CLASS" value="core.DemoApplication" />
@@ -174,11 +174,11 @@
     </configuration>
     <recent_temporary>
       <list>
+        <item itemvalue="JUnit.TaskServiceTest.deleteTask" />
         <item itemvalue="JUnit.TaskServiceTest" />
         <item itemvalue="JUnit.TaskServiceTest.createTask" />
         <item itemvalue="JUnit.TaskServiceTest.editTask" />
         <item itemvalue="JUnit.TaskgroupServiceTest" />
-        <item itemvalue="JUnit.TaskgroupServiceTest.getTaskgroupByIDAndUsername" />
       </list>
     </recent_temporary>
   </component>
diff --git a/backend/src/test/java/core/tasks/TaskServiceTest.java b/backend/src/test/java/core/tasks/TaskServiceTest.java
index fed7515..1cd88a9 100644
--- a/backend/src/test/java/core/tasks/TaskServiceTest.java
+++ b/backend/src/test/java/core/tasks/TaskServiceTest.java
@@ -176,17 +176,16 @@ public class TaskServiceTest {
         assertEquals(ServiceExitCode.OK, result_11.getExitCode());
         assertEquals(task_11, result_11.getResult());
     }
-    /*@Test
+
+    @Test
     @SqlGroup({
             @Sql("classpath:taskgroupRepositoryTestEntries.sql"),
             @Sql("classpath:taskRepositoryEntries.sql")
     })
     void deleteTask() {
-        Task task = entityManager.find(Task.class, 1L);
-        task.getTaskgroup().getTasks().remove(task);
-        taskgroupRepository.save(task.getTaskgroup());
-        Task updatedTask = entityManager.find(Task.class, 1L);
-        taskRepository.deleteByTaskID(entityManager.find(Task.class, 1L).getTaskID());
-        assertThat(entityManager.find(Task.class, 1L)).isNull();
-    }*/
+        for(long i=1; i<=15; i++) {
+            taskRepository.deleteByTaskID(entityManager.find(Task.class, i).getTaskID());
+            assertThat(entityManager.find(Task.class, i)).isNull();
+        }
+    }
 }

From eaab4f8de2bd3a21af287f889dc791684b8de0b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20B=C3=B6ckelmann?= <uqpko@student.kit.edu>
Date: Sat, 11 Nov 2023 10:22:31 +0100
Subject: [PATCH 4/6] Consider increased number of tasks

---
 backend/.idea/workspace.xml                   | 41 +++++++++----------
 .../java/core/tasks/TaskRepositoryTest.java   |  4 +-
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index bac7f1a..3e12b67 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -86,7 +86,22 @@
       <recent name="$PROJECT_DIR$/src/test/java/core/taskgroups" />
     </key>
   </component>
-  <component name="RunManager" selected="JUnit.TaskServiceTest.deleteTask">
+  <component name="RunManager" selected="JUnit.TaskRepositoryTest">
+    <configuration name="TaskRepositoryTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <module name="demo" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="core.tasks.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <option name="PACKAGE_NAME" value="core.tasks" />
+      <option name="MAIN_CLASS_NAME" value="core.tasks.TaskRepositoryTest" />
+      <option name="TEST_OBJECT" value="class" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration name="TaskServiceTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="demo" />
       <extension name="coverage">
@@ -134,22 +149,6 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="TaskServiceTest.editTask" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <module name="demo" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="core.tasks.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <option name="PACKAGE_NAME" value="core.tasks" />
-      <option name="MAIN_CLASS_NAME" value="core.tasks.TaskServiceTest" />
-      <option name="METHOD_NAME" value="editTask" />
-      <option name="TEST_OBJECT" value="method" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
     <configuration name="TaskgroupServiceTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="demo" />
       <extension name="coverage">
@@ -174,11 +173,11 @@
     </configuration>
     <recent_temporary>
       <list>
-        <item itemvalue="JUnit.TaskServiceTest.deleteTask" />
-        <item itemvalue="JUnit.TaskServiceTest" />
-        <item itemvalue="JUnit.TaskServiceTest.createTask" />
-        <item itemvalue="JUnit.TaskServiceTest.editTask" />
+        <item itemvalue="JUnit.TaskRepositoryTest" />
         <item itemvalue="JUnit.TaskgroupServiceTest" />
+        <item itemvalue="JUnit.TaskServiceTest" />
+        <item itemvalue="JUnit.TaskServiceTest.deleteTask" />
+        <item itemvalue="JUnit.TaskServiceTest.createTask" />
       </list>
     </recent_temporary>
   </component>
diff --git a/backend/src/test/java/core/tasks/TaskRepositoryTest.java b/backend/src/test/java/core/tasks/TaskRepositoryTest.java
index 5df74d5..99ea0ce 100644
--- a/backend/src/test/java/core/tasks/TaskRepositoryTest.java
+++ b/backend/src/test/java/core/tasks/TaskRepositoryTest.java
@@ -49,7 +49,7 @@ public class TaskRepositoryTest {
         List<Task> tasks_user1_false = taskRepository.findAllByUser(testUser1.getUsername(), false);
         List<Task> tasks_user1_true = taskRepository.findAllByUser(testUser1.getUsername(), true);
         assertEquals(7, tasks_user1_true.size());
-        assertEquals(7, tasks_user1_false.size());
+        assertEquals(8, tasks_user1_false.size());
 
         assertTrue(tasks_user1_false.contains(testEntityManager.find(Task.class, 1L)));
         assertTrue(tasks_user1_false.contains(testEntityManager.find(Task.class, 3L)));
@@ -149,7 +149,7 @@ public class TaskRepositoryTest {
 
         List<Task> active = taskRepository.findAllActive(testuser1.getUsername(), referenceDate);
         //1,3,5,11,12
-        assertEquals(5, active.size());
+        assertEquals(6, active.size());
         assertTrue(active.contains(testEntityManager.find(Task.class, 1L)));
         assertTrue(active.contains(testEntityManager.find(Task.class, 3L)));
         assertTrue(active.contains(testEntityManager.find(Task.class, 5L)));

From c9343ea05e949086c3e6514d54f571f54b9aedea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20B=C3=B6ckelmann?= <uqpko@student.kit.edu>
Date: Sat, 11 Nov 2023 10:30:50 +0100
Subject: [PATCH 5/6] Remove entityManager from TaskService

---
 backend/.idea/workspace.xml                   | 34 +++++++++++++------
 .../main/java/core/services/TaskService.java  |  5 ---
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index 3e12b67..6ffd214 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -4,10 +4,8 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Resolve Merge-Conflict">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+    <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Consider increased number of tasks">
       <change beforePath="$PROJECT_DIR$/src/main/java/core/services/TaskService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/services/TaskService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/core/tasks/TaskServiceTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/core/tasks/TaskServiceTest.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -86,7 +84,7 @@
       <recent name="$PROJECT_DIR$/src/test/java/core/taskgroups" />
     </key>
   </component>
-  <component name="RunManager" selected="JUnit.TaskRepositoryTest">
+  <component name="RunManager" selected="JUnit.TaskServiceTest.deleteTask">
     <configuration name="TaskRepositoryTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="demo" />
       <extension name="coverage">
@@ -173,10 +171,10 @@
     </configuration>
     <recent_temporary>
       <list>
+        <item itemvalue="JUnit.TaskServiceTest.deleteTask" />
+        <item itemvalue="JUnit.TaskServiceTest" />
         <item itemvalue="JUnit.TaskRepositoryTest" />
         <item itemvalue="JUnit.TaskgroupServiceTest" />
-        <item itemvalue="JUnit.TaskServiceTest" />
-        <item itemvalue="JUnit.TaskServiceTest.deleteTask" />
         <item itemvalue="JUnit.TaskServiceTest.createTask" />
       </list>
     </recent_temporary>
@@ -457,15 +455,29 @@
       <option name="project" value="LOCAL" />
       <updated>1699693472182</updated>
     </task>
-    <option name="localTasksCounter" value="31" />
+    <task id="LOCAL-00031" summary="Deleting Task test">
+      <option name="closed" value="true" />
+      <created>1699694400508</created>
+      <option name="number" value="00031" />
+      <option name="presentableId" value="LOCAL-00031" />
+      <option name="project" value="LOCAL" />
+      <updated>1699694400508</updated>
+    </task>
+    <task id="LOCAL-00032" summary="Consider increased number of tasks">
+      <option name="closed" value="true" />
+      <created>1699694552466</created>
+      <option name="number" value="00032" />
+      <option name="presentableId" value="LOCAL-00032" />
+      <option name="project" value="LOCAL" />
+      <updated>1699694552466</updated>
+    </task>
+    <option name="localTasksCounter" value="33" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="3" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="Delete Schedules" />
-    <MESSAGE value="Deliver Schedule Path Info when fetching Schedules" />
     <MESSAGE value="Removed unused TaskgroupShortInfo.java" />
     <MESSAGE value="Fix Foreign Key Constraint Fail when deleting Taskgroups" />
     <MESSAGE value="Stop and Finish TaskSchedules" />
@@ -489,7 +501,9 @@
     <MESSAGE value="Use @Sql instead of persit()" />
     <MESSAGE value="Make the Test Transactional" />
     <MESSAGE value="Resolve Merge-Conflict" />
-    <option name="LAST_COMMIT_MESSAGE" value="Resolve Merge-Conflict" />
+    <MESSAGE value="Deleting Task test" />
+    <MESSAGE value="Consider increased number of tasks" />
+    <option name="LAST_COMMIT_MESSAGE" value="Consider increased number of tasks" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
diff --git a/backend/src/main/java/core/services/TaskService.java b/backend/src/main/java/core/services/TaskService.java
index 278a69f..49949b4 100644
--- a/backend/src/main/java/core/services/TaskService.java
+++ b/backend/src/main/java/core/services/TaskService.java
@@ -24,8 +24,6 @@ public class TaskService {
     private final TaskRepository taskRepository;
     private final TaskScheduleService taskScheduleService;
     private final TaskgroupRepository taskgroupRepository;
-    @PersistenceContext
-    private EntityManager entityManager;
 
 
     public TaskService(@Autowired TaskRepository taskRepository,
@@ -95,9 +93,6 @@ public class TaskService {
     public void deleteTask(Task task) {
         taskScheduleService.deleteScheduleByTask(task);
         taskRepository.deleteByTaskID(task.getTaskID());
-
-        entityManager.flush();
-        entityManager.detach(task);
     }
 
     public void clearTasks(Taskgroup taskgroup) {

From fcde6c4aadcdcbedc7e1e87ca726eca97de57515 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20B=C3=B6ckelmann?= <uqpko@student.kit.edu>
Date: Sat, 11 Nov 2023 10:47:12 +0100
Subject: [PATCH 6/6] TaskServiceTest

---
 backend/.idea/workspace.xml                   | 75 +++++++++-------
 .../test/java/core/tasks/TaskServiceTest.java | 89 ++++++++++++++++++-
 2 files changed, 131 insertions(+), 33 deletions(-)

diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index 6ffd214..fc7a90a 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -4,8 +4,9 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Consider increased number of tasks">
-      <change beforePath="$PROJECT_DIR$/src/main/java/core/services/TaskService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/services/TaskService.java" afterDir="false" />
+    <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Remove entityManager from TaskService">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/test/java/core/tasks/TaskServiceTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/core/tasks/TaskServiceTest.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -84,22 +85,7 @@
       <recent name="$PROJECT_DIR$/src/test/java/core/taskgroups" />
     </key>
   </component>
-  <component name="RunManager" selected="JUnit.TaskServiceTest.deleteTask">
-    <configuration name="TaskRepositoryTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <module name="demo" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="core.tasks.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <option name="PACKAGE_NAME" value="core.tasks" />
-      <option name="MAIN_CLASS_NAME" value="core.tasks.TaskRepositoryTest" />
-      <option name="TEST_OBJECT" value="class" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
+  <component name="RunManager" selected="JUnit.TaskServiceTest">
     <configuration name="TaskServiceTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="demo" />
       <extension name="coverage">
@@ -115,7 +101,7 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="TaskServiceTest.createTask" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="TaskServiceTest.clearTasks" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="demo" />
       <extension name="coverage">
         <pattern>
@@ -125,7 +111,7 @@
       </extension>
       <option name="PACKAGE_NAME" value="core.tasks" />
       <option name="MAIN_CLASS_NAME" value="core.tasks.TaskServiceTest" />
-      <option name="METHOD_NAME" value="createTask" />
+      <option name="METHOD_NAME" value="clearTasks" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
@@ -147,17 +133,34 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="TaskgroupServiceTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="TaskServiceTest.finishTask" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="demo" />
       <extension name="coverage">
         <pattern>
-          <option name="PATTERN" value="core.taskgroups.*" />
+          <option name="PATTERN" value="core.tasks.*" />
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
-      <option name="PACKAGE_NAME" value="core.taskgroups" />
-      <option name="MAIN_CLASS_NAME" value="core.taskgroups.TaskgroupServiceTest" />
-      <option name="TEST_OBJECT" value="class" />
+      <option name="PACKAGE_NAME" value="core.tasks" />
+      <option name="MAIN_CLASS_NAME" value="core.tasks.TaskServiceTest" />
+      <option name="METHOD_NAME" value="finishTask" />
+      <option name="TEST_OBJECT" value="method" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="TaskServiceTest.loadAllTasks" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <module name="demo" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="core.tasks.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <option name="PACKAGE_NAME" value="core.tasks" />
+      <option name="MAIN_CLASS_NAME" value="core.tasks.TaskServiceTest" />
+      <option name="METHOD_NAME" value="loadAllTasks" />
+      <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
@@ -171,11 +174,11 @@
     </configuration>
     <recent_temporary>
       <list>
-        <item itemvalue="JUnit.TaskServiceTest.deleteTask" />
         <item itemvalue="JUnit.TaskServiceTest" />
-        <item itemvalue="JUnit.TaskRepositoryTest" />
-        <item itemvalue="JUnit.TaskgroupServiceTest" />
-        <item itemvalue="JUnit.TaskServiceTest.createTask" />
+        <item itemvalue="JUnit.TaskServiceTest.loadAllTasks" />
+        <item itemvalue="JUnit.TaskServiceTest.finishTask" />
+        <item itemvalue="JUnit.TaskServiceTest.clearTasks" />
+        <item itemvalue="JUnit.TaskServiceTest.deleteTask" />
       </list>
     </recent_temporary>
   </component>
@@ -471,14 +474,21 @@
       <option name="project" value="LOCAL" />
       <updated>1699694552466</updated>
     </task>
-    <option name="localTasksCounter" value="33" />
+    <task id="LOCAL-00033" summary="Remove entityManager from TaskService">
+      <option name="closed" value="true" />
+      <created>1699695051881</created>
+      <option name="number" value="00033" />
+      <option name="presentableId" value="LOCAL-00033" />
+      <option name="project" value="LOCAL" />
+      <updated>1699695051881</updated>
+    </task>
+    <option name="localTasksCounter" value="34" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="3" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="Removed unused TaskgroupShortInfo.java" />
     <MESSAGE value="Fix Foreign Key Constraint Fail when deleting Taskgroups" />
     <MESSAGE value="Stop and Finish TaskSchedules" />
     <MESSAGE value="Include TaskScheduleStopResponse" />
@@ -503,7 +513,8 @@
     <MESSAGE value="Resolve Merge-Conflict" />
     <MESSAGE value="Deleting Task test" />
     <MESSAGE value="Consider increased number of tasks" />
-    <option name="LAST_COMMIT_MESSAGE" value="Consider increased number of tasks" />
+    <MESSAGE value="Remove entityManager from TaskService" />
+    <option name="LAST_COMMIT_MESSAGE" value="Remove entityManager from TaskService" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
diff --git a/backend/src/test/java/core/tasks/TaskServiceTest.java b/backend/src/test/java/core/tasks/TaskServiceTest.java
index 1cd88a9..0d30d8c 100644
--- a/backend/src/test/java/core/tasks/TaskServiceTest.java
+++ b/backend/src/test/java/core/tasks/TaskServiceTest.java
@@ -1,6 +1,7 @@
 package core.tasks;
 
 import core.api.models.timemanager.tasks.TaskFieldInfo;
+import core.api.models.timemanager.tasks.TaskScope;
 import core.entities.timemanager.Task;
 import core.entities.timemanager.Taskgroup;
 import core.repositories.timemanager.TaskRepository;
@@ -17,6 +18,7 @@ import javax.persistence.EntityManager;
 import javax.transaction.Transactional;
 
 import java.time.LocalDate;
+import java.util.List;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
@@ -184,8 +186,93 @@ public class TaskServiceTest {
     })
     void deleteTask() {
         for(long i=1; i<=15; i++) {
-            taskRepository.deleteByTaskID(entityManager.find(Task.class, i).getTaskID());
+            taskService.deleteTask(entityManager.find(Task.class, i));
             assertThat(entityManager.find(Task.class, i)).isNull();
         }
     }
+
+    @Test
+    @SqlGroup({
+            @Sql("classpath:taskgroupRepositoryTestEntries.sql"),
+            @Sql("classpath:taskRepositoryEntries.sql")
+    })
+    void clearTasks() {
+        //Situation 1: Delete from taskgroup with no tasks
+        taskService.clearTasks(entityManager.find(Taskgroup.class, 1L));
+        for(long i=1; i<=15; i++) {
+            assertThat(entityManager.find(Task.class, i)).isNotNull();
+        }
+        //Situation 2: Delete from taskgroup with tasks
+        taskService.clearTasks(entityManager.find(Taskgroup.class, 2L));
+        for(long i=1; i<=15; i++) {
+            assertThat(entityManager.find(Task.class, i)).isNull();
+        }
+    }
+
+    @Test
+    @SqlGroup({
+            @Sql("classpath:taskgroupRepositoryTestEntries.sql"),
+            @Sql("classpath:taskRepositoryEntries.sql")
+    })
+    void finishTask() {
+        taskService.finishTask(entityManager.find(Task.class, 1L));
+        assertTrue(entityManager.find(Task.class, 1L).isFinished());
+
+        taskService.finishTask(entityManager.find(Task.class, 2L));
+        assertTrue(entityManager.find(Task.class, 1L).isFinished());
+    }
+
+    @Test
+    @SqlGroup({
+            @Sql("classpath:taskgroupRepositoryTestEntries.sql"),
+            @Sql("classpath:taskRepositoryEntries.sql")
+    })
+    void loadAllTasks() {
+        //Situation 1: No tasks existing
+        List<Task> result_1 = taskService.loadAllTasks(username2, TaskScope.UNFINISHED);
+        assertEquals(0, result_1.size());
+
+        //Situation 2: Tasks existing, Unfinished#
+        List<Task> result_2 = taskService.loadAllTasks(username, TaskScope.UNFINISHED);
+        assertEquals(8, result_2.size());
+        assertTrue(result_2.contains(entityManager.find(Task.class, 1L)));
+        assertTrue(result_2.contains(entityManager.find(Task.class, 3L)));
+        assertTrue(result_2.contains(entityManager.find(Task.class, 5L)));
+        assertTrue(result_2.contains(entityManager.find(Task.class, 7L)));
+        assertTrue(result_2.contains(entityManager.find(Task.class, 9L)));
+        assertTrue(result_2.contains(entityManager.find(Task.class, 11L)));
+        assertTrue(result_2.contains(entityManager.find(Task.class, 12L)));
+
+        //Situation 3: Finished tasks
+        List<Task> result_3 = taskService.loadAllTasks(username, TaskScope.FINISHED);
+        assertEquals(7, result_3.size());
+        assertTrue(result_3.contains(entityManager.find(Task.class, 2L)));
+        assertTrue(result_3.contains(entityManager.find(Task.class, 4L)));
+        assertTrue(result_3.contains(entityManager.find(Task.class, 6L)));
+        assertTrue(result_3.contains(entityManager.find(Task.class, 8L)));
+        assertTrue(result_3.contains(entityManager.find(Task.class, 10L)));
+        assertTrue(result_3.contains(entityManager.find(Task.class, 13L)));
+        assertTrue(result_3.contains(entityManager.find(Task.class, 14L)));
+
+        //overdue
+        List<Task> result_4 = taskService.loadAllTasks(username, TaskScope.OVERDUE);
+        assertEquals(2, result_4.size());
+        assertTrue(result_4.contains(entityManager.find(Task.class, 3L)));
+        assertTrue(result_4.contains(entityManager.find(Task.class, 5L)));
+
+        //upcoming
+        List<Task> result_5 = taskService.loadAllTasks(username, TaskScope.UPCOMING);
+        assertEquals(2, result_5.size());
+        assertTrue(result_5.contains(entityManager.find(Task.class, 7L)));
+        assertTrue(result_5.contains(entityManager.find(Task.class, 9L)));
+        //Active
+        List<Task> result_6 = taskService.loadAllTasks(username, TaskScope.ACTIVE);
+        assertEquals(6, result_6.size());
+        assertTrue(result_6.contains(entityManager.find(Task.class, 1L)));
+        assertTrue(result_6.contains(entityManager.find(Task.class, 3L)));
+        assertTrue(result_6.contains(entityManager.find(Task.class, 5L)));
+        assertTrue(result_6.contains(entityManager.find(Task.class, 11L)));
+        assertTrue(result_6.contains(entityManager.find(Task.class, 12L)));
+
+    }
 }