feat(trpc): provide starred and watching filters data

taskany-inc · May 31, 2023 · dcf58dc · dcf58dc
1 parent 124f3da
commit dcf58dc
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 3 deletions.
diff --git a/src/schema/common.ts b/src/schema/common.ts
@@ -29,6 +29,8 @@ export const queryWithFiltersSchema = z.object({
     project: z.array(z.string()).optional(),
     sort: sortablePropertiesSchema,
     query: z.string().optional(),
+    starred: z.boolean().optional(),
+    watching: z.boolean().optional(),
 });
 
 export type QueryWithFilters = z.infer<typeof queryWithFiltersSchema>;
diff --git a/trpc/queries/goals.ts b/trpc/queries/goals.ts
@@ -7,7 +7,7 @@ const defaultOrderBy = {
 };
 
 // TODO: make it much more type-safety
-export const goalsFilter = (data: QueryWithFilters, extra: any = {}): any => {
+export const goalsFilter = (data: QueryWithFilters, activityId: string, extra: any = {}): any => {
     const priorityFilter = data.priority?.length ? { priority: { in: data.priority } } : {};
 
     const statesFilter = data.state?.length
@@ -129,6 +129,26 @@ export const goalsFilter = (data: QueryWithFilters, extra: any = {}): any => {
         });
     }
 
+    const starredFilter = data.starred
+        ? {
+              stargizers: {
+                  some: {
+                      id: activityId,
+                  },
+              },
+          }
+        : {};
+
+    const watchingFilter = data.watching
+        ? {
+              watchers: {
+                  some: {
+                      id: activityId,
+                  },
+              },
+          }
+        : {};
+
     return {
         where: {
             archived: false,
@@ -162,6 +182,8 @@ export const goalsFilter = (data: QueryWithFilters, extra: any = {}): any => {
                     },
                 },
             ],
+            ...starredFilter,
+            ...watchingFilter,
             ...priorityFilter,
             ...statesFilter,
             ...tagsFilter,

diff --git a/trpc/router/goal.ts b/trpc/router/goal.ts
@@ -243,6 +243,7 @@ export const goal = router({
                         sort: {},
                         query: '',
                     },
+                    ctx.session.user.activityId,
                     {
                         ...userDashboardGoals,
                     },
@@ -252,7 +253,7 @@ export const goal = router({
                 },
             }),
             prisma.goal.findMany({
-                ...goalsFilter(input, {
+                ...goalsFilter(input, ctx.session.user.activityId, {
                     ...userDashboardGoals,
                 }),
                 include: {

diff --git a/trpc/router/project.ts b/trpc/router/project.ts
@@ -137,6 +137,7 @@ export const project = router({
                         project: [],
                         query: '',
                     },
+                    ctx.session.user.activityId,
                     {
                         AND: {
                             OR: [
@@ -161,7 +162,7 @@ export const project = router({
                 },
             }),
             prisma.goal.findMany({
-                ...goalsFilter(input, {
+                ...goalsFilter(input, ctx.session.user.activityId, {
                     AND: {
                         OR: [
                             {