Merge pull request #3257 from SeedCompany/primary-partner

Author: CarsonF

src/components/organization/dto/list-organization.dto.ts

@@ -1,4 +1,4 @@
-import { InputType, ObjectType } from '@nestjs/graphql';
+import { Field, InputType, ObjectType } from '@nestjs/graphql';
 import {
   FilterField,
   ID,
@@ -10,6 +10,11 @@ import { Organization } from './organization.dto';
 
 @InputType()
 export abstract class OrganizationFilters {
+  @Field({
+    nullable: true,
+  })
+  readonly name?: string;
+
   readonly userId?: ID;
 }
 

src/components/organization/organization.repository.ts

@@ -7,10 +7,13 @@ import {
   Session,
   UnsecuredDto,
 } from '~/common';
-import { DtoRepository } from '~/core/database';
+import { DtoRepository, OnIndex } from '~/core/database';
 import {
   ACTIVE,
   createNode,
+  defineSorters,
+  filter,
+  FullTextIndex,
   matchProjectScopedRoles,
   matchProjectSens,
   matchProps,
@@ -19,11 +22,12 @@ import {
   paginate,
   rankSens,
   requestingUser,
-  sorting,
+  sortWith,
 } from '~/core/database/query';
 import {
   CreateOrganization,
   Organization,
+  OrganizationFilters,
   OrganizationListInput,
   UpdateOrganization,
 } from './dto';
@@ -111,20 +115,12 @@ export class OrganizationRepository extends DtoRepository<
         );
   }
 
-  async list({ filter, ...input }: OrganizationListInput, session: Session) {
+  async list(input: OrganizationListInput, session: Session) {
     const query = this.db
       .query()
       .matchNode('node', 'Organization')
-      .match([
-        ...(filter?.userId && session.userId
-          ? [
-              node('node'),
-              relation('in', '', 'organization', ACTIVE),
-              node('user', 'User', { id: filter.userId }),
-            ]
-          : []),
-      ])
       .match(requestingUser(session))
+      .apply(organizationFilters(input.filter))
       .apply(
         this.privileges.forUser(session).filterToReadable({
           wrapContext: (inner) => (query) =>
@@ -141,8 +137,40 @@ export class OrganizationRepository extends DtoRepository<
               .apply(oncePerProject(inner)),
         }),
       )
-      .apply(sorting(Organization, input))
+      .apply(sortWith(organizationSorters, input))
       .apply(paginate(input, this.hydrate(session)));
     return (await query.first())!; // result from paginate() will always have 1 row.
   }
+
+  @OnIndex('schema')
+  private async createSchemaIndexes() {
+    await this.db.query().apply(OrgNameIndex.create()).run();
+  }
 }
+
+export const organizationFilters = filter.define(() => OrganizationFilters, {
+  userId: filter.pathExists((id) => [
+    node('node'),
+    relation('in', '', 'organization', ACTIVE),
+    node('', 'User', { id }),
+  ]),
+  name: filter.fullText({
+    index: () => OrgNameIndex,
+    matchToNode: (q) =>
+      q.match([
+        node('node', 'Organization'),
+        relation('out', '', 'name', ACTIVE),
+        node('match'),
+      ]),
+    minScore: 0.8,
+  }),
+});
+
+export const organizationSorters = defineSorters(Organization, {});
+
+const OrgNameIndex = FullTextIndex({
+  indexName: 'OrganizationName',
+  labels: 'OrgName',
+  properties: 'value',
+  analyzer: 'standard-folding',
+});

src/components/partner/dto/list-partner.dto.ts

@@ -6,6 +6,7 @@ import {
   SecuredList,
   SortablePaginationInput,
 } from '~/common';
+import { OrganizationFilters } from '../../organization/dto';
 import { Partner } from './partner.dto';
 
 @InputType()
@@ -18,6 +19,9 @@ export abstract class PartnerFilters {
     nullable: true,
   })
   readonly pinned?: boolean;
+
+  @FilterField(() => OrganizationFilters)
+  readonly organization?: OrganizationFilters & {};
 }
 
 @InputType()

src/components/partner/partner.repository.ts

