Skip to content
This repository was archived by the owner on May 5, 2021. It is now read-only.

Commit cc39e6a

Browse files
ChristopherRiedelChristopherRiedel
authored
Merge pull request SORMAS-Foundation#2736 from hzi-braunschweig/feature-2562-Person_address_refinement
Feature 2562 person address refinement
2 parents 7ff2404 + c3d5cb5 commit cc39e6a

58 files changed

Lines changed: 1183 additions & 613 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
*******************************************************************************/
1818
package de.symeda.sormas.api;
1919

20-
import de.symeda.sormas.api.region.GeoLatLon;
21-
2220
import javax.ejb.Remote;
2321

22+
import de.symeda.sormas.api.region.GeoLatLon;
23+
2424
@Remote
2525
public interface ConfigFacade {
2626

@@ -30,6 +30,8 @@ public interface ConfigFacade {
3030

3131
boolean isGermanServer();
3232

33+
boolean isSwissServer();
34+
3335
String getEpidPrefix();
3436

3537
String getAppUrl();

‎sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseExportDto.java‎

Lines changed: 38 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,13 @@ public class CaseExportDto implements Serializable {
151151
private String city;
152152
@PersonalData
153153
@SensitiveData
154-
private String address;
154+
private String street;
155+
@PersonalData
156+
@SensitiveData
157+
private String houseNumber;
158+
@PersonalData
159+
@SensitiveData
160+
private String additionalInformation;
155161
@PersonalData
156162
@SensitiveData
157163
@Pseudonymizer(PostalCodePseudonymizer.class)
@@ -226,7 +232,7 @@ public CaseExportDto(long id, long personId, long personAddressId, long epiDataI
226232
Date quarantineOrderedOfficialDocumentDate, boolean quarantineExtended,
227233
YesNoUnknown admittedToHealthFacility, Date admissionDate, Date dischargeDate, YesNoUnknown leftAgainstAdvice, PresentCondition presentCondition,
228234
Date deathDate, Date burialDate, BurialConductor burialConductor, String burialPlaceDescription,
229-
String addressRegion, String addressDistrict, String city, String address, String postalCode,
235+
String addressRegion, String addressDistrict, String city, String street, String houseNumber, String additionalInformation, String postalCode,
230236
String phone, String phoneOwner, EducationType educationType, String educationDetails,
231237
OccupationType occupationType, String occupationDetails, String occupationFacility,
232238
String occupationFacilityUuid, String occupationFacilityDetails, YesNoUnknown traveled,
@@ -283,7 +289,9 @@ public CaseExportDto(long id, long personId, long personAddressId, long epiDataI
283289
this.addressRegion = addressRegion;
284290
this.addressDistrict = addressDistrict;
285291
this.city = city;
286-
this.address = address;
292+
this.street = street;
293+
this.houseNumber = houseNumber;
294+
this.additionalInformation = additionalInformation;
287295
this.postalCode = postalCode;
288296
this.phone = PersonHelper.buildPhoneString(phone, phoneOwner);
289297
this.educationType = PersonHelper.buildEducationString(educationType, educationDetails);
@@ -805,13 +813,33 @@ public String getCity() {
805813
@ExportTarget(caseExportTypes = {
806814
CaseExportType.CASE_SURVEILLANCE,
807815
CaseExportType.CASE_MANAGEMENT })
808-
@ExportProperty(LocationDto.ADDRESS)
816+
@ExportProperty(LocationDto.STREET)
809817
@ExportGroup(ExportGroupType.SENSITIVE)
810-
public String getAddress() {
811-
return address;
818+
public String getStreet() {
819+
return street;
812820
}
813821

814822
@Order(60)
823+
@ExportTarget(caseExportTypes = {
824+
CaseExportType.CASE_SURVEILLANCE,
825+
CaseExportType.CASE_MANAGEMENT })
826+
@ExportProperty(LocationDto.HOUSE_NUMBER)
827+
@ExportGroup(ExportGroupType.SENSITIVE)
828+
public String getHouseNumber() {
829+
return houseNumber;
830+
}
831+
832+
@Order(61)
833+
@ExportTarget(caseExportTypes = {
834+
CaseExportType.CASE_SURVEILLANCE,
835+
CaseExportType.CASE_MANAGEMENT })
836+
@ExportProperty(LocationDto.ADDITIONAL_INFORMATION)
837+
@ExportGroup(ExportGroupType.SENSITIVE)
838+
public String getAdditionalInformation() {
839+
return additionalInformation;
840+
}
841+
842+
@Order(62)
815843
@ExportTarget(caseExportTypes = {
816844
CaseExportType.CASE_SURVEILLANCE,
817845
CaseExportType.CASE_MANAGEMENT })
@@ -821,7 +849,7 @@ public String getPostalCode() {
821849
return postalCode;
822850
}
823851

824-
@Order(61)
852+
@Order(63)
825853
@ExportTarget(caseExportTypes = {
826854
CaseExportType.CASE_SURVEILLANCE,
827855
CaseExportType.CASE_MANAGEMENT })
@@ -831,7 +859,7 @@ public String getAddressGpsCoordinates() {
831859
return addressGpsCoordinates;
832860
}
833861

834-
@Order(62)
862+
@Order(64)
835863
@ExportTarget(caseExportTypes = {
836864
CaseExportType.CASE_SURVEILLANCE,
837865
CaseExportType.CASE_MANAGEMENT })
@@ -841,7 +869,7 @@ public String getPhone() {
841869
return phone;
842870
}
843871

844-
@Order(63)
872+
@Order(65)
845873
@ExportTarget(caseExportTypes = {
846874
CaseExportType.CASE_SURVEILLANCE,
847875
CaseExportType.CASE_MANAGEMENT })
@@ -855,7 +883,7 @@ public void setEducationType(String educationType) {
855883
this.educationType = educationType;
856884
}
857885

858-
@Order(64)
886+
@Order(66)
859887
@ExportTarget(caseExportTypes = {
860888
CaseExportType.CASE_SURVEILLANCE,
861889
CaseExportType.CASE_MANAGEMENT })

‎sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactExportDto.java‎

Lines changed: 35 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,13 @@ public class ContactExportDto implements Serializable {
8282
private String city;
8383
@PersonalData
8484
@SensitiveData
85-
private String address;
85+
private String street;
86+
@PersonalData
87+
@SensitiveData
88+
private String houseNumber;
89+
@PersonalData
90+
@SensitiveData
91+
private String additionalInformation;
8692
@PersonalData
8793
@SensitiveData
8894
@Pseudonymizer(PostalCodePseudonymizer.class)
@@ -129,7 +135,7 @@ public ContactExportDto(long id, long personId, String uuid, String sourceCaseUu
129135
QuarantineType quarantine, String quarantineTypeDetails, Date quarantineFrom, Date quarantineTo, String quarantineHelpNeeded,
130136
boolean quarantineOrderedVerbally, boolean quarantineOrderedOfficialDocument, Date quarantineOrderedVerballyDate, Date quarantineOrderedOfficialDocumentDate, boolean quarantineExtended,
131137
PresentCondition presentCondition, Date deathDate,
132-
String addressRegion, String addressDistrict, String city, String address, String postalCode,
138+
String addressRegion, String addressDistrict, String city, String street, String houseNumber, String additionalInformation, String postalCode,
133139
String phone, String phoneOwner, OccupationType occupationType, String occupationDetails,
134140
String occupationFacility, String occupationFacilityUuid, String occupationFacilityDetails,
135141
String region, String district, String community,
@@ -177,7 +183,9 @@ public ContactExportDto(long id, long personId, String uuid, String sourceCaseUu
177183
this.addressRegion = addressRegion;
178184
this.addressDistrict = addressDistrict;
179185
this.city = city;
180-
this.address = address;
186+
this.street = street;
187+
this.houseNumber = houseNumber;
188+
this.additionalInformation = additionalInformation;
181189
this.postalCode = postalCode;
182190
this.phone = PersonHelper.buildPhoneString(phone, phoneOwner);
183191
this.occupationType = PersonHelper.buildOccupationString(
@@ -421,46 +429,56 @@ public String getCity() {
421429
}
422430

423431
@Order(43)
424-
public String getAddress() {
425-
return address;
432+
public String getStreet() {
433+
return street;
426434
}
427435

428436
@Order(44)
437+
public String getHouseNumber() {
438+
return houseNumber;
439+
}
440+
441+
@Order(45)
442+
public String getAdditionalInformation() {
443+
return additionalInformation;
444+
}
445+
446+
@Order(46)
429447
public String getPostalCode() {
430448
return postalCode;
431449
}
432450

433-
@Order(45)
451+
@Order(47)
434452
public String getPhone() {
435453
return phone;
436454
}
437455

438-
@Order(46)
456+
@Order(48)
439457
public String getOccupationType() {
440458
return occupationType;
441459
}
442460

443-
@Order(47)
461+
@Order(49)
444462
public int getNumberOfVisits() {
445463
return numberOfVisits;
446464
}
447465

448-
@Order(48)
466+
@Order(50)
449467
public YesNoUnknown getLastCooperativeVisitSymptomatic() {
450468
return lastCooperativeVisitSymptomatic;
451469
}
452470

453-
@Order(49)
471+
@Order(51)
454472
public Date getLastCooperativeVisitDate() {
455473
return lastCooperativeVisitDate;
456474
}
457475

458-
@Order(50)
476+
@Order(52)
459477
public String getLastCooperativeVisitSymptoms() {
460478
return lastCooperativeVisitSymptoms;
461479
}
462480

463-
@Order(51)
481+
@Order(53)
464482
public YesNoUnknown getTraveled() {
465483
return traveled;
466484
}
@@ -469,7 +487,7 @@ public void setTraveled(YesNoUnknown traveled) {
469487
this.traveled = traveled;
470488
}
471489

472-
@Order(52)
490+
@Order(54)
473491
public String getTravelHistory() {
474492
return travelHistory;
475493
}
@@ -478,7 +496,7 @@ public void setTravelHistory(String travelHistory) {
478496
this.travelHistory = travelHistory;
479497
}
480498

481-
@Order(53)
499+
@Order(55)
482500
public YesNoUnknown getBurialAttended() {
483501
return burialAttended;
484502
}
@@ -487,7 +505,7 @@ public void setBurialAttended(YesNoUnknown burialAttended) {
487505
this.burialAttended = burialAttended;
488506
}
489507

490-
@Order(54)
508+
@Order(56)
491509
public YesNoUnknown getDirectContactConfirmedCase() {
492510
return directContactConfirmedCase;
493511
}
@@ -496,7 +514,7 @@ public void setDirectContactConfirmedCase(YesNoUnknown directContactConfirmedCas
496514
this.directContactConfirmedCase = directContactConfirmedCase;
497515
}
498516

499-
@Order(55)
517+
@Order(57)
500518
public YesNoUnknown getDirectContactProbableCase() {
501519
return directContactProbableCase;
502520
}
@@ -505,7 +523,7 @@ public void setDirectContactProbableCase(YesNoUnknown directContactProbableCase)
505523
this.directContactProbableCase = directContactProbableCase;
506524
}
507525

508-
@Order(56)
526+
@Order(58)
509527
public YesNoUnknown getContactWithRodent() {
510528
return contactWithRodent;
511529
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import de.symeda.sormas.api.Disease;
66
import de.symeda.sormas.api.caze.CaseClassification;
7+
import de.symeda.sormas.api.location.LocationDto;
78
import de.symeda.sormas.api.person.ApproximateAgeType;
89
import de.symeda.sormas.api.person.Sex;
910
import de.symeda.sormas.api.user.UserReferenceDto;
@@ -52,7 +53,7 @@ public ContactIndexDetailedDto(String uuid, String personFirstName, String perso
5253
String caseReportingUserUid, String caseRegionUuid, String caseDistrictUud, String caseCommunityUuid,
5354
String caseHealthFacilityUuid, String casePointOfEntryUuid,
5455
Sex sex, Integer approximateAge, ApproximateAgeType approximateAgeType,
55-
String districtName, String city, String address, String postalCode, String phone,
56+
String districtName, String city, String street, String houseNumber, String postalCode, String phone,
5657
String reportingUserFirstName, String reportingUserLastName,
5758
int visitCount) {
5859
//@formatter:on
@@ -68,7 +69,7 @@ public ContactIndexDetailedDto(String uuid, String personFirstName, String perso
6869
this.approximateAge = ApproximateAgeType.ApproximateAgeHelper.formatApproximateAge(approximateAge, approximateAgeType);
6970
this.districtName = districtName;
7071
this.city = city;
71-
this.address = address;
72+
this.address = LocationDto.buildStreetAndHouseNumberCaption(street, houseNumber);
7273
this.postalCode = postalCode;
7374
this.phone = phone;
7475
this.reportingUser = new UserReferenceDto(reportingUserUuid, reportingUserFirstName, reportingUserLastName, null);

0 commit comments

Comments
 (0)