Make update properties/relations implementation details of repos

Author: CarsonF

src/components/authorization/policy/executor/user-resource-privileges.ts

@@ -13,7 +13,7 @@ import {
   UnauthorizedException,
   UnsecuredDto,
 } from '~/common';
-import { ChangesOf, isRelation } from '~/core/database/changes';
+import { AnyChangesOf, isRelation } from '~/core/database/changes';
 import {
   AnyAction,
   ChildListAction,
@@ -169,7 +169,7 @@ export class UserResourcePrivileges<
    * Verifies the current user can make the changes specified to the given object.
    */
   verifyChanges(
-    changes: ChangesOf<TResourceStatic['prototype']>,
+    changes: AnyChangesOf<TResourceStatic['prototype']>,
     {
       pathPrefix: pathPrefixProp,
     }: {

src/components/budget/budget-record.repository.ts

@@ -1,5 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { node, Query, relation } from 'cypher-query-builder';
+import { ChangesOf } from '~/core/database/changes';
 import {
   ID,
   labelForView,
@@ -21,7 +22,13 @@ import {
   paginate,
   sorting,
 } from '../../core/database/query';
-import { BudgetRecord, BudgetRecordListInput, CreateBudgetRecord } from './dto';
+import {
+  Budget,
+  BudgetRecord,
+  BudgetRecordListInput,
+  CreateBudgetRecord,
+  UpdateBudgetRecord,
+} from './dto';
 
 interface BudgetRecordHydrateArgs {
   recordVar?: string;
@@ -66,6 +73,14 @@ export class BudgetRecordRepository extends DtoRepository<
     return result.id;
   }
 
+  async update(
+    existing: BudgetRecord,
+    changes: ChangesOf<Budget, UpdateBudgetRecord>,
+    changeset?: ID,
+  ) {
+    return await this.updateProperties(existing, changes, changeset);
+  }
+
   async doesRecordExist(input: CreateBudgetRecord) {
     const result = await this.db
       .query()

src/components/budget/budget.repository.ts

@@ -1,6 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { inArray, node, Query, relation } from 'cypher-query-builder';
 import { pickBy } from 'lodash';
+import { ChangesOf } from '~/core/database/changes';
 import {
   ID,
   labelForView,
@@ -34,6 +35,7 @@ import {
   BudgetRecord,
   CreateBudget,
   BudgetStatus as Status,
+  UpdateBudget,
 } from './dto';
 
 @Injectable()
@@ -88,6 +90,16 @@ export class BudgetRepository extends DtoRepository<
     return result.id;
   }
 
+  async update(
+    existing: Budget,
+    simpleChanges: Omit<
+      ChangesOf<Budget, UpdateBudget>,
+      'universalTemplateFile'
+    >,
+  ) {
+    return await this.updateProperties(existing, simpleChanges);
+  }
+
   async readMany(ids: readonly ID[], session: Session, view?: ObjectView) {
     const label = labelForView('Budget', view);
     return await this.db

src/components/budget/budget.service.ts

@@ -228,7 +228,7 @@ export class BudgetService {
       universalTemplateFile,
       session,
     );
-    return await this.budgetRepo.updateProperties(budget, simpleChanges);
+    return await this.budgetRepo.update(budget, simpleChanges);
   }
 
   async updateRecord(
@@ -249,7 +249,7 @@ export class BudgetService {
     this.privileges.for(session, BudgetRecord, br).verifyChanges(changes);
 
     try {
-      const result = await this.budgetRecordsRepo.updateProperties(
+      const result = await this.budgetRecordsRepo.update(
         br,
         changes,
         changeset,

src/components/ceremony/ceremony.repository.ts

@@ -1,5 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { node, Query, relation } from 'cypher-query-builder';
+import { ChangesOf } from '~/core/database/changes';
 import { ID, Session, UnsecuredDto } from '../../common';
 import { DtoRepository } from '../../core';
 import {
@@ -12,7 +13,12 @@ import {
   requestingUser,
   sorting,
 } from '../../core/database/query';
-import { Ceremony, CeremonyListInput, CreateCeremony } from './dto';
+import {
+  Ceremony,
+  CeremonyListInput,
+  CreateCeremony,
+  UpdateCeremony,
+} from './dto';
 
 @Injectable()
 export class CeremonyRepository extends DtoRepository<
@@ -35,6 +41,13 @@ export class CeremonyRepository extends DtoRepository<
       .first();
   }
 
+  async update(
+    existing: Ceremony,
+    changes: ChangesOf<Ceremony, UpdateCeremony>,
+  ) {
+    return await this.updateProperties(existing, changes);
+  }
+
   protected hydrate(session: Session) {
     return (query: Query) =>
       query

src/components/ceremony/ceremony.service.ts

@@ -77,7 +77,7 @@ export class CeremonyService {
     const object = await this.readOne(input.id, session);
     const changes = this.ceremonyRepo.getActualChanges(object, input);
     this.privileges.for(session, Ceremony, object).verifyChanges(changes);
-    return await this.ceremonyRepo.updateProperties(object, changes);
+    return await this.ceremonyRepo.update(object, changes);
   }
 
   async delete(id: ID, session: Session): Promise<void> {

src/components/comments/comment.repository.ts

@@ -1,6 +1,7 @@
 import { forwardRef, Inject, Injectable } from '@nestjs/common';
 import { node, Query, relation } from 'cypher-query-builder';
 import { DateTime } from 'luxon';
+import { ChangesOf } from '~/core/database/changes';
 import { ID, Session, UnsecuredDto } from '../../common';
 import { DatabaseService, DtoRepository } from '../../core';
 import {
@@ -15,7 +16,12 @@ import {
   variable,
 } from '../../core/database/query';
 import { CommentThreadRepository } from './comment-thread.repository';
-import { Comment, CommentListInput, CreateCommentInput } from './dto';
+import {
+  Comment,
+  CommentListInput,
+  CreateCommentInput,
+  UpdateCommentInput,
+} from './dto';
 
 @Injectable()
 export class CommentRepository extends DtoRepository(Comment) {
@@ -56,6 +62,13 @@ export class CommentRepository extends DtoRepository(Comment) {
       .first();
   }
 
+  async update(
+    existing: UnsecuredDto<Comment>,
+    changes: ChangesOf<Comment, UpdateCommentInput>,
+  ) {
+    await this.updateProperties(existing, changes);
+  }
+
   override hydrate() {
     return (query: Query) =>
       query

src/components/comments/comment.service.ts

@@ -136,7 +136,7 @@ export class CommentService {
 
     const changes = this.repo.getActualChanges(object, input);
     this.privileges.for(session, Comment, object).verifyChanges(changes);
-    await this.repo.updateProperties(object, changes);
+    await this.repo.update(object, changes);
 
     return await this.readOne(input.id, session);
   }

src/components/engagement/engagement.repository.ts

@@ -17,7 +17,7 @@ import {
   viewOfChangeset,
 } from '../../common';
 import { CommonRepository, DatabaseService, OnIndex } from '../../core';
-import { DbChanges, getChanges } from '../../core/database/changes';
+import { ChangesOf, getChanges } from '../../core/database/changes';
 import {
   ACTIVE,
   coalesce,
@@ -45,6 +45,8 @@ import {
   IEngagement,
   InternshipEngagement,
   LanguageEngagement,
+  UpdateInternshipEngagement,
+  UpdateLanguageEngagement,
 } from './dto';
 
 export type LanguageOrEngagementId = MergeExclusive<
@@ -261,100 +263,52 @@ export class EngagementRepository extends CommonRepository {
 
   getActualLanguageChanges = getChanges(LanguageEngagement);
 
-  async updateLanguageProperties(
-    object: LanguageEngagement | UnsecuredDto<LanguageEngagement>,
-    changes: DbChanges<LanguageEngagement>,
+  async updateLanguage(
+    existing: LanguageEngagement | UnsecuredDto<LanguageEngagement>,
+    changes: ChangesOf<LanguageEngagement, UpdateLanguageEngagement>,
     changeset?: ID,
   ): Promise<void> {
+    const { pnp, ...simpleChanges } = changes;
+
     await this.db.updateProperties({
       type: LanguageEngagement,
-      object,
-      changes,
+      object: existing,
+      changes: simpleChanges,
       changeset,
     });
   }
 
   getActualInternshipChanges = getChanges(InternshipEngagement);
 
-  async updateMentor(id: ID, mentorId: ID) {
-    await this.db
-      .query()
-      .match([node('newMentorUser', 'User', { id: mentorId })])
-      .match([
-        node('internshipEngagement', 'InternshipEngagement', {
-          id,
-        }),
-      ])
-      .optionalMatch([
-        node('internshipEngagement'),
-        relation('out', 'rel', 'mentor', ACTIVE),
-        node('oldMentorUser', 'User'),
-      ])
-      .set({
-        values: {
-          rel: {
-            active: false,
-          },
-        },
-      })
-      .create([
-        node('internshipEngagement'),
-        relation('out', '', 'mentor', {
-          active: true,
-          createdAt: DateTime.local(),
-        }),
-        node('newMentorUser'),
-      ])
-      .return('internshipEngagement.id as id')
-      .run();
-  }
-
-  async updateCountryOfOrigin(id: ID, countryOfOriginId: ID) {
-    await this.db
-      .query()
-      .match([
-        node('newCountry', 'Location', {
-          id: countryOfOriginId,
-        }),
-      ])
-      .match([
-        node('internshipEngagement', 'InternshipEngagement', {
-          id,
-        }),
-      ])
-      .optionalMatch([
-        node('internshipEngagement'),
-        relation('out', 'rel', 'countryOfOrigin', ACTIVE),
-        node('oldCountry', 'Location'),
-      ])
-      .set({
-        values: {
-          rel: {
-            active: false,
-          },
-        },
-      })
-      .create([
-        node('internshipEngagement'),
-        relation('out', '', 'countryOfOrigin', {
-          active: true,
-          createdAt: DateTime.local(),
-        }),
-        node('newCountry'),
-      ])
-      .return('internshipEngagement.id as id')
-      .run();
-  }
-
-  async updateInternshipProperties(
-    object: InternshipEngagement | UnsecuredDto<InternshipEngagement>,
-    changes: DbChanges<InternshipEngagement>,
+  async updateInternship(
+    existing: InternshipEngagement | UnsecuredDto<InternshipEngagement>,
+    changes: ChangesOf<InternshipEngagement, UpdateInternshipEngagement>,
     changeset?: ID,
   ): Promise<void> {
+    const {
+      mentorId,
+      countryOfOriginId,
+      growthPlan: _,
+      ...simpleChanges
+    } = changes;
+
+    if (mentorId !== undefined) {
+      await this.updateRelation('mentor', 'User', existing.id, mentorId);
+    }
+
+    if (countryOfOriginId !== undefined) {
+      await this.updateRelation(
+        'countryOfOrigin',
+        'Location',
+        existing.id,
+        countryOfOriginId,
+      );
+    }
+
     await this.db.updateProperties({
       type: InternshipEngagement,
-      object,
-      changes,
+      object: existing,
+      changes: simpleChanges,
       changeset,
     });
   }