Merge branch 'develop'

Author: CarsonF

src/common/secured-mapper.ts

@@ -1,3 +1,6 @@
+import { DataLoader } from '@seedcompany/data-loader';
+import { NotFoundException } from './exceptions';
+import { ID } from './id-field';
 import { Secured, UnwrapSecured } from './secured-property';
 
 /**
@@ -15,3 +18,35 @@ export async function mapSecuredValue<T extends Secured<any>, S>(
   const mapped = await mapper(value);
   return { ...rest, value: mapped };
 }
+
+/**
+ * A helper to hydrate a secured id list with a DataLoader.
+ */
+export async function loadSecuredIds<TID extends ID, Res>(
+  loader: DataLoader<Res, ID>,
+  input: Secured<readonly TID[]>,
+): Promise<Required<Secured<readonly Res[]>>> {
+  const { value: ids, ...rest } = input;
+  const value = await loadManyIgnoreMissingThrowAny(loader, ids ?? []);
+  return { ...rest, value };
+}
+
+/**
+ * A helper to load many keys from a DataLoader,
+ * ignoring missing keys and throwing any other errors.
+ */
+export async function loadManyIgnoreMissingThrowAny<Key, Res>(
+  loader: DataLoader<Res, Key>,
+  keys: readonly Key[],
+): Promise<Required<readonly Res[]>> {
+  const loaded = (await loader.loadMany(keys)).flatMap((item) => {
+    if (item instanceof NotFoundException) {
+      return [];
+    } else if (item instanceof Error) {
+      throw item;
+    }
+
+    return item;
+  });
+  return loaded;
+}

src/components/changeset/enforce-changeset-editable.pipe.ts

@@ -4,7 +4,12 @@ import {
   DataLoaderStrategy,
 } from '@seedcompany/data-loader';
 import { isPlainObject } from 'lodash';
-import { ID, InputException, isIdLike } from '../../common';
+import {
+  ID,
+  InputException,
+  isIdLike,
+  loadManyIgnoreMissingThrowAny,
+} from '~/common';
 import { GqlContextHost, NotGraphQLContext } from '../../core';
 import { ResourceLoaderRegistry } from '../../core/resources/loader.registry';
 import { Changeset } from './dto';
