Add Partner.languageOfReporting

Author: rdonigian

dbschema/partner.gel

@@ -31,6 +31,7 @@ module default {
 
     pointOfContact: User;
     languageOfWiderCommunication: Language;
+    languageOfReporting: Language;
 
     required organization: Organization {
       readonly := true;

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

@@ -50,6 +50,9 @@ export abstract class CreatePartner {
   @IdField({ nullable: true })
   readonly languageOfWiderCommunicationId?: ID<'Language'> | null;
 
+  @IdField({ nullable: true })
+  readonly languageOfReportingId?: ID<'Language'> | null;
+
   @Field(() => [IDType], { nullable: true })
   @IsId({ each: true })
   @Transform(({ value }) => uniq(value))

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

@@ -61,6 +61,8 @@ export class Partner extends Interfaces {
 
   readonly languageOfWiderCommunication: Secured<LinkTo<'Language'> | null>;
 
+  readonly languageOfReporting: Secured<LinkTo<'Language'> | null>;
+
   readonly fieldRegions: Required<
     Secured<ReadonlyArray<LinkTo<'FieldRegion'>>>
   >;

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

@@ -48,6 +48,9 @@ export abstract class UpdatePartner {
   @IdField({ nullable: true })
   readonly languageOfWiderCommunicationId?: ID<'Language'> | null;
 
+  @IdField({ nullable: true })
+  readonly languageOfReportingId?: ID<'Language'> | null;
+
   @ListField(() => IDType, { optional: true })
   @IsId({ each: true })
   readonly countries?: ReadonlyArray<ID<'Location'>>;

src/components/partner/partner.gel.repository.ts

@@ -14,6 +14,7 @@ export class PartnerGelRepository
       organization: true,
       pointOfContact: true,
       languageOfWiderCommunication: true,
+      languageOfReporting: true,
       fieldRegions: true,
       countries: true,
       languagesOfConsulting: true,

src/components/partner/partner.repository.ts

@@ -93,6 +93,7 @@ export class PartnerRepository extends DtoRepository(Partner) {
           fieldRegions: ['FieldRegion', input.fieldRegions],
           countries: ['Location', input.countries],
           languagesOfConsulting: ['Language', input.languagesOfConsulting],
+          languageOfReporting: ['Language', input.languageOfReportingId],
         }),
       )
       .apply(departmentIdBlockUtils.createMaybe(input.departmentIdBlock))
@@ -114,6 +115,7 @@ export class PartnerRepository extends DtoRepository(Partner) {
       id,
       pointOfContactId,
       languageOfWiderCommunicationId,
+      languageOfReportingId,
       fieldRegions,
       countries,
       languagesOfConsulting,
@@ -141,6 +143,15 @@ export class PartnerRepository extends DtoRepository(Partner) {
       );
     }
 
+    if (languageOfReportingId) {
+      await this.updateRelation(
+        'languageOfReporting',
+        'Language',
+        changes.id,
+        languageOfReportingId,
+      );
+    }
+
     if (countries) {
       try {
         await this.updateRelationList({
@@ -273,6 +284,11 @@ export class PartnerRepository extends DtoRepository(Partner) {
           relation('out', '', 'languageOfWiderCommunication', ACTIVE),
           node('languageOfWiderCommunication', 'Language'),
         ])
+        .optionalMatch([
+          node('node'),
+          relation('out', '', 'languageOfReporting', ACTIVE),
+          node('languageOfReporting', 'Language'),
+        ])
         .apply(departmentIdBlockUtils.hydrate())
         .return<{ dto: UnsecuredDto<Partner> }>(
           merge('props', {
@@ -282,6 +298,7 @@ export class PartnerRepository extends DtoRepository(Partner) {
             pointOfContact: 'pointOfContact { .id }',
             languageOfWiderCommunication:
               'languageOfWiderCommunication { .id }',
+            languageOfReporting: 'languageOfReporting { .id }',
             fieldRegions: 'fieldRegions',
             countries: 'countries',
             languagesOfConsulting: 'languagesOfConsulting',

src/components/partner/partner.resolver.ts

@@ -103,6 +103,16 @@ export class PartnerResolver {
     );
   }
 
+  @ResolveField(() => SecuredLanguageNullable)
+  async languageOfReporting(
+    @Parent() partner: Partner,
+    @Loader(LanguageLoader) languages: LoaderOf<LanguageLoader>,
+  ): Promise<SecuredLanguageNullable> {
+    return await mapSecuredValue(partner.languageOfReporting, ({ id }) =>
+      languages.load({ id, view: { active: true } }),
+    );
+  }
+
   @ResolveField(() => SecuredFieldRegions)
   async fieldRegions(
     @Parent() partner: Partner,