fix: add recursive check on goal parent and children criteria

src/components/GoalActivityFeed/GoalActivityFeed.tsx

@@ -2,6 +2,7 @@ import { nullable } from '@taskany/bricks';
 import { forwardRef, useCallback } from 'react';
 import dynamic from 'next/dynamic';
 
+import { trpc } from '../../utils/trpcClient';
 import { ModalEvent, dispatchModalEvent } from '../../utils/dispatchModal';
 import { editGoalKeys } from '../../utils/hotkeys';
 import { GoalByIdReturnType } from '../../../trpc/inferredTypes';
@@ -147,6 +148,8 @@ export const GoalActivityFeed = forwardRef<HTMLDivElement, GoalActivityFeedProps
             [onGoalCriteriaConvert],
         );
 
+        const { data: parentGoalIds = [] } = trpc.v2.goal.getParentIds.useQuery([goal.id]);
+
         const criteriaValidityData = useCriteriaValidityData(goal._criteria);
 
         return (
@@ -184,6 +187,7 @@ export const GoalActivityFeed = forwardRef<HTMLDivElement, GoalActivityFeedProps
                                     onSubmit={handleCreateCriteria}
                                     validateGoalCriteriaBindings={validateGoalCriteriaBindings}
                                     validityData={criteriaValidityData}
+                                    filter={[goal.id, ...parentGoalIds.map((id) => id.id)]}
                                 />
                             </GoalFormPopupTrigger>
                         ))}

src/components/GoalCriteriaSuggest.tsx

