Merge pull request SORMAS-Foundation#3496 from hzi-braunschweig/feat-3101-split-contact-address

SORMAS-Foundation#3101 split address into street, number, additional info in contacts view

Author: vlad-ciucescu

sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactIndexDetailedDto.java

@@ -22,7 +22,9 @@ public class ContactIndexDetailedDto extends ContactIndexDto {
 	public static final String APPROXIMATE_AGE = "approximateAge";
 	public static final String DISTRICT_NAME = "districtName";
 	public static final String CITY = "city";
-	public static final String ADDRESS = "address";
+	public static final String STREET = "street";
+	public static final String HOUSE_NUMBER = "houseNumber";
+	public static final String ADDITIONAL_INFORMATION = "additionalInformation";
 	public static final String POSTAL_CODE = "postalCode";
 	public static final String PHONE = "phone";
 	public static final String REPORTING_USER = "reportingUser";
@@ -37,7 +39,13 @@ public class ContactIndexDetailedDto extends ContactIndexDto {
 	private String city;
 	@PersonalData
 	@SensitiveData
-	private String address;
+	private String street;
+	@PersonalData
+	@SensitiveData
+	private String houseNumber;
+	@PersonalData
+	@SensitiveData
+	private String additionalInformation;
 	@PersonalData
 	@SensitiveData
 	@Pseudonymizer(PostalCodePseudonymizer.class)
@@ -59,7 +67,7 @@ public ContactIndexDetailedDto(String uuid, String personFirstName, String perso
 								   String caseReportingUserUid, String caseRegionUuid, String caseDistrictUud, String caseCommunityUuid,
 								   String caseHealthFacilityUuid, String casePointOfEntryUuid, Date changeDate, String externalID,
 								   Sex sex, Integer approximateAge, ApproximateAgeType approximateAgeType,
-								   String districtName, String city, String street, String houseNumber, String postalCode, String phone,
+								   String districtName, String city, String street, String houseNumber, String additionalInformation, String postalCode, String phone,
 								   String reportingUserFirstName, String reportingUserLastName, int visitCount, long eventCount
 	) {
 	//@formatter:on
@@ -75,7 +83,9 @@ public ContactIndexDetailedDto(String uuid, String personFirstName, String perso
 		this.approximateAge = ApproximateAgeType.ApproximateAgeHelper.formatApproximateAge(approximateAge, approximateAgeType);
 		this.districtName = districtName;
 		this.city = city;
-		this.address = LocationDto.buildStreetAndHouseNumberCaption(street, houseNumber);
+		this.street = street;
+		this.houseNumber = houseNumber;
+		this.additionalInformation = additionalInformation;
 		this.postalCode = postalCode;
 		this.phone = phone;
 		this.reportingUser = new UserReferenceDto(reportingUserUuid, reportingUserFirstName, reportingUserLastName, null);
@@ -98,8 +108,16 @@ public String getCity() {
 		return city;
 	}
 
-	public String getAddress() {
-		return address;
+	public String getStreet() {
+		return street;
+	}
+
+	public String getHouseNumber() {
+		return houseNumber;
+	}
+
+	public String getAdditionalInformation() {
+		return additionalInformation;
 	}
 
 	public String getPostalCode() {

sormas-backend/src/main/java/de/symeda/sormas/backend/contact/ContactListCriteriaBuilder.java

@@ -178,6 +178,7 @@ private List<Selection<?>> getContactIndexDetailedSelections(Root<Contact> conta
 				joins.getAddress().get(Location.CITY),
 				joins.getAddress().get(Location.STREET),
 				joins.getAddress().get(Location.HOUSE_NUMBER),
+				joins.getAddress().get(Location.ADDITIONAL_INFORMATION),
 				joins.getAddress().get(Location.POSTAL_CODE),
 				joins.getPerson().get(Person.PHONE),
 				joins.getReportingUser().get(User.FIRST_NAME),
@@ -196,10 +197,11 @@ private List<Expression<?>> getIndexDetailOrders(SortProperty sortProperty, Root
 		case ContactIndexDetailedDto.DISTRICT_NAME:
 			return Collections.singletonList(joins.getDistrict().get(District.NAME));
 		case ContactIndexDetailedDto.CITY:
+		case ContactIndexDetailedDto.STREET:
+		case ContactIndexDetailedDto.HOUSE_NUMBER:
+		case ContactIndexDetailedDto.ADDITIONAL_INFORMATION:
 		case ContactIndexDetailedDto.POSTAL_CODE:
 			return Collections.singletonList(joins.getAddress().get(sortProperty.propertyName));
-		case ContactIndexDetailedDto.ADDRESS:
-			return Collections.singletonList(joins.getAddress().get(Location.STREET));
 		case ContactIndexDetailedDto.REPORTING_USER:
 			return Arrays.asList(joins.getReportingUser().get(User.FIRST_NAME), joins.getReportingUser().get(User.LAST_NAME));
 		default:

sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseGridDetailed.java

@@ -48,8 +48,8 @@ protected Stream<String> getPersonColumns() {
 		return Stream.concat(
 			super.getPersonColumns(),
 			Stream.of(
-				CaseIndexDetailedDto.AGE_AND_BIRTH_DATE,
 				CaseIndexDetailedDto.SEX,
+				CaseIndexDetailedDto.AGE_AND_BIRTH_DATE,
 				CaseIndexDetailedDto.CITY,
 				CaseIndexDetailedDto.STREET,
 				CaseIndexDetailedDto.HOUSE_NUMBER,

sormas-ui/src/main/java/de/symeda/sormas/ui/contact/ContactGridDetailed.java

@@ -46,7 +46,9 @@ protected Stream<String> getPersonColumns() {
 				ContactIndexDetailedDto.APPROXIMATE_AGE,
 				ContactIndexDetailedDto.DISTRICT_NAME,
 				ContactIndexDetailedDto.CITY,
-				ContactIndexDetailedDto.ADDRESS,
+				ContactIndexDetailedDto.STREET,
+				ContactIndexDetailedDto.HOUSE_NUMBER,
+				ContactIndexDetailedDto.ADDITIONAL_INFORMATION,
 				ContactIndexDetailedDto.POSTAL_CODE,
 				ContactIndexDetailedDto.PHONE));
 	}
@@ -66,7 +68,9 @@ protected void initColumns() {
 		getColumn(ContactIndexDetailedDto.APPROXIMATE_AGE).setWidth(50);
 		getColumn(ContactIndexDetailedDto.DISTRICT_NAME).setWidth(150);
 		getColumn(ContactIndexDetailedDto.CITY).setWidth(150);
-		getColumn(ContactIndexDetailedDto.ADDRESS).setWidth(200);
+		getColumn(ContactIndexDetailedDto.STREET).setWidth(150);
+		getColumn(ContactIndexDetailedDto.HOUSE_NUMBER).setWidth(50);
+		getColumn(ContactIndexDetailedDto.ADDITIONAL_INFORMATION).setWidth(200);
 		getColumn(ContactIndexDetailedDto.POSTAL_CODE).setWidth(100);
 		getColumn(ContactIndexDetailedDto.PHONE).setWidth(100);
 		((Column<ContactIndexDetailedDto, CaseReferenceDto>) getColumn(ContactIndexDetailedDto.CAZE)).setWidth(150)