SORMAS-Foundation#2562: Make multiple addresses for person available

Author: ChristopherRiedel

sormas-api/src/main/java/de/symeda/sormas/api/ConfigFacade.java

@@ -17,10 +17,10 @@
  *******************************************************************************/
 package de.symeda.sormas.api;
 
-import de.symeda.sormas.api.region.GeoLatLon;
-
 import javax.ejb.Remote;
 
+import de.symeda.sormas.api.region.GeoLatLon;
+
 @Remote
 public interface ConfigFacade {
 
@@ -30,6 +30,8 @@ public interface ConfigFacade {
 
 	boolean isGermanServer();
 
+	boolean isSwissServer();
+
 	String getEpidPrefix();
 
 	String getAppUrl();

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java

@@ -881,6 +881,8 @@ public interface Captions {
 	String linkEventToCase = "linkEventToCase";
 	String Location = "Location";
 	String Location_additionalInformation = "Location.additionalInformation";
+	String Location_addressType = "Location.addressType";
+	String Location_addressTypeDetails = "Location.addressTypeDetails";
 	String Location_areaType = "Location.areaType";
 	String Location_details = "Location.details";
 	String Location_houseNumber = "Location.houseNumber";
@@ -969,6 +971,7 @@ public interface Captions {
 	String PathogenTests = "PathogenTests";
 	String Person = "Person";
 	String Person_address = "Person.address";
+	String Person_addresses = "Person.addresses";
 	String Person_ageAndBirthDate = "Person.ageAndBirthDate";
 	String Person_approximateAge = "Person.approximateAge";
 	String Person_approximateAgeReferenceDate = "Person.approximateAgeReferenceDate";

sormas-api/src/main/java/de/symeda/sormas/api/location/LocationDto.java

@@ -18,6 +18,7 @@
 package de.symeda.sormas.api.location;
 
 import de.symeda.sormas.api.PseudonymizableDto;
+import de.symeda.sormas.api.person.PersonAddressType;
 import de.symeda.sormas.api.region.CommunityReferenceDto;
 import de.symeda.sormas.api.region.DistrictReferenceDto;
 import de.symeda.sormas.api.region.RegionReferenceDto;
@@ -46,6 +47,8 @@ public class LocationDto extends PseudonymizableDto {
 	public static final String STREET = "street";
 	public static final String HOUSE_NUMBER = "houseNumber";
 	public static final String ADDITIONAL_INFORMATION = "additionalInformation";
+	public static final String ADDRESS_TYPE = "addressType";
+	public static final String ADDRESS_TYPE_DETAILS = "addressTypeDetails";
 
 	private RegionReferenceDto region;
 	private DistrictReferenceDto district;
@@ -81,6 +84,8 @@ public class LocationDto extends PseudonymizableDto {
 	@PersonalData
 	@SensitiveData
 	private String additionalInformation;
+	private PersonAddressType addressType;
+	private String addressTypeDetails;
 
 	public String getDetails() {
 		return details;
@@ -186,6 +191,22 @@ public void setAdditionalInformation(String additionalInformation) {
 		this.additionalInformation = additionalInformation;
 	}
 
+	public PersonAddressType getAddressType() {
+		return addressType;
+	}
+
+	public void setAddressType(PersonAddressType addressType) {
+		this.addressType = addressType;
+	}
+
+	public String getAddressTypeDetails() {
+		return addressTypeDetails;
+	}
+
+	public void setAddressTypeDetails(String addressTypeDetails) {
+		this.addressTypeDetails = addressTypeDetails;
+	}
+
 	@Override
 	public String toString() {
 

sormas-api/src/main/java/de/symeda/sormas/api/person/PersonAddressType.java

@@ -0,0 +1,17 @@
+package de.symeda.sormas.api.person;
+
+import de.symeda.sormas.api.i18n.I18nProperties;
+
+public enum PersonAddressType {
+
+	HOME,
+	PLACE_OF_RESIDENCE,
+	PLACE_OF_EXPOSURE,
+	PLACE_OF_WORK,
+	EVENT_LOCATION,
+	OTHER_ADDRESS;
+
+	public String toString() {
+		return I18nProperties.getEnumCaption(this);
+	}
+}

sormas-api/src/main/java/de/symeda/sormas/api/person/PersonDto.java

@@ -17,9 +17,12 @@
  *******************************************************************************/
 package de.symeda.sormas.api.person;
 
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 import de.symeda.sormas.api.Disease;
+import de.symeda.sormas.api.ImportIgnore;
 import de.symeda.sormas.api.PseudonymizableDto;
 import de.symeda.sormas.api.facility.FacilityReferenceDto;
 import de.symeda.sormas.api.facility.FacilityType;
@@ -100,6 +103,7 @@ public class PersonDto extends PseudonymizableDto {
 	public static final String EMAIL_ADDRESS = "emailAddress";
 	public static final String OCCUPATION_FACILITY_TYPE = "occupationFacilityType";
 	public static final String PLACE_OF_BIRTH_FACILITY_TYPE = "placeOfBirthFacilityType";
+	public static final String ADDRESSES = "addresses";
 
 	// Fields are declared in the order they should appear in the import template
 
@@ -257,6 +261,7 @@ public class PersonDto extends PseudonymizableDto {
 	private String passportNumber;
 	@SensitiveData
 	private String nationalHealthId;
+	private List<LocationDto> addresses = new ArrayList<>();
 
 	public Integer getBirthdateDD() {
 		return birthdateDD;
@@ -642,6 +647,15 @@ public void setPlaceOfBirthFacilityType(FacilityType placeOfBirthFacilityType) {
 		this.placeOfBirthFacilityType = placeOfBirthFacilityType;
 	}
 
+	@ImportIgnore
+	public List<LocationDto> getAddresses() {
+		return addresses;
+	}
+
+	public void setAddresses(List<LocationDto> addresses) {
+		this.addresses = addresses;
+	}
+
 	@Override
 	public String toString() {
 		return buildCaption(firstName, lastName);

sormas-api/src/main/java/de/symeda/sormas/api/person/PersonFacade.java

@@ -17,16 +17,17 @@
  *******************************************************************************/
 package de.symeda.sormas.api.person;
 
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import javax.ejb.Remote;
+
 import de.symeda.sormas.api.Disease;
 import de.symeda.sormas.api.caze.CaseCriteria;
 import de.symeda.sormas.api.region.DistrictReferenceDto;
 import de.symeda.sormas.api.user.UserReferenceDto;
 
-import javax.ejb.Remote;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
 @Remote
 public interface PersonFacade {
 
@@ -46,8 +47,6 @@ public interface PersonFacade {
 
 	List<PersonDto> getByUuids(List<String> uuids);
 
-	PersonIndexDto getIndexDto(String uuid);
-
 	Map<Disease, Long> getDeathCountByDisease(CaseCriteria caseCriteria, boolean excludeSharedCases, boolean excludeCasesFromContacts);
 
 	/**