@@ -16,6 +16,8 @@ import {
   collect,
   createNode,
   createRelationships,
+  defineSorters,
+  filter,
   filter as filters,
   matchProjectScopedRoles,
   matchProjectSens,
@@ -25,9 +27,19 @@ import {
   paginate,
   rankSens,
   requestingUser,
-  sorting,
+  sortWith,
 } from '~/core/database/query';
-import { CreatePartner, Partner, PartnerListInput, UpdatePartner } from './dto';
+import {
+  organizationFilters,
+  organizationSorters,
+} from '../organization/organization.repository';
+import {
+  CreatePartner,
+  Partner,
+  PartnerFilters,
+  PartnerListInput,
+  UpdatePartner,
+} from './dto';
 
 @Injectable()
 export class PartnerRepository extends DtoRepository<
@@ -262,28 +274,12 @@ export class PartnerRepository extends DtoRepository<
         );
   }
 
-  async list({ filter, ...input }: PartnerListInput, session: Session) {
+  async list(input: PartnerListInput, session: Session) {
     const result = await this.db
       .query()
       .matchNode('node', 'Partner')
-      .match([
-        ...(filter?.userId && session.userId
-          ? [
-              node('node'),
-              relation('out', '', 'organization', ACTIVE),
-              node('', 'Organization'),
-              relation('in', '', 'organization', ACTIVE),
-              node('user', 'User', { id: filter.userId }),
-            ]
-          : []),
-      ])
       .match(requestingUser(session))
-      .apply(
-        filters.builder(filter ?? {}, {
-          pinned: filters.isPinned,
-          userId: filters.skip, // already applied above
-        }),
-      )
+      .apply(partnerFilters(input.filter))
       .apply(
         this.privileges.forUser(session).filterToReadable({
           wrapContext: (inner) => (query) =>
@@ -298,22 +294,52 @@ export class PartnerRepository extends DtoRepository<
               .apply(oncePerProject(inner)),
         }),
       )
-      .apply(
-        sorting(Partner, input, {
-          name: (query) =>
-            query
-              .match([
-                node('node'),
-                relation('out', '', 'organization', ACTIVE),
-                node('organization', 'Organization'),
-                relation('out', '', 'name', ACTIVE),
-                node('prop', 'Property'),
-              ])
-              .return<{ sortValue: string }>('prop.value as sortValue'),
-        }),
-      )
+      .apply(sortWith(partnerSorters, input))
       .apply(paginate(input, this.hydrate(session)))
       .first();
     return result!; // result from paginate() will always have 1 row.
   }
 }
+
+export const partnerFilters = filters.define(() => PartnerFilters, {
+  pinned: filters.isPinned,
+  userId: filters.pathExists((id) => [
+    node('node'),
+    relation('out', '', 'organization', ACTIVE),
+    node('', 'Organization'),
+    relation('in', '', 'organization', ACTIVE),
+    node('', 'User', { id }),
+  ]),
+  organization: filter.sub(() => organizationFilters)((sub) =>
+    sub
+      .with('node as partner')
+      .match([
+        node('partner'),
+        relation('out', '', 'organization'),
+        node('node', 'Organization'),
+      ]),
+  ),
+});
+
+export const partnerSorters = defineSorters(Partner, {
+  name: (query) =>
+    query
+      .match([
+        node('node'),
+        relation('out', '', 'organization', ACTIVE),
+        node('organization', 'Organization'),
+        relation('out', '', 'name', ACTIVE),
+        node('prop', 'Property'),
+      ])
+      .return<{ sortValue: string }>('prop.value as sortValue'),
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  'organization.*': (query, input) =>
+    query
+      .with('node as partner')
+      .match([
+        node('partner'),
+        relation('out', '', 'organization'),
+        node('node', 'Organization'),
+      ])
+      .apply(sortWith(organizationSorters, input)),
+});

src/components/partnership/dto/list-partnership.dto.ts

@@ -6,11 +6,15 @@ import {
   SecuredList,
   SortablePaginationInput,
 } from '~/common';
