chore(3314): enforce distinct PO and TL idir for edit requests

bcgov · Nov 12, 2024 · 13e7d3d · 13e7d3d
1 parent fa173cd
commit 13e7d3d
Show file tree

Hide file tree

Showing 8 changed files with 136 additions and 8 deletions.
diff --git a/app/app/api/private-cloud/products/_operations/update.test.ts b/app/app/api/private-cloud/products/_operations/update.test.ts
@@ -37,6 +37,7 @@ async function makeBasicProductChange(extra = {}) {
   const response = await editPrivateCloudProject(requests.create.licencePlate, {
     ...requests.create.decisionData,
     developmentQuota: newDevelopmentQuota,
+    isAgMinistryChecked: true,
     ...extra,
   });
 

diff --git a/app/app/api/private-cloud/products/_operations/update.ts b/app/app/api/private-cloud/products/_operations/update.ts
@@ -28,7 +28,8 @@ export default async function updateOp({
     return UnauthorizedResponse();
   }
 
-  const { requestComment, quotaContactName, quotaContactEmail, quotaJustification, ...rest } = body;
+  const { requestComment, quotaContactName, quotaContactEmail, quotaJustification, isAgMinistryChecked, ...rest } =
+    body;
 
   if (!product._permissions.manageMembers) {
     rest.members = product.members;

diff --git a/app/app/api/private-cloud/requests/[id]/decision/route.test.ts b/app/app/api/private-cloud/requests/[id]/decision/route.test.ts
@@ -136,6 +136,7 @@ describe('Review Private Cloud Update Request - Permissions', () => {
     const response = await editPrivateCloudProject(requests.main.licencePlate, {
       ...requests.main.decisionData,
       developmentQuota: newDevelopmentQuota,
+      isAgMinistryChecked: true,
     });
 
     expect(response.status).toBe(200);

diff --git a/app/app/api/public-cloud/products/_operations/update.ts b/app/app/api/public-cloud/products/_operations/update.ts
@@ -27,7 +27,7 @@ export default async function updateOp({
     return UnauthorizedResponse();
   }
 
-  const { requestComment, accountCoding, ...rest } = body;
+  const { requestComment, accountCoding, isAgMinistryChecked, isEaApproval, ...rest } = body;
 
   if (!product._permissions.manageMembers) {
     rest.members = product.members;

diff --git a/app/app/api/public-cloud/requests/[id]/decision/route.test.ts b/app/app/api/public-cloud/requests/[id]/decision/route.test.ts
@@ -188,7 +188,9 @@ describe('Review Public Cloud Update Request - Permissions', () => {
       ...requests.main.decisionData,
       accountCoding: requests.main.decisionData.billing.accountCoding,
       environmentsEnabled: newEnvironmentsEnabled,
+      isAgMinistryChecked: true,
     });
+
     expect(response.status).toBe(200);
 
     requests.main = await response.json();

diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/validation-schemas/private-cloud.ts b/app/validation-schemas/private-cloud.ts
@@ -146,9 +146,25 @@ const _privateCloudEditRequestBodySchema = _privateCloudCreateRequestBodySchema.
   }),
 );
 
-export const privateCloudEditRequestBodySchema = _privateCloudEditRequestBodySchema.refine(isEmailUnique, {
-  message: 'Project Owner and Primary Technical Lead must not have the same email.',
-});
+export const privateCloudEditRequestBodySchema = _privateCloudEditRequestBodySchema
+  .merge(
+    z.object({
+      isAgMinistryChecked: z.boolean().optional(),
+    }),
+  )
+  .refine(
+    (formData) => {
+      return AGMinistries.includes(formData.ministry) ? formData.isAgMinistryChecked : true;
+    },
+    {
+      message: 'AG Ministry Checkbox should be checked.',
+      path: ['isAgMinistryChecked'],
+    },
+  )
+  .refine(isEmailUnique, {
+    message: 'Project Owner and Primary Technical Lead must not have the same email.',
+    path: ['primaryTechnicalLead'],
+  });
 
 export const privateCloudRequestDecisionBodySchema = _privateCloudEditRequestBodySchema.merge(
   z.object({

diff --git a/app/validation-schemas/public-cloud.ts b/app/validation-schemas/public-cloud.ts
@@ -102,9 +102,26 @@ const _publicCloudEditRequestBodySchema = _publicCloudCreateRequestBodySchema.me
   }),
 );
 
-export const publicCloudEditRequestBodySchema = _publicCloudEditRequestBodySchema.refine(isEmailUnique, {
-  message: 'Project Owner and Primary Technical Lead must not have the same email.',
-});
+export const publicCloudEditRequestBodySchema = _publicCloudEditRequestBodySchema
+  .merge(
+    z.object({
+      isAgMinistryChecked: z.boolean().optional(),
+      isEaApproval: z.boolean().optional(),
+    }),
+  )
+  .refine(
+    (formData) => {
+      return AGMinistries.includes(formData.ministry) ? formData.isAgMinistryChecked : true;
+    },
+    {
+      message: 'AG Ministry Checkbox should be checked.',
+      path: ['isAgMinistryChecked'],
+    },
+  )
+  .refine(isEmailUnique, {
+    message: 'Project Owner and Primary Technical Lead must not have the same email.',
+    path: ['primaryTechnicalLead'],
+  });
 
 export const publicCloudRequestDecisionBodySchema = _publicCloudEditRequestBodySchema.merge(
   z.object({