fix validation schema in /contact-information (#347)

DTS-STN · Mar 6, 2025 · 269e38b · 269e38b
1 parent 6c55f76
commit 269e38b
Showing 1 changed file with 43 additions and 33 deletions.
diff --git a/frontend/app/routes/protected/person-case/contact-information.tsx b/frontend/app/routes/protected/person-case/contact-information.tsx
@@ -80,40 +80,50 @@ export async function action({ context, params, request }: Route.ActionArgs) {
               v.email(t('protected:contact-information.error-messages.email-address-invalid-format')),
             ),
           ),
-          country: v.picklist(
-            countryService.getCountries().map(({ id }) => id),
-            t('protected:contact-information.error-messages.country-required'),
-          ),
-          address: v.pipe(v.string(), v.trim(), v.nonEmpty(t('protected:contact-information.error-messages.address-required'))),
-          postalCode: v.pipe(
-            v.string(),
-            v.trim(),
-            v.nonEmpty(t('protected:contact-information.error-messages.postal-code-required')),
-          ),
-          city: v.pipe(v.string(), v.trim(), v.nonEmpty(t('protected:contact-information.error-messages.city-required'))),
-          province: v.pipe(
-            v.string(),
-            v.trim(),
-            v.nonEmpty(t('protected:contact-information.error-messages.province-required')),
-          ),
         }),
-        v.variant('country', [
-          v.object({
-            country: v.literal(serverEnvironment.PP_CANADA_COUNTRY_CODE),
-            province: v.picklist(
-              provinceService.getProvinces().map(({ id }) => id),
-              t('protected:contact-information.error-messages.province-required'),
-            ),
-          }),
-          v.object({
-            country: v.string(),
-            province: v.pipe(
-              v.string(),
-              v.trim(),
-              v.nonEmpty(t('protected:contact-information.error-messages.province-required')),
-            ),
-          }),
-        ]),
+        v.variant(
+          'country',
+          [
+            v.object({
+              country: v.literal(serverEnvironment.PP_CANADA_COUNTRY_CODE),
+              province: v.picklist(
+                provinceService.getProvinces().map(({ id }) => id),
+                t('protected:contact-information.error-messages.province-required'),
+              ),
+              address: v.pipe(
+                v.string(),
+                v.trim(),
+                v.nonEmpty(t('protected:contact-information.error-messages.address-required')),
+              ),
+              postalCode: v.pipe(
+                v.string(),
+                v.trim(),
+                v.nonEmpty(t('protected:contact-information.error-messages.postal-code-required')),
+              ),
+              city: v.pipe(v.string(), v.trim(), v.nonEmpty(t('protected:contact-information.error-messages.city-required'))),
+            }),
+            v.object({
+              country: v.picklist(countryService.getCountries().map(({ id }) => id)),
+              province: v.pipe(
+                v.string(),
+                v.trim(),
+                v.nonEmpty(t('protected:contact-information.error-messages.province-required')),
+              ),
+              address: v.pipe(
+                v.string(),
+                v.trim(),
+                v.nonEmpty(t('protected:contact-information.error-messages.address-required')),
+              ),
+              postalCode: v.pipe(
+                v.string(),
+                v.trim(),
+                v.nonEmpty(t('protected:contact-information.error-messages.postal-code-required')),
+              ),
+              city: v.pipe(v.string(), v.trim(), v.nonEmpty(t('protected:contact-information.error-messages.city-required'))),
+            }),
+          ],
+          t('protected:contact-information.error-messages.country-required'),
+        ),
       ]) satisfies v.GenericSchema<ContactInformationData>;
 
       const input = {