Update assignTasks implementation

src/backend/routers/iep.test.ts

@@ -165,7 +165,7 @@ test("addTask - no duplicate benchmark_id + assigned_id combo", async (t) => {
 });
 
 test("assignTaskToParas - no duplicate benchmark_id + para_id combo", async (t) => {
-  const { trpc, seed } = await getTestServer(t, {
+  const { trpc, db, seed } = await getTestServer(t, {
     authenticateAs: UserType.CaseManager,
   });
 
@@ -212,17 +212,18 @@ test("assignTaskToParas - no duplicate benchmark_id + para_id combo", async (t)
     para_ids: [para_1.user_id],
   });
 
-  const error = await t.throwsAsync(async () => {
-    await trpc.iep.assignTaskToParas.mutate({
-      benchmark_id: benchmark1Id,
-      para_ids: [para_1.user_id, para_2.user_id],
-    });
+  await trpc.iep.assignTaskToParas.mutate({
+    benchmark_id: benchmark1Id,
+    para_ids: [para_1.user_id, para_2.user_id],
   });
 
-  t.is(
-    error?.message,
-    "Task already exists: This benchmark has already been assigned to one or more of these paras"
-  );
+  const result = await db
+    .selectFrom("task")
+    .where("benchmark_id", "=", benchmark1Id)
+    .selectAll()
+    .execute();
+
+  t.is(result.length, 2);
 });
 
 test("add benchmark - check full schema", async (t) => {

src/backend/routers/iep.ts

@@ -237,32 +237,56 @@ export const iep = router({
     .mutation(async (req) => {
       const { benchmark_id, para_ids } = req.input;
 
-      // TODO: instead of throwing an error if a task already exists,
-      // just add/remove existing tasks as needed.
-
+      // fetch all existing task records for this benchmark
       const existingTasks = await req.ctx.db
         .selectFrom("task")
         .where("benchmark_id", "=", benchmark_id)
-        .where("assignee_id", "in", para_ids)
         .selectAll()
         .execute();
 
-      if (existingTasks.length > 0) {
-        throw new Error(
-          "Task already exists: This benchmark has already been assigned to one or more of these paras"
-        );
-      }
-
-      const result = await req.ctx.db
-        .insertInto("task")
-        .values(
-          para_ids.map((para_id) => ({
-            benchmark_id,
-            assignee_id: para_id,
-          }))
+      // collect list of task records to delete (if assignee_id not in para_ids)
+      const deleteTaskIds = existingTasks
+        .filter(
+          (task) => task.assignee_id && !para_ids.includes(task.assignee_id)
         )
-        .returningAll()
-        .executeTakeFirst();
+        .map((task) => task.task_id);
+
+      // collect a list of new assignee_ids to insert
+      const newAssigneeIds = para_ids.filter(
+        (para_id) => !existingTasks.find((task) => task.assignee_id === para_id)
+      );
+
+      let result:
+        | {
+            benchmark_id: string | null;
+            assignee_id: string | null;
+            created_at: Date;
+            seen: boolean;
+            task_id: string;
+          }
+        | undefined;
+      await req.ctx.db.transaction().execute(async (trx) => {
+        // delete tasks whose assignees that are not in para_ids
+        if (deleteTaskIds.length > 0) {
+          await trx
+            .deleteFrom("task")
+            .where("task_id", "in", deleteTaskIds)
+            .execute();
+        }
+        // insert new tasks for new assignees
+        if (newAssigneeIds.length > 0) {
+          result = await req.ctx.db
+            .insertInto("task")
+            .values(
+              newAssigneeIds.map((para_id) => ({
+                benchmark_id,
+                assignee_id: para_id,
+              }))
+            )
+            .returningAll()
+            .executeTakeFirst();
+        }
+      });
       return result;
     }),
 

src/components/benchmarks/BenchmarkAssignmentModal.tsx

@@ -97,21 +97,23 @@ export const BenchmarkAssignmentModal = (
       // Reached end, save
       try {
         // maybe invoke these two in parallel?
-        await assignTaskToPara.mutateAsync({
-          benchmark_id: props.benchmark_id,
-          para_ids: selectedParaIds,
-        });
-        await updateBenchmark.mutateAsync({
-          benchmark_id: props.benchmark_id,
-          due_date:
-            assignmentDuration.type === "until_date"
-              ? assignmentDuration.date
-              : undefined,
-          trial_count:
-            assignmentDuration.type === "minimum_number_of_collections"
-              ? assignmentDuration.minimumNumberOfCollections
-              : undefined,
-        });
+        await Promise.all([
+          assignTaskToPara.mutateAsync({
+            benchmark_id: props.benchmark_id,
+            para_ids: selectedParaIds,
+          }),
+          updateBenchmark.mutateAsync({
+            benchmark_id: props.benchmark_id,
+            due_date:
+              assignmentDuration.type === "until_date"
+                ? assignmentDuration.date
+                : undefined,
+            trial_count:
+              assignmentDuration.type === "minimum_number_of_collections"
+                ? assignmentDuration.minimumNumberOfCollections
+                : undefined,
+          }),
+        ]);
         handleClose();
       } catch (err) {
         // TODO: issue #450