Merge pull request #3275 from SeedCompany/intern-name-filter

Author: CarsonF

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

@@ -8,6 +8,7 @@ import {
 } from '~/common';
 import { LanguageFilters } from '../../language/dto';
 import { ProjectFilters } from '../../project/dto';
+import { UserFilters } from '../../user/dto';
 import {
   Engagement,
   IEngagement,
@@ -26,6 +27,8 @@ export abstract class EngagementFilters {
 
   @Field({
     nullable: true,
+    description:
+      'Only engagements whose project or engaged entity (language / user) name match',
   })
   readonly name?: string;
 
@@ -38,10 +41,20 @@ export abstract class EngagementFilters {
   @FilterField(() => ProjectFilters)
   readonly project?: ProjectFilters & {};
 
+  @Field({
+    nullable: true,
+    description:
+      'Only engagements whose engaged entity (language / user) name match',
+  })
+  readonly engagedName?: string;
+
   readonly languageId?: ID;
   @FilterField(() => LanguageFilters)
   readonly language?: LanguageFilters & {};
 
+  @FilterField(() => UserFilters)
+  readonly intern?: UserFilters & {};
+
   readonly partnerId?: ID<'Partner'>;
 }
 

src/components/engagement/engagement.repository.ts

@@ -58,6 +58,7 @@ import {
 import { ProjectType } from '../project/dto';
 import { projectFilters } from '../project/project-filters.query';
 import { projectSorters } from '../project/project.repository';
+import { userFilters } from '../user';
 import {
   CreateInternshipEngagement,
   CreateLanguageEngagement,
@@ -518,6 +519,7 @@ export class EngagementRepository extends CommonRepository {
   @OnIndex('schema')
   private async createSchemaIndexes() {
     await this.db.query().apply(NameIndex.create()).run();
+    await this.db.query().apply(EngagedNameIndex.create()).run();
     await this.db.query().apply(LanguageNameIndex.create()).run();
     await this.db.query().apply(InternshipNameIndex.create()).run();
   }
@@ -552,6 +554,22 @@ export const engagementFilters = filter.define(() => EngagementFilters, {
     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'),
@@ -592,6 +610,15 @@ export const engagementFilters = filter.define(() => EngagementFilters, {
         node('node', 'Language'),
       ]),
   ),
+  intern: filter.sub(() => userFilters)((sub) =>
+    sub
+      .with('node as eng')
+      .match([
+        node('eng'),
+        relation('out', '', 'intern'),
+        node('node', 'User'),
+      ]),
+  ),
 });
 
 export const engagementSorters = defineSorters(IEngagement, {
@@ -714,6 +741,12 @@ const NameIndex = FullTextIndex({
   properties: 'value',
   analyzer: 'standard-folding',
 });
+const EngagedNameIndex = FullTextIndex({
+  indexName: 'EngagedName',
+  labels: ['LanguageName', 'LanguageDisplayName', 'UserName'],
+  properties: 'value',
+  analyzer: 'standard-folding',
+});
 const LanguageNameIndex = FullTextIndex({
   indexName: 'LanguageEngagementName',
   labels: ['ProjectName', 'LanguageName', 'LanguageDisplayName'],

src/components/user/dto/list-users.dto.ts

@@ -4,6 +4,11 @@ import { User } from './user.dto';
 
 @InputType()
 export abstract class UserFilters {
+  @Field({
+    nullable: true,
+  })
+  readonly name?: string;
+
   @Field({
     description: 'Only users that are pinned/unpinned by the requesting user',
     nullable: true,

src/components/user/user.repository.ts

@@ -10,14 +10,15 @@ import {
   Session,
   UnsecuredDto,
 } from '~/common';
-import { DtoRepository, UniquenessError } from '~/core/database';
+import { DtoRepository, OnIndex, UniquenessError } from '~/core/database';
 import {
   ACTIVE,
   createNode,
   createProperty,
   deactivateProperty,
   defineSorters,
   filter,
+  FullTextIndex,
   matchProps,
   merge,
   paginate,
@@ -32,6 +33,7 @@ import {
   SystemAgent,
   UpdateUser,
   User,
+  UserFilters,
   UserListInput,
 } from './dto';
 
@@ -224,11 +226,7 @@ export class UserRepository extends DtoRepository<typeof User, [Session | ID]>(
       .query()
       .matchNode('node', 'User')
       .match(requestingUser(session))
-      .apply(
-        filter.builder(input.filter ?? {}, {
-          pinned: filter.isPinned,
-        }),
-      )
+      .apply(userFilters(input.filter))
       .apply(this.privileges.forUser(session).filterToReadable())
       .apply(sortWith(userSorters, input))
       .apply(paginate(input, this.hydrate(session.userId)))
@@ -364,6 +362,36 @@ export class UserRepository extends DtoRepository<typeof User, [Session | ID]>(
   hydrateAsNeo4j(session: Session | ID) {
     return this.hydrate(session);
   }
+
+  @OnIndex('schema')
+  private async createSchemaIndexes() {
+    await this.db.query().apply(NameIndex.create()).run();
+  }
 }
 
+export const userFilters = filter.define(() => UserFilters, {
+  pinned: filter.isPinned,
+  name: filter.fullText({
+    index: () => NameIndex,
+    matchToNode: (q) =>
+      q.match([
+        node('node', 'User'),
+        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,
+  }),
+});
+
 export const userSorters = defineSorters(User, {});
+
+const NameIndex = FullTextIndex({
+  indexName: 'UserName',
+  labels: 'UserName',
+  properties: 'value',
+  analyzer: 'standard-folding',
+});