Switch project filters to new signature

Author: CarsonF

src/components/project/index.ts

@@ -1,4 +1,3 @@
 export * from './project.service';
 export * from './project-member';
-export * from './list-filter.query';
 export * from './project.loader';

src/components/project/list-filter.query.ts

@@ -1,78 +1,77 @@
 import { greaterThan, inArray, node, relation } from 'cypher-query-builder';
 import { ACTIVE, filter, matchProjectSens, path } from '~/core/database/query';
-import { ProjectListInput } from './dto';
+import { ProjectFilters } from './dto';
 
-export const projectListFilter = (input: ProjectListInput) =>
-  filter.builder(input.filter ?? {}, {
-    type: filter.stringListBaseNodeProp(),
-    status: filter.stringListProp(),
-    onlyMultipleEngagements:
-      ({ value, query }) =>
-      () =>
-        value
-          ? query
-              .match([
-                node('node'),
-                relation('out', '', 'engagement', ACTIVE),
-                node('engagement', 'Engagement'),
-              ])
-              .with('node, count(engagement) as engagementCount')
-              .where({ engagementCount: greaterThan(1) })
-          : null,
-    step: filter.stringListProp(),
-    createdAt: filter.dateTimeBaseNodeProp(),
-    modifiedAt: filter.dateTimeProp(),
-    mine: filter.pathExistsWhenTrue([
-      node('requestingUser'),
-      relation('in', '', 'user'),
-      node('', 'ProjectMember'),
-      relation('in', '', 'member'),
-      node('node'),
-    ]),
-    pinned: filter.isPinned,
-    presetInventory: filter.propVal(),
-    partnerId: filter.pathExists((id) => [
-      node('node'),
-      relation('out', '', 'partnership', ACTIVE),
-      node('', 'Partnership'),
-      relation('out', '', 'partner', ACTIVE),
-      node('', 'Partner', { id }),
-    ]),
-    userId: ({ value }) => ({
-      userId: [
-        // TODO We can leak if the project includes this person, if the
-        // requesting user does not have access to view the project's members.
-        path([
-          node('node'),
-          relation('out', '', 'member', ACTIVE),
-          node('', 'ProjectMember'),
-          relation('out', '', 'user', ACTIVE),
-          node('', 'User', { id: value }),
-        ]),
-        // TODO does it make sense to include interns in this filter?
-        path([
-          node('node'),
-          relation('out', '', 'engagement', ACTIVE),
-          node('', 'Engagement'),
-          relation('out', '', 'intern', ACTIVE),
-          node('', 'User', { id: value }),
-        ]),
-      ],
-    }),
-    languageId: filter.pathExists((id) => [
-      node('node'),
-      relation('out', '', 'engagement', ACTIVE),
-      node('', 'LanguageEngagement'),
-      relation('out', '', 'language', ACTIVE),
-      node('', 'Language', { id }),
-    ]),
-    sensitivity:
-      ({ value, query }) =>
-      () =>
-        value
-          ? query
-              .apply(matchProjectSens('node'))
-              .with('*')
-              .where({ sensitivity: inArray(value) })
-          : query,
-  });
+export const projectFilters = filter.define(() => ProjectFilters, {
+  type: filter.stringListBaseNodeProp(),
+  status: filter.stringListProp(),
+  onlyMultipleEngagements:
+    ({ value, query }) =>
+    () =>
+      value
+        ? query
+            .match([
+              node('node'),
+              relation('out', '', 'engagement', ACTIVE),
+              node('engagement', 'Engagement'),
+            ])
+            .with('node, count(engagement) as engagementCount')
+            .where({ engagementCount: greaterThan(1) })
+        : null,
+  step: filter.stringListProp(),
+  createdAt: filter.dateTimeBaseNodeProp(),
+  modifiedAt: filter.dateTimeProp(),
+  mine: filter.pathExistsWhenTrue([
+    node('requestingUser'),
+    relation('in', '', 'user'),
+    node('', 'ProjectMember'),
+    relation('in', '', 'member'),
+    node('node'),
+  ]),
+  pinned: filter.isPinned,
+  presetInventory: filter.propVal(),
+  partnerId: filter.pathExists((id) => [
+    node('node'),
+    relation('out', '', 'partnership', ACTIVE),
+    node('', 'Partnership'),
+    relation('out', '', 'partner', ACTIVE),
+    node('', 'Partner', { id }),
+  ]),
+  userId: ({ value }) => ({
+    userId: [
+      // TODO We can leak if the project includes this person, if the
+      // requesting user does not have access to view the project's members.
+      path([
+        node('node'),
+        relation('out', '', 'member', ACTIVE),
+        node('', 'ProjectMember'),
+        relation('out', '', 'user', ACTIVE),
+        node('', 'User', { id: value }),
+      ]),
+      // TODO does it make sense to include interns in this filter?
+      path([
+        node('node'),
+        relation('out', '', 'engagement', ACTIVE),
+        node('', 'Engagement'),
+        relation('out', '', 'intern', ACTIVE),
+        node('', 'User', { id: value }),
+      ]),
+    ],
+  }),
+  languageId: filter.pathExists((id) => [
+    node('node'),
+    relation('out', '', 'engagement', ACTIVE),
+    node('', 'LanguageEngagement'),
+    relation('out', '', 'language', ACTIVE),
+    node('', 'Language', { id }),
+  ]),
+  sensitivity:
+    ({ value, query }) =>
+    () =>
+      value
+        ? query
+            .apply(matchProjectSens('node'))
+            .with('*')
+            .where({ sensitivity: inArray(value) })
+        : query,
+});

src/components/project/project.repository.ts

@@ -38,7 +38,7 @@ import {
   stepToStatus,
   UpdateProject,
 } from './dto';
-import { projectListFilter } from './list-filter.query';
+import { projectFilters } from './list-filter.query';
 
 @Injectable()
 export class ProjectRepository extends CommonRepository {
@@ -285,7 +285,7 @@ export class ProjectRepository extends CommonRepository {
       .matchNode('node', 'Project')
       .with('distinct(node) as node, node as project')
       .match(requestingUser(session))
-      .apply(projectListFilter(input))
+      .apply(projectFilters(input.filter))
       .apply(this.privileges.for(session, IProject).filterToReadable())
       .apply(sortWith(projectSorters, input))
       .apply(paginate(input, this.hydrate(session.userId)))