Feature 4058 contact selection (SORMAS-Foundation#4128)

Author: ChristopherRiedel

sormas-ui/src/main/java/de/symeda/sormas/ui/labmessage/EntrySelectionField.java

@@ -207,8 +207,12 @@ private void addSelectContactRadioGroup() {
 		rbSelectContact.addValueChangeListener(e -> {
 			if (e.getValue() != null) {
 				rbCreateEntity.setValue(null);
-				rbSelectCase.setValue(null);
-				rbSelectEventParticipant.setValue(null);
+				if (rbSelectCase != null) {
+					rbSelectCase.setValue(null);
+				}
+				if (rbSelectEventParticipant != null) {
+					rbSelectEventParticipant.setValue(null);
+				}
 				contactGrid.setEnabled(true);
 				if (caseGrid != null) {
 					caseGrid.setEnabled(false);

sormas-ui/src/main/java/de/symeda/sormas/ui/labmessage/LabMessageController.java

@@ -16,6 +16,7 @@
 import de.symeda.sormas.api.caze.CaseIndexDto;
 import de.symeda.sormas.api.caze.CaseSimilarityCriteria;
 import de.symeda.sormas.api.contact.ContactDto;
+import de.symeda.sormas.api.contact.ContactSimilarityCriteria;
 import de.symeda.sormas.api.contact.SimilarContactDto;
 import de.symeda.sormas.api.event.SimilarEventParticipantDto;
 import de.symeda.sormas.api.facility.FacilityReferenceDto;
@@ -84,20 +85,20 @@ public void process(String uuid) {
 					caseSimilarityCriteria.personUuid(selectedPerson.getUuid());
 					List<CaseIndexDto> similarCases = FacadeProvider.getCaseFacade().getSimilarCases(caseSimilarityCriteria);
 
-//					TODO: Add picking of contacts and event participants
-//					ContactSimilarityCriteria contactSimilarityCriteria = new ContactSimilarityCriteria();
-//					contactSimilarityCriteria.setPerson(selectedPerson);
-//					contactSimilarityCriteria.setDisease(labMessageDto.getTestedDisease());
-//					List<SimilarContactDto> similarContacts = FacadeProvider.getContactFacade().getMatchingContacts(contactSimilarityCriteria);
-//
+					ContactSimilarityCriteria contactSimilarityCriteria = new ContactSimilarityCriteria();
+					contactSimilarityCriteria.setPerson(selectedPerson);
+					contactSimilarityCriteria.setDisease(labMessageDto.getTestedDisease());
+					List<SimilarContactDto> similarContacts = FacadeProvider.getContactFacade().getMatchingContacts(contactSimilarityCriteria);
+
+//					TODO: Add picking of event participants
 //					EventParticipantSimilarityCriteria eventParticipantSimilarityCriteria = new EventParticipantSimilarityCriteria();
 //					eventParticipantSimilarityCriteria.setPerson(selectedPerson);
 //					eventParticipantSimilarityCriteria.setDisease(labMessageDto.getTestedDisease());
 //					List<SimilarEventParticipantDto> similarEventParticipants =
 //						FacadeProvider.getEventParticipantFacade().getSimilarEventParticipants(eventParticipantSimilarityCriteria);
 //
 //					pickOrCreateEntry(labMessageDto, similarCases, similarContacts, similarEventParticipants);
-					pickOrCreateEntry(labMessageDto, similarCases, null, null, selectedPersonDto);
+					pickOrCreateEntry(labMessageDto, similarCases, similarContacts, null, selectedPersonDto);
 				}
 			}, false);
 	}
@@ -120,6 +121,8 @@ private void pickOrCreateEntry(
 				createContact(labMessageDto, person);
 			} else if (similarEntriesDto.getCaze() != null) {
 				createSample(FacadeProvider.getCaseFacade().getCaseDataByUuid(similarEntriesDto.getCaze().getUuid()), labMessageDto);
+			} else if (similarEntriesDto.getContact() != null) {
+				createSample(FacadeProvider.getContactFacade().getContactByUuid(similarEntriesDto.getContact().getUuid()), labMessageDto);
 			}
 		});