fix(PartnershipProjects): disallow works with current project as part…

…nership
taskany-inc · Aug 19, 2024 · 2ea3bc2 · 2ea3bc2
1 parent 778a0c7
commit 2ea3bc2
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 3 deletions.
diff --git a/src/components/GoalSidebar/GoalSidebar.tsx b/src/components/GoalSidebar/GoalSidebar.tsx
@@ -178,6 +178,7 @@ export const GoalSidebar: FC<GoalSidebarProps> = ({ goal, onGoalTransfer, onGoal
                     {nullable(goal._isEditable, () => (
                         <GoalParentDropdown
                             mode="single"
+                            filter={goal.projectId != null ? [goal.projectId] : []}
                             placement="bottom-start"
                             placeholder={tr('Type project title')}
                             onChange={({ id }) => addPartnerProject(id)}
@@ -300,6 +301,7 @@ export const GoalSidebar: FC<GoalSidebarProps> = ({ goal, onGoalTransfer, onGoal
             {nullable(goal._isEditable, () => (
                 <IssueMeta>
                     <GoalParentDropdown
+                        filter={goal.projectId != null ? [goal.projectId] : []}
                         mode="single"
                         placement="bottom-start"
                         placeholder={tr('Type project title')}

diff --git a/src/utils/db/index.ts b/src/utils/db/index.ts
@@ -354,7 +354,12 @@ export const updateLinkedGoalsByProject = async (projectId: string, activityId:
                     data: { deleted: true },
                 });
 
-                await Promise.all([archiveGoals, createHistoryRecords, updateCriterias]);
+                const removePartnershipGoals = ctx.$executeRaw`
+                    DELETE FROM "_partnershipProjects"
+                    WHERE "B" = ${projectId};
+                `;
+
+                await Promise.all([archiveGoals, createHistoryRecords, updateCriterias, removePartnershipGoals]);
 
                 // get all goals which current project's goals as criteria
                 const res = await ctx.goalAchieveCriteria.findMany({

diff --git a/trpc/router/goal.ts b/trpc/router/goal.ts
@@ -488,6 +488,13 @@ export const goal = router({
 
             if (!actualGoal || !actualProject || actualProject.personal) return null;
 
+            if (actualGoal.projectId === actualProject.id) {
+                throw new TRPCError({
+                    code: 'PRECONDITION_FAILED',
+                    message: tr('Cannot transfer goal to selected project'),
+                });
+            }
+
             const { activityId, role } = ctx.session.user;
 
             try {
@@ -824,6 +831,7 @@ export const goal = router({
                     participants: { include: { user: true, ghost: true } },
                     watchers: { include: { user: true, ghost: true } },
                     activity: { include: { user: true, ghost: true } },
+                    partnershipProjects: true,
                     owner: { include: { user: true, ghost: true } },
                     state: true,
                     project: true,
@@ -849,6 +857,9 @@ export const goal = router({
                                 nextValue: archived ? 'move to archive' : 'move from archive',
                             },
                         },
+                        partnershipProjects: {
+                            disconnect: actualGoal.partnershipProjects.map(({ id }) => ({ id })),
+                        },
                     },
                     include: {
                         state: true,
@@ -1531,6 +1542,18 @@ export const goal = router({
         .input(togglePartnerProjectSchema)
         .use(goalEditAccessMiddleware)
         .mutation(async ({ input, ctx }) => {
+            const currentGoal = await prisma.goal.findFirst({
+                where: { id: input.id },
+                include: { partnershipProjects: true },
+            });
+
+            if (currentGoal?.partnershipProjects.find(({ id }) => id === input.projectId)) {
+                throw new TRPCError({
+                    code: 'PRECONDITION_FAILED',
+                    message: tr('Cannot link goal to selected project'),
+                });
+            }
+
             try {
                 const updatedGoal = await prisma.goal.update({
                     where: { id: input.id },

diff --git a/trpc/router/router.i18n/en.json b/trpc/router/router.i18n/en.json
@@ -1,5 +1,7 @@
 {
     "Cannot create goal. Project now is archived": "Cannot create goal. Project {title} ({id}) now is archived",
     "These bindings is already exist": "These bindings is already exist",
-    "No filter with id": "No filter with id `{id}`"
+    "No filter with id": "No filter with id `{id}`",
+    "Cannot link goal to selected project": "Cannot link goal to selected project",
+    "Cannot transfer goal to selected project": "Cannot transfer goal to selected project"
 }
diff --git a/trpc/router/router.i18n/ru.json b/trpc/router/router.i18n/ru.json
@@ -1,5 +1,7 @@
 {
     "Cannot create goal. Project now is archived": "Невозможно создать цель. Проект {title} ({id}) заархивирован",
     "These bindings is already exist": "Такая связь уже сущевует",
-    "No filter with id": "Нет фильтра с id `{id}`"
+    "No filter with id": "Нет фильтра с id `{id}`",
+    "Cannot link goal to selected project": "Невозможно связать текущую цель с выбранным проектом",
+    "Cannot transfer goal to selected project": "Невозможно перенести цель в выбранный проект"
 }