Replace internal projectId filter with project.id

Author: CarsonF

src/components/engagement/dto/list-engagements.dto.ts

@@ -45,7 +45,6 @@ export abstract class EngagementFilters {
   })
   readonly status?: readonly EngagementStatus[];
 
-  readonly projectId?: ID;
   @FilterField(() => ProjectFilters)
   readonly project?: ProjectFilters & {};
 

src/components/engagement/engagement.repository.ts

@@ -496,18 +496,24 @@ export class EngagementRepository extends CommonRepository {
       .subQuery((sub) =>
         sub
           .match([
-            node('project', 'Project', pickBy({ id: input.filter?.projectId })),
+            node(
+              'project',
+              'Project',
+              pickBy({ id: input.filter?.project?.id }),
+            ),
             relation('out', '', 'engagement', ACTIVE),
             node('node', 'Engagement'),
           ])
           .apply(whereNotDeletedInChangeset(changeset))
           .return(['node', 'project'])
           .apply((q) =>
-            changeset && input.filter?.projectId
+            changeset && input.filter?.project?.id
               ? q
                   .union()
                   .match([
-                    node('project', 'Project', { id: input.filter.projectId }),
+                    node('project', 'Project', {
+                      id: input.filter.project?.id,
+                    }),
                     relation('out', '', 'engagement', INACTIVE),
                     node('node', 'Engagement'),
                     relation('in', '', 'changeset', ACTIVE),
@@ -739,11 +745,6 @@ export const engagementFilters = filter.define(() => EngagementFilters, {
     ),
   }),
   status: filter.stringListProp(),
-  projectId: filter.pathExists((id) => [
-    node('node'),
-    relation('in', '', 'engagement'),
-    node('project', 'Project', { id }),
-  ]),
   partnerId: filter.pathExists((id) => [
     node('node'),
     relation('in', '', 'engagement'),

src/components/project/dto/list-projects.dto.ts

@@ -29,6 +29,8 @@ import {
 
 @InputType()
 export abstract class ProjectFilters {
+  readonly id?: ID<'Project'>;
+
   @OptionalField()
   readonly name?: string;
 

src/components/project/project-filters.query.ts

@@ -20,6 +20,7 @@ import { projectMemberFilters } from './project-member/project-member.repository
 import { ProjectNameIndex } from './project.repository';
 
 export const projectFilters = filter.define(() => ProjectFilters, {
+  id: filter.baseNodeProp(),
   type: filter.stringListBaseNodeProp(),
   pinned: filter.isPinned,
   status: filter.stringListProp(),

src/components/project/project-member/dto/list-project-members.dto.ts

@@ -1,7 +1,6 @@
 import { InputType, ObjectType } from '@nestjs/graphql';
 import {
   FilterField,
-  type ID,
   ListField,
   OptionalField,
   PaginatedList,
@@ -26,8 +25,6 @@ export abstract class ProjectMemberFilters {
 
   @FilterField(() => ProjectFilters)
   readonly project?: ProjectFilters & {};
-
-  readonly projectId?: ID;
 }
 
 @InputType()

src/components/project/project-member/project-member.repository.ts

@@ -161,15 +161,15 @@ export class ProjectMemberRepository extends DtoRepository(ProjectMember) {
     return result!; // result from paginate() will always have 1 row.
   }
 
-  async listAsNotifiers(projectId: ID, roles?: Role[]) {
+  async listAsNotifiers(project: ID<'Project'>, roles?: Role[]) {
     return await this.db
       .query()
       .match([
         node('node', 'ProjectMember'),
         relation('out', '', 'user', ACTIVE),
         node('user', 'User'),
       ])
-      .apply(projectMemberFilters({ projectId, roles }))
+      .apply(projectMemberFilters({ project: { id: project }, roles }))
       .with('user')
       .optionalMatch([
         node('user'),
@@ -185,11 +185,6 @@ export class ProjectMemberRepository extends DtoRepository(ProjectMember) {
 }
 
 export const projectMemberFilters = filter.define(() => ProjectMemberFilters, {
-  projectId: filter.pathExists((id) => [
-    node('', 'Project', { id }),
-    relation('out', '', 'member', ACTIVE),
-    node('node'),
-  ]),
   project: filter.sub((): FilterFn<ProjectFilters> => projectFilters)((sub) =>
     sub.match([
       node('node', 'Project'),

src/components/project/project.service.ts

@@ -354,7 +354,10 @@ export class ProjectService {
         ...input,
         filter: {
           ...input.filter,
-          projectId: project.id,
+          project: {
+            id: project.id,
+            ...input.filter?.project,
+          },
         },
       },
       view,
@@ -379,7 +382,10 @@ export class ProjectService {
       ...input,
       filter: {
         ...input.filter,
-        projectId: project.id,
+        project: {
+          id: project.id,
+          ...input.filter?.project,
+        },
       },
     });
 

src/core/database/query/filters.ts

@@ -112,6 +112,10 @@ export const propVal =
     return { [prop ?? key]: cond };
   };
 
+export const baseNodeProp =
+  <T>(prop?: string): Builder<T> =>
+  ({ key, value }) => ({ [`node.${prop ?? key}`]: value });
+
 export const propPartialVal =
   <T, K extends ConditionalKeys<Required<T>, string>>(
     prop?: string,