fix(ProjectScore): recalc score after move goal into archive

taskany-inc · Jul 25, 2023 · 5132a60 · 5132a60
1 parent 1abcd38
commit 5132a60
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/utils/db.ts b/src/utils/db.ts
@@ -335,7 +335,7 @@ export const updateGoalWithCalculatedWeight = async (goalId: string) => {
                 await ctx.$executeRaw`
                     UPDATE "Project"
                     SET "averageScore" = (SELECT AVG("completedCriteriaWeight") FROM "Goal"
-                        WHERE "projectId" = ${updatedGoal.projectId})
+                        WHERE "projectId" = ${updatedGoal.projectId} AND "archived" IS NOT true)
                     WHERE "id" = ${updatedGoal.projectId};
                 `;
             }

diff --git a/trpc/router/goal.ts b/trpc/router/goal.ts
@@ -708,7 +708,7 @@ export const goal = router({
             }
 
             try {
-                const updatedGoal = prisma.goal.update({
+                const updatedGoal = await prisma.goal.update({
                     where: { id },
                     data: {
                         archived,
@@ -723,6 +723,10 @@ export const goal = router({
                     },
                 });
 
+                if (updatedGoal) {
+                    await updateGoalWithCalculatedWeight(updatedGoal.id);
+                }
+
                 const recipients = Array.from(
                     new Set(
                         [...actualGoal.participants, ...actualGoal.watchers, actualGoal.activity, actualGoal.owner]