Merge pull request #3302 from SeedCompany/neo4j/filter-perf

Neo4j Filter Performance
SeedCompany · Oct 4, 2024 · fba9266 · fba9266
2 parents f292865 + 15cd13e
commit fba9266
Show file tree

Hide file tree

Showing 12 changed files with 225 additions and 230 deletions.
diff --git a/src/components/engagement/engagement.repository.ts b/src/components/engagement/engagement.repository.ts
@@ -699,41 +699,6 @@ export const engagementFilters = filter.define(() => EngagementFilters, {
     ),
   }),
   status: filter.stringListProp(),
-  name: filter.fullText({
-    index: () => NameIndex,
-    matchToNode: (q) =>
-      q.match([
-        node('node', 'Engagement'),
-        relation('either', '', undefined, ACTIVE),
-        node('', 'BaseNode'),
-        relation('out', '', undefined, ACTIVE),
-        node('match'),
-      ]),
-    // UI joins project & language/intern names with dash
-    // Remove it from search if users type it
-    normalizeInput: (v) => v.replaceAll(/ -/g, ''),
-    // Treat each word as a separate search term
-    // Each word could point to a different node
-    // i.e. "project - language"
-    separateQueryForEachWord: true,
-    minScore: 0.9,
-  }),
-  engagedName: filter.fullText({
-    index: () => EngagedNameIndex,
-    matchToNode: (q) =>
-      q.match([
-        node('node', 'Engagement'),
-        relation('out', '', undefined, ACTIVE),
-        node('', 'BaseNode'),
-        relation('out', '', undefined, ACTIVE),
-        node('match'),
-      ]),
-    // Treat each word as a separate search term
-    // Each word could point to a different node
-    // i.e. "first - last"
-    separateQueryForEachWord: true,
-    minScore: 0.9,
-  }),
   projectId: filter.pathExists((id) => [
     node('node'),
     relation('in', '', 'engagement'),
@@ -753,36 +718,6 @@ export const engagementFilters = filter.define(() => EngagementFilters, {
     relation('out', '', 'language'),
     node('', 'Language', { id }),
   ]),
-  project: filter.sub(
-    () => projectFilters,
-    'requestingUser',
-  )((sub) =>
-    sub
-      .with('node as eng, requestingUser')
-      .match([
-        node('eng'),
-        relation('in', '', 'engagement'),
-        node('node', 'Project'),
-      ]),
-  ),
-  language: filter.sub(() => languageFilters)((sub) =>
-    sub
-      .with('node as eng')
-      .match([
-        node('eng'),
-        relation('out', '', 'language'),
-        node('node', 'Language'),
-      ]),
-  ),
-  intern: filter.sub(() => userFilters)((sub) =>
-    sub
-      .with('node as eng')
-      .match([
-        node('eng'),
-        relation('out', '', 'intern'),
-        node('node', 'User'),
-      ]),
-  ),
   startDate: filter.dateTime(({ query }) => {
     query.optionalMatch([
       [
@@ -817,6 +752,65 @@ export const engagementFilters = filter.define(() => EngagementFilters, {
     ]);
     return coalesce('endDateOverride.value', 'mouEnd.value');
   }),
+  name: filter.fullText({
+    index: () => NameIndex,
+    matchToNode: (q) =>
+      q.match([
+        node('node', 'Engagement'),
+        relation('either', '', undefined, ACTIVE),
+        node('', 'BaseNode'),
+        relation('out', '', undefined, ACTIVE),
+        node('match'),
+      ]),
+    // UI joins project & language/intern names with dash
+    // Remove it from search if users type it
+    normalizeInput: (v) => v.replaceAll(/ -/g, ''),
+    // Treat each word as a separate search term
+    // Each word could point to a different node
+    // i.e. "project - language"
+    separateQueryForEachWord: true,
+    minScore: 0.9,
+  }),
+  engagedName: filter.fullText({
+    index: () => EngagedNameIndex,
+    matchToNode: (q) =>
+      q.match([
+        node('node', 'Engagement'),
+        relation('out', '', undefined, ACTIVE),
+        node('', 'BaseNode'),
+        relation('out', '', undefined, ACTIVE),
+        node('match'),
+      ]),
+    // Treat each word as a separate search term
+    // Each word could point to a different node
+    // i.e. "first - last"
+    separateQueryForEachWord: true,
+    minScore: 0.9,
+  }),
+  project: filter.sub(
+    () => projectFilters,
+    'requestingUser',
+  )((sub) =>
+    sub.match([
+      node('outer'),
+      relation('in', '', 'engagement'),
+      node('node', 'Project'),
+    ]),
+  ),
+  language: filter.sub(() => languageFilters)((sub) =>
+    sub.match([
+      node('outer'),
+      relation('out', '', 'language'),
+      node('node', 'Language'),
+    ]),
+  ),
+  intern: filter.sub(() => userFilters)((sub) =>
+    sub.match([
+      node('outer'),
+      relation('out', '', 'intern'),
+      node('node', 'User'),
+    ]),
+  ),
 });
 
 export const engagementSorters = defineSorters(IEngagement, {

diff --git a/src/components/language/language.repository.ts b/src/components/language/language.repository.ts
@@ -280,15 +280,7 @@ export class LanguageRepository extends DtoRepository<
 }
 
 export const languageFilters = filter.define(() => LanguageFilters, {
-  name: filter.fullText({
-    index: () => NameIndex,
-    matchToNode: (q) =>
-      q.match([
-        node('node', 'Language'),
-        relation('out', '', undefined, ACTIVE),
-        node('match'),
-      ]),
-  }),
+  pinned: filter.isPinned,
   sensitivity: filter.stringListProp(),
   leastOfThese: filter.propVal(),
   isSignLanguage: filter.propVal(),
@@ -308,21 +300,27 @@ export const languageFilters = filter.define(() => LanguageFilters, {
     relation('out', '', 'partner', ACTIVE),
     node('', 'Partner', { id }),
   ]),
+  name: filter.fullText({
+    index: () => NameIndex,
+    matchToNode: (q) =>
+      q.match([
+        node('node', 'Language'),
+        relation('out', '', undefined, ACTIVE),
+        node('match'),
+      ]),
+  }),
+  ethnologue: filter.sub(() => ethnologueFilters)((sub) =>
+    sub.match([
+      node('outer'),
+      relation('out', '', 'ethnologue'),
+      node('node', 'EthnologueLanguage'),
+    ]),
+  ),
   presetInventory: ({ value, query }) => {
     query.apply(isPresetInventory).with('*');
     const condition = equals('true', true);
     return { presetInventory: value ? condition : not(condition) };
   },
-  pinned: filter.isPinned,
-  ethnologue: filter.sub(() => ethnologueFilters)((sub) =>
-    sub
-      .with('node as lang')
-      .match([
-        node('lang'),
-        relation('out', '', 'ethnologue'),
-        node('node', 'EthnologueLanguage'),
-      ]),
-  ),
 });
 
 const ethnologueFilters = filter.define(() => EthnologueLanguageFilters, {

diff --git a/src/components/location/location.repository.ts b/src/components/location/location.repository.ts
@@ -245,6 +245,11 @@ export class LocationRepository extends DtoRepository(Location) {
 export const locationSorters = defineSorters(Location, {});
 
 export const locationFilters = filter.define(() => LocationFilters, {
+  fundingAccountId: filter.pathExists((id) => [
+    node('node'),
+    relation('out', '', 'fundingAccount', ACTIVE),
+    node('', 'FundingAccount', { id }),
+  ]),
   name: filter.fullText({
     index: () => NameIndex,
     matchToNode: (q) =>
@@ -254,11 +259,6 @@ export const locationFilters = filter.define(() => LocationFilters, {
         node('match'),
       ]),
   }),
-  fundingAccountId: filter.pathExists((id) => [
-    node('node'),
-    relation('out', '', 'fundingAccount', ACTIVE),
-    node('', 'FundingAccount', { id }),
-  ]),
 });
 
 const NameIndex = FullTextIndex({

diff --git a/src/components/partner/partner.repository.ts b/src/components/partner/partner.repository.ts
@@ -312,13 +312,11 @@ export const partnerFilters = filters.define(() => PartnerFilters, {
     node('', 'User', { id }),
   ]),
   organization: filter.sub(() => organizationFilters)((sub) =>
-    sub
-      .with('node as partner')
-      .match([
-        node('partner'),
-        relation('out', '', 'organization'),
-        node('node', 'Organization'),
-      ]),
+    sub.match([
+      node('outer'),
+      relation('out', '', 'organization'),
+      node('node', 'Organization'),
+    ]),
   ),
 });
 

diff --git a/src/components/partnership/partnership.repository.ts b/src/components/partnership/partnership.repository.ts
@@ -429,13 +429,11 @@ export const partnershipFilters = filter.define(() => PartnershipFilters, {
   projectId: filter.skip,
   types: filter.intersectsProp(),
   partner: filter.sub(() => partnerFilters)((sub) =>
-    sub
-      .with('node as partnership')
-      .match([
-        node('partnership'),
-        relation('out', '', 'partner'),
-        node('node', 'Partner'),
-      ]),
+    sub.match([
+      node('outer'),
+      relation('out', '', 'partner'),
+      node('node', 'Partner'),
+    ]),
   ),
 });
 

diff --git a/src/components/periodic-report/periodic-report.repository.ts b/src/components/periodic-report/periodic-report.repository.ts
@@ -190,18 +190,7 @@ export class PeriodicReportRepository extends DtoRepository<
     const result = await this.db
       .query()
       .matchNode('node', 'PeriodicReport')
-      .apply(
-        filter.builder(filters, {
-          parent: filter.pathExists((id) => [
-            node('', 'BaseNode', { id }),
-            relation('out', '', 'report', ACTIVE),
-            node('node'),
-          ]),
-          start: filter.dateTimeProp(),
-          end: filter.dateTimeProp(),
-          type: ({ value }) => ({ node: hasLabel(`${value}Report`) }),
-        }),
-      )
+      .apply(periodicReportFilters(filters))
       .apply(sorting(resource, input))
       .apply(paginate(input, this.hydrate(session)))
       .first();
@@ -460,6 +449,19 @@ export const matchCurrentDue =
       ])
       .limit(1);
 
+export const periodicReportFilters = filter.define<
+  Pick<PeriodicReportListInput, 'type' | 'start' | 'end' | 'parent'>
+>(() => undefined as any, {
+  type: ({ value }) => ({ node: hasLabel(`${value}Report`) }),
+  parent: filter.pathExists((id) => [
+    node('', 'BaseNode', { id }),
+    relation('out', '', 'report', ACTIVE),
+    node('node'),
+  ]),
+  start: filter.dateTimeProp(),
+  end: filter.dateTimeProp(),
+});
+
 export const periodicReportSorters = defineSorters(IPeriodicReport, {});
 
 export const progressReportSorters = defineSorters(ProgressReport, {

diff --git a/src/components/product/product.repository.ts b/src/components/product/product.repository.ts
@@ -54,6 +54,7 @@ import {
   ProducibleType,
   Product,
   ProductCompletionDescriptionSuggestionsInput,
+  ProductFilters,
   ProductListInput,
   ProgressMeasurement,
   UpdateDirectScriptureProduct,
@@ -505,14 +506,10 @@ export class ProductRepository extends CommonRepository {
           ...(approach ? ApproachToMethodologies[approach] : []),
           ...(methodology ? [methodology] : []),
         ];
-        filter.builder(
-          { ...rest, ...(merged.length ? { methodology: merged } : {}) },
-          {
-            engagementId: filter.skip,
-            placeholder: filter.isPropNotNull('placeholderDescription'),
-            methodology: filter.propVal(),
-          },
-        )(q);
+        productFilters({
+          ...rest,
+          ...(merged.length ? { methodology: merged } : {}),
+        })(q);
       })
       .apply(sorting(Product, input))
       .apply(paginate(input, this.hydrate(session)))
@@ -583,6 +580,16 @@ export class ProductRepository extends CommonRepository {
   }
 }
 
+export const productFilters = filter.define<
+  Omit<ProductFilters, 'approach' | 'methodology'> & {
+    methodology?: Methodology[];
+  }
+>(() => undefined as any, {
+  engagementId: filter.skip,
+  placeholder: filter.isPropNotNull('placeholderDescription'),
+  methodology: filter.stringListProp(),
+});
+
 const ProductCompletionDescriptionIndex = FullTextIndex({
   indexName: 'ProductCompletionDescription',
   labels: 'ProductCompletionDescription',

diff --git a/src/components/progress-report/media/progress-report-media.repository.ts b/src/components/progress-report/media/progress-report-media.repository.ts
@@ -48,16 +48,7 @@ export class ProgressReportMediaRepository extends DtoRepository<
         relation('out', '', 'child', ACTIVE),
         node('node', this.resource.dbLabel),
       ])
-      .apply(
-        filter.builder(
-          { variants: args.variants },
-          {
-            variants: ({ value }) => ({
-              'node.variant': inArray(value.map((v) => v.key)),
-            }),
-          },
-        ),
-      )
+      .apply(progressReportMediaFilters({ variants: args.variants }))
       .match(requestingUser(session))
       .apply(projectFromProgressReportChild)
       .apply(
@@ -298,3 +289,11 @@ export class ProgressReportMediaRepository extends DtoRepository<
         );
   }
 }
+
+export const progressReportMediaFilters = filter.define<
+  Pick<ListArgs, 'variants'>
+>(() => ListArgs, {
+  variants: ({ value }) => ({
+    'node.variant': inArray(value.map((v) => v.key)),
+  }),
+});