From dc71266bccfdc7dc140c7ede449526a2d25790d1 Mon Sep 17 00:00:00 2001
From: Anton <sab94a@yandex.ru>
Date: Tue, 27 Jun 2023 17:16:08 +0300
Subject: [PATCH] fix(ProjectListItemConnected): add query state to goals
 counter

---
 package-lock.json                             |  50 ++--
 package.json                                  |   4 +-
 .../ProjectCreateForm/ProjectCreateForm.tsx   |  11 +-
 .../ProjectListItemCollapsable.tsx            |   6 +-
 src/components/ProjectListItemConnected.tsx   |  16 +-
 src/components/ProjectPage/ProjectPage.tsx    |   8 +-
 .../ProjectSettingsPage.tsx                   |   2 +-
 src/components/ProjectsPage/ProjectsPage.tsx  |   9 +-
 src/hooks/useProjectResource.ts               |   2 +-
 src/pages/explore/projects.tsx                |  11 +-
 src/pages/projects/[id]/index.tsx             |   5 +-
 src/pages/projects/[id]/settings.tsx          |   2 +-
 src/pages/projects/index.tsx                  |  12 +-
 trpc/queries/project.ts                       |  84 ++++--
 trpc/router/project.ts                        | 266 ++++++++++--------
 15 files changed, 294 insertions(+), 194 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fc4a6cb6c..09816ba46 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,6 @@
         "@aws-sdk/client-s3": "3.347.1",
         "@hookform/resolvers": "3.1.1",
         "@next-auth/prisma-adapter": "1.0.6",
-        "@prisma/client": "4.14.1",
         "@sentry/nextjs": "7.50.0",
         "@tanstack/react-query": "4.29.5",
         "@tanstack/react-query-devtools": "4.29.5",
@@ -57,6 +56,7 @@
         "@commitlint/config-conventional": "17.6.1",
         "@faker-js/faker": "7.6.0",
         "@next/bundle-analyzer": "13.2.1",
+        "@prisma/client": "4.16.1",
         "@svgr/webpack": "7.0.0",
         "@types/cors": "2.8.13",
         "@types/jest": "29.5.1",
@@ -90,7 +90,7 @@
         "jest": "29.5.0",
         "lint-staged": "13.1.2",
         "prettier": "2.8.8",
-        "prisma": "4.15.0",
+        "prisma": "4.16.1",
         "ts-jest": "29.1.0",
         "ts-node": "10.9.1",
         "typescript": "5.1.3",
