Merge pull request SORMAS-Foundation#3218 from hzi-braunschweig/3156_sormas-to-sormas-handle-other-facilities

SORMAS-Foundation#3156 handle home or other facility and other point of entry infrastructure data

Author: FredrikSchaefer

sormas-api/src/main/java/de/symeda/sormas/api/facility/FacilityDto.java

@@ -17,7 +17,9 @@
  *******************************************************************************/
 package de.symeda.sormas.api.facility;
 
+import java.util.Arrays;
 import java.util.Date;
+import java.util.List;
 
 import de.symeda.sormas.api.EntityDto;
 import de.symeda.sormas.api.region.CommunityReferenceDto;
@@ -32,6 +34,7 @@ public class FacilityDto extends EntityDto {
 	public static final String I18N_PREFIX = "Facility";
 	public static final String OTHER_FACILITY_UUID = "SORMAS-CONSTID-OTHERS-FACILITY";
 	public static final String NONE_FACILITY_UUID = "SORMAS-CONSTID-ISNONE-FACILITY";
+	public static final List<String> CONSTANT_FACILITY_UUIDS = Arrays.asList(OTHER_FACILITY_UUID, NONE_FACILITY_UUID);
 	public static final String OTHER_FACILITY = "OTHER_FACILITY";
 	public static final String NO_FACILITY = "NO_FACILITY";
 	public static final String NAME = "name";

sormas-api/src/main/java/de/symeda/sormas/api/infrastructure/PointOfEntryDto.java

@@ -1,6 +1,8 @@
 package de.symeda.sormas.api.infrastructure;
 
+import java.util.Arrays;
 import java.util.Date;
+import java.util.List;
 
 import de.symeda.sormas.api.EntityDto;
 import de.symeda.sormas.api.region.DistrictReferenceDto;
@@ -15,6 +17,8 @@ public class PointOfEntryDto extends EntityDto {
 	public static final String OTHER_SEAPORT_UUID = "SORMAS-CONSTID-OTHERS-SEAPORTX";
 	public static final String OTHER_GROUND_CROSSING_UUID = "SORMAS-CONSTIG-OTHERS-GROUNDCR";
 	public static final String OTHER_POE_UUID = "SORMAS-CONSTID-OTHERS-OTHERPOE";
+	public static final List<String> CONSTANT_POE_UUIDS =
+		Arrays.asList(OTHER_AIRPORT_UUID, OTHER_SEAPORT_UUID, OTHER_GROUND_CROSSING_UUID, OTHER_POE_UUID);
 	public static final String OTHER_AIRPORT = "OTHER_AIRPORT";
 	public static final String OTHER_SEAPORT = "OTHER_SEAPORT";
 	public static final String OTHER_GROUND_CROSSING = "OTHER_GROUND_CROSSING";
@@ -173,4 +177,8 @@ public void setExternalID(String externalID) {
 	public String toString() {
 		return InfrastructureHelper.buildPointOfEntryString(getUuid(), name);
 	}
+
+	public PointOfEntryReferenceDto toReference() {
+		return new PointOfEntryReferenceDto(getUuid(), toString());
+	}
 }

sormas-backend/src/main/java/de/symeda/sormas/backend/sormastosormas/SormasToSormasFacadeEjb.java

@@ -64,12 +64,14 @@
 import de.symeda.sormas.api.contact.ContactCriteria;
 import de.symeda.sormas.api.contact.ContactDto;
 import de.symeda.sormas.api.epidata.EpiDataDto;
+import de.symeda.sormas.api.facility.FacilityDto;
 import de.symeda.sormas.api.facility.FacilityReferenceDto;
 import de.symeda.sormas.api.facility.FacilityType;
 import de.symeda.sormas.api.i18n.Captions;
 import de.symeda.sormas.api.i18n.I18nProperties;
 import de.symeda.sormas.api.i18n.Strings;
 import de.symeda.sormas.api.i18n.Validations;
+import de.symeda.sormas.api.infrastructure.PointOfEntryDto;
 import de.symeda.sormas.api.infrastructure.PointOfEntryReferenceDto;
 import de.symeda.sormas.api.location.LocationDto;
 import de.symeda.sormas.api.person.PersonDto;
@@ -526,26 +528,39 @@ private InfrastructureData loadLocalInfrastructure(
 		}
 
 		if (facility != null) {
-			String facilityName = facility.getCaption();
-			FacilityReferenceDto localFacility =
-				facilityFacade.getByNameAndType(facilityName, localDistrict, localCommunity, facilityType, false).stream().findFirst().orElse(null);
-
-			if (localFacility == null) {
-				unmatchedFields.add(I18nProperties.getCaption(Captions.facility) + ": " + facilityName);
+			String facilityUuid = facility.getUuid();
+			if (FacilityDto.CONSTANT_FACILITY_UUIDS.contains(facilityUuid)) {
+				infrastructureData.facility = facilityFacade.getByUuid(facilityUuid).toReference();
 			} else {
-				infrastructureData.facility = localFacility;
+				String facilityName = facility.getCaption();
+				FacilityReferenceDto localFacility = facilityFacade.getByNameAndType(facilityName, localDistrict, localCommunity, facilityType, false)
+					.stream()
+					.findFirst()
+					.orElse(null);
+
+				if (localFacility == null) {
+					unmatchedFields.add(I18nProperties.getCaption(Captions.facility) + ": " + facilityName);
+				} else {
+					infrastructureData.facility = localFacility;
+				}
 			}
 		}
 
 		if (pointOfEntry != null) {
-			String pointOfEntryName = pointOfEntry.getCaption();
-			PointOfEntryReferenceDto localPointOfEntry =
-				pointOfEntryFacade.getByName(pointOfEntryName, localDistrict, false).stream().findFirst().orElse(null);
+			String pointOfEntryUuid = pointOfEntry.getUuid();
 
-			if (localPointOfEntry == null) {
-				unmatchedFields.add(I18nProperties.getCaption(Captions.pointOfEntry) + ": " + pointOfEntryName);
+			if (PointOfEntryDto.CONSTANT_POE_UUIDS.contains(pointOfEntryUuid)) {
+				infrastructureData.pointOfEntry = pointOfEntryFacade.getByUuid(pointOfEntryUuid).toReference();
 			} else {
-				infrastructureData.pointOfEntry = localPointOfEntry;
+				String pointOfEntryName = pointOfEntry.getCaption();
+				PointOfEntryReferenceDto localPointOfEntry =
+					pointOfEntryFacade.getByName(pointOfEntryName, localDistrict, false).stream().findFirst().orElse(null);
+
+				if (localPointOfEntry == null) {
+					unmatchedFields.add(I18nProperties.getCaption(Captions.pointOfEntry) + ": " + pointOfEntryName);
+				} else {
+					infrastructureData.pointOfEntry = localPointOfEntry;
+				}
 			}
 		}