Skip to content

Bugfix 13625 add handling person multiple contact info #13872

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

Merged
KarnaiahPesula merged 7 commits into from
Mar 11, 2026
Merged

Bugfix 13625 add handling person multiple contact info #13872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9f0d8ae
#13625 - Added handling of person multiple contact email and phone
raulbob Mar 9, 2026
35aff93
#13625 - Added additional tests for person multiple contacts logic
raulbob Mar 9, 2026
f9ca77e
#13625 - Fixed unhandled code branches for person updates
raulbob Mar 10, 2026
c963ed4
#13754 - Fixed NPE when date of diagnosis is not provided
raulbob Mar 9, 2026
138a191
Added hanlding for potential report date overwrite
raulbob Mar 9, 2026
ac3b15e
Fixed small issues
raulbob Mar 10, 2026
2d2417d
Added additional handling for multiple contact updates.
raulbob Mar 10, 2026
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
20 changes: 20 additions & 0 deletions sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,8 @@ public class ExternalMessageDto extends SormasToSormasShareableDto {
public static final String DIAGNOSTIC_DATE = "diagnosticDate";
public static final String ACTIVITIES_AS_CASE = "activitiesAsCase";
public static final String EXPOSURES = "exposures";
public static final String ADDITIONAL_PERSON_CONTACT_DETAILS = "additionalPersonContactDetails";
public static final String ADDITIONAL_PERSON_ADDRESSES = "additionalPersonAddresses";
public static final String RADIOGRAPHY_COMPATIBILITY = "radiographyCompatibility";
public static final String OTHER_DIAGNOSTIC_CRITERIA = "otherDiagnosticCriteria";
public static final String TUBERCULOSIS = "tuberculosis";
Expand Down Expand Up @@ -246,6 +248,8 @@ public class ExternalMessageDto extends SormasToSormasShareableDto {

private String activitiesAsCase;
private String exposures;
private String additionalPersonContactDetails;
private String additionalPersonAddresses;

private RadiographyCompatibility radiographyCompatibility;
@Size(max = FieldConstraints.CHARACTER_LIMIT_DEFAULT, message = Validations.textTooLong)
Expand Down Expand Up @@ -836,6 +840,22 @@ public void setActivitiesAsCase(String activitiesAsCase) {
this.activitiesAsCase = activitiesAsCase;
}

public String getAdditionalPersonContactDetails() {
return additionalPersonContactDetails;
}

public void setAdditionalPersonContactDetails(String additionalPersonContactDetails) {
this.additionalPersonContactDetails = additionalPersonContactDetails;
}

public String getAdditionalPersonAddresses() {
return additionalPersonAddresses;
}

public void setAdditionalPersonAddresses(String additionalPersonAddresses) {
this.additionalPersonAddresses = additionalPersonAddresses;
}

public String getExposures() {
return exposures;
}
Expand Down
143 changes: 17 additions & 126 deletions ...va/de/symeda/sormas/api/externalmessage/processing/AbstractMessageProcessingFlowBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,11 @@
import de.symeda.sormas.api.externalmessage.processing.labmessage.LabMessageProcessingHelper;
import de.symeda.sormas.api.externalmessage.processing.labmessage.SampleAndPathogenTests;
import de.symeda.sormas.api.feature.FeatureType;
import de.symeda.sormas.api.infrastructure.country.CountryReferenceDto;
import de.symeda.sormas.api.infrastructure.facility.FacilityDto;
import de.symeda.sormas.api.infrastructure.facility.FacilityReferenceDto;
import de.symeda.sormas.api.infrastructure.facility.FacilityType;
import de.symeda.sormas.api.location.LocationDto;
import de.symeda.sormas.api.person.PersonContactDetailDto;
import de.symeda.sormas.api.person.PersonContactDetailType;
import de.symeda.sormas.api.person.PersonDto;
import de.symeda.sormas.api.person.PersonReferenceDto;
import de.symeda.sormas.api.person.PhoneNumberType;
import de.symeda.sormas.api.sample.PathogenTestDto;
import de.symeda.sormas.api.sample.SampleCriteria;
import de.symeda.sormas.api.sample.SampleDto;
Expand Down Expand Up @@ -1051,12 +1046,18 @@ protected abstract void markExternalMessageAsProcessed(
ProcessingResult<ExternalMessageProcessingResult> result,
SurveillanceReportDto surveillanceReport);

protected void doPersonUpdates(EntitySelection<PersonDto> personSelection) {
// requested for #13589
// TODO: we need to find a better way to handle this
@Override
protected CompletionStage<ProcessingResult<ExternalMessageProcessingResult>> pickOrCreatePerson(ExternalMessageProcessingResult previousResult) {
return super.pickOrCreatePerson(previousResult).thenCompose(result -> {
if (!result.getStatus().isCanceled() && result.getData() != null) {
mergePerson(result.getData().getSelectedPerson());
}
return result.asCompletedFuture();
});
}

if (personSelection.isNew()) {
// no updates for new persons
protected void mergePerson(EntitySelection<PersonDto> personSelection) {
if (personSelection == null) {
return;
}

Expand All @@ -1065,124 +1066,14 @@ protected void doPersonUpdates(EntitySelection<PersonDto> personSelection) {
return;
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.

boolean doUpdate = false;

final LocationDto personAddress = person.getAddress();

if (personAddress != null) {
final String houseNumber = getExternalMessage().getPersonHouseNumber();
if (houseNumber != null) {
personAddress.setHouseNumber(houseNumber);
}
final String street = getExternalMessage().getPersonStreet();
if (street != null) {
personAddress.setStreet(street);
}
final String city = getExternalMessage().getPersonCity();
if (city != null) {
personAddress.setCity(city);
}
final String postalCode = getExternalMessage().getPersonPostalCode();
if (postalCode != null) {
personAddress.setPostalCode(postalCode);
}
final CountryReferenceDto country = getExternalMessage().getPersonCountry();
if (country != null) {
personAddress.setCountry(country);
}

doUpdate = true;
}

final List<PersonContactDetailDto> personContactDetails = person.getPersonContactDetails();

final String phoneNumber = getExternalMessage().getPersonPhone();
final PhoneNumberType phoneNumberType = getExternalMessage().getPersonPhoneNumberType();

if (phoneNumber != null && !phoneNumber.isBlank()) {
final PersonContactDetailDto primaryPhone = personContactDetails.stream()
.filter(pdc -> pdc.getPersonContactDetailType() == PersonContactDetailType.PHONE && !pdc.isThirdParty() && pdc.isPrimaryContact())
.findFirst()
.orElse(null);

final PersonContactDetailDto existingPhone = personContactDetails.stream()
.filter(pdc -> pdc.getPersonContactDetailType() == PersonContactDetailType.PHONE && !pdc.isThirdParty() && phoneNumber.equals(pdc.getContactInformation()))
.findFirst()
.orElse(null);

if(existingPhone != null) {
// if we have a existing phone number maybe it is not the new one
// make the primary phone not primary anymore and set the primary on the existing one
// coincidentally the existing one may be the primary one so set it to false first just in case
if(primaryPhone != null) {
primaryPhone.setPrimaryContact(false);
}
existingPhone.setPrimaryContact(true);
} else {
// we do not have the new phone number in the list so we need to create a new one
final PersonContactDetailDto personContactDetail = new PersonContactDetailDto();
personContactDetail.setPerson(person.toReference());
personContactDetail.setPrimaryContact(true);
personContactDetail.setPersonContactDetailType(PersonContactDetailType.PHONE);
personContactDetail.setPrimaryContact(true);
personContactDetail.setPhoneNumberType(phoneNumberType);
personContactDetail.setContactInformation(phoneNumber);
personContactDetail.setThirdParty(false);
personContactDetails.add(personContactDetail);

// we need to set the old primary to false
if(primaryPhone != null) {
primaryPhone.setPrimaryContact(false);
}
}

doUpdate = true;
}

final String emailAddress = getExternalMessage().getPersonEmail();

if (emailAddress != null && !emailAddress.isBlank()) {
final PersonContactDetailDto primaryEmail = personContactDetails.stream()
.filter(pdc -> pdc.getPersonContactDetailType() == PersonContactDetailType.EMAIL && !pdc.isThirdParty() && pdc.isPrimaryContact())
.findFirst()
.orElse(null);

final PersonContactDetailDto existingEmail = personContactDetails.stream()
.filter(pdc -> pdc.getPersonContactDetailType() == PersonContactDetailType.EMAIL && !pdc.isThirdParty() && emailAddress.equals(pdc.getContactInformation()))
.findFirst()
.orElse(null);

if(existingEmail != null) {
// if we have a existing email address maybe it is not the new one
// make the primary email not primary anymore and set the primary on the existing one
// coincidentally the existing one may be the primary one so set it to false first just in case
if(primaryEmail != null) {
primaryEmail.setPrimaryContact(false);
}
existingEmail.setPrimaryContact(true);
} else {
// we do not have the new email address in the list so we need to create a new one
final PersonContactDetailDto personContactDetail = new PersonContactDetailDto();
personContactDetail.setPerson(person.toReference());
personContactDetail.setPrimaryContact(true);
personContactDetail.setPersonContactDetailType(PersonContactDetailType.EMAIL);
personContactDetail.setPrimaryContact(true);
personContactDetail.setContactInformation(emailAddress);
personContactDetail.setThirdParty(false);
personContactDetails.add(personContactDetail);

// we need to set the old primary to false
if(primaryEmail != null) {
primaryEmail.setPrimaryContact(false);
}
}

doUpdate = true;
if (personSelection.isNew()) {
// no merges for new person
// additional contacts will be handled by {@link AbstractProcessingFlow#buildPerson()}
return;
}

if (doUpdate) {
getExternalMessageProcessingFacade().updatePerson(person);
}
getMapper().mergePersonAddress(person);
getMapper().mergePersonContactDetails(person);
}

/**
Expand Down
8 changes: 2 additions & 6 deletions ...src/main/java/de/symeda/sormas/api/externalmessage/processing/AbstractProcessingFlow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,10 +151,6 @@ protected CompletionStage<ProcessingResult<ExternalMessageProcessingResult>> pic

return mapHandlerResult(callback, previousResult, personSelection -> {
logger.debug("[MESSAGE PROCESSING] Continue processing with person: {}", personSelection);

// requested for #13589
doPersonUpdates(personSelection);

return previousResult.withPerson(personSelection.getEntity(), personSelection.isNew());
});
}
Expand All @@ -175,14 +171,14 @@ protected <T> CompletionStage<ProcessingResult<ExternalMessageProcessingResult>>

protected abstract void handlePickOrCreatePerson(PersonDto person, HandlerCallback<EntitySelection<PersonDto>> callback);

protected abstract void doPersonUpdates(EntitySelection<PersonDto> personSelection);

private PersonDto buildPerson() {

final PersonDto personDto = PersonDto.build();

mapper.mapToPerson(personDto);
mapper.mapToLocation(personDto.getAddress());
mapper.mapAdditionalPersonContactDetails(personDto);
mapper.mapAdditionalPersonAddresses(personDto);
Comment thread
raulbob marked this conversation as resolved.

return personDto;
}
Expand Down
Loading
Loading