@@ -5055,11 +5055,12 @@
       }
     },
     "node_modules/@prisma/client": {
-      "version": "4.14.1",
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@prisma/client/-/client-4.16.1.tgz",
+      "integrity": "sha512-CoDHu7Bt+NuDo40ijoeHP79EHtECsPBTy3yte5Yo3op8TqXt/kV0OT5OrsWewKvQGKFMHhYQ+ePed3zzjYdGAw==",
       "hasInstallScript": true,
-      "license": "Apache-2.0",
       "dependencies": {
-        "@prisma/engines-version": "4.14.0-67.d9a4c5988f480fa576d43970d5a23641aa77bc9c"
+        "@prisma/engines-version": "4.16.0-66.b20ead4d3ab9e78ac112966e242ded703f4a052c"
       },
       "engines": {
         "node": ">=14.17"
@@ -5074,14 +5075,16 @@
       }
     },
     "node_modules/@prisma/engines": {
-      "version": "4.15.0",
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-4.16.1.tgz",
+      "integrity": "sha512-gpZG0kGGxfemgvK/LghHdBIz+crHkZjzszja94xp4oytpsXrgt/Ice82MvPsWMleVIniKuARrowtsIsim0PFJQ==",
       "devOptional": true,
-      "hasInstallScript": true,
-      "license": "Apache-2.0"
+      "hasInstallScript": true
     },
     "node_modules/@prisma/engines-version": {
-      "version": "4.14.0-67.d9a4c5988f480fa576d43970d5a23641aa77bc9c",
-      "license": "Apache-2.0"
+      "version": "4.16.0-66.b20ead4d3ab9e78ac112966e242ded703f4a052c",
+      "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-4.16.0-66.b20ead4d3ab9e78ac112966e242ded703f4a052c.tgz",
+      "integrity": "sha512-tMWAF/qF00fbUH1HB4Yjmz6bjh7fzkb7Y3NRoUfMlHu6V+O45MGvqwYxqwBjn1BIUXkl3r04W351D4qdJjrgvA=="
     },
     "node_modules/@rollup/plugin-commonjs": {
       "version": "24.0.0",
@@ -15728,12 +15731,13 @@
       }
     },
     "node_modules/prisma": {
-      "version": "4.15.0",
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/prisma/-/prisma-4.16.1.tgz",
+      "integrity": "sha512-C2Xm7yxHxjFjjscBEW4tmoraPHH/Vyu/A0XABdbaFtoiOZARsxvOM7rwc2iZ0qVxbh0bGBGBWZUSXO/52/nHBQ==",
       "devOptional": true,
       "hasInstallScript": true,
-      "license": "Apache-2.0",
       "dependencies": {
-        "@prisma/engines": "4.15.0"
+        "@prisma/engines": "4.16.1"
       },
       "bin": {
         "prisma": "build/index.js",
@@ -21991,17 +21995,23 @@
       "version": "2.11.6"
     },
     "@prisma/client": {
-      "version": "4.14.1",
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@prisma/client/-/client-4.16.1.tgz",
+      "integrity": "sha512-CoDHu7Bt+NuDo40ijoeHP79EHtECsPBTy3yte5Yo3op8TqXt/kV0OT5OrsWewKvQGKFMHhYQ+ePed3zzjYdGAw==",
       "requires": {
-        "@prisma/engines-version": "4.14.0-67.d9a4c5988f480fa576d43970d5a23641aa77bc9c"
+        "@prisma/engines-version": "4.16.0-66.b20ead4d3ab9e78ac112966e242ded703f4a052c"
       }
     },
     "@prisma/engines": {
-      "version": "4.15.0",
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-4.16.1.tgz",
+      "integrity": "sha512-gpZG0kGGxfemgvK/LghHdBIz+crHkZjzszja94xp4oytpsXrgt/Ice82MvPsWMleVIniKuARrowtsIsim0PFJQ==",
       "devOptional": true
     },
     "@prisma/engines-version": {
-      "version": "4.14.0-67.d9a4c5988f480fa576d43970d5a23641aa77bc9c"
+      "version": "4.16.0-66.b20ead4d3ab9e78ac112966e242ded703f4a052c",
+      "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-4.16.0-66.b20ead4d3ab9e78ac112966e242ded703f4a052c.tgz",
+      "integrity": "sha512-tMWAF/qF00fbUH1HB4Yjmz6bjh7fzkb7Y3NRoUfMlHu6V+O45MGvqwYxqwBjn1BIUXkl3r04W351D4qdJjrgvA=="
     },
     "@rollup/plugin-commonjs": {
       "version": "24.0.0",
@@ -28590,10 +28600,12 @@
       }
     },
     "prisma": {
-      "version": "4.15.0",
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/prisma/-/prisma-4.16.1.tgz",
+      "integrity": "sha512-C2Xm7yxHxjFjjscBEW4tmoraPHH/Vyu/A0XABdbaFtoiOZARsxvOM7rwc2iZ0qVxbh0bGBGBWZUSXO/52/nHBQ==",
       "devOptional": true,
       "requires": {
-        "@prisma/engines": "4.15.0"
+        "@prisma/engines": "4.16.1"
       }
     },
     "process-nextick-args": {
diff --git a/package.json b/package.json
index efe1fccee..aa8916120 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,6 @@
     "@aws-sdk/client-s3": "3.347.1",
     "@hookform/resolvers": "3.1.1",
     "@next-auth/prisma-adapter": "1.0.6",
-    "@prisma/client": "4.14.1",
     "@sentry/nextjs": "7.50.0",
     "@tanstack/react-query": "4.29.5",
     "@tanstack/react-query-devtools": "4.29.5",
@@ -72,6 +71,7 @@
     "@commitlint/config-conventional": "17.6.1",
     "@faker-js/faker": "7.6.0",
     "@next/bundle-analyzer": "13.2.1",
+    "@prisma/client": "4.16.1",
     "@svgr/webpack": "7.0.0",
     "@types/cors": "2.8.13",
     "@types/jest": "29.5.1",
@@ -105,7 +105,7 @@
     "jest": "29.5.0",
     "lint-staged": "13.1.2",
     "prettier": "2.8.8",
-    "prisma": "4.15.0",
+    "prisma": "4.16.1",
     "ts-jest": "29.1.0",
     "ts-node": "10.9.1",
     "typescript": "5.1.3",
diff --git a/src/components/ProjectCreateForm/ProjectCreateForm.tsx b/src/components/ProjectCreateForm/ProjectCreateForm.tsx
index 461f9935e..418f022eb 100644
--- a/src/components/ProjectCreateForm/ProjectCreateForm.tsx
+++ b/src/components/ProjectCreateForm/ProjectCreateForm.tsx
@@ -101,9 +101,14 @@ const ProjectCreateForm: React.FC = () => {
 
     const isKeyEnoughLength = Boolean(keyWatcher?.length >= 3);
     const flowRecomendations = trpc.flow.recommedations.useQuery();
-    const existingProject = trpc.project.getById.useQuery(keyWatcher, {
-        enabled: isKeyEnoughLength,
-    });
+    const existingProject = trpc.project.getById.useQuery(
+        {
+            id: keyWatcher,
+        },
+        {
+            enabled: isKeyEnoughLength,
+        },
+    );
 
     const isKeyUnique = Boolean(!existingProject?.data);
 
diff --git a/src/components/ProjectListItemCollapsable/ProjectListItemCollapsable.tsx b/src/components/ProjectListItemCollapsable/ProjectListItemCollapsable.tsx
index 0ceff5abe..f8d10c855 100644
--- a/src/components/ProjectListItemCollapsable/ProjectListItemCollapsable.tsx
+++ b/src/components/ProjectListItemCollapsable/ProjectListItemCollapsable.tsx
@@ -23,7 +23,6 @@ interface ProjectListItemCollapsableProps {
     collapsedGoals: boolean;
     onClick?: () => void;
     onGoalsClick?: () => void;
-    goalsCounter?: number;
     loading?: boolean;
     deep?: number;
 }
@@ -37,7 +36,6 @@ export const ProjectListItemCollapsable: React.FC<ProjectListItemCollapsableProp
     children,
     goals,
     loading = false,
-    goalsCounter,
     deep = 0,
 }) => {
     const contentHidden = collapsed || loading;
@@ -70,12 +68,12 @@ export const ProjectListItemCollapsable: React.FC<ProjectListItemCollapsableProp
                         watching={project._isWatching}
                     >
                         <StyledGoalsButtonContainer>
-                            {goalsCounter ? (
+                            {project._count.goals ? (
                                 <Button
                                     ghost={collapsedGoals}
                                     onClick={onGoalsButtonClick}
                                     text={tr('Goals')}
-                                    iconRight={<Badge size="s">{goalsCounter}</Badge>}
+                                    iconRight={<Badge size="s">{project._count.goals}</Badge>}
                                 />
                             ) : (
                                 <Text color={gray7}>{tr('No goals')}</Text>
diff --git a/src/components/ProjectListItemConnected.tsx b/src/components/ProjectListItemConnected.tsx
index 97a3195c8..42b66cb02 100644
--- a/src/components/ProjectListItemConnected.tsx
+++ b/src/components/ProjectListItemConnected.tsx
@@ -1,4 +1,4 @@
-import { FC, MouseEventHandler, useState, useMemo, useCallback } from 'react';
+import { FC, MouseEventHandler, useState, useMemo, useCallback, useEffect } from 'react';
 
 import { GoalByIdReturnType, ProjectByIdReturnType } from '../../trpc/inferredTypes';
 import { trpc } from '../utils/trpcClient';
@@ -34,7 +34,7 @@ export const ProjectListItemConnected: FC<{
     const { data: projectDeepInfo } = trpc.project.getDeepInfo.useQuery(
         {
             id: project.id,
-            ...queryState,
+            goalsQuery: queryState,
         },
         {
             enabled: !collapsedGoals,
@@ -44,9 +44,12 @@ export const ProjectListItemConnected: FC<{
     );
 
     const ids = useMemo(() => project?.children.map(({ id }) => id) || [], [project]);
-    const { data: childrenProjects = [], status } = trpc.project.getByIds.useQuery(ids, {
-        enabled: !collapsed,
-    });
+    const { data: childrenProjects = [], status } = trpc.project.getByIds.useQuery(
+        { ids, goalsQuery: queryState },
+        {
+            enabled: !collapsed,
+        },
+    );
 
     const goals = useMemo(
         () => projectDeepInfo?.goals.filter((g) => g.projectId === project.id),
@@ -61,8 +64,6 @@ export const ProjectListItemConnected: FC<{
         setIsCollapsedGoals((value) => !value);
     }, []);
 
-    const goalsCounter = goals ? goals.length : project._count.goals;
-
     return (
         <ProjectListItemCollapsable
             href={routes.project(project.id)}
@@ -96,7 +97,6 @@ export const ProjectListItemConnected: FC<{
             onClick={onClick}
             onGoalsClick={onGoalsClick}
             loading={status === 'loading'}
-            goalsCounter={goalsCounter}
             deep={deep}
         >
             {childrenProjects.map((p) => (
diff --git a/src/components/ProjectPage/ProjectPage.tsx b/src/components/ProjectPage/ProjectPage.tsx
index 67703e5d9..b43f5cd7b 100644
--- a/src/components/ProjectPage/ProjectPage.tsx
+++ b/src/components/ProjectPage/ProjectPage.tsx
@@ -63,11 +63,15 @@ export const ProjectPage = ({ user, ssrTime, params: { id } }: ExternalPageProps
         preset: preset?.data,
     });
 
-    const project = trpc.project.getById.useQuery(id);
+    const project = trpc.project.getById.useQuery({
+        id,
+        goalsQuery: queryState,
+    });
+
     const { data: projectDeepInfo, isLoading } = trpc.project.getDeepInfo.useQuery(
         {
             id,
-            ...queryState,
+            goalsQuery: queryState,
         },
         {
             keepPreviousData: true,
diff --git a/src/components/ProjectSettingsPage/ProjectSettingsPage.tsx b/src/components/ProjectSettingsPage/ProjectSettingsPage.tsx
index e6874a72b..e84c89275 100644
--- a/src/components/ProjectSettingsPage/ProjectSettingsPage.tsx
+++ b/src/components/ProjectSettingsPage/ProjectSettingsPage.tsx
@@ -43,7 +43,7 @@ export const ProjectSettingsPage = ({ user, ssrTime, params: { id } }: ExternalP
     const [currentProjectCache, setCurrentProjectCache] = useLocalStorage('currentProjectCache');
     const [recentProjectsCache, setRecentProjectsCache] = useLocalStorage('recentProjectsCache', {});
 
-    const project = trpc.project.getById.useQuery(id);
+    const project = trpc.project.getById.useQuery({ id });
 
     const { updateProject, deleteProject, transferOwnership } = useProjectResource(id);
 
diff --git a/src/components/ProjectsPage/ProjectsPage.tsx b/src/components/ProjectsPage/ProjectsPage.tsx
index 2a90db40f..38f89fe42 100644
--- a/src/components/ProjectsPage/ProjectsPage.tsx
+++ b/src/components/ProjectsPage/ProjectsPage.tsx
@@ -30,10 +30,6 @@ export const ProjectsPage = ({ user, ssrTime }: ExternalPageProps) => {
     const [preview, setPreview] = useState<GoalByIdReturnType | null>(null);
     const { toggleFilterStar } = useFilterResource();
 
-    const { data: projects = [] } = trpc.project.getAll.useQuery({
-        firstLevel: true,
-    });
-
     const utils = trpc.useContext();
     const preset = trpc.filter.getById.useQuery(String(nextRouter.query.filter), {
         enabled: Boolean(nextRouter.query.filter),
@@ -63,6 +59,11 @@ export const ProjectsPage = ({ user, ssrTime }: ExternalPageProps) => {
         preset: preset?.data,
     });
 
+    const { data: projects = [] } = trpc.project.getAll.useQuery({
+        firstLevel: true,
+        goalsQuery: queryState,
+    });
+
     const shadowPreset = userFilters.data?.filter((f) => f.params === queryString)[0];
 
     const onGoalPrewiewShow = useCallback(
diff --git a/src/hooks/useProjectResource.ts b/src/hooks/useProjectResource.ts
index 1d37c6814..b61584e99 100644
--- a/src/hooks/useProjectResource.ts
+++ b/src/hooks/useProjectResource.ts
@@ -17,7 +17,7 @@ export const useProjectResource = (id: string) => {
     const transferOwnershipMutation = trpc.project.transferOwnership.useMutation();
 
     const invalidate = useCallback(() => {
-        utils.project.getById.invalidate(id);
+        utils.project.getById.invalidate({ id });
     }, [id, utils.project.getById]);
 
     const createProject = useCallback(
diff --git a/src/pages/explore/projects.tsx b/src/pages/explore/projects.tsx
index 7610a7143..4d2f7d7d3 100644
--- a/src/pages/explore/projects.tsx
+++ b/src/pages/explore/projects.tsx
@@ -1,9 +1,16 @@
 import { ExploreProjectsPage } from '../../components/ExporeProjectsPage/ExporeProjectsPage';
 import { declareSsrProps } from '../../utils/declareSsrProps';
+import { parseFilterValues } from '../../hooks/useUrlFilterParams';
 
 export const getServerSideProps = declareSsrProps(
-    async ({ ssrHelpers }) => {
-        await ssrHelpers.project.getAll.fetch();
+    async ({ ssrHelpers, query }) => {
+        const preset =
+            typeof query.filter === 'string' ? await ssrHelpers.filter.getById.fetch(query.filter) : undefined;
+
+        await ssrHelpers.project.getAll.fetch({
+            firstLevel: true,
+            goalsQuery: parseFilterValues(preset ? Object.fromEntries(new URLSearchParams(preset.params)) : query),
+        });
     },
     {
         private: true,
diff --git a/src/pages/projects/[id]/index.tsx b/src/pages/projects/[id]/index.tsx
index 77c53f7d8..2553af22e 100644
--- a/src/pages/projects/[id]/index.tsx
+++ b/src/pages/projects/[id]/index.tsx
@@ -7,10 +7,11 @@ export const getServerSideProps = declareSsrProps(
         const preset =
             typeof query.filter === 'string' ? await ssrHelpers.filter.getById.fetch(query.filter) : undefined;
         await ssrHelpers.filter.getUserFilters.fetch();
-        const project = await ssrHelpers.project.getById.fetch(id);
+        const goalsQuery = parseFilterValues(preset ? Object.fromEntries(new URLSearchParams(preset.params)) : query);
+        const project = await ssrHelpers.project.getById.fetch({ id, goalsQuery });
         await ssrHelpers.project.getDeepInfo.fetch({
             id,
-            ...parseFilterValues(preset ? Object.fromEntries(new URLSearchParams(preset.params)) : query),
+            goalsQuery,
         });
 
         if (!project) {
diff --git a/src/pages/projects/[id]/settings.tsx b/src/pages/projects/[id]/settings.tsx
index 26d645a0c..285f8e5fa 100644
--- a/src/pages/projects/[id]/settings.tsx
+++ b/src/pages/projects/[id]/settings.tsx
@@ -3,7 +3,7 @@ import { declareSsrProps } from '../../../utils/declareSsrProps';
 
 export const getServerSideProps = declareSsrProps(
     async ({ ssrHelpers, params: { id } }) => {
-        const data = await ssrHelpers.project.getById.fetch(id);
+        const data = await ssrHelpers.project.getById.fetch({ id });
 
         if (!data) {
             return {
diff --git a/src/pages/projects/index.tsx b/src/pages/projects/index.tsx
index 29959eaf6..608e9ae52 100644
--- a/src/pages/projects/index.tsx
+++ b/src/pages/projects/index.tsx
@@ -3,8 +3,16 @@ import { parseFilterValues } from '../../hooks/useUrlFilterParams';
 import { declareSsrProps } from '../../utils/declareSsrProps';
 
 export const getServerSideProps = declareSsrProps(
-    async ({ ssrHelpers }) => {
-        await ssrHelpers.project.getAll.fetch();
+    async ({ ssrHelpers, query }) => {
+        const preset =
+            typeof query.filter === 'string' ? await ssrHelpers.filter.getById.fetch(query.filter) : undefined;
+        await ssrHelpers.filter.getUserFilters.fetch();
+        const goalsQuery = parseFilterValues(preset ? Object.fromEntries(new URLSearchParams(preset.params)) : query);
+
+        await ssrHelpers.project.getAll.fetch({
+            firstLevel: true,
+            goalsQuery,
+        });
     },
     {
         private: true,
diff --git a/trpc/queries/project.ts b/trpc/queries/project.ts
index db9fe7de7..0d16bc95e 100644
--- a/trpc/queries/project.ts
+++ b/trpc/queries/project.ts
@@ -1,33 +1,61 @@
-export const projectFullSchema = {
-    stargizers: true,
-    watchers: true,
-    parent: true,
-    tags: true,
-    children: {
-        include: {
-            parent: true,
+import { QueryWithFilters } from '../../src/schema/common';
+
+import { goalsFilter } from './goals';
+
+export const getProjectSchema = ({
+    goalsQuery,
+    activityId,
+    firstLevel,
+}: {
+    activityId?: string;
+    goalsQuery?: QueryWithFilters;
+    firstLevel?: boolean;
+} = {}) => ({
+    include: {
+        stargizers: true,
+        watchers: true,
+        parent: true,
+        tags: true,
+        children: {
+            include: {
+                parent: true,
+            },
         },
-    },
-    participants: {
-        include: {
-            user: true,
-            ghost: true,
+        participants: {
+            include: {
+                user: true,
+                ghost: true,
+            },
         },
-    },
-    activity: {
-        include: {
-            user: true,
-            ghost: true,
+        activity: {
+            include: {
+                user: true,
+                ghost: true,
+            },
         },
-    },
-    _count: {
-        select: {
-            stargizers: true,
-            watchers: true,
-            participants: true,
-            children: true,
-            goals: true,
-            parent: true,
+        _count: {
+            select: {
+                stargizers: true,
+                watchers: true,
+                participants: true,
+                children: true,
+                goals:
+                    goalsQuery && activityId
+                        ? {
+                              where: goalsFilter(goalsQuery, activityId).where,
+                          }
+                        : true,
+                parent: true,
+            },
         },
     },
-};
+    ...(firstLevel
+        ? {
+              where: {
+                  parent: {
+                      none: {},
+                  },
+              },
+          }
+        : {}),
+});
diff --git a/trpc/router/project.ts b/trpc/router/project.ts
index 33b374142..70fd47d41 100644
--- a/trpc/router/project.ts
+++ b/trpc/router/project.ts
@@ -1,4 +1,4 @@
-import z from 'zod';
+import z, { boolean } from 'zod';
 import { TRPCError } from '@trpc/server';
 
 import { prisma } from '../../src/utils/prisma';
@@ -16,9 +16,9 @@ import {
     goalDeepQuery,
     goalsFilter,
 } from '../queries/goals';
-import { ToggleSubscriptionSchema } from '../../src/schema/common';
+import { ToggleSubscriptionSchema, queryWithFiltersSchema } from '../../src/schema/common';
 import { connectionMap } from '../queries/connections';
-import { projectFullSchema } from '../queries/project';
+import { getProjectSchema } from '../queries/project';
 
 type WithId = { id: string };
 
@@ -72,153 +72,189 @@ export const project = router({
             z
                 .object({
                     firstLevel: z.boolean().optional(),
+                    goalsQuery: queryWithFiltersSchema.optional(),
                 })
                 .optional(),
         )
-        .query(({ ctx, input: { firstLevel } = {} }) => {
-            return prisma.project
+        .query(({ ctx, input: { firstLevel, goalsQuery } = {} }) =>
+            prisma.project
                 .findMany({
                     orderBy: {
                         createdAt: 'asc',
                     },
-                    include: { ...projectFullSchema },
-                    ...(firstLevel
-                        ? {
-                              where: {
-                                  parent: {
-                                      none: {},
-                                  },
-                              },
-                          }
-                        : {}),
+                    ...getProjectSchema({
+                        activityId: ctx.session.user.activityId,
+                        goalsQuery,
+                        firstLevel,
+                    }),
+                })
+                .then((res) => res.map((project) => addCalculatedProjectFields(project, ctx.session.user.activityId))),
+        ),
+    getTop: protectedProcedure
+        .input(
+            z
+                .object({
+                    firstLevel: z.boolean().optional(),
+                    goalsQuery: queryWithFiltersSchema.optional(),
+                })
+                .optional(),
+        )
+        .query(async ({ ctx, input: { firstLevel, goalsQuery } = {} }) => {
+            const allProjects = await prisma.project
+                .findMany({
+                    orderBy: {
+                        createdAt: 'asc',
+                    },
+                    ...getProjectSchema({
+                        activityId: ctx.session.user.activityId,
+                        goalsQuery,
+                        firstLevel,
+                    }),
                 })
                 .then((res) => res.map((project) => addCalculatedProjectFields(project, ctx.session.user.activityId)));
+
+            // FIX: it is hack!
+            return allProjects.filter((p) => p._count.parent === 0);
         }),
-    getTop: protectedProcedure.query(async ({ ctx }) => {
-        const allProjects = await prisma.project
-            .findMany({
-                orderBy: {
-                    createdAt: 'asc',
+    getById: protectedProcedure
+        .input(
+            z.object({
+                id: z.string(),
+                goalsQuery: queryWithFiltersSchema.optional(),
+            }),
+        )
+        .query(async ({ ctx, input: { id, goalsQuery } }) => {
+            const project = await prisma.project.findUnique({
+                ...getProjectSchema({
+                    activityId: ctx.session.user.activityId,
+                    goalsQuery,
+                }),
+                where: {
+                    id,
                 },
-                include: { ...projectFullSchema },
-            })
-            .then((res) => res.map((project) => addCalculatedProjectFields(project, ctx.session.user.activityId)));
-
-        // FIX: it is hack!
-        return allProjects.filter((p) => p._count.parent === 0);
-    }),
-    getById: protectedProcedure.input(z.string()).query(async ({ ctx, input: id }) => {
-        const project = await prisma.project.findUnique({
-            where: {
-                id,
-            },
-            include: projectFullSchema,
-        });
+            });
 
-        if (!project) return null;
+            if (!project) return null;
 
-        return addCalculatedProjectFields(project, ctx.session.user.activityId);
-    }),
-    getByIds: protectedProcedure.input(z.array(z.string())).query(async ({ ctx, input }) => {
-        const projects = await prisma.project.findMany({
-            where: {
-                id: {
-                    in: input,
+            return addCalculatedProjectFields(project, ctx.session.user.activityId);
+        }),
+    getByIds: protectedProcedure
+        .input(
+            z.object({
+                ids: z.array(z.string()),
+                goalsQuery: queryWithFiltersSchema.optional(),
+            }),
+        )
+        .query(async ({ ctx, input: { ids, goalsQuery } }) => {
+            const projects = await prisma.project.findMany({
+                where: {
+                    id: {
+                        in: ids,
+                    },
                 },
-            },
-            include: projectFullSchema,
-        });
+                ...getProjectSchema({
+                    activityId: ctx.session.user.activityId,
+                    goalsQuery,
+                }),
+            });
 
-        return projects.map((project) => addCalculatedProjectFields(project, ctx.session.user.activityId));
-    }),
-    getDeepInfo: protectedProcedure.input(projectDeepInfoSchema).query(async ({ ctx, input }) => {
-        const [allProjectGoals, filtredProjectGoals] = await Promise.all([
-            prisma.goal.findMany({
-                ...goalsFilter(
-                    {
-                        priority: [],
-                        state: [],
-                        tag: [],
-                        estimate: [],
-                        owner: [],
-                        project: [],
-                        query: '',
+            return projects.map((project) => addCalculatedProjectFields(project, ctx.session.user.activityId));
+        }),
+    getDeepInfo: protectedProcedure
+        .input(
+            z.object({
+                id: z.string(),
+                goalsQuery: queryWithFiltersSchema,
+            }),
+        )
+        .query(async ({ ctx, input: { id, goalsQuery } }) => {
+            const [allProjectGoals, filtredProjectGoals] = await Promise.all([
+                prisma.goal.findMany({
+                    ...goalsFilter(
+                        {
+                            priority: [],
+                            state: [],
+                            tag: [],
+                            estimate: [],
+                            owner: [],
+                            project: [],
+                            query: '',
+                        },
+                        ctx.session.user.activityId,
+                        {
+                            AND: {
+                                OR: [
+                                    {
+                                        projectId: id,
+                                    },
+                                    {
+                                        project: {
+                                            parent: {
+                                                some: {
+                                                    id,
+                                                },
+                                            },
+                                        },
+                                    },
+                                ],
+                            },
+                        },
+                    ),
+                    include: {
+                        ...goalDeepQuery,
+                        estimate: {
+                            include: {
+                                estimate: true,
+                            },
+                            orderBy: {
+                                createdAt: 'asc',
+                            },
+                        },
                     },
-                    ctx.session.user.activityId,
-                    {
+                }),
+                prisma.goal.findMany({
+                    ...goalsFilter(goalsQuery, ctx.session.user.activityId, {
                         AND: {
                             OR: [
                                 {
-                                    projectId: input.id,
+                                    projectId: id,
                                 },
                                 {
                                     project: {
                                         parent: {
                                             some: {
-                                                id: input.id,
+                                                id,
                                             },
                                         },
                                     },
                                 },
                             ],
                         },
-                    },
-                ),
-                include: {
-                    ...goalDeepQuery,
-                    estimate: {
-                        include: {
-                            estimate: true,
-                        },
-                        orderBy: {
-                            createdAt: 'asc',
-                        },
-                    },
-                },
-            }),
-            prisma.goal.findMany({
-                ...goalsFilter(input, ctx.session.user.activityId, {
-                    AND: {
-                        OR: [
-                            {
-                                projectId: input.id,
+                    }),
+                    include: {
+                        ...goalDeepQuery,
+                        estimate: {
+                            include: {
+                                estimate: true,
                             },
-                            {
-                                project: {
-                                    parent: {
-                                        some: {
-                                            id: input.id,
-                                        },
-                                    },
-                                },
+                            orderBy: {
+                                createdAt: 'asc',
                             },
-                        ],
-                    },
-                }),
-                include: {
-                    ...goalDeepQuery,
-                    estimate: {
-                        include: {
-                            estimate: true,
-                        },
-                        orderBy: {
-                            createdAt: 'asc',
                         },
                     },
-                },
-            }),
-        ]);
+                }),
+            ]);
 
-        return {
-            goals: filtredProjectGoals.map((g) => ({
-                ...g,
-                project: g.project ? addCalculatedProjectFields(g.project, ctx.session.user.activityId) : null,
-                ...addCalclulatedGoalsFields(g, ctx.session.user.activityId),
-                estimate: getEstimateListFormJoin(g),
-            })),
-            meta: calcGoalsMeta(allProjectGoals),
-        };
-    }),
+            return {
+                goals: filtredProjectGoals.map((g) => ({
+                    ...g,
+                    project: g.project ? addCalculatedProjectFields(g.project, ctx.session.user.activityId) : null,
+                    ...addCalclulatedGoalsFields(g, ctx.session.user.activityId),
+                    estimate: getEstimateListFormJoin(g),
+                })),
+                meta: calcGoalsMeta(allProjectGoals),
+            };
+        }),
     create: protectedProcedure
         .input(projectCreateSchema)
         .mutation(async ({ ctx, input: { id, title, description, flow } }) => {