Merge branch 'development' into feature-2528-campaign-diagram-percentages

Author: MateStrysewske

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

@@ -17,6 +17,11 @@
  *******************************************************************************/
 package de.symeda.sormas.api.caze;
 
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
 import de.symeda.sormas.api.Disease;
 import de.symeda.sormas.api.DiseaseHelper;
 import de.symeda.sormas.api.clinicalcourse.ClinicalCourseDto;
@@ -54,11 +59,6 @@
 import de.symeda.sormas.api.utils.pseudonymization.Pseudonymizer;
 import de.symeda.sormas.api.utils.pseudonymization.valuepseudonymizers.PostalCodePseudonymizer;
 
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
 /**
  * A DTO class that contains the properties that are exported during a detailed case export. These
  * properties are also those that users can select when creating a custom export configuration.
@@ -93,6 +93,7 @@ public class CaseExportDto implements Serializable {
 	public static final String LAST_COOPERATIVE_VISIT_SYMPTOMATIC = "lastCooperativeVisitSymptomatic";
 	public static final String LAST_COOPERATIVE_VISIT_DATE = "lastCooperativeVisitDate";
 	public static final String LAST_COOPERATIVE_VISIT_SYMPTOMS = "lastCooperativeVisitSymptoms";
+	public static final String FACILITY = "facility";
 	public static final String EVENT_COUNT = "eventCount";
 	public static final String LATEST_EVENT_ID = "latestEventId";
 	public static final String LATEST_EVENT_STATUS = "latestEventStatus";
@@ -169,6 +170,9 @@ public class CaseExportDto implements Serializable {
 	@PersonalData
 	@SensitiveData
 	private String addressGpsCoordinates;
+	@PersonalData
+	@SensitiveData
+	private String facility;
 	@SensitiveData
 	private String phone;
 	private String occupationType;
@@ -246,9 +250,9 @@ public CaseExportDto(long id, long personId, long personAddressId, long epiDataI
 						 YesNoUnknown admittedToHealthFacility, Date admissionDate, Date dischargeDate, YesNoUnknown leftAgainstAdvice, PresentCondition presentCondition,
 						 Date deathDate, Date burialDate, BurialConductor burialConductor, String burialPlaceDescription,
 						 String addressRegion, String addressDistrict, String city, String street, String houseNumber, String additionalInformation, String postalCode,
+						 String facility, String facilityUuid, String facilityDetails,
 						 String phone, String phoneOwner, EducationType educationType, String educationDetails,
-						 OccupationType occupationType, String occupationDetails, String occupationFacility,
-						 String occupationFacilityUuid, String occupationFacilityDetails, YesNoUnknown traveled,
+						 OccupationType occupationType, String occupationDetails, YesNoUnknown traveled,
 						 YesNoUnknown burialAttended, YesNoUnknown directContactConfirmedCase, YesNoUnknown directContactProbableCase, YesNoUnknown contactWithRodent,
 						 //Date onsetDate,
 						 Vaccination vaccination, String vaccinationDoses, Date vaccinationDate,
@@ -310,12 +314,10 @@ public CaseExportDto(long id, long personId, long personAddressId, long epiDataI
 		this.houseNumber = houseNumber;
 		this.additionalInformation = additionalInformation;
 		this.postalCode = postalCode;
+		this.facility = FacilityHelper.buildFacilityString(facilityUuid, facility, facilityDetails);
 		this.phone = PersonHelper.buildPhoneString(phone, phoneOwner);
 		this.educationType = PersonHelper.buildEducationString(educationType, educationDetails);
-		this.occupationType = PersonHelper.buildOccupationString(
-			occupationType,
-			occupationDetails,
-			FacilityHelper.buildFacilityString(occupationFacilityUuid, occupationFacility, occupationFacilityDetails));
+		this.occupationType = PersonHelper.buildOccupationString(occupationType, occupationDetails);
 		this.traveled = traveled;
 		this.burialAttended = burialAttended;
 		this.directContactConfirmedCase = directContactConfirmedCase;
@@ -735,8 +737,8 @@ public boolean isQuarantineExtended() {
 
 	@Order(44)
 	@ExportTarget(caseExportTypes = {
-			CaseExportType.CASE_SURVEILLANCE,
-			CaseExportType.CASE_MANAGEMENT })
+		CaseExportType.CASE_SURVEILLANCE,
+		CaseExportType.CASE_MANAGEMENT })
 	@ExportProperty(value = QUARANTINE_INFORMATION, combined = true)
 	@ExportGroup(ExportGroupType.ADDITIONAL)
 	public boolean isQuarantineReduced() {
@@ -921,7 +923,17 @@ public String getAddressGpsCoordinates() {
 		return addressGpsCoordinates;
 	}
 
-	@Order(64)
+	@Order(63)
+	@ExportTarget(caseExportTypes = {
+		CaseExportType.CASE_SURVEILLANCE,
+		CaseExportType.CASE_MANAGEMENT })
+	@ExportProperty(FACILITY)
+	@ExportGroup(ExportGroupType.SENSITIVE)
+	public String getFacility() {
+		return facility;
+	}
+
+	@Order(65)
 	@ExportTarget(caseExportTypes = {
 		CaseExportType.CASE_SURVEILLANCE,
 		CaseExportType.CASE_MANAGEMENT })
@@ -931,7 +943,7 @@ public String getPhone() {
 		return phone;
 	}
 
-	@Order(65)
+	@Order(66)
 	@ExportTarget(caseExportTypes = {
 		CaseExportType.CASE_SURVEILLANCE,
 		CaseExportType.CASE_MANAGEMENT })
@@ -945,7 +957,7 @@ public void setEducationType(String educationType) {
 		this.educationType = educationType;
 	}
 
-	@Order(66)
+	@Order(67)
 	@ExportTarget(caseExportTypes = {
 		CaseExportType.CASE_SURVEILLANCE,
 		CaseExportType.CASE_MANAGEMENT })
@@ -1448,6 +1460,10 @@ public void setAddressGpsCoordinates(String addressGpsCoordinates) {
 		this.addressGpsCoordinates = addressGpsCoordinates;
 	}
 
+	public void setFacility(String facility) {
+		this.facility = facility;
+	}
+
 	public void setPhone(String phone) {
 		this.phone = phone;
 	}

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

@@ -17,6 +17,11 @@
  *******************************************************************************/
 package de.symeda.sormas.api.contact;
 
