servie return undefined instead of throwing error

faiza-jahanzeb · faiza-jahanzeb · commit 7b68774ded39 · 2025-03-25T11:08:24.000-04:00
diff --git a/frontend/app/.server/domain/multi-channel/case-api-service-default.ts b/frontend/app/.server/domain/multi-channel/case-api-service-default.ts
@@ -8,13 +8,14 @@ export function getDefaultSinCaseService(): SinCaseService {
   return {
     getSinCases: async (): Promise<SinCaseDto[]> => {
       const response = await fetch(`${serverEnvironment.INTEROP_SIN_REG_API_BASE_URL}/cases`);
+      if (response.status === 404) return [];
       if (!response.ok) throw new AppError(`Cases not found.`, ErrorCodes.SIN_CASE_NOT_FOUND);
       return response.json();
     },
 
-    getSinCaseById: async (id: string): Promise<SinCaseDto> => {
+    getSinCaseById: async (id: string): Promise<SinCaseDto | undefined> => {
       const response = await fetch(`${serverEnvironment.INTEROP_SIN_REG_API_BASE_URL}/cases/${id}`);
-      if (!response.ok) throw new AppError(`Case with ID '${id}' not found.`, ErrorCodes.SIN_CASE_NOT_FOUND);
+      if (response.status === 404) return undefined;
       return response.json();
     },
   };
diff --git a/frontend/app/.server/domain/multi-channel/case-api-service.ts b/frontend/app/.server/domain/multi-channel/case-api-service.ts
@@ -5,7 +5,7 @@ import { serverEnvironment } from '~/.server/environment';
 
 export type SinCaseService = {
   getSinCases(): Promise<SinCaseDto[]>;
-  getSinCaseById(id: string): Promise<SinCaseDto>;
+  getSinCaseById(id: string): Promise<SinCaseDto | undefined>;
 };
 
 export function getSinCaseService(): SinCaseService {
diff --git a/frontend/app/routes/protected/multi-channel/send-validation.tsx b/frontend/app/routes/protected/multi-channel/send-validation.tsx
@@ -67,7 +67,6 @@ export async function loader({ context, request }: Route.LoaderArgs) {
 
   // TODO: the id will likely come from a path param in the URL?
   const personSinCase = await getSinCaseService().getSinCaseById('000000000');
-
   const {
     birthDetails,
     contactInformation,
@@ -76,40 +75,40 @@ export async function loader({ context, request }: Route.LoaderArgs) {
     personalInformation,
     previousSin,
     primaryDocuments,
-    // TODO - Check why request details is not displayed
-    // requestDetails,
     secondaryDocument,
-  } = personSinCase;
+  } = personSinCase ?? {};
 
   return {
     documentTitle: t('protected:send-validation.page-title'),
-    caseId: personSinCase.caseId,
+    caseId: personSinCase?.caseId ?? null,
     inPersonSINCase: {
       primaryDocuments: {
         ...primaryDocuments,
-        currentStatusInCanadaName: getLocalizedApplicantStatusInCanadaChoiceById(primaryDocuments.currentStatusInCanada, lang)
-          .name,
-        documentTypeName: getLocalizedApplicantPrimaryDocumentChoiceById(primaryDocuments.documentType, lang).name,
-        genderName: getLocalizedApplicantGenderById(primaryDocuments.gender, lang).name,
+        currentStatusInCanadaName:
+          primaryDocuments && getLocalizedApplicantStatusInCanadaChoiceById(primaryDocuments.currentStatusInCanada, lang).name,
+        documentTypeName:
+          primaryDocuments && getLocalizedApplicantPrimaryDocumentChoiceById(primaryDocuments.documentType, lang).name,
+        genderName: primaryDocuments && getLocalizedApplicantGenderById(primaryDocuments.gender, lang).name,
       },
       secondaryDocument: {
         ...secondaryDocument,
-        documentTypeName: getLocalizedApplicantSecondaryDocumentChoiceById(secondaryDocument.documentType, lang).name,
+        documentTypeName:
+          secondaryDocument && getLocalizedApplicantSecondaryDocumentChoiceById(secondaryDocument.documentType, lang).name,
       },
       personalInformation: {
         ...personalInformation,
-        genderName: getLocalizedApplicantGenderById(personalInformation.gender, lang).name,
+        genderName: personalInformation && getLocalizedApplicantGenderById(personalInformation.gender, lang).name,
       },
       birthDetails: {
         ...birthDetails,
-        countryName: getLocalizedCountryById(birthDetails.country, lang).name,
-        provinceName: birthDetails.province
+        countryName: birthDetails && getLocalizedCountryById(birthDetails.country, lang).name,
+        provinceName: birthDetails?.province
           ? birthDetails.country === serverEnvironment.PP_CANADA_COUNTRY_CODE
             ? getLocalizedProvinceById(birthDetails.province, lang).name
             : birthDetails.province
           : undefined,
       },
-      parentDetails: parentDetails.map((parentdetail) => ({
+      parentDetails: parentDetails?.map((parentdetail) => ({
         ...parentdetail,
         countryName: parentdetail.unavailable
           ? undefined
@@ -124,26 +123,28 @@ export async function loader({ context, request }: Route.LoaderArgs) {
       })),
       contactInformation: {
         ...contactInformation,
-        preferredLanguageName: getLocalizedLanguageOfCorrespondenceById(contactInformation.preferredLanguage, lang).name,
-        countryName: getLocalizedCountryById(contactInformation.country, lang).name,
+        preferredLanguageName:
+          contactInformation && getLocalizedLanguageOfCorrespondenceById(contactInformation.preferredLanguage, lang).name,
+        countryName: contactInformation && getLocalizedCountryById(contactInformation.country, lang).name,
         provinceName:
-          contactInformation.country === serverEnvironment.PP_CANADA_COUNTRY_CODE
+          contactInformation?.country === serverEnvironment.PP_CANADA_COUNTRY_CODE
             ? getLocalizedProvinceById(contactInformation.province, lang).name
-            : contactInformation.province,
+            : contactInformation?.province,
       },
       previousSin: {
         ...previousSin,
-        hasPreviousSinText: getLocalizedApplicantHadSinOptionById(previousSin.hasPreviousSin, lang).name,
+        hasPreviousSinText: previousSin && getLocalizedApplicantHadSinOptionById(previousSin.hasPreviousSin, lang).name,
       },
       currentNameInfo: {
         ...currentNameInfo,
-        firstName: currentNameInfo.preferredSameAsDocumentName ? primaryDocuments.givenName : currentNameInfo.firstName,
-        middleName: currentNameInfo.preferredSameAsDocumentName ? undefined : currentNameInfo.middleName,
-        lastName: currentNameInfo.preferredSameAsDocumentName ? primaryDocuments.lastName : currentNameInfo.lastName,
-        supportingDocuments: currentNameInfo.preferredSameAsDocumentName ? undefined : currentNameInfo.supportingDocuments,
-        supportingDocumentsNames: currentNameInfo.preferredSameAsDocumentName
+        preferredSameAsDocumentName: currentNameInfo?.preferredSameAsDocumentName,
+        firstName: currentNameInfo?.preferredSameAsDocumentName ? primaryDocuments?.givenName : currentNameInfo?.firstName,
+        middleName: currentNameInfo?.preferredSameAsDocumentName ? undefined : currentNameInfo?.middleName,
+        lastName: currentNameInfo?.preferredSameAsDocumentName ? primaryDocuments?.lastName : currentNameInfo?.lastName,
+        supportingDocuments: currentNameInfo?.preferredSameAsDocumentName ? undefined : currentNameInfo?.supportingDocuments,
+        supportingDocumentsNames: currentNameInfo?.preferredSameAsDocumentName
           ? undefined
-          : currentNameInfo.supportingDocuments.required
+          : currentNameInfo?.supportingDocuments.required
             ? currentNameInfo.supportingDocuments.documentTypes.map(
                 (doc) => getLocalizedApplicantSupportingDocumentTypeById(doc, lang).name,
               )
diff --git a/frontend/app/routes/protected/sin-application/review-birth-details.tsx b/frontend/app/routes/protected/sin-application/review-birth-details.tsx
@@ -6,10 +6,10 @@ import { Address } from '~/components/address';
 import { DescriptionList, DescriptionListItem } from '~/components/description-list';
 
 interface ReviewBirthDetailsProps {
-  city: string | undefined;
-  provinceName: string | undefined;
-  countryName: string;
-  fromMultipleBirth: boolean;
+  city?: string;
+  provinceName?: string;
+  countryName?: string;
+  fromMultipleBirth?: boolean;
   children: ReactNode;
 }
 
@@ -20,13 +20,15 @@ export function ReviewBirthDetails({ city, provinceName, countryName, fromMultip
       <h2 className="font-lato text-2xl font-bold">{t('protected:birth-details.page-title')}</h2>
       <DescriptionList className="divide-y border-y">
         <DescriptionListItem className="py-3" term={t('protected:review.birth-place')}>
-          <Address
-            address={{
-              city: city,
-              provinceState: provinceName,
-              country: countryName,
-            }}
-          />
+          {countryName && (
+            <Address
+              address={{
+                city: city,
+                provinceState: provinceName,
+                country: countryName,
+              }}
+            />
+          )}
         </DescriptionListItem>
         <DescriptionListItem className="py-3" term={t('protected:review.multiple-birth')}>
           <p>{fromMultipleBirth ? t('protected:review.yes') : t('protected:review.no')}</p>
diff --git a/frontend/app/routes/protected/sin-application/review-contact-information.tsx b/frontend/app/routes/protected/sin-application/review-contact-information.tsx
@@ -6,15 +6,15 @@ import { Address } from '~/components/address';
 import { DescriptionList, DescriptionListItem } from '~/components/description-list';
 
 interface ReviewContactInformationProps {
-  preferredLanguageName: string;
-  primaryPhoneNumber: string;
-  secondaryPhoneNumber: string | undefined;
-  emailAddress: string | undefined;
-  countryName: string;
-  address: string;
-  postalCode: string;
-  city: string;
-  provinceName: string | undefined;
+  preferredLanguageName?: string;
+  primaryPhoneNumber?: string;
+  secondaryPhoneNumber?: string;
+  emailAddress?: string;
+  countryName?: string;
+  address?: string;
+  postalCode?: string;
+  city?: string;
+  provinceName?: string;
   children: ReactNode;
 }
 
@@ -59,15 +59,17 @@ export function ReviewContactInformation({
         </h3>
         <DescriptionList className="mt-3 divide-y border-y">
           <DescriptionListItem className="py-3" term={t('protected:contact-information.address-label')}>
-            <Address
-              address={{
-                addressLine1: address,
-                city: city,
-                provinceState: provinceName,
-                postalZipCode: postalCode,
-                country: countryName,
-              }}
-            />
+            {countryName && (
+              <Address
+                address={{
+                  addressLine1: address,
+                  city: city,
+                  provinceState: provinceName,
+                  postalZipCode: postalCode,
+                  country: countryName,
+                }}
+              />
+            )}
           </DescriptionListItem>
         </DescriptionList>
       </div>
diff --git a/frontend/app/routes/protected/sin-application/review-current-name.tsx b/frontend/app/routes/protected/sin-application/review-current-name.tsx
@@ -6,12 +6,12 @@ import { DescriptionList, DescriptionListItem } from '~/components/description-l
 import { UnorderedList } from '~/components/lists';
 
 interface ReviewCurrentNameProps {
-  preferredSameAsDocumentName: boolean;
-  firstName: string;
-  middleName: string | undefined;
-  lastName: string;
-  supportingDocuments: { required: boolean; documentTypes?: string[] } | undefined;
-  supportingDocumentsNames: string[] | undefined;
+  preferredSameAsDocumentName?: boolean;
+  firstName?: string;
+  middleName?: string;
+  lastName?: string;
+  supportingDocuments?: { required: boolean; documentTypes?: string[] };
+  supportingDocumentsNames?: string[];
   children: ReactNode;
 }
 
diff --git a/frontend/app/routes/protected/sin-application/review-parent-details.tsx b/frontend/app/routes/protected/sin-application/review-parent-details.tsx
@@ -6,7 +6,7 @@ import { Address } from '~/components/address';
 import { DescriptionList, DescriptionListItem } from '~/components/description-list';
 
 interface ReviewParentDetailsProps {
-  parentDetails: (
+  parentDetails?: (
     | {
         unavailable: boolean;
         givenName?: string;
diff --git a/frontend/app/routes/protected/sin-application/review-personal-info.tsx b/frontend/app/routes/protected/sin-application/review-personal-info.tsx
@@ -6,10 +6,10 @@ import { DescriptionList, DescriptionListItem } from '~/components/description-l
 import { UnorderedList } from '~/components/lists';
 
 interface ReviewPersonalInfoProps {
-  firstNamePreviouslyUsed: string[] | undefined;
-  lastNameAtBirth: string;
-  lastNamePreviouslyUsed: string[] | undefined;
-  genderName: string;
+  firstNamePreviouslyUsed?: string[];
+  lastNameAtBirth?: string;
+  lastNamePreviouslyUsed?: string[];
+  genderName?: string;
   children: ReactNode;
 }
 
diff --git a/frontend/app/routes/protected/sin-application/review-previous-sin.tsx b/frontend/app/routes/protected/sin-application/review-previous-sin.tsx
@@ -5,8 +5,8 @@ import { useTranslation } from 'react-i18next';
 import { DescriptionList, DescriptionListItem } from '~/components/description-list';
 
 interface ReviewPreviousSinProps {
-  hasPreviousSinText: string;
-  socialInsuranceNumber: string | undefined;
+  hasPreviousSinText?: string;
+  socialInsuranceNumber?: string;
   children: ReactNode;
 }
 
diff --git a/frontend/app/routes/protected/sin-application/review-primary-docs.tsx b/frontend/app/routes/protected/sin-application/review-primary-docs.tsx
@@ -5,15 +5,15 @@ import { useTranslation } from 'react-i18next';
 import { DescriptionList, DescriptionListItem } from '~/components/description-list';
 
 interface ReviewPrimaryDocsProps {
-  currentStatusInCanadaName: string;
-  documentTypeName: string;
-  registrationNumber: string;
-  clientNumber: string;
-  givenName: string;
-  lastName: string;
-  dateOfBirth: string;
-  genderName: string;
-  citizenshipDate: string;
+  currentStatusInCanadaName?: string;
+  documentTypeName?: string;
+  registrationNumber?: string;
+  clientNumber?: string;
+  givenName?: string;
+  lastName?: string;
+  dateOfBirth?: string;
+  genderName?: string;
+  citizenshipDate?: string;
   children: ReactNode;
 }
 
diff --git a/frontend/app/routes/protected/sin-application/review-secondary-doc.tsx b/frontend/app/routes/protected/sin-application/review-secondary-doc.tsx
@@ -5,9 +5,9 @@ import { useTranslation } from 'react-i18next';
 import { DescriptionList, DescriptionListItem } from '~/components/description-list';
 
 interface ReviewSecondaryDocProps {
-  documentTypeName: string;
-  expiryMonth: string;
-  expiryYear: string;
+  documentTypeName?: string;
+  expiryMonth?: string;
+  expiryYear?: string;
   children: ReactNode;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@ import { useTranslation } from 'react-i18next';`
`5`	`5`	`import { DescriptionList, DescriptionListItem } from '~/components/description-list';`
`6`	`6`
`7`	`7`	`interface ReviewPreviousSinProps {`
`8`		`- hasPreviousSinText: string;`
`9`		`- socialInsuranceNumber: string \| undefined;`
	`8`	`+ hasPreviousSinText?: string;`
	`9`	`+ socialInsuranceNumber?: string;`
`10`	`10`	`children: ReactNode;`
`11`	`11`	`}`
`12`	`12`