@@ -61,11 +66,8 @@ export class EnforceChangesetEditablePipe implements PipeTransform {
       this.loaderRegistry.loaders.get('Changeset')!.factory;
     const loader = await this.loaderContext.getLoader(loaderFactory, context);
 
-    const changesets = await loader.loadMany(ids);
+    const changesets = await loadManyIgnoreMissingThrowAny(loader, ids);
     for (const changeset of changesets) {
-      if (changeset instanceof Error) {
-        throw changeset;
-      }
       if (!changeset.editable) {
         throw new InputException('Changeset is not editable');
       }

src/components/field-region/dto/field-region.dto.ts

@@ -8,6 +8,7 @@ import {
   Resource,
   Secured,
   SecuredProperty,
+  SecuredPropertyList,
   SecuredProps,
   SecuredString,
 } from '../../../common';
@@ -34,6 +35,11 @@ export class FieldRegion extends Resource {
 })
 export class SecuredFieldRegion extends SecuredProperty(FieldRegion) {}
 
+@ObjectType({
+  description: SecuredPropertyList.descriptionFor('a list of field regions'),
+})
+export class SecuredFieldRegions extends SecuredPropertyList(FieldRegion) {}
+
 declare module '~/core/resources/map' {
   interface ResourceMap {
     FieldRegion: typeof FieldRegion;

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

@@ -1,8 +1,9 @@
-import { Field, InputType, ObjectType } from '@nestjs/graphql';
+import { Field, ID as IDType, InputType, ObjectType } from '@nestjs/graphql';
 import { Transform, Type } from 'class-transformer';
 import { Matches, ValidateNested } from 'class-validator';
 import { uniq } from 'lodash';
-import { ID, IdField, IdOf, NameField } from '../../../common';
+import { ID, IdField, IdOf, IsId, NameField } from '../../../common';
+import { FieldRegion } from '../../field-region';
 import type { Language } from '../../language';
 import { FinancialReportingType } from '../../partnership/dto/financial-reporting-type';
 import { PartnerType } from './partner-type.enum';
@@ -41,6 +42,11 @@ export abstract class CreatePartner {
 
   @IdField({ nullable: true })
   readonly languageOfWiderCommunicationId?: IdOf<Language> | null;
+
+  @Field(() => [IDType], { nullable: true })
+  @IsId({ each: true })
+  @Transform(({ value }) => uniq(value))
+  readonly fieldRegions?: ReadonlyArray<IdOf<FieldRegion>> = [];
 }
 
 @InputType()

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

@@ -20,6 +20,7 @@ import {
   SensitivityField,
 } from '../../../common';
 import { ScopedRole } from '../../authorization';
+import { FieldRegion } from '../../field-region';
 import type { Language } from '../../language';
 import { FinancialReportingType } from '../../partnership/dto/financial-reporting-type';
 import { Pinnable } from '../../pin/dto';
@@ -76,6 +77,8 @@ export class Partner extends Interfaces {
 
   readonly languageOfWiderCommunication: Secured<IdOf<Language> | null>;
 
+  readonly fieldRegions: Required<Secured<ReadonlyArray<IdOf<FieldRegion>>>>;
+
   @DateTimeField()
   readonly modifiedAt: DateTime;
 

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

@@ -1,8 +1,9 @@
-import { Field, InputType, ObjectType } from '@nestjs/graphql';
+import { Field, ID as IDType, InputType, ObjectType } from '@nestjs/graphql';
 import { Transform, Type } from 'class-transformer';
 import { Matches, ValidateNested } from 'class-validator';
 import { uniq } from 'lodash';
-import { ID, IdField, IdOf, NameField } from '../../../common';
+import { ID, IdField, IdOf, IsId, NameField } from '../../../common';
+import { FieldRegion } from '../../field-region';
 import type { Language } from '../../language';
 import { FinancialReportingType } from '../../partnership/dto/financial-reporting-type';
 import { PartnerType } from './partner-type.enum';
@@ -41,6 +42,11 @@ export abstract class UpdatePartner {
 
   @IdField({ nullable: true })
   readonly languageOfWiderCommunicationId?: IdOf<Language> | null;
+
+  @Field(() => [IDType], { nullable: true })
+  @IsId({ each: true })
+  @Transform(({ value }) => (value ? uniq(value) : undefined))
+  readonly fieldRegions?: ReadonlyArray<IdOf<FieldRegion>>;
 }
 
 @InputType()

src/components/partner/partner.repository.ts

@@ -5,6 +5,7 @@ import { ID, ServerException, Session, UnsecuredDto } from '../../common';
 import { DtoRepository } from '../../core';
 import {
   ACTIVE,
+  collect,
   createNode,
   createRelationships,
   filter as filters,
@@ -62,6 +63,7 @@ export class PartnerRepository extends DtoRepository<
             'Language',
             input.languageOfWiderCommunicationId,
           ],
+          fieldRegions: ['FieldRegion', input.fieldRegions],
         }),
       )
       .return<{ id: ID }>('node.id as id')
@@ -103,6 +105,15 @@ export class PartnerRepository extends DtoRepository<
             .raw('WHERE size(projList) = 0')
             .return(`'High' as sensitivity`),
         )
+        .subQuery('node', (sub) =>
+          sub
+            .match([
+              node('node'),
+              relation('out', '', 'fieldRegions'),
+              node('fieldRegions', 'FieldRegion'),
+            ])
+            .return(collect('fieldRegions.id').as('fieldRegionsIds')),
+        )
         .apply(matchProps())
         .optionalMatch([
           node('node'),
@@ -125,6 +136,7 @@ export class PartnerRepository extends DtoRepository<
             organization: 'organization.id',
             pointOfContact: 'pointOfContact.id',
             languageOfWiderCommunication: 'languageOfWiderCommunication.id',
+            fieldRegions: 'fieldRegionsIds',
             scope: 'scopedRoles',
             pinned: 'exists((:User { id: $requestingUser })-[:pinned]->(node))',
           }).as('dto'),

src/components/partner/partner.resolver.ts

