fix: fix issue with deletion provisioned email for public cloud (#2267)

bcgov · Mar 12, 2024 · ae056b1 · ae056b1
1 parent 1300784
commit ae056b1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/app/api/public-cloud/provision/[licencePlate]/route.ts b/app/api/public-cloud/provision/[licencePlate]/route.ts
@@ -3,7 +3,7 @@ import { $Enums, DecisionStatus, Prisma, PublicCloudRequestedProject } from '@pr
 import prisma from '@/core/prisma';
 import { string, z } from 'zod';
 import { PublicCloudRequestedProjectWithContacts } from '@/services/nats/public-cloud';
-import { sendProvisionedEmails } from '@/services/ches/public-cloud/email-handler';
+import { sendProvisionedEmails, sendDeleteRequestApprovalEmails } from '@/services/ches/public-cloud/email-handler';
 import { wrapAsync } from '@/helpers/runtime';
 
 const ParamsSchema = z.object({
@@ -81,7 +81,11 @@ export async function PUT(req: NextRequest, { params }: { params: Params }) {
       },
     });
 
-    wrapAsync(() => sendProvisionedEmails(project as PublicCloudRequestedProjectWithContacts));
+    wrapAsync(() => {
+      if (request.type === $Enums.RequestType.DELETE) {
+        sendDeleteRequestApprovalEmails(project as PublicCloudRequestedProjectWithContacts);
+      } else sendProvisionedEmails(project as PublicCloudRequestedProjectWithContacts);
+    });
 
     return new NextResponse(`Successfully marked ${licencePlate} as provisioned.`, { status: 200 });
   } catch (error: any) {

diff --git a/emails/_components/Edit/ContactChanges.tsx b/emails/_components/Edit/ContactChanges.tsx
@@ -102,7 +102,7 @@ export default function ContactChanges({
           ) : (
             <Text className="mb-1">No Current Expense Authority</Text>
           )}
-          <Text className="font-semibold mb-0">{requestedLabel}Expense Authority</Text>
+          <Text className="font-semibold mb-0">{requestedLabel} Expense Authority</Text>
           <Text className="mb-1 mt-2">
             {expenseAuthorityRequested?.firstName} {expenseAuthorityRequested?.lastName}
           </Text>

diff --git a/emails/_components/Edit/utils/compare-projects.ts b/emails/_components/Edit/utils/compare-projects.ts
@@ -38,6 +38,7 @@ const publicCloudFieldsToCompare: Array<keyof PublicCloudProject> = [
   'projectOwnerId',
   'primaryTechnicalLeadId',
   'secondaryTechnicalLeadId',
+  'expenseAuthorityId',
   'accountCoding',
   'budget',
 ];

diff --git a/emails/_templates/public-cloud/EditSummary.tsx b/emails/_templates/public-cloud/EditSummary.tsx
@@ -61,7 +61,10 @@ const EditSummaryTemplate = ({ request, comment }: EmailProp) => {
                   />
                 </div>
               )}
-              {(changed.projectOwnerId || changed.primaryTechnicalLeadId || changed.secondaryTechnicalLeadId) && (
+              {(changed.projectOwnerId ||
+                changed.primaryTechnicalLeadId ||
+                changed.secondaryTechnicalLeadId ||
+                changed.expenseAuthorityId) && (
                 <div className="pb-6 mt-4 mb-4 border-solid border-0 border-b-1 border-slate-300">
                   <ContactChanges
                     poCurrent={current.projectOwner}