Merge pull request #3207 from SeedCompany/1100-Controller-Notifications

SeedCompany · May 10, 2024 · 12ccab3 · 12ccab3
2 parents ab7ad29 + 5bae9fb
commit 12ccab3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 23 deletions.
diff --git a/src/components/project/project.rules.ts b/src/components/project/project.rules.ts
@@ -26,6 +26,7 @@ import {
   ProjectStepTransition,
   TransitionType,
 } from './dto';
+import { FinancialApproverRepository } from './financial-approver';
 import { ProjectService } from './project.service';
 
 type EmailAddress = string;
@@ -54,7 +55,7 @@ export interface EmailNotification {
     'email' | 'displayFirstName' | 'displayLastName' | 'timezone'
   >;
   changedBy: Pick<User, 'id' | 'displayFirstName' | 'displayLastName'>;
-  project: Pick<Project, 'id' | 'modifiedAt' | 'name' | 'step'>;
+  project: Pick<Project, 'id' | 'modifiedAt' | 'name' | 'step' | 'type'>;
   previousStep?: ProjectStep;
 }
 
@@ -73,6 +74,7 @@ export class ProjectRules {
     @Inject(forwardRef(() => AuthenticationService))
     private readonly auth: AuthenticationService & {},
     private readonly configService: ConfigService,
+    private readonly financialApproverRepo: FinancialApproverRepository,
     // eslint-disable-next-line @seedcompany/no-unused-vars
     @Logger('project:rules') private readonly logger: ILogger,
   ) {}
@@ -85,6 +87,10 @@ export class ProjectRules {
   ): Promise<StepRule> {
     const mostRecentPreviousStep = (steps: ProjectStep[]) =>
       this.getMostRecentPreviousStep(id, steps, changeset);
+    const financialApprovers = async () =>
+      (await this.financialApproverRepo.read(projectType)).map(
+        ({ user }) => user.id,
+      );
     const isMultiplication =
       projectType === ProjectType.MultiplicationTranslation;
 
@@ -405,15 +411,15 @@ export class ProjectRules {
               type: TransitionType.Approve,
               label: 'Confirm Project 🎉',
               notifiers: async () => [
-                ...(await this.getRoleEmails(Role.Controller)),
+                ...(await financialApprovers()),
                 'project_approval@tsco.org',
                 'projects@tsco.org',
               ],
             },
           ],
           getNotifiers: async () => [
             ...(await this.getProjectTeamUserIds(id)),
-            ...(await this.getRoleEmails(Role.Controller)),
+            ...(await financialApprovers()),
           ],
         };
       case ProjectStep.OnHoldFinanceConfirmation:
@@ -425,7 +431,7 @@ export class ProjectRules {
               type: TransitionType.Approve,
               label: 'Confirm Project 🎉',
               notifiers: async () => [
-                ...(await this.getRoleEmails(Role.Controller)),
+                ...(await financialApprovers()),
                 'project_approval@tsco.org',
                 'projects@tsco.org',
               ],
@@ -443,7 +449,7 @@ export class ProjectRules {
           ],
           getNotifiers: async () => [
             ...(await this.getProjectTeamUserIds(id)),
-            ...(await this.getRoleEmails(Role.Controller)),
+            ...(await financialApprovers()),
           ],
         };
       case ProjectStep.Active:
@@ -500,7 +506,7 @@ export class ProjectRules {
           ],
           getNotifiers: async () => [
             ...(await this.getProjectTeamUserIds(id)),
-            ...(await this.getRoleEmails(Role.Controller)),
+            ...(await financialApprovers()),
             'project_extension@tsco.org',
             'project_revision@tsco.org',
           ],
@@ -598,7 +604,7 @@ export class ProjectRules {
           ],
           getNotifiers: async () => [
             ...(await this.getProjectTeamUserIds(id)),
-            ...(await this.getRoleEmails(Role.Controller)),
+            ...(await financialApprovers()),
             'project_extension@tsco.org',
             'project_revision@tsco.org',
           ],
@@ -1046,22 +1052,6 @@ export class ProjectRules {
     return users?.ids ?? [];
   }
 
-  private async getRoleEmails(role: Role): Promise<string[]> {
-    const emails = await this.db
-      .query()
-      .match([
-        node('email', 'EmailAddress'),
-        relation('in', '', 'email', ACTIVE),
-        node('user', 'User'),
-        relation('out', '', 'roles', ACTIVE),
-        node('role', 'Property', { value: role }),
-      ])
-      .return<{ emails: string[] }>('collect(email.value) as emails')
-      .first();
-
-    return emails?.emails ?? [];
-  }
-
   /** Of the given steps which one was the most recent previous step */
   private async getMostRecentPreviousStep(
     id: ID,

diff --git a/src/core/email/templates/project-step-changed.template.tsx b/src/core/email/templates/project-step-changed.template.tsx
@@ -63,6 +63,8 @@ export function ProjectStepChanged({
               value={project.modifiedAt}
               timezone={recipient.timezone.value}
             />
+            <br />
+            Project Type: {project.type}
           </Text>
           <HideInText>
             <Button href={projectUrl} paddingTop={16}>