+import static de.symeda.sormas.api.CountryHelper.COUNTRY_CODE_GERMANY;
+import static de.symeda.sormas.api.CountryHelper.COUNTRY_CODE_SWITZERLAND;
+
+import java.util.Date;
+
 import de.symeda.sormas.api.Disease;
 import de.symeda.sormas.api.PseudonymizableDto;
 import de.symeda.sormas.api.caze.CaseDataDto;
@@ -35,8 +40,6 @@
 import de.symeda.sormas.api.utils.SensitiveData;
 import de.symeda.sormas.api.utils.YesNoUnknown;
 
-import java.util.Date;
-
 public class ContactDto extends PseudonymizableDto {
 
 	private static final long serialVersionUID = -7764607075875188799L;
@@ -102,6 +105,8 @@ public class ContactDto extends PseudonymizableDto {
 	public static final String ADDITIONAL_DETAILS = "additionalDetails";
 	public static final String EPI_DATA = "epiData";
 	public static final String HEALTH_CONDITIONS = "healthConditions";
+	public static final String END_OF_QUARANTINE_REASON = "endOfQuarantineReason";
+	public static final String END_OF_QUARANTINE_REASON_DETAILS = "endOfQuarantineReasonDetails";
 
 	private CaseReferenceDto caze;
 	private String caseIdExternalSystem;
@@ -180,20 +185,20 @@ public class ContactDto extends PseudonymizableDto {
 	@SensitiveData
 	private String quarantineHelpNeeded;
 	@HideForCountriesExcept(countries = {
-		"de",
-		"ch" })
+		COUNTRY_CODE_GERMANY,
+		COUNTRY_CODE_SWITZERLAND })
 	private boolean quarantineOrderedVerbally;
 	@HideForCountriesExcept(countries = {
-		"de",
-		"ch" })
+		COUNTRY_CODE_GERMANY,
+		COUNTRY_CODE_SWITZERLAND })
 	private boolean quarantineOrderedOfficialDocument;
 	@HideForCountriesExcept(countries = {
-		"de",
-		"ch" })
+		COUNTRY_CODE_GERMANY,
+		COUNTRY_CODE_SWITZERLAND })
 	private Date quarantineOrderedVerballyDate;
 	@HideForCountriesExcept(countries = {
-		"de",
-		"ch" })
+		COUNTRY_CODE_GERMANY,
+		COUNTRY_CODE_SWITZERLAND })
 	private Date quarantineOrderedOfficialDocumentDate;
 	@HideForCountriesExcept
 	private YesNoUnknown quarantineHomePossible;