@@ -11,11 +11,13 @@ import {
   ID,
   IdArg,
   ListArg,
+  loadSecuredIds,
   LoggedInSession,
   mapSecuredValue,
   Session,
 } from '../../common';
 import { Loader, LoaderOf } from '../../core';
+import { FieldRegionLoader, SecuredFieldRegions } from '../field-region';
 import { LanguageLoader, SecuredLanguageNullable } from '../language';
 import { OrganizationLoader, SecuredOrganization } from '../organization';
 import { PartnerLoader, PartnerService } from '../partner';
@@ -93,6 +95,14 @@ export class PartnerResolver {
     );
   }
 
+  @ResolveField(() => SecuredFieldRegions)
+  async fieldRegions(
+    @Parent() partner: Partner,
+    @Loader(FieldRegionLoader) loader: LoaderOf<FieldRegionLoader>,
+  ): Promise<SecuredFieldRegions> {
+    return await loadSecuredIds(loader, partner.fieldRegions);
+  }
+
   @ResolveField(() => SecuredProjectList, {
     description: 'The list of projects the partner has a partnership with.',
   })

src/components/partner/partner.service.ts

@@ -99,12 +99,12 @@ export class PartnerService {
   }
 
   async update(input: UpdatePartner, session: Session): Promise<Partner> {
-    const object = await this.readOne(input.id, session);
+    const partner = await this.readOne(input.id, session);
 
     if (
       !this.validateFinancialReportingType(
-        input.financialReportingTypes ?? object.financialReportingTypes.value,
-        input.types ?? object.types.value,
+        input.financialReportingTypes ?? partner.financialReportingTypes.value,
+        input.types ?? partner.types.value,
       )
     ) {
       if (input.financialReportingTypes && input.types) {
@@ -119,28 +119,44 @@ export class PartnerService {
       };
     }
 
-    const changes = this.repo.getActualChanges(object, input);
-    this.privileges.for(session, Partner, object).verifyChanges(changes);
+    const changes = this.repo.getActualChanges(partner, input);
+    this.privileges.for(session, Partner, partner).verifyChanges(changes);
     const {
       pointOfContactId,
       languageOfWiderCommunicationId,
+      fieldRegions,
       ...simpleChanges
     } = changes;
 
-    await this.repo.updateProperties(object, simpleChanges);
+    await this.repo.updateProperties(partner, simpleChanges);
 
     if (pointOfContactId) {
       await this.repo.updatePointOfContact(input.id, pointOfContactId, session);
     }
+
     if (languageOfWiderCommunicationId) {
       await this.repo.updateRelation(
         'languageOfWiderCommunication',
         'Language',
-        object.id,
+        partner.id,
         languageOfWiderCommunicationId,
       );
     }
 
+    if (fieldRegions) {
+      try {
+        await this.repo.updateRelationList({
+          id: partner.id,
+          relation: 'fieldRegions',
+          newList: fieldRegions,
+        });
+      } catch (e) {
+        throw e instanceof InputException
+          ? e.withField('partner.fieldRegions')
+          : e;
+      }
+    }
+
     return await this.readOne(input.id, session);
   }
 

src/components/product-progress/progress-report-connection.resolver.ts

@@ -1,6 +1,6 @@
 import { Args, Parent, ResolveField, Resolver } from '@nestjs/graphql';
 import { sortBy } from 'lodash';
-import { ClientException } from '~/common';
+import { loadManyIgnoreMissingThrowAny } from '~/common';
 import { Loader, LoaderOf } from '~/core';
 import { ProgressReport } from '../progress-report/dto';
 import {
@@ -30,16 +30,11 @@ export class ProgressReportConnectionResolver {
     @Loader(ProductProgressByReportLoader)
     loader: LoaderOf<ProductProgressByReportLoader>,
   ): Promise<ReadonlyArray<readonly ProductProgress[]>> {
-    const detailsOrErrors = await loader.loadMany(
+    const detailsOrErrors = await loadManyIgnoreMissingThrowAny(
+      loader,
       Progress.Variants.map((variant) => ({ report, variant })),
     );
     const details = detailsOrErrors.flatMap((entry) => {
-      if (entry instanceof Error) {
-        if (entry instanceof ClientException) {
-          return [];
-        }
-        throw entry;
-      }
       if (entry.details.length === 0) {
         return [];
       }