Add Project.marketingRegionOverride (#3045)

Author: willdch

src/components/authorization/policies/by-role/intern.policy.ts

@@ -27,7 +27,12 @@ import { inherit, member, Policy, Role } from '../util';
   r.Project.when(member)
     .read.specifically((p) => [
       p.rootDirectory.edit,
-      p.many('departmentId', 'marketingLocation', 'fieldRegion').none,
+      p.many(
+        'departmentId',
+        'marketingLocation',
+        'marketingRegionOverride',
+        'fieldRegion',
+      ).none,
     ])
     .children((c) => c.posts.edit),
   r.ProjectMember.when(member).read,

src/components/authorization/policies/by-role/marketing.policy.ts

@@ -36,6 +36,7 @@ import {
         .many('rootDirectory', 'primaryLocation', 'otherLocations')
         .whenAny(member, sensOnlyLow).read,
       p.marketingLocation.edit,
+      p.marketingRegionOverride.edit,
     ])
     .children((c) => c.posts.edit),
 ])

src/components/authorization/policies/by-role/mentor.policy.ts

@@ -28,7 +28,12 @@ import { inherit, member, Policy, Role } from '../util';
   r.Project.when(member)
     .read.specifically((p) => [
       p.rootDirectory.edit,
-      p.many('departmentId', 'marketingLocation', 'fieldRegion').none,
+      p.many(
+        'departmentId',
+        'marketingLocation',
+        'marketingRegionOverride',
+        'fieldRegion',
+      ).none,
     ])
     .children((c) => c.posts.edit),
   r.ProjectMember.when(member).read,

src/components/authorization/policies/by-role/translator.policy.ts

@@ -40,7 +40,12 @@ import { member, Policy, Role, variant } from '../util';
   r.Project.when(member)
     .read.specifically((p) => [
       p.rootDirectory.edit,
-      p.many('departmentId', 'marketingLocation', 'fieldRegion').none,
+      p.many(
+        'departmentId',
+        'marketingLocation',
+        'marketingRegionOverride',
+        'fieldRegion',
+      ).none,
     ])
     .children((c) => c.posts.edit),
   r.ProjectMember.when(member).read,

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

@@ -9,11 +9,13 @@ import {
   DateTimeField,
   ID,
   IdField,
+  IdOf,
   IsId,
   NameField,
   Sensitivity,
   SensitivityField,
 } from '../../../common';
+import { Location } from '../../location/dto';
 import { ReportPeriod } from '../../periodic-report/dto';
 import { ProjectStep } from './project-step.enum';
 import { ProjectType } from './project-type.enum';
@@ -46,6 +48,12 @@ export abstract class CreateProject {
   })
   readonly marketingLocationId?: ID;
 
+  @IdField({
+    description: 'A marketing region override location ID',
+    nullable: true,
+  })
+  readonly marketingRegionOverrideId?: IdOf<Location> | null;
+
   @IdField({
     description: 'A field region ID',
     nullable: true,

src/components/project/dto/project.dto.ts

@@ -14,6 +14,7 @@ import {
   DbSort,
   DbUnique,
   ID,
+  IdOf,
   IntersectionType,
   NameField,
   parentIdMiddleware,
@@ -128,6 +129,7 @@ class Project extends Interfaces {
 
   readonly marketingLocation: Secured<ID | null>;
 
+  readonly marketingRegionOverride: Secured<IdOf<Location> | null>;
   readonly fieldRegion: Secured<ID | null>;
 
   readonly owningOrganization: Secured<ID | null>;

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

@@ -9,11 +9,13 @@ import {
   DateTimeField,
   ID,
   IdField,
+  IdOf,
   NameField,
   Sensitivity,
   SensitivityField,
 } from '../../../common';
 import { ChangesetIdField } from '../../changeset';
+import { Location } from '../../location/dto';
 import { ReportPeriod } from '../../periodic-report/dto';
 import { ProjectStep } from './project-step.enum';
 import { IProject, Project } from './project.dto';
@@ -38,6 +40,12 @@ export abstract class UpdateProject {
   })
   readonly marketingLocationId?: ID | null;
 
+  @IdField({
+    description: 'A marketing region override location ID',
+    nullable: true,
+  })
+  readonly marketingRegionOverrideId?: IdOf<Location> | null;
+
   @IdField({
     description: 'A field region ID',
     nullable: true,

src/components/project/project.repository.ts

@@ -115,6 +115,11 @@ export class ProjectRepository extends CommonRepository {
           relation('out', '', 'owningOrganization', ACTIVE),
           node('organization', 'Organization'),
         ])
+        .optionalMatch([
+          node('node'),
+          relation('out', '', 'marketingRegionOverride', ACTIVE),
+          node('marketingRegionOverride', 'Location'),
+        ])
         .subQuery('node', (sub) =>
           sub
             .match([
@@ -135,6 +140,7 @@ export class ProjectRepository extends CommonRepository {
             owningOrganization: 'organization.id',
             engagementTotal: 'engagementTotal',
             changeset: 'changeset.id',
+            marketingRegionOverride: 'marketingRegionOverride.id',
           }).as('dto'),
         );
   }
@@ -156,6 +162,7 @@ export class ProjectRepository extends CommonRepository {
       primaryLocationId,
       fieldRegionId,
       marketingLocationId,
+      marketingRegionOverrideId,
       otherLocationIds,
       type,
       ...initialProps
@@ -194,6 +201,7 @@ export class ProjectRepository extends CommonRepository {
           primaryLocation: ['Location', primaryLocationId],
           otherLocations: ['Location', otherLocationIds],
           marketingLocation: ['Location', marketingLocationId],
+          marketingRegionOverride: ['Location', marketingRegionOverrideId],
           owningOrganization: ['Organization', this.config.defaultOrg.id],
         }),
       )
@@ -213,6 +221,7 @@ export class ProjectRepository extends CommonRepository {
     const {
       primaryLocationId,
       marketingLocationId,
+      marketingRegionOverrideId,
       fieldRegionId,
       ...simpleChanges
     } = changes;
@@ -269,6 +278,20 @@ export class ProjectRepository extends CommonRepository {
       };
     }
 
+    if (marketingRegionOverrideId !== undefined) {
+      await this.updateRelation(
+        'marketingRegionOverride',
+        'Location',
+        existing.id,
+        marketingRegionOverrideId,
+        'Project',
+      );
+      result = {
+        ...result,
+        marketingRegionOverride: marketingRegionOverrideId,
+      };
+    }
+
     return result;
   }
 

src/components/project/project.resolver.ts

@@ -316,6 +316,16 @@ export class ProjectResolver {
     );
   }
 
+  @ResolveField(() => SecuredLocation)
+  async marketingRegionOverride(
+    @Parent() project: Project,
+    @Loader(LocationLoader) locations: LoaderOf<LocationLoader>,
+  ): Promise<SecuredLocation> {
+    return await mapSecuredValue(project.marketingRegionOverride, (id) =>
+      locations.load(id),
+    );
+  }
+
   @ResolveField(() => SecuredFieldRegion)
   async fieldRegion(
     @Parent() project: Project,

src/components/project/project.service.ts

@@ -135,6 +135,12 @@ export class ProjectService {
       'marketingLocationId',
       'Marketing location not found',
     );
+    await this.validateOtherResourceId(
+      input.marketingRegionOverrideId,
+      'Location',
+      'marketingRegionOverrideId',
+      'Marketing Region Override not found',
+    );
 
     try {
       const id = await this.repo.create(input);