@@ -19,6 +19,7 @@ interface GoalCriteriaSuggestProps {
     items?: {
         goal?: Goal | null;
     }[];
+    filter?: string[];
     versa?: boolean;
     /** Value allows restrict search results by current user */
     restrictedSearch?: boolean;
@@ -34,6 +35,7 @@ interface GoalCriteriaSuggestProps {
 export const GoalCriteriaSuggest: React.FC<GoalCriteriaSuggestProps> = ({
     id,
     items,
+    filter,
     withModeSwitch,
     defaultMode = 'simple',
     versa,
@@ -64,6 +66,7 @@ export const GoalCriteriaSuggest: React.FC<GoalCriteriaSuggestProps> = ({
             input: query as string,
             limit: 5,
             onlyCurrentUser: restrictedSearch,
+            filter,
         },
         { enabled: mode === 'goal', cacheTime: 0 },
     );
@@ -182,6 +185,8 @@ export const VersaCriteriaSuggest: React.FC<VersaCriteriaSuggestProps> = ({ goal
 
     const validityData = useCriteriaValidityData(data);
 
+    const { data: childrenIds = [] } = trpc.v2.goal.getChildrenIds.useQuery([goalId]);
+
     return (
         <GoalCriteriaSuggest
             id={goalId}
@@ -191,6 +196,7 @@ export const VersaCriteriaSuggest: React.FC<VersaCriteriaSuggestProps> = ({ goal
             validateGoalCriteriaBindings={validateGoalCriteriaBindings}
             versa
             restrictedSearch
+            filter={[goalId, ...childrenIds.map(({ id }) => id).filter(Boolean)]}
             validityData={validityData}
             onGoalSelect={({ id }) => setSelectedGoalId(id)}
         />

src/schema/common.ts

@@ -46,6 +46,7 @@ export const suggestionsQuerySchema = z.object({
     limit: z.number().optional(),
     input: z.string(),
     onlyCurrentUser: z.boolean().optional(),
+    filter: z.string().array().optional(),
 });
 
 export type SuggestionsQuerySchema = z.infer<typeof suggestionsQuerySchema>;

trpc/queries/goalV2.ts

@@ -282,3 +282,47 @@ export const goalBaseQuery = () => {
             sql`to_json("State")`.as('state'),
         ]);
 };
+
+export const getDeepParentGoalIds = (ids: string[]) => {
+    return db
+        .withRecursive('parentsTree', (qb) =>
+            qb
+                .selectFrom('GoalAchieveCriteria')
+                .select('GoalAchieveCriteria.goalId as id')
+                .where('GoalAchieveCriteria.criteriaGoalId', 'is not', null)
+                .where('GoalAchieveCriteria.criteriaGoalId', 'in', ids)
+                .where('GoalAchieveCriteria.deleted', 'is not', true)
+                .union((qb) =>
+                    qb
+                        .selectFrom('GoalAchieveCriteria')
+                        .select('GoalAchieveCriteria.goalId as id')
+                        .where('GoalAchieveCriteria.criteriaGoalId', 'is not', null)
+                        .where('GoalAchieveCriteria.deleted', 'is not', true)
+                        .innerJoin('parentsTree', 'parentsTree.id', 'GoalAchieveCriteria.criteriaGoalId'),
+                ),
+        )
+        .selectFrom('parentsTree')
+        .selectAll();
+};
+
+export const getDeepChildrenGoalIds = (ids: string[]) => {
+    return db
+        .withRecursive('parentsTree', (qb) =>
+            qb
+                .selectFrom('GoalAchieveCriteria')
+                .select('GoalAchieveCriteria.criteriaGoalId as id')
+                .where('GoalAchieveCriteria.goalId', 'in', ids)
+                .where('GoalAchieveCriteria.criteriaGoalId', 'is not', null)
+                .where('GoalAchieveCriteria.deleted', 'is not', true)
+                .union((qb) =>
+                    qb
+                        .selectFrom('GoalAchieveCriteria')
+                        .select('GoalAchieveCriteria.criteriaGoalId as id')
+                        .where('GoalAchieveCriteria.criteriaGoalId', 'is not', null)
+                        .where('GoalAchieveCriteria.deleted', 'is not', true)
+                        .innerJoin('parentsTree', 'parentsTree.id', 'GoalAchieveCriteria.goalId'),
+                ),
+        )
+        .selectFrom('parentsTree')
+        .selectAll();
+};

trpc/router/goal.ts

@@ -62,13 +62,14 @@ import { commentsByGoalIdQuery, reactionsForGoalComments } from '../queries/comm
 import { ReactionsMap } from '../../src/types/reactions';
 import { safeGetUserName } from '../../src/utils/getUserName';
 import { extraDataForEachRecord, goalHistorySeparator, historyQuery } from '../queries/history';
+import { getDeepParentGoalIds } from '../queries/goalV2';
 
 import { tr } from './router.i18n';
 
 export const goal = router({
     suggestions: protectedProcedure
         .input(suggestionsQuerySchema)
-        .query(async ({ ctx, input: { input, limit = 5, onlyCurrentUser = false } }) => {
+        .query(async ({ ctx, input: { input, limit = 5, onlyCurrentUser = false, filter } }) => {
             const { activityId, role } = ctx.session.user || {};
 
             const splittedInput = input.split('-');
@@ -118,6 +119,7 @@ export const goal = router({
                         project: {
                             ...getProjectAccessFilter(activityId, role),
                         },
+                        id: { not: { in: filter } },
                     },
                 },
                 include: getGoalDeepQuery({
@@ -1101,6 +1103,16 @@ export const goal = router({
                 }
             }
 
+            const parentIds = await getDeepParentGoalIds([input.goalId]).execute();
+
+            if (
+                input.criteriaGoal?.id &&
+                (parentIds?.map(({ id }) => id).includes(input.criteriaGoal.id) ||
+                    input.goalId === input.criteriaGoal.id)
+            ) {
+                throw new TRPCError({ code: 'BAD_REQUEST', message: tr("Goal cannot be it's own criteria") });
+            }
+
             try {
                 const newCriteria = await prisma.goalAchieveCriteria.create({
                     data: {

trpc/router/goalV2.ts

@@ -0,0 +1,14 @@
+import { z } from 'zod';
+
+import { protectedProcedure, router } from '../trpcBackend';
+import { getDeepParentGoalIds, getDeepChildrenGoalIds } from '../queries/goalV2';
+
+export const goal = router({
+    getParentIds: protectedProcedure.input(z.string().array()).query(async ({ input }) => {
+        return getDeepParentGoalIds(input).execute();
+    }),
+
+    getChildrenIds: protectedProcedure.input(z.string().array()).query(async ({ input }) => {
+        return getDeepChildrenGoalIds(input).execute();
+    }),
+});

trpc/router/index.ts

@@ -15,6 +15,7 @@ import { whatsnew } from './whatsnew';
 import { crew } from './crew';
 import { appConfig } from './appConfig';
 import { project as projectV2 } from './projectV2';
+import { goal as goalV2 } from './goalV2';
 
 export const trpcRouter = router({
     filter,
@@ -33,6 +34,7 @@ export const trpcRouter = router({
     appConfig,
     v2: router({
         project: projectV2,
+        goal: goalV2,
     }),
 });
 

trpc/router/router.i18n/en.json

@@ -3,5 +3,6 @@
     "These bindings is already exist": "These bindings is already exist",
     "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"
+    "Cannot transfer goal to selected project": "Cannot transfer goal to selected project",
+    "Goal cannot be it's own criteria": "Goal cannot be it's own criteria"
 }

trpc/router/router.i18n/ru.json

@@ -3,5 +3,6 @@
     "These bindings is already exist": "Такая связь уже сущевует",
     "No filter with id": "Нет фильтра с id `{id}`",
     "Cannot link goal to selected project": "Невозможно связать текущую цель с выбранным проектом",
-    "Cannot transfer goal to selected project": "Невозможно перенести цель в выбранный проект"
+    "Cannot transfer goal to selected project": "Невозможно перенести цель в выбранный проект",
+    "Goal cannot be it's own criteria": "Цель не может быть своим критерием"
 }