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

bcgov · Nov 13, 2024 · 5b0f98c · 5b0f98c
1 parent fa173cd
commit 5b0f98c
Show file tree

Hide file tree

Showing 9 changed files with 2,898 additions and 1,896 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.test.ts b/app/app/api/public-cloud/products/_operations/update.test.ts
@@ -46,6 +46,7 @@ async function makeBasicProductChange(extra = {}) {
     ...requests.create.decisionData,
     accountCoding: requests.create.decisionData.billing.accountCoding,
     environmentsEnabled: newEnvironmentsEnabled,
+    isAgMinistryChecked: true,
     ...extra,
   });
 

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();