chore: request returns last 5 created goals of the user if nthg is ty…

…ping
taskany-inc · Jul 25, 2023 · a0c0055 · a0c0055
1 parent 1abcd38
commit a0c0055
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 39 deletions.
diff --git a/src/components/CriteriaForm/CriteriaForm.tsx b/src/components/CriteriaForm/CriteriaForm.tsx
@@ -280,7 +280,7 @@ export const CriteriaForm: React.FC<CriteriaFormProps> = ({ onSubmit, goalId, va
                             setError={setError}
                             onSelect={handleSelectGoal}
                             titles={validityData.title}
-                            isItemSelected={selectedGoalId != null}
+                            isItemSelected={Boolean(selectedGoalId?.id)}
                         />
                     )}
                 />

diff --git a/trpc/router/goal.ts b/trpc/router/goal.ts
@@ -47,52 +47,60 @@ import { createLocaleDate } from '../../src/utils/dateTime';
 import { addCalculatedProjectFields } from './project';
 
 export const goal = router({
-    suggestions: protectedProcedure.input(suggestionsQueryScheme).query(async ({ input }) => {
-        const splittedInput = input.input.split('-');
-        let selectParams: Prisma.GoalFindManyArgs['where'] = {
-            title: {
-                contains: input.input,
-                mode: 'insensitive',
-            },
-        };
-
-        if (splittedInput.length === 2 && !Number.isNaN(+splittedInput[1])) {
-            const [projectId, scopedId] = splittedInput;
-            selectParams = {
-                AND: [
-                    {
-                        projectId: {
-                            contains: projectId,
-                            mode: 'insensitive',
-                        },
-                    },
-                    {
-                        scopeId: Number(scopedId),
-                    },
-                ],
+    suggestions: protectedProcedure
+        .input(suggestionsQueryScheme)
+        .query(async ({ ctx, input: { input, limit = 5 } }) => {
+            const { activityId } = ctx.session.user || {};
+
+            const splittedInput = input.split('-');
+            let selectParams: Prisma.GoalFindManyArgs['where'] = {
+                title: {
+                    contains: input,
+                    mode: 'insensitive',
+                },
             };
-        }
 
-        return prisma.goal.findMany({
-            take: input.limit || 5,
-            where: {
-                AND: {
-                    ...selectParams,
-                    OR: [
+            if (splittedInput.length === 2 && !Number.isNaN(+splittedInput[1])) {
+                const [projectId, scopedId] = splittedInput;
+                selectParams = {
+                    AND: [
                         {
-                            archived: false,
+                            projectId: {
+                                contains: projectId,
+                                mode: 'insensitive',
+                            },
                         },
                         {
-                            archived: null,
+                            scopeId: Number(scopedId),
                         },
                     ],
+                };
+            }
+
+            return prisma.goal.findMany({
+                take: limit,
+                orderBy: {
+                    createdAt: 'desc',
                 },
-            },
-            include: {
-                ...goalDeepQuery,
-            },
-        });
-    }),
+                where: {
+                    activityId: input.length ? { contains: '' } : activityId,
+                    AND: {
+                        ...selectParams,
+                        OR: [
+                            {
+                                archived: false,
+                            },
+                            {
+                                archived: null,
+                            },
+                        ],
+                    },
+                },
+                include: {
+                    ...goalDeepQuery,
+                },
+            });
+        }),
     getBatch: protectedProcedure
         .input(
             z.object({