@@ -208,18 +213,26 @@ public class ContactDto extends PseudonymizableDto {
 	private boolean quarantineExtended;
 	private boolean quarantineReduced;
 	@HideForCountriesExcept(countries = {
-		"de",
-		"ch" })
+		COUNTRY_CODE_GERMANY,
+		COUNTRY_CODE_SWITZERLAND })
 	private boolean quarantineOfficialOrderSent;
 	@HideForCountriesExcept(countries = {
-		"de",
-		"ch" })
+		COUNTRY_CODE_GERMANY,
+		COUNTRY_CODE_SWITZERLAND })
 	private Date quarantineOfficialOrderSentDate;
 	@SensitiveData
 	private String additionalDetails;
 	private EpiDataDto epiData;
 	private HealthConditionsDto healthConditions;
 
+	@HideForCountriesExcept(countries = {
+		COUNTRY_CODE_SWITZERLAND })
+	private EndOfQuarantineReason endOfQuarantineReason;
+	@HideForCountriesExcept(countries = {
+		COUNTRY_CODE_SWITZERLAND })
+	@SensitiveData
+	private String endOfQuarantineReasonDetails;
+
 	public static ContactDto build() {
 		return build(null, null, null);
 	}
@@ -731,4 +744,20 @@ public HealthConditionsDto getHealthConditions() {
 	public void setHealthConditions(HealthConditionsDto healthConditions) {
 		this.healthConditions = healthConditions;
 	}
+
+	public EndOfQuarantineReason getEndOfQuarantineReason() {
+		return endOfQuarantineReason;
+	}
+
+	public void setEndOfQuarantineReason(EndOfQuarantineReason endOfQuarantineReason) {
+		this.endOfQuarantineReason = endOfQuarantineReason;
+	}
+
+	public String getEndOfQuarantineReasonDetails() {
+		return endOfQuarantineReasonDetails;
+	}
+
+	public void setEndOfQuarantineReasonDetails(String endOfQuarantineReasonDetails) {
+		this.endOfQuarantineReasonDetails = endOfQuarantineReasonDetails;
+	}
 }

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

@@ -17,6 +17,9 @@
  *******************************************************************************/
 package de.symeda.sormas.api.contact;
 
+import java.io.Serializable;
+import java.util.Date;
+
 import de.symeda.sormas.api.Disease;
 import de.symeda.sormas.api.DiseaseHelper;
 import de.symeda.sormas.api.caze.BirthDateDto;
@@ -37,9 +40,6 @@
 import de.symeda.sormas.api.utils.pseudonymization.Pseudonymizer;
 import de.symeda.sormas.api.utils.pseudonymization.valuepseudonymizers.PostalCodePseudonymizer;
 
