Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FM2-650: Replace the existing name instead of creating a new name #546

Merged
merged 4 commits into from
Dec 3, 2024
Merged

FM2-650: Replace the existing name instead of creating a new name #546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a5f1900
(fix) void old patient names
icrc-jofrancisco Jul 23, 2024
ac091a0
(chore) replace the existing name instead of creating a new name
icrc-jofrancisco Jul 25, 2024
e36af45
(chore) replace the existing name instead of creating a new name
icrc-jofrancisco Jul 25, 2024
50ba3aa
(feat) Update existing person name when the name exists
Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion api/src/main/java/org/openmrs/module/fhir2/api/translators/impl/PatientTranslatorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,14 @@ public org.openmrs.Patient toOpenmrsType(@Nonnull org.openmrs.Patient currentPat
}

for (HumanName name : patient.getName()) {
currentPatient.addName(nameTranslator.toOpenmrsType(name));
PersonName existingName = null;
if (name.hasId()) {
existingName = currentPatient.getNames().stream().filter(n -> n.getUuid().equals(name.getId())).findFirst()
.orElse(null);
}

PersonName pn = nameTranslator.toOpenmrsType(existingName != null ? existingName : new PersonName(), name);
currentPatient.addName(pn);
}

if (patient.hasGender()) {
Expand Down
25 changes: 24 additions & 1 deletion ...rc/test/java/org/openmrs/module/fhir2/api/translators/impl/PatientTranslatorImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ public class PatientTranslatorImplTest {

private static final String PATIENT_IDENTIFIER_UUID = "654321-fedcba-654321";

private static final String PATIENT_NAME_UUID = "1fdb5469-57c7-435f-b009-3dcceb23b0a2";

private static final String PATIENT_GIVEN_NAME = "Jean Claude";

private static final String PATIENT_FAMILY_NAME = "van Damme";
Expand Down Expand Up @@ -304,17 +306,38 @@ public void shouldTranslateFhirPatientNameToOpenmrsPatientName() {
PersonName personName = new PersonName();
personName.setGivenName(PATIENT_GIVEN_NAME);
personName.setFamilyName(PATIENT_FAMILY_NAME);
when(nameTranslator.toOpenmrsType(any())).thenReturn(personName);
when(nameTranslator.toOpenmrsType(any(), any())).thenReturn(personName);

Patient patient = new Patient();
HumanName name = new HumanName();
name.addGiven(PATIENT_GIVEN_NAME);
name.setFamily(PATIENT_FAMILY_NAME);
patient.addName(name);

org.openmrs.Patient result = patientTranslator.toOpenmrsType(patient);
assertThat(result.getGivenName(), equalTo(PATIENT_GIVEN_NAME));
assertThat(result.getFamilyName(), equalTo(PATIENT_FAMILY_NAME));
}

@Test
public void shouldTranslateFhirPatientNameToExistingOpenmrsPatientName() {
PersonName personName = new PersonName();
personName.setUuid(PATIENT_NAME_UUID);
personName.setGivenName(PATIENT_GIVEN_NAME);
personName.setFamilyName(PATIENT_FAMILY_NAME);
when(nameTranslator.toOpenmrsType(any(), any())).thenReturn(personName);

Patient patient = new Patient();
HumanName name = new HumanName();
name.setId(PATIENT_NAME_UUID);
name.addGiven(PATIENT_GIVEN_NAME);
name.setFamily(PATIENT_FAMILY_NAME);
patient.addName(name);

org.openmrs.Patient result = patientTranslator.toOpenmrsType(patient);
assertThat(result.getGivenName(), equalTo(PATIENT_GIVEN_NAME));
assertThat(result.getFamilyName(), equalTo(PATIENT_FAMILY_NAME));
assertThat(result.getPersonName().getUuid(), equalTo(PATIENT_NAME_UUID));
}

@Test
Expand Down
Loading