Merge pull request #3262 from SeedCompany/location-filters

Author: CarsonF

src/components/location/dto/list-locations.dto.ts

@@ -1,4 +1,4 @@
-import { InputType, ObjectType } from '@nestjs/graphql';
+import { Field, InputType, ObjectType } from '@nestjs/graphql';
 import {
   FilterField,
   ID,
@@ -10,14 +10,19 @@ import { Location } from './location.dto';
 
 @InputType()
 export abstract class LocationFilters {
+  @Field({
+    nullable: true,
+  })
+  readonly name?: string;
+
   readonly fundingAccountId?: ID;
 }
 
 @InputType()
 export class LocationListInput extends SortablePaginationInput<keyof Location>({
   defaultSort: 'name',
 }) {
-  @FilterField(() => LocationFilters, { internal: true })
+  @FilterField(() => LocationFilters)
   readonly filter?: LocationFilters;
 }
 

src/components/location/location.repository.ts

@@ -9,12 +9,14 @@ import {
   Session,
   UnsecuredDto,
 } from '~/common';
-import { DtoRepository } from '~/core/database';
+import { DtoRepository, OnIndex } from '~/core/database';
 import {
   ACTIVE,
   createNode,
   createRelationships,
   defineSorters,
+  filter,
+  FullTextIndex,
   matchProps,
   merge,
   paginate,
@@ -25,6 +27,7 @@ import { FileId } from '../file/dto';
 import {
   CreateLocation,
   Location,
+  LocationFilters,
   LocationListInput,
   UpdateLocation,
 } from './dto';
@@ -157,10 +160,11 @@ export class LocationRepository extends DtoRepository(Location) {
         );
   }
 
-  async list({ filter, ...input }: LocationListInput) {
+  async list(input: LocationListInput) {
     const result = await this.db
       .query()
       .matchNode('node', 'Location')
+      .apply(locationFilters(input.filter))
       .apply(sortWith(locationSorters, input))
       .apply(paginate(input, this.hydrate()))
       .first();
@@ -231,6 +235,35 @@ export class LocationRepository extends DtoRepository(Location) {
       .first();
     return !!result;
   }
+
+  @OnIndex('schema')
+  private async createSchemaIndexes() {
+    await this.db.query().apply(NameIndex.create()).run();
+  }
 }
 
 export const locationSorters = defineSorters(Location, {});
+
+export const locationFilters = filter.define(() => LocationFilters, {
+  name: filter.fullText({
+    index: () => NameIndex,
+    matchToNode: (q) =>
+      q.match([
+        node('node', 'Location'),
+        relation('out', '', undefined, ACTIVE),
+        node('match'),
+      ]),
+  }),
+  fundingAccountId: filter.pathExists((id) => [
+    node('node'),
+    relation('out', '', 'fundingAccount', ACTIVE),
+    node('', 'FundingAccount', { id }),
+  ]),
+});
+
+const NameIndex = FullTextIndex({
+  indexName: 'LocationName',
+  labels: 'LocationName',
+  properties: 'value',
+  analyzer: 'standard-folding',
+});

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

@@ -11,6 +11,7 @@ import {
   Sensitivity,
   SortablePaginationInput,
 } from '~/common';
+import { LocationFilters } from '../../location/dto';
 import { PartnershipFilters } from '../../partnership/dto';
 import { ProjectStatus } from './project-status.enum';
 import { ProjectStep } from './project-step.enum';
@@ -103,6 +104,9 @@ export abstract class ProjectFilters {
 
   @FilterField(() => PartnershipFilters)
   readonly primaryPartnership?: PartnershipFilters & {};
+
+  @FilterField(() => LocationFilters)
+  readonly primaryLocation?: LocationFilters & {};
 }
 
 @InputType()

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

@@ -6,6 +6,7 @@ import {
   path,
   variable,
 } from '~/core/database/query';
+import { locationFilters } from '../location/location.repository';
 import { partnershipFilters } from '../partnership/partnership.repository';
 import { ProjectFilters } from './dto';
 import { ProjectNameIndex } from './project.repository';
@@ -103,4 +104,13 @@ export const projectFilters = filter.define(() => ProjectFilters, {
         node('', 'Property', { value: variable('true') }),
       ]),
   ),
+  primaryLocation: filter.sub(() => locationFilters)((sub) =>
+    sub
+      .with('node as project')
+      .match([
+        node('project'),
+        relation('out', '', 'primaryLocation', ACTIVE),
+        node('node', 'Location'),
+      ]),
+  ),
 });