-import java.io.Serializable;
-import java.util.Date;
-
 public class ContactExportDto implements Serializable {
 
 	private static final long serialVersionUID = 2054231712903661096L;
@@ -93,6 +93,9 @@ public class ContactExportDto implements Serializable {
 	@SensitiveData
 	@Pseudonymizer(PostalCodePseudonymizer.class)
 	private String postalCode;
+	@PersonalData
+	@SensitiveData
+	private String facility;
 	@SensitiveData
 	private String phone;
 	private String occupationType;
@@ -140,8 +143,8 @@ public ContactExportDto(long id, long personId, String uuid, String sourceCaseUu
 							boolean quarantineOfficialOrderSent, Date quarantineOfficialOrderSentDate,
 							PresentCondition presentCondition, Date deathDate,
 							String addressRegion, String addressDistrict, String city, String street, String houseNumber, String additionalInformation, String postalCode,
+							String facility, String facilityUuid, String facilityDetails,
 							String phone, String phoneOwner, OccupationType occupationType, String occupationDetails,
-							String occupationFacility, String occupationFacilityUuid, String occupationFacilityDetails,
 							String region, String district, String community,
 							long epiDataId, YesNoUnknown traveled, YesNoUnknown burialAttended, YesNoUnknown directContactConfirmedCase, YesNoUnknown directContactProbableCase, YesNoUnknown contactWithRodent,
 							String reportingUserUuid, String regionUuid, String districtUuid, String communityUuid,
@@ -194,11 +197,9 @@ public ContactExportDto(long id, long personId, String uuid, String sourceCaseUu
 		this.houseNumber = houseNumber;
 		this.additionalInformation = additionalInformation;
 		this.postalCode = postalCode;
+		this.facility = FacilityHelper.buildFacilityString(facilityUuid, facility, facilityDetails);
 		this.phone = PersonHelper.buildPhoneString(phone, phoneOwner);
-		this.occupationType = PersonHelper.buildOccupationString(
-			occupationType,
-			occupationDetails,
-			FacilityHelper.buildFacilityString(occupationFacilityUuid, occupationFacility, occupationFacilityDetails));
+		this.occupationType = PersonHelper.buildOccupationString(occupationType, occupationDetails);
 		this.region = region;
 		this.district = district;
 		this.community = community;
@@ -485,36 +486,41 @@ public String getPostalCode() {
 	}
 
 	@Order(50)
+	public String getFacility() {
+		return facility;
+	}
+
+	@Order(51)
 	public String getPhone() {
 		return phone;
 	}
 
-	@Order(51)
+	@Order(52)
 	public String getOccupationType() {
 		return occupationType;
 	}
 
-	@Order(52)
+	@Order(53)
 	public int getNumberOfVisits() {
 		return numberOfVisits;
 	}
 
-	@Order(53)
+	@Order(54)
 	public YesNoUnknown getLastCooperativeVisitSymptomatic() {
 		return lastCooperativeVisitSymptomatic;
 	}
 
-	@Order(54)
+	@Order(55)
 	public Date getLastCooperativeVisitDate() {
 		return lastCooperativeVisitDate;
 	}
 
-	@Order(55)
+	@Order(56)
 	public String getLastCooperativeVisitSymptoms() {
 		return lastCooperativeVisitSymptoms;
 	}
 
-	@Order(56)
+	@Order(57)
 	public YesNoUnknown getTraveled() {
 		return traveled;
 	}
@@ -523,7 +529,7 @@ public void setTraveled(YesNoUnknown traveled) {
 		this.traveled = traveled;
 	}
 
-	@Order(57)
+	@Order(58)
 	public String getTravelHistory() {
 		return travelHistory;
 	}
@@ -532,7 +538,7 @@ public void setTravelHistory(String travelHistory) {
 		this.travelHistory = travelHistory;
 	}
 
-	@Order(58)
+	@Order(59)
 	public YesNoUnknown getBurialAttended() {
 		return burialAttended;
 	}
@@ -541,7 +547,7 @@ public void setBurialAttended(YesNoUnknown burialAttended) {
 		this.burialAttended = burialAttended;
 	}
 
-	@Order(59)
+	@Order(60)
 	public YesNoUnknown getDirectContactConfirmedCase() {
 		return directContactConfirmedCase;
 	}
@@ -550,7 +556,7 @@ public void setDirectContactConfirmedCase(YesNoUnknown directContactConfirmedCas
 		this.directContactConfirmedCase = directContactConfirmedCase;
 	}
 
-	@Order(60)
+	@Order(61)
 	public YesNoUnknown getDirectContactProbableCase() {
 		return directContactProbableCase;
 	}
@@ -559,7 +565,7 @@ public void setDirectContactProbableCase(YesNoUnknown directContactProbableCase)
 		this.directContactProbableCase = directContactProbableCase;
 	}
 
-	@Order(61)
+	@Order(62)
 	public YesNoUnknown getContactWithRodent() {
 		return contactWithRodent;
 	}
@@ -719,4 +725,8 @@ public String getCommunityUuid() {
 	public ContactJurisdictionDto getJurisdiction() {
 		return jurisdiction;
 	}
+
+	public void setFacility(String facility) {
+		this.facility = facility;
+	}
 }