SORMAS-Foundation#2996: Display "External ID" field for switzerland

ChristopherRiedel · ChristopherRiedel · commit a52efdcc06b6 · 2020-11-06T13:47:06.000+01:00
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseDataDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseDataDto.java
@@ -55,12 +55,10 @@
 import de.symeda.sormas.api.utils.Required;
 import de.symeda.sormas.api.utils.SensitiveData;
 import de.symeda.sormas.api.utils.YesNoUnknown;
-
 import de.symeda.sormas.api.utils.pseudonymization.PseudonymizableDto;
 import de.symeda.sormas.api.utils.pseudonymization.Pseudonymizer;
 import de.symeda.sormas.api.utils.pseudonymization.valuepseudonymizers.LatitudePseudonymizer;
 import de.symeda.sormas.api.utils.pseudonymization.valuepseudonymizers.LongitudePseudonymizer;
-import java.util.Date;
 
 public class CaseDataDto extends PseudonymizableDto {
 
@@ -362,7 +360,9 @@ public class CaseDataDto extends PseudonymizableDto {
 	private String pointOfEntryDetails;
 	@SensitiveData
 	private String additionalDetails;
-	@HideForCountriesExcept
+	@HideForCountriesExcept(countries = {
+		COUNTRY_CODE_GERMANY,
+		COUNTRY_CODE_SWITZERLAND })
 	private String externalID;
 	private boolean sharedToCountry;
 	private QuarantineType quarantine;
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseExportDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseExportDto.java
@@ -236,6 +236,7 @@ public class CaseExportDto implements Serializable {
 	private String latestEventId;
 	private String latestEventTitle;
 	private EventStatus latestEventStatus;
+	private String externalID;
 
 	//@formatter:off
 	public CaseExportDto(long id, long personId, long personAddressId, long epiDataId, long symptomsId,
@@ -263,7 +264,7 @@ public CaseExportDto(long id, long personId, long personAddressId, long epiDataI
 						 //Date onsetDate,
 						 Vaccination vaccination, String vaccinationDoses, Date vaccinationDate,
 						 VaccinationInfoSource vaccinationInfoSource, YesNoUnknown postpartum, Trimester trimester,
-						 long eventCount) {
+						 long eventCount, String externalID) {
 		//@formatter:on
 
 		this.id = id;
@@ -340,6 +341,7 @@ public CaseExportDto(long id, long personId, long personAddressId, long epiDataI
 		this.followUpStatus = followUpStatus;
 		this.followUpUntil = followUpUntil;
 		this.eventCount = eventCount;
+		this.externalID = externalID;
 
 		jurisdiction = new CaseJurisdictionDto(reportingUserUuid, regionUuid, districtUuid, communityUuid, healthFacilityUuid, pointOfEntryUuid);
 	}
@@ -417,6 +419,16 @@ public String getEpidNumber() {
 	}
 
 	@Order(4)
+	@ExportTarget(caseExportTypes = {
+		CaseExportType.CASE_SURVEILLANCE,
+		CaseExportType.CASE_MANAGEMENT })
+	@ExportProperty(CaseDataDto.EXTERNAL_ID)
+	@ExportGroup(ExportGroupType.CORE)
+	public String getExternalID() {
+		return externalID;
+	}
+
+	@Order(5)
 	@ExportTarget(caseExportTypes = {
 		CaseExportType.CASE_SURVEILLANCE,
 		CaseExportType.CASE_MANAGEMENT })
@@ -1620,4 +1632,8 @@ public void setLatestEventTitle(String latestEventTitle) {
 	public void setLatestEventStatus(EventStatus latestEventStatus) {
 		this.latestEventStatus = latestEventStatus;
 	}
+
+	public void setExternalID(String externalID) {
+		this.externalID = externalID;
+	}
 }
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactDto.java
@@ -111,7 +111,7 @@ public class ContactDto extends PseudonymizableDto {
 	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";
-  public static final String RETURNING_TRAVELER = "returningTraveler";
+	public static final String RETURNING_TRAVELER = "returningTraveler";
 
 	private CaseReferenceDto caze;
 	private String caseIdExternalSystem;
@@ -164,6 +164,9 @@ public class ContactDto extends PseudonymizableDto {
 	private ContactRelation relationToCase;
 	@SensitiveData
 	private String relationDescription;
+	@HideForCountriesExcept(countries = {
+		COUNTRY_CODE_GERMANY,
+		COUNTRY_CODE_SWITZERLAND })
 	private String externalID;
 
 	private boolean highPriority;
@@ -754,7 +757,7 @@ public HealthConditionsDto getHealthConditions() {
 	public void setHealthConditions(HealthConditionsDto healthConditions) {
 		this.healthConditions = healthConditions;
 	}
-  
+
 	public SormasToSormasOriginInfoDto getSormasToSormasOriginInfo() {
 		return sormasToSormasOriginInfo;
 	}
@@ -787,11 +790,11 @@ public void setEndOfQuarantineReasonDetails(String endOfQuarantineReasonDetails)
 		this.endOfQuarantineReasonDetails = endOfQuarantineReasonDetails;
 	}
 
-  public YesNoUnknown getReturningTraveler() {
+	public YesNoUnknown getReturningTraveler() {
 		return returningTraveler;
 	}
 
 	public void setReturningTraveler(YesNoUnknown returningTraveler) {
 		this.returningTraveler = returningTraveler;
-  }
+	}
 }
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactExportDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactExportDto.java
@@ -139,6 +139,7 @@ public class ContactExportDto implements Serializable {
 	private final Long eventCount;
 	private String latestEventId;
 	private String latestEventTitle;
+	private String externalID;
 
 	//@formatter:off
 	public ContactExportDto(long id, long personId, String uuid, String sourceCaseUuid, CaseClassification caseClassification, Disease disease, String diseaseDetails,
@@ -156,7 +157,7 @@ public ContactExportDto(long id, long personId, String uuid, String sourceCaseUu
 							String phone, String phoneOwner, OccupationType occupationType, String occupationDetails,
 							String region, String district, String community,
 							long epiDataId, YesNoUnknown traveled, YesNoUnknown burialAttended, YesNoUnknown directContactConfirmedCase, YesNoUnknown directContactProbableCase,
-							YesNoUnknown contactWithRodent, YesNoUnknown returningTraveler, long eventCount,
+							YesNoUnknown contactWithRodent, YesNoUnknown returningTraveler, long eventCount, String externalID,
 							String reportingUserUuid, String regionUuid, String districtUuid, String communityUuid,
 							String caseReportingUserUuid, String caseRegionUui, String caseDistrictUud, String caseCommunityUuid, String caseHealthFacilityUuid, String casePointOfEntryUuid
 	) {
@@ -222,6 +223,7 @@ public ContactExportDto(long id, long personId, String uuid, String sourceCaseUu
 		this.contactWithRodent = contactWithRodent;
 		this.returningTraveler = returningTraveler;
 		this.eventCount = eventCount;
+		this.externalID = externalID;
 
 		CaseJurisdictionDto caseJurisdiction = caseReportingUserUuid != null
 			? null
@@ -261,26 +263,31 @@ public String getUuid() {
 	}
 
 	@Order(1)
+	public String getExternalID() {
+		return externalID;
+	}
+
+	@Order(2)
 	public String getSourceCaseUuid() {
 		return sourceCaseUuid;
 	}
 
-	@Order(2)
+	@Order(3)
 	public CaseClassification getCaseClassification() {
 		return caseClassification;
 	}
 
-	@Order(3)
+	@Order(4)
 	public String getDisease() {
 		return disease;
 	}
 
-	@Order(4)
+	@Order(5)
 	public ContactClassification getContactClassification() {
 		return contactClassification;
 	}
 
-	@Order(5)
+	@Order(6)
 	public Date getLastContactDate() {
 		return lastContactDate;
 	}
@@ -325,7 +332,7 @@ public String getDistrict() {
 		return district;
 	}
 
-	@Order(17)
+	@Order(18)
 	public String getCommunity() {
 		return community;
 	}
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactIndexDetailedDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactIndexDetailedDto.java
@@ -57,7 +57,7 @@ public ContactIndexDetailedDto(String uuid, String personFirstName, String perso
 								   Date followUpUntil, SymptomJournalStatus symptomJournalStatus, String contactOfficerUuid, String reportingUserUuid, Date reportDateTime,
 								   CaseClassification caseClassification,
 								   String caseReportingUserUid, String caseRegionUuid, String caseDistrictUud, String caseCommunityUuid,
-								   String caseHealthFacilityUuid, String casePointOfEntryUuid, Date changeDate,
+								   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 reportingUserFirstName, String reportingUserLastName, int visitCount, long eventCount
@@ -68,7 +68,7 @@ public ContactIndexDetailedDto(String uuid, String personFirstName, String perso
 		super(uuid, personFirstName, personLastName, cazeUuid, disease, diseaseDetails, caseFirstName, caseLastName, regionUuid, districtUuid, communityUuid,
 				lastContactDate, contactCategory, contactProximity, contactClassification, contactStatus, followUpStatus, followUpUntil, symptomJournalStatus,
 				contactOfficerUuid, reportingUserUuid, reportDateTime, caseClassification,
-				caseReportingUserUid, caseRegionUuid, caseDistrictUud, caseCommunityUuid, caseHealthFacilityUuid, casePointOfEntryUuid, changeDate, visitCount);
+				caseReportingUserUid, caseRegionUuid, caseDistrictUud, caseCommunityUuid, caseHealthFacilityUuid, casePointOfEntryUuid, changeDate, externalID, visitCount);
 		//@formatter:on
 
 		this.sex = sex;
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactIndexDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactIndexDto.java
@@ -50,6 +50,7 @@ public class ContactIndexDto extends PseudonymizableIndexDto implements Serializ
 	public static final String CONTACT_OFFICER_UUID = "contactOfficerUuid";
 	public static final String CONTACT_CATEGORY = "contactCategory";
 	public static final String CASE_CLASSIFICATION = "caseClassification";
+	public static final String EXTERNAL_ID = "externalID";
 
 	private String uuid;
 	@PersonalData
@@ -71,6 +72,7 @@ public class ContactIndexDto extends PseudonymizableIndexDto implements Serializ
 	private ContactCategory contactCategory;
 	private CaseClassification caseClassification;
 	private int visitCount;
+	private String externalID;
 
 	private ContactJurisdictionDto jurisdiction;
 	private CaseJurisdictionDto caseJurisdiction;
@@ -84,6 +86,7 @@ public ContactIndexDto(String uuid, String personFirstName, String personLastNam
 						   CaseClassification caseClassification,
 						   String caseReportingUserUid, String caseRegionUuid, String caseDistrictUud, String caseCommunityUuid, String caseHealthFacilityUuid, String casePointOfEntryUuid,
 						   Date changeDate, // XXX: unused, only here for TypedQuery mapping
+						   String externalID,
 						   int visitCount) {
 	//@formatter:on
 
@@ -116,6 +119,7 @@ public ContactIndexDto(String uuid, String personFirstName, String personLastNam
 		this.reportDateTime = reportDateTime;
 		this.caseClassification = caseClassification;
 		this.visitCount = visitCount;
+		this.externalID = externalID;
 
 		this.jurisdiction = new ContactJurisdictionDto(reportingUserUuid, regionUuid, districtUuid, communityUuid, caseJurisdiction);
 	}
@@ -268,6 +272,14 @@ public void setVisitCount(int visitCount) {
 		this.visitCount = visitCount;
 	}
 
+	public String getExternalID() {
+		return externalID;
+	}
+
+	public void setExternalID(String externalID) {
+		this.externalID = externalID;
+	}
+
 	public ContactReferenceDto toReference() {
 		return new ContactReferenceDto(uuid);
 	}
diff --git a/sormas-api/src/main/resources/doc/SORMAS_Data_Dictionary.xlsx b/sormas-api/src/main/resources/doc/SORMAS_Data_Dictionary.xlsx
diff --git a/sormas-api/src/main/resources/doc/SORMAS_User_Rights.xlsx b/sormas-api/src/main/resources/doc/SORMAS_User_Rights.xlsx
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/caze/CaseFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/caze/CaseFacadeEjb.java
@@ -574,7 +574,8 @@ public List<CaseExportDto> getExportList(
 				joins.getEpiData().get(EpiData.RODENTS), caseRoot.get(Case.VACCINATION), caseRoot.get(Case.VACCINATION_DOSES),
 				caseRoot.get(Case.VACCINATION_DATE), caseRoot.get(Case.VACCINATION_INFO_SOURCE),
 				caseRoot.get(Case.POSTPARTUM), caseRoot.get(Case.TRIMESTER),
-				eventCountSq
+				eventCountSq,
+				caseRoot.get(Case.EXTERNAL_ID)
 				);
 		//@formatter:on
 
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/contact/ContactFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/contact/ContactFacadeEjb.java
@@ -495,7 +495,8 @@ public List<ContactExportDto> getExportList(ContactCriteria contactCriteria, int
 					joins.getEpiData().get(EpiData.DIRECT_CONTACT_PROBABLE_CASE),
 					joins.getEpiData().get(EpiData.RODENTS),
 					contact.get(Contact.RETURNING_TRAVELER),
-					eventCountSq),
+					eventCountSq,
+					contact.get(Contact.EXTERNAL_ID)),
 				listCriteriaBuilder.getJurisdictionSelections(joins)).collect(Collectors.toList()));
 
 		cq.distinct(true);
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/contact/ContactListCriteriaBuilder.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/contact/ContactListCriteriaBuilder.java
@@ -122,7 +122,8 @@ private List<Selection<?>> getContactIndexSelections(Root<Contact> contact, Cont
 			joins.getCaseCommunity().get(Community.UUID),
 			joins.getCaseHealthFacility().get(Facility.UUID),
 			joins.getCaseasePointOfEntry().get(PointOfEntry.UUID),
-			contact.get(Contact.CHANGE_DATE));
+			contact.get(Contact.CHANGE_DATE),
+			contact.get(Contact.EXTERNAL_ID));
 	}
 
 	private List<Expression<?>> getIndexOrders(SortProperty sortProperty, Root<Contact> contact, ContactJoins joins) {
@@ -140,6 +141,7 @@ private List<Expression<?>> getIndexOrders(SortProperty sortProperty, Root<Conta
 		case ContactIndexDto.REPORT_DATE_TIME:
 		case ContactIndexDto.DISEASE:
 		case ContactIndexDto.CASE_CLASSIFICATION:
+		case ContactIndexDto.EXTERNAL_ID:
 			expressions.add(contact.get(sortProperty.propertyName));
 			break;
 		case ContactIndexDto.PERSON_FIRST_NAME:
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/AbstractCaseGrid.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/AbstractCaseGrid.java
@@ -17,11 +17,18 @@
  *******************************************************************************/
 package de.symeda.sormas.ui.caze;
 
+import java.text.DecimalFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 import com.vaadin.data.provider.DataProvider;
 import com.vaadin.data.provider.ListDataProvider;
 import com.vaadin.shared.data.sort.SortDirection;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.renderers.DateRenderer;
+
 import de.symeda.sormas.api.CountryHelper;
 import de.symeda.sormas.api.DiseaseHelper;
 import de.symeda.sormas.api.FacadeProvider;
@@ -52,12 +59,6 @@
 import de.symeda.sormas.ui.utils.UuidRenderer;
 import de.symeda.sormas.ui.utils.ViewConfiguration;
 
-import java.text.DecimalFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
 @SuppressWarnings("serial")
 public abstract class AbstractCaseGrid<IndexDto extends CaseIndexDto> extends FilteredGrid<IndexDto, CaseCriteria> {
 
@@ -94,8 +95,7 @@ public AbstractCaseGrid(Class<IndexDto> beanType, CaseCriteria criteria) {
 					CaseIndexDto.I18N_PREFIX,
 					PersonDto.I18N_PREFIX,
 					LocationDto.I18N_PREFIX));
-			column.setStyleGenerator(
-				FieldAccessColumnStyleGenerator.getDefault(getBeanType(), column.getId()));
+			column.setStyleGenerator(FieldAccessColumnStyleGenerator.getDefault(getBeanType(), column.getId()));
 		}
 
 		addItemClickListener(new ShowDetailsListener<>(CaseIndexDto.UUID, e -> ControllerProvider.getCaseController().navigateToCase(e.getUuid())));
@@ -145,7 +145,8 @@ protected void initColumns() {
 
 		setColumns(getGridColumns().toArray(String[]::new));
 
-		if (FacadeProvider.getConfigFacade().isConfiguredCountry(CountryHelper.COUNTRY_CODE_GERMANY)) {
+		if (FacadeProvider.getConfigFacade().isConfiguredCountry(CountryHelper.COUNTRY_CODE_GERMANY)
+			|| FacadeProvider.getConfigFacade().isConfiguredCountry(CountryHelper.COUNTRY_CODE_SWITZERLAND)) {
 			getColumn(CaseIndexDto.EPID_NUMBER).setHidden(true);
 		} else {
 			getColumn(CaseIndexDto.EXTERNAL_ID).setHidden(true);
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/contact/AbstractContactGrid.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/contact/AbstractContactGrid.java
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/contact/ContactDataForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/contact/ContactDataForm.java
