Fix bugs in task deletion strategies

Waydriver · Jul 5, 2023 · 6774a5c · 6774a5c
1 parent 8ace71e
commit 6774a5c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/src/data/tasks.ts b/src/data/tasks.ts
@@ -23,10 +23,10 @@ export const getTasksInProject = (id: ProjectId): Task[] => {
 
 /**
  * Recursively expand a prerequisite to give a list of all prerequisite tasks
- * given this task is a prerequisite (includes original task ID)
+ * given this task is a prerequisite (does not include original task ID)
  */
 export const expandTaskPrerequisite = (id: TaskId): TaskId[] => {
-  const prerequisites = [id];
+  const prerequisites = [];
 
   const task = getTaskById(id) as Task;
 
@@ -61,7 +61,7 @@ export const findAllSuccessorTasks = (id: TaskId): TaskId[] => {
     const prereqs = expandTaskPrerequisite(task.id);
     if (prereqs.includes(id)) {
       // Only include it if it isn't there already
-      if (successors.includes(task.id)) {
+      if (!successors.includes(task.id)) {
         successors.push(task.id);
       }
     }

diff --git a/src/routes/task.ts b/src/routes/task.ts
@@ -253,7 +253,10 @@ task.put(
           `Task with ID ${prereqId} does not belong to same project`
         );
       }
-      if (expandTaskPrerequisite(prereqId).includes(taskId)) {
+      if (
+        // FIXME: Make ESLint prefer operators at start of lines
+        expandTaskPrerequisite(prereqId).includes(taskId) || prereqId === taskId
+      ) {
         throw HttpError(
           400,
           `Using task with ID ${prereqId} as a prerequisite would create a circular dependency`

diff --git a/tests/task/remove.test.ts b/tests/task/remove.test.ts
@@ -92,6 +92,7 @@ describe('/task remove', () => {
 
     describe('reroute', () => {
       it('updates prerequisites for direct dependents', async () => {
+        jest.setTimeout(99999999);
         const { token } = await makeUser();
         const { id: projectId } = await makeProject(token);
         const { id: taskId1 } = await makeTask(token, projectId);
@@ -114,7 +115,7 @@ describe('/task remove', () => {
 
         // Delete task 2 with reroute strategy
         await expect(
-          api.task.remove(token, taskId2, TaskDeletionStrategy.Cascade)
+          api.task.remove(token, taskId2, TaskDeletionStrategy.Reroute)
         ).resolves.toStrictEqual(
           {}
         );