Allow null for Partner.pointOfContact to clear it (#2909)

Author: CarsonF

src/components/partner/dto/partner.dto.ts

@@ -55,7 +55,7 @@ export class Partner extends Interfaces {
 
   readonly organization: Secured<ID>;
 
-  readonly pointOfContact: Secured<ID>;
+  readonly pointOfContact: Secured<ID | null>;
 
   @Field()
   readonly types: SecuredPartnerTypes;

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

@@ -15,7 +15,7 @@ export abstract class UpdatePartner {
   readonly id: ID;
 
   @IdField({ nullable: true })
-  readonly pointOfContactId?: ID;
+  readonly pointOfContactId?: ID | null;
 
   @Field(() => [PartnerType], { nullable: true })
   @Transform(({ value }) => uniq(value))

src/components/partner/partner.repository.ts

@@ -143,37 +143,6 @@ export class PartnerRepository extends DtoRepository<
         );
   }
 
-  async updatePointOfContact(id: ID, user: ID, session: Session) {
-    const createdAt = DateTime.local();
-    await this.db
-      .query()
-      .apply(matchRequestingUser(session))
-      .matchNode('partner', 'Partner', { id })
-      .matchNode('newPointOfContact', 'User', {
-        id: user,
-      })
-      .optionalMatch([
-        node('org'),
-        relation('out', 'oldPointOfContactRel', 'pointOfContact', {
-          active: true,
-        }),
-        node('pointOfContact', 'User'),
-      ])
-      .setValues({
-        'oldPointOfContactRel.active': false,
-      })
-      .with('*')
-      .create([
-        node('partner'),
-        relation('out', '', 'pointOfContact', {
-          active: true,
-          createdAt,
-        }),
-        node('newPointOfContact'),
-      ])
-      .run();
-  }
-
   async list({ filter, ...input }: PartnerListInput, session: Session) {
     const result = await this.db
       .query()

src/components/partner/partner.service.ts

@@ -130,8 +130,13 @@ export class PartnerService {
 
     await this.repo.updateProperties(partner, simpleChanges);
 
-    if (pointOfContactId) {
-      await this.repo.updatePointOfContact(input.id, pointOfContactId, session);
+    if (pointOfContactId !== undefined) {
+      await this.repo.updateRelation(
+        'pointOfContact',
+        'User',
+        input.id,
+        pointOfContactId,
+      );
     }
 
     if (languageOfWiderCommunicationId) {