+import { PartnerFilters } from '../../partner/dto';
 import { Partnership } from './partnership.dto';
 
 @InputType()
 export abstract class PartnershipFilters {
   readonly projectId?: ID;
+
+  @FilterField(() => PartnerFilters)
+  readonly partner?: PartnerFilters & {};
 }
 
 @InputType()

src/components/partnership/dto/partnership.dto.ts

@@ -8,6 +8,7 @@ import {
   Secured,
   SecuredBoolean,
   SecuredDateNullable,
+  SecuredProperty,
   SecuredProps,
   Sensitivity,
   SensitivityField,
@@ -92,3 +93,8 @@ declare module '~/core/resources/map' {
     Partnership: typeof e.default.Partnership;
   }
 }
+
+@ObjectType({
+  description: SecuredProperty.descriptionFor('a partnership'),
+})
+export class SecuredPartnership extends SecuredProperty(Partnership) {}

src/components/partnership/partnership.repository.ts

@@ -20,6 +20,8 @@ import {
   coalesce,
   createNode,
   createRelationships,
+  defineSorters,
+  filter,
   INACTIVE,
   matchChangesetAndChangedProps,
   matchProps,
@@ -28,15 +30,17 @@ import {
   oncePerProject,
   paginate,
   requestingUser,
-  sorting,
+  sortWith,
   whereNotDeletedInChangeset,
 } from '~/core/database/query';
 import { FileService } from '../file';
 import { FileId } from '../file/dto';
+import { partnerFilters, partnerSorters } from '../partner/partner.repository';
 import {
   CreatePartnership,
   Partnership,
   PartnershipAgreementStatus,
+  PartnershipFilters,
   PartnershipListInput,
   UpdatePartnership,
 } from './dto';
@@ -233,12 +237,13 @@ export class PartnershipRepository extends DtoRepository<
           ),
       )
       .match(requestingUser(session))
+      .apply(partnershipFilters(input.filter))
       .apply(
         this.privileges.forUser(session).filterToReadable({
           wrapContext: oncePerProject,
         }),
       )
-      .apply(sorting(Partnership, input))
+      .apply(sortWith(partnershipSorters, input))
       .apply(paginate(input, this.hydrate(session, viewOfChangeset(changeset))))
       .first();
     return result!; // result from paginate() will always have 1 row.
@@ -398,3 +403,29 @@ export class PartnershipRepository extends DtoRepository<
     };
   }
 }
+
+export const partnershipFilters = filter.define(() => PartnershipFilters, {
+  projectId: filter.skip,
+  partner: filter.sub(() => partnerFilters)((sub) =>
+    sub
+      .with('node as partnership')
+      .match([
+        node('partnership'),
+        relation('out', '', 'partner'),
+        node('node', 'Partner'),
+      ]),
+  ),
+});
+
+export const partnershipSorters = defineSorters(Partnership, {
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  'partner.*': (query, input) =>
+    query
+      .with('node as partnership')
+      .match([
+        node('partnership'),
+        relation('out', '', 'partner'),
+        node('node', 'Partner'),
+      ])
+      .apply(sortWith(partnerSorters, input)),
+});

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

@@ -11,6 +11,7 @@ import {
   Sensitivity,
   SortablePaginationInput,
 } from '~/common';
+import { PartnershipFilters } from '../../partnership/dto';
 import { ProjectStatus } from './project-status.enum';
 import { ProjectStep } from './project-step.enum';
 import { ProjectType } from './project-type.enum';
@@ -99,6 +100,9 @@ export abstract class ProjectFilters {
   readonly partnerId?: ID;
 
   readonly userId?: ID;
+
+  @FilterField(() => PartnershipFilters)
+  readonly primaryPartnership?: PartnershipFilters & {};
 }
 
 @InputType()

src/components/project/dto/project.dto.ts

@@ -124,6 +124,8 @@ class Project extends Interfaces {
   @Calculated()
   readonly status: ProjectStatus;
 
+  readonly primaryPartnership: Secured<LinkTo<'Partnership'> | null>;
+
   readonly primaryLocation: Secured<LinkTo<'Location'> | null>;
 
   readonly marketingLocation: Secured<LinkTo<'Location'> | null>;