chore(3314): enforce distinct PO and TL idir

bcgov · Nov 12, 2024 · 8302d07 · 8302d07
1 parent fa173cd
commit 8302d07
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 9 deletions.
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,24 @@ 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.',
+  });
 
 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,25 @@ 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.',
+  });
 
 export const publicCloudRequestDecisionBodySchema = _publicCloudEditRequestBodySchema.merge(
   z.object({