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

Commit cba1e0a

Browse files
lgallgal
lgal
authored and
lgal
committed
SORMAS-Foundation#2950 added person address community on case, contact and event participant export
1 parent 84d6795 commit cba1e0a

10 files changed

Lines changed: 150 additions & 89 deletions

File tree

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

Lines changed: 45 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@
1717
*******************************************************************************/
1818
package de.symeda.sormas.api.caze;
1919

20+
import java.io.Serializable;
21+
import java.util.ArrayList;
22+
import java.util.Date;
23+
import java.util.List;
24+
2025
import de.symeda.sormas.api.Disease;
2126
import de.symeda.sormas.api.DiseaseHelper;
2227
import de.symeda.sormas.api.clinicalcourse.ClinicalCourseDto;
@@ -54,11 +59,6 @@
5459
import de.symeda.sormas.api.utils.pseudonymization.Pseudonymizer;
5560
import de.symeda.sormas.api.utils.pseudonymization.valuepseudonymizers.PostalCodePseudonymizer;
5661

57-
import java.io.Serializable;
58-
import java.util.ArrayList;
59-
import java.util.Date;
60-
import java.util.List;
61-
6262
/**
6363
* A DTO class that contains the properties that are exported during a detailed case export. These
6464
* properties are also those that users can select when creating a custom export configuration.
@@ -81,6 +81,9 @@ public class CaseExportDto implements Serializable {
8181
public static final String MAX_SOURCE_CASE_CLASSIFICATION = "maxSourceCaseClassification";
8282
public static final String ASSOCIATED_WITH_OUTBREAK = "associatedWithOutbreak";
8383
public static final String BURIAL_INFO = "burialInfo";
84+
public static final String ADDRESS_DISTRICT = "addressDistrict";
85+
public static final String ADDRESS_REGION = "addressRegion";
86+
public static final String ADDRESS_COMMUNITY = "addressCommunity";
8487
public static final String ADDRESS_GPS_COORDINATES = "addressGpsCoordinates";
8588
public static final String TRAVELED = "traveled";
8689
public static final String TRAVEL_HISTORY = "travelHistory";
@@ -152,6 +155,9 @@ public class CaseExportDto implements Serializable {
152155
private String addressDistrict;
153156
@PersonalData
154157
@SensitiveData
158+
private String addressCommunity;
159+
@PersonalData
160+
@SensitiveData
155161
private String city;
156162
@PersonalData
157163
@SensitiveData
@@ -245,7 +251,7 @@ public CaseExportDto(long id, long personId, long personAddressId, long epiDataI
245251
boolean quarantineOfficialOrderSent, Date quarantineOfficialOrderSentDate,
246252
YesNoUnknown admittedToHealthFacility, Date admissionDate, Date dischargeDate, YesNoUnknown leftAgainstAdvice, PresentCondition presentCondition,
247253
Date deathDate, Date burialDate, BurialConductor burialConductor, String burialPlaceDescription,
248-
String addressRegion, String addressDistrict, String city, String street, String houseNumber, String additionalInformation, String postalCode,
254+
String addressRegion, String addressDistrict, String addressCommunity, String city, String street, String houseNumber, String additionalInformation, String postalCode,
249255
String phone, String phoneOwner, EducationType educationType, String educationDetails,
250256
OccupationType occupationType, String occupationDetails, String occupationFacility,
251257
String occupationFacilityUuid, String occupationFacilityDetails, YesNoUnknown traveled,
@@ -305,6 +311,7 @@ public CaseExportDto(long id, long personId, long personAddressId, long epiDataI
305311
this.burialInfo = new BurialInfoDto(burialDate, burialConductor, burialPlaceDescription);
306312
this.addressRegion = addressRegion;
307313
this.addressDistrict = addressDistrict;
314+
this.addressCommunity = addressCommunity;
308315
this.city = city;
309316
this.street = street;
310317
this.houseNumber = houseNumber;
@@ -845,7 +852,7 @@ public BurialInfoDto getBurialInfo() {
845852
@ExportTarget(caseExportTypes = {
846853
CaseExportType.CASE_SURVEILLANCE,
847854
CaseExportType.CASE_MANAGEMENT })
848-
@ExportProperty(LocationDto.REGION)
855+
@ExportProperty(CaseExportDto.ADDRESS_REGION)
849856
@ExportGroup(ExportGroupType.SENSITIVE)
850857
public String getAddressRegion() {
851858
return addressRegion;
@@ -855,13 +862,23 @@ public String getAddressRegion() {
855862
@ExportTarget(caseExportTypes = {
856863
CaseExportType.CASE_SURVEILLANCE,
857864
CaseExportType.CASE_MANAGEMENT })
858-
@ExportProperty(LocationDto.DISTRICT)
865+
@ExportProperty(CaseExportDto.ADDRESS_DISTRICT)
859866
@ExportGroup(ExportGroupType.SENSITIVE)
860867
public String getAddressDistrict() {
861868
return addressDistrict;
862869
}
863870

864871
@Order(58)
872+
@ExportTarget(caseExportTypes = {
873+
CaseExportType.CASE_SURVEILLANCE,
874+
CaseExportType.CASE_MANAGEMENT })
875+
@ExportProperty(CaseExportDto.ADDRESS_COMMUNITY)
876+
@ExportGroup(ExportGroupType.SENSITIVE)
877+
public String getAddressCommunity() {
878+
return addressCommunity;
879+
}
880+
881+
@Order(59)
865882
@ExportTarget(caseExportTypes = {
866883
CaseExportType.CASE_SURVEILLANCE,
867884
CaseExportType.CASE_MANAGEMENT })
@@ -871,7 +888,7 @@ public String getCity() {
871888
return city;
872889
}
873890

874-
@Order(59)
891+
@Order(60)
875892
@ExportTarget(caseExportTypes = {
876893
CaseExportType.CASE_SURVEILLANCE,
877894
CaseExportType.CASE_MANAGEMENT })
@@ -881,7 +898,7 @@ public String getStreet() {
881898
return street;
882899
}
883900

884-
@Order(60)
901+
@Order(61)
885902
@ExportTarget(caseExportTypes = {
886903
CaseExportType.CASE_SURVEILLANCE,
887904
CaseExportType.CASE_MANAGEMENT })
@@ -891,7 +908,7 @@ public String getHouseNumber() {
891908
return houseNumber;
892909
}
893910

894-
@Order(61)
911+
@Order(70)
895912
@ExportTarget(caseExportTypes = {
896913
CaseExportType.CASE_SURVEILLANCE,
897914
CaseExportType.CASE_MANAGEMENT })
@@ -901,7 +918,7 @@ public String getAdditionalInformation() {
901918
return additionalInformation;
902919
}
903920

904-
@Order(62)
921+
@Order(71)
905922
@ExportTarget(caseExportTypes = {
906923
CaseExportType.CASE_SURVEILLANCE,
907924
CaseExportType.CASE_MANAGEMENT })
@@ -911,7 +928,7 @@ public String getPostalCode() {
911928
return postalCode;
912929
}
913930

914-
@Order(63)
931+
@Order(72)
915932
@ExportTarget(caseExportTypes = {
916933
CaseExportType.CASE_SURVEILLANCE,
917934
CaseExportType.CASE_MANAGEMENT })
@@ -921,7 +938,7 @@ public String getAddressGpsCoordinates() {
921938
return addressGpsCoordinates;
922939
}
923940

924-
@Order(64)
941+
@Order(73)
925942
@ExportTarget(caseExportTypes = {
926943
CaseExportType.CASE_SURVEILLANCE,
927944
CaseExportType.CASE_MANAGEMENT })
@@ -931,7 +948,7 @@ public String getPhone() {
931948
return phone;
932949
}
933950

934-
@Order(65)
951+
@Order(74)
935952
@ExportTarget(caseExportTypes = {
936953
CaseExportType.CASE_SURVEILLANCE,
937954
CaseExportType.CASE_MANAGEMENT })
@@ -945,7 +962,7 @@ public void setEducationType(String educationType) {
945962
this.educationType = educationType;
946963
}
947964

948-
@Order(66)
965+
@Order(75)
949966
@ExportTarget(caseExportTypes = {
950967
CaseExportType.CASE_SURVEILLANCE,
951968
CaseExportType.CASE_MANAGEMENT })
@@ -955,7 +972,7 @@ public String getOccupationType() {
955972
return occupationType;
956973
}
957974

958-
@Order(69)
975+
@Order(76)
959976
@ExportTarget(caseExportTypes = {
960977
CaseExportType.CASE_SURVEILLANCE })
961978
@ExportProperty(TRAVELED)
@@ -968,7 +985,7 @@ public void setTraveled(YesNoUnknown traveled) {
968985
this.traveled = traveled;
969986
}
970987

971-
@Order(70)
988+
@Order(77)
972989
@ExportTarget(caseExportTypes = {
973990
CaseExportType.CASE_SURVEILLANCE })
974991
@ExportProperty(TRAVEL_HISTORY)
@@ -977,7 +994,7 @@ public String getTravelHistory() {
977994
return travelHistory;
978995
}
979996

980-
@Order(71)
997+
@Order(78)
981998
@ExportTarget(caseExportTypes = {
982999
CaseExportType.CASE_SURVEILLANCE })
9831000
@ExportProperty(EpiDataDto.BURIAL_ATTENDED)
@@ -990,7 +1007,7 @@ public void setBurialAttended(YesNoUnknown burialAttended) {
9901007
this.burialAttended = burialAttended;
9911008
}
9921009

993-
@Order(72)
1010+
@Order(79)
9941011
@ExportTarget(caseExportTypes = {
9951012
CaseExportType.CASE_SURVEILLANCE })
9961013
@ExportProperty(EpiDataDto.DIRECT_CONTACT_CONFIRMED_CASE)
@@ -1003,7 +1020,7 @@ public void setDirectContactConfirmedCase(YesNoUnknown directContactConfirmedCas
10031020
this.directContactConfirmedCase = directContactConfirmedCase;
10041021
}
10051022

1006-
@Order(73)
1023+
@Order(90)
10071024
@ExportTarget(caseExportTypes = {
10081025
CaseExportType.CASE_SURVEILLANCE })
10091026
@ExportProperty(EpiDataDto.DIRECT_CONTACT_PROBABLE_CASE)
@@ -1016,7 +1033,7 @@ public void setDirectContactProbableCase(YesNoUnknown directContactProbableCase)
10161033
this.directContactProbableCase = directContactProbableCase;
10171034
}
10181035

1019-
@Order(74)
1036+
@Order(91)
10201037
@ExportTarget(caseExportTypes = {
10211038
CaseExportType.CASE_SURVEILLANCE })
10221039
@ExportProperty(EpiDataDto.RODENTS)
@@ -1025,7 +1042,7 @@ public YesNoUnknown getContactWithRodent() {
10251042
return contactWithRodent;
10261043
}
10271044

1028-
@Order(80)
1045+
@Order(92)
10291046
@ExportTarget(caseExportTypes = {
10301047
CaseExportType.CASE_SURVEILLANCE,
10311048
CaseExportType.CASE_MANAGEMENT })
@@ -1035,7 +1052,7 @@ public Vaccination getVaccination() {
10351052
return vaccination;
10361053
}
10371054

1038-
@Order(81)
1055+
@Order(93)
10391056
@ExportTarget(caseExportTypes = {
10401057
CaseExportType.CASE_SURVEILLANCE,
10411058
CaseExportType.CASE_MANAGEMENT })
@@ -1045,7 +1062,7 @@ public String getVaccinationDoses() {
10451062
return vaccinationDoses;
10461063
}
10471064

1048-
@Order(82)
1065+
@Order(94)
10491066
@ExportTarget(caseExportTypes = {
10501067
CaseExportType.CASE_SURVEILLANCE,
10511068
CaseExportType.CASE_MANAGEMENT })
@@ -1055,7 +1072,7 @@ public Date getVaccinationDate() {
10551072
return vaccinationDate;
10561073
}
10571074

1058-
@Order(83)
1075+
@Order(95)
10591076
@ExportTarget(caseExportTypes = {
10601077
CaseExportType.CASE_SURVEILLANCE,
10611078
CaseExportType.CASE_MANAGEMENT })
@@ -1065,12 +1082,12 @@ public VaccinationInfoSource getVaccinationInfoSource() {
10651082
return vaccinationInfoSource;
10661083
}
10671084

1068-
// @Order(90)
1085+
// @Order(96)
10691086
// public Date getOnsetDate() {
10701087
// return onsetDate;
10711088
// }
10721089
//
1073-
// @Order(91)
1090+
// @Order(97)
10741091
// public String getSymptoms() {
10751092
// return symptoms;
10761093
// }

0 commit comments

Comments
 (0)