Refactor Engagement relationship IDs to Links

Co-authored-by: Bryan Nelson <[email protected]>

Author: CarsonF

src/components/ceremony/handlers/create-engagement-default-ceremony.handler.ts

@@ -48,7 +48,7 @@ export class CreateEngagementDefaultCeremonyHandler
 
     event.engagement = {
       ...engagement,
-      ceremony: ceremonyId,
+      ceremony: { id: ceremonyId },
     };
   }
 }

src/components/ceremony/handlers/delete-engagement-default-ceremony.handler.ts

@@ -16,7 +16,7 @@ export class DetachEngagementRootDirectoryHandler
       return;
     }
 
-    const ceremonyId = engagement?.ceremony?.value;
+    const ceremonyId = engagement?.ceremony?.value?.id;
     if (!ceremonyId) {
       return;
     }

src/components/engagement/dto/engagement.dto.ts

@@ -7,7 +7,6 @@ import {
   DateInterval,
   DateTimeField,
   DbLabel,
-  ID,
   IntersectTypes,
   parentIdMiddleware,
   Resource,
@@ -28,7 +27,6 @@ import { e } from '~/core/edgedb';
 import { LinkTo, RegisterResource } from '~/core/resources';
 import { ScopedRole } from '../../authorization/dto';
 import { ChangesetAware } from '../../changeset/dto';
-import { DefinedFile } from '../../file/dto';
 import { Product, SecuredMethodologies } from '../../product/dto';
 import {
   InternshipProject,
@@ -80,7 +78,7 @@ class Engagement extends Interfaces {
   @DbLabel('EngagementStatus')
   readonly status: SecuredEngagementStatus;
 
-  readonly ceremony: Secured<ID>;
+  readonly ceremony: Secured<LinkTo<'Ceremony'>>;
 
   @Field({
     description: 'Translation / Growth Plan complete date',
@@ -166,7 +164,7 @@ export class LanguageEngagement extends Engagement {
   @Field(() => TranslationProject)
   declare readonly parent: BaseNode;
 
-  readonly language: Secured<ID>;
+  readonly language: Secured<LinkTo<'Language'>>;
 
   @Field()
   readonly firstScripture: SecuredBoolean;
@@ -185,7 +183,7 @@ export class LanguageEngagement extends Engagement {
   @Field()
   readonly paratextRegistryId: SecuredString;
 
-  readonly pnp: DefinedFile;
+  readonly pnp: Secured<LinkTo<'File'>>;
 
   @Field()
   readonly historicGoal: SecuredString;
@@ -207,11 +205,11 @@ export class InternshipEngagement extends Engagement {
   @Field(() => InternshipProject)
   declare readonly parent: BaseNode;
 
-  readonly countryOfOrigin: Secured<ID | null>;
+  readonly countryOfOrigin: Secured<LinkTo<'Location'> | null>;
 
-  readonly intern: Secured<ID>;
+  readonly intern: Secured<LinkTo<'User'>>;
 
-  readonly mentor: Secured<ID | null>;
+  readonly mentor: Secured<LinkTo<'User'> | null>;
 
   @Field()
   @DbLabel('InternPosition')
@@ -221,7 +219,7 @@ export class InternshipEngagement extends Engagement {
   @DbLabel('ProductMethodology')
   readonly methodologies: SecuredMethodologies;
 
-  readonly growthPlan: DefinedFile;
+  readonly growthPlan: Secured<LinkTo<'File'>>;
 }
 
 export const engagementRange = (engagement: UnsecuredDto<Engagement>) =>

src/components/engagement/engagement.repository.ts

@@ -171,11 +171,12 @@ export class EngagementRepository extends CommonRepository {
               type: 'project.type',
               status: 'status.value',
             },
-            language: 'language.id',
-            ceremony: 'ceremony.id',
-            intern: 'intern.id',
-            countryOfOrigin: 'countryOfOrigin.id',
-            mentor: 'mentor.id',
+            language: 'language { .id }',
+            pnp: { id: 'props.pnp' },
+            ceremony: 'ceremony { .id }',
+            intern: 'intern { .id }',
+            countryOfOrigin: 'countryOfOrigin { .id }',
+            mentor: 'mentor { .id }',
             startDate: coalesce(
               'changedProps.startDateOverride',
               'props.startDateOverride',

src/components/engagement/engagement.resolver.ts

@@ -104,7 +104,7 @@ export class EngagementResolver {
     @Parent() engagement: Engagement,
     @Loader(CeremonyLoader) ceremonies: LoaderOf<CeremonyLoader>,
   ): Promise<SecuredCeremony> {
-    return await mapSecuredValue(engagement.ceremony, (id) =>
+    return await mapSecuredValue(engagement.ceremony, ({ id }) =>
       ceremonies.load(id),
     );
   }

src/components/engagement/internship-engagement.resolver.ts

@@ -24,23 +24,23 @@ export class InternshipEngagementResolver {
     @Parent() engagement: InternshipEngagement,
     @Loader(UserLoader) users: LoaderOf<UserLoader>,
   ): Promise<SecuredUser> {
-    return await mapSecuredValue(engagement.intern, (id) => users.load(id));
+    return await mapSecuredValue(engagement.intern, ({ id }) => users.load(id));
   }
 
   @ResolveField(() => SecuredUser)
   async mentor(
     @Parent() engagement: InternshipEngagement,
     @Loader(UserLoader) users: LoaderOf<UserLoader>,
   ): Promise<SecuredUser> {
-    return await mapSecuredValue(engagement.mentor, (id) => users.load(id));
+    return await mapSecuredValue(engagement.mentor, ({ id }) => users.load(id));
   }
 
   @ResolveField(() => SecuredLocation)
   async countryOfOrigin(
     @Parent() engagement: InternshipEngagement,
     @Loader(LocationLoader) locations: LoaderOf<LocationLoader>,
   ): Promise<SecuredLocation> {
-    return await mapSecuredValue(engagement.countryOfOrigin, (id) =>
+    return await mapSecuredValue(engagement.countryOfOrigin, ({ id }) =>
       locations.load(id),
     );
   }

src/components/engagement/language-engagement.resolver.ts

@@ -25,7 +25,7 @@ export class LanguageEngagementResolver {
     @Parent() engagement: LanguageEngagement,
     @Loader(LanguageLoader) languages: LoaderOf<LanguageLoader>,
   ): Promise<SecuredLanguage> {
-    return await mapSecuredValue(engagement.language, (id) =>
+    return await mapSecuredValue(engagement.language, ({ id }) =>
       languages.load({ id, view: viewOfChangeset(engagement.changeset) }),
     );
   }

src/components/product/handlers/extract-products-from-pnp.handler.ts

@@ -33,7 +33,7 @@ export class ExtractProductsFromPnpHandler
     }
     const availableSteps = getAvailableSteps({ methodology });
 
-    const file = await this.files.getFile(engagement.pnp, event.session);
+    const file = await this.files.getFile(engagement.pnp.id, event.session);
     const fv = await this.files.getFileVersion(
       file.latestVersionId,
       event.session,