Merge pull request HospitalRun#1822 from igeagonz/new-patient-message…

…-fix fix(patient-slice.ts): conditionally render family name and suffix
igeagonz · Feb 13, 2020 · d5dacd6 · d5dacd6
2 parents e69de57 + 3bdd62d
commit d5dacd6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 20 deletions.
diff --git a/src/__tests__/patients/patient-slice.test.ts b/src/__tests__/patients/patient-slice.test.ts
@@ -161,14 +161,10 @@ describe('patients slice', () => {
     it('should call the Toaster function with the correct data', async () => {
       jest.spyOn(components, 'Toast')
       const expectedPatientId = '12345'
-      const expectedGivenName = 'given'
-      const expectedFamilyName = 'family'
-      const expectedSuffix = 'suffix'
+      const expectedFullName = 'John Doe II'
       const expectedPatient = {
         id: expectedPatientId,
-        givenName: expectedGivenName,
-        familyName: expectedFamilyName,
-        suffix: expectedSuffix,
+        fullName: expectedFullName,
       } as Patient
       const mockedPatientRepository = mocked(PatientRepository, true)
       mockedPatientRepository.save.mockResolvedValue(expectedPatient)
@@ -182,7 +178,7 @@ describe('patients slice', () => {
       expect(mockedComponents.Toast).toHaveBeenCalledWith(
         'success',
         'Success!',
-        `patients.successfullyCreated ${expectedGivenName} ${expectedFamilyName} ${expectedSuffix}`,
+        `patients.successfullyCreated ${expectedFullName}`,
       )
     })
   })
@@ -286,14 +282,10 @@ describe('patients slice', () => {
     it('should call the Toaster function with the correct data', async () => {
       jest.spyOn(components, 'Toast')
       const expectedPatientId = '12345'
-      const expectedGivenName = 'given'
-      const expectedFamilyName = 'family'
-      const expectedSuffix = 'suffix'
+      const fullName = 'John Doe II'
       const expectedPatient = {
         id: expectedPatientId,
-        givenName: expectedGivenName,
-        familyName: expectedFamilyName,
-        suffix: expectedSuffix,
+        fullName,
       } as Patient
       const mockedPatientRepository = mocked(PatientRepository, true)
       mockedPatientRepository.saveOrUpdate.mockResolvedValue(expectedPatient)
@@ -307,7 +299,7 @@ describe('patients slice', () => {
       expect(mockedComponents.Toast).toHaveBeenCalledWith(
         'success',
         'Success!',
-        `patients.successfullyUpdated ${expectedGivenName} ${expectedFamilyName} ${expectedSuffix}`,
+        `patients.successfullyUpdated ${fullName}`,
       )
     })
   })

diff --git a/src/patients/patient-slice.ts b/src/patients/patient-slice.ts
@@ -67,9 +67,7 @@ export const createPatient = (patient: Patient, history: any): AppThunk => async
   Toast(
     'success',
     il8n.t('Success!'),
-    `${il8n.t('patients.successfullyCreated')} ${patient.givenName} ${patient.familyName} ${
-      patient.suffix
-    }`,
+    `${il8n.t('patients.successfullyCreated')} ${patient.fullName}`,
   )
 }
 
@@ -81,9 +79,7 @@ export const updatePatient = (patient: Patient, history: any): AppThunk => async
   Toast(
     'success',
     il8n.t('Success!'),
-    `${il8n.t('patients.successfullyUpdated')} ${patient.givenName} ${patient.familyName} ${
-      patient.suffix
-    }`,
+    `${il8n.t('patients.successfullyUpdated')} ${patient.fullName}`,
   )
 }