Merge branch 'development' of https://github.com/hzi-braunschweig/SORMAS-Project into development

Author: MateStrysewske

sormas-api/src/main/java/de/symeda/sormas/api/bagexport/BAGExportCaseDto.java

@@ -1375,6 +1375,7 @@ public interface Captions {
 	String SormasToSormasOptions_pseudonymizeSensitiveData = "SormasToSormasOptions.pseudonymizeSensitiveData";
 	String SormasToSormasOptions_withAssociatedContacts = "SormasToSormasOptions.withAssociatedContacts";
 	String SormasToSormasOptions_withSamples = "SormasToSormasOptions.withSamples";
+	String sormasToSormasReturn = "sormasToSormasReturn";
 	String sormasToSormasSentFrom = "sormasToSormasSentFrom";
 	String sormasToSormasShare = "sormasToSormasShare";
 	String sormasToSormasSharedBy = "sormasToSormasSharedBy";

sormas-api/src/main/java/de/symeda/sormas/api/bagexport/BAGExportContactDto.java

@@ -99,6 +99,8 @@ public interface Validations {
 	String sormasToSormasContactCaseNotExists = "sormasToSormasContactCaseNotExists";
 	String sormasToSormasContactExists = "sormasToSormasContactExists";
 	String sormasToSormasOrganizationIdMissing = "sormasToSormasOrganizationIdMissing";
+	String sormasToSormasReturnCaseNotExists = "sormasToSormasReturnCaseNotExists";
+	String sormasToSormasReturnContactNotExists = "sormasToSormasReturnContactNotExists";
 	String sormasToSormasSampleExists = "sormasToSormasSampleExists";
 	String sormasToSormasSenderNameMissing = "sormasToSormasSenderNameMissing";
 	String sormasToSormasShareInfoMissing = "sormasToSormasShareInfoMissing";

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java

@@ -30,6 +30,14 @@ public interface SormasToSormasFacade {
 
 	void shareContacts(List<String> contactUuids, SormasToSormasOptionsDto options) throws SormasToSormasException;
 
+	void returnCase(String caseUuid, SormasToSormasOptionsDto options) throws SormasToSormasException;
+
+	void returnContact(String contactUuid, SormasToSormasOptionsDto options) throws SormasToSormasException;
+
+	void saveReturnedCase(SormasToSormasEncryptedDataDto sharedCase) throws SormasToSormasException, SormasToSormasValidationException;
+
+	void saveReturnedContact(SormasToSormasEncryptedDataDto sharedContact) throws SormasToSormasException, SormasToSormasValidationException;
+
 	List<ServerAccessDataReferenceDto> getAvailableOrganizations();
 
 	ServerAccessDataReferenceDto getOrganizationRef(String id);

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Validations.java

@@ -0,0 +1,22 @@
+/*
+ * SORMAS® - Surveillance Outbreak Response Management & Analysis System
+ * Copyright © 2016-2020 Helmholtz-Zentrum für Infektionsforschung GmbH (HZI)
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.symeda.sormas.api.sormastosormas;
+
+import javax.ejb.Remote;
+
+@Remote
+public interface SormasToSormasOriginInfoFacade {
+}

sormas-api/src/main/java/de/symeda/sormas/api/sormastosormas/SormasToSormasFacade.java

@@ -1939,6 +1939,7 @@ sormasToSormasDialogTitle=Share with health department
 sormasToSormasErrorDialogTitle=Error while sharing with another health department
 sormasToSormasListTitle=Share
 sormasToSormasShare=Share
+sormasToSormasReturn=Return
 sormasToSormasCaseNotShared=This case is not shared
 sormasToSormasContactNotShared=This contact is not shared
 sormasToSormasSharedWith=Shared with

sormas-api/src/main/java/de/symeda/sormas/api/sormastosormas/SormasToSormasOriginInfoFacade.java

@@ -126,6 +126,8 @@ sormasToSormasShareInfoMissing = Sender information is missing
 sormasToSormasOrganizationIdMissing = Sender organization is is missing
 sormasToSormasSenderNameMissing = Sender name is missing
 sormasToSormasSampleExists = This sample already exists
+sormasToSormasReturnCaseNotExists = Case does not exist
+sormasToSormasReturnContactNotExists = Contact does not exist
 validPhoneNumber = %s must be a valid phone number
 validEmailAddress = %s must be a valid email address
 externalJournalPersonValidationBirthdate = Invalid birthdate.

sormas-api/src/main/resources/captions.properties

@@ -18,6 +18,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -72,7 +73,9 @@ public List<BAGExportCaseDto> getCaseExportList(int first, int max) {
 		Join<Case, Person> person = caseJoins.getPerson();
 		Join<Person, Location> homeAddress = caseJoins.getPersonAddress();
 
+		Expression<String> homeAddressCountry = cb.literal(TODO_VALUE);
 		Expression<String> mobileNumber = cb.literal(TODO_VALUE);
+		Expression<String> activityMappingYn = cb.literal(TODO_VALUE);
 
 		cq.multiselect(
 			caseRoot.get(Case.CASE_ID_ISM),
@@ -84,6 +87,7 @@ public List<BAGExportCaseDto> getCaseExportList(int first, int max) {
 			homeAddress.get(Location.HOUSE_NUMBER),
 			homeAddress.get(Location.CITY),
 			homeAddress.get(Location.POSTAL_CODE),
+			homeAddressCountry,
 			person.get(Person.PHONE),
 			mobileNumber,
 			person.get(Person.EMAIL_ADDRESS),
@@ -92,14 +96,23 @@ public List<BAGExportCaseDto> getCaseExportList(int first, int max) {
 			person.get(Person.BIRTHDATE_MM),
 			person.get(Person.BIRTHDATE_YYYY),
 			person.get(Person.OCCUPATION_TYPE),
+
 			caseJoins.getSymptoms().get(Symptoms.SYMPTOMATIC),
 			caseRoot.get(Case.COVID_TEST_REASON),
 			caseRoot.get(Case.COVID_TEST_REASON_DETAILS),
 			caseJoins.getSymptoms().get(Symptoms.ONSET_DATE),
+
+			activityMappingYn,
+
 			caseRoot.get(Case.CONTACT_TRACING_FIRST_CONTACT_DATE),
+
+			caseRoot.get(Case.WAS_IN_QUARANTINE_BEFORE_ISOLATION),
+			caseRoot.get(Case.QUARANTINE_REASON_BEFORE_ISOLATION),
+			caseRoot.get(Case.QUARANTINE_REASON_BEFORE_ISOLATION_DETAILS),
+
 			caseRoot.get(Case.QUARANTINE),
 			caseRoot.get(Case.QUARANTINE_TYPE_DETAILS),
-			caseRoot.get(Case.FOLLOW_UP_UNTIL),
+			caseRoot.get(Case.QUARANTINE_FROM),
 			caseRoot.get(Case.QUARANTINE_TO),
 			caseRoot.get(Case.END_OF_ISOLATION_REASON),
 			caseRoot.get(Case.END_OF_ISOLATION_REASON_DETAILS));
@@ -151,20 +164,26 @@ public List<BAGExportCaseDto> getCaseExportList(int first, int max) {
 			List<Location> addresses = personAddresses.getOrDefault(caze.getPersonId(), Collections.emptyList());
 
 			addresses.stream().filter(a -> PersonAddressType.PLACE_OF_WORK.equals(a.getAddressType())).findFirst().ifPresent(workAddress -> {
+				caze.setWorkPlaceName(TODO_VALUE);
 				caze.setWorkPlaceStreet(workAddress.getStreet());
 				caze.setWorkPlaceStreetNumber(workAddress.getHouseNumber());
-				caze.setWorkPlaceLocation(workAddress.getCity());
+				caze.setWorkPlaceCity(workAddress.getCity());
 				caze.setWorkPlacePostalCode(workAddress.getPostalCode());
+				caze.setWorkPlaceCountry(TODO_VALUE);
 			});
 
-			caze.setInfectionLocationYn(YesNoUnknown.NO);
+			caze.setExposureLocationYn(YesNoUnknown.NO);
 			addresses.stream().filter(a -> PersonAddressType.PLACE_OF_EXPOSURE.equals(a.getAddressType())).findFirst().ifPresent(exposureAddress -> {
-				caze.setInfectionLocationYn(YesNoUnknown.YES);
-
-				caze.setInfectionLocationStreet(exposureAddress.getStreet());
-				caze.setInfectionLocationStreetNumber(exposureAddress.getHouseNumber());
-				caze.setInfectionLocationCity(exposureAddress.getCity());
-				caze.setInfectionLocationPostalCode(exposureAddress.getPostalCode());
+				caze.setExposureLocationYn(YesNoUnknown.YES);
+				caze.setExposureCountry(TODO_VALUE);
+				caze.setExposureLocationType(exposureAddress.getFacilityType());
+				caze.setExposureLocationFlightDetail(exposureAddress.getFacilityDetails());
+				caze.setExposureLocationName(TODO_VALUE);
+				caze.setExposureLocationStreet(exposureAddress.getStreet());
+				caze.setExposureLocationStreetNumber(exposureAddress.getHouseNumber());
+				caze.setExposureLocationCity(exposureAddress.getCity());
+				caze.setExposureLocationPostalCode(exposureAddress.getPostalCode());
+				caze.setExposureLocationFlightDetail(TODO_VALUE);
 			});
 
 			addresses.stream()
@@ -175,6 +194,7 @@ public List<BAGExportCaseDto> getCaseExportList(int first, int max) {
 					caze.setIsolationLocationStreetNumber(isolationAddress.getHouseNumber());
 					caze.setIsolationLocationCity(isolationAddress.getCity());
 					caze.setIsolationLocationPostalCode(isolationAddress.getPostalCode());
+					caze.setIsolationLocationCountry(TODO_VALUE);
 				});
 
 			List<Sample> caseSamples = samples.get(caze.getCaseId());
@@ -208,8 +228,10 @@ public List<BAGExportContactDto> getContactExportList(int first, int max) {
 
 		Join<Contact, Person> person = contactJoins.getPerson();
 		Join<Person, Location> homeAddress = contactJoins.getPersonAddress();
+		Join<Contact, Case> caze = contactJoins.getCaze();
 
 		Expression<String> mobileNumber = cb.literal(TODO_VALUE);
+		Expression<Date> caseLinkContactDate = cb.nullLiteral(Date.class);
 
 		cq.multiselect(
 			contactRoot.get(Contact.ID),
@@ -222,15 +244,17 @@ public List<BAGExportContactDto> getContactExportList(int first, int max) {
 			homeAddress.get(Location.POSTAL_CODE),
 			person.get(Person.PHONE),
 			mobileNumber,
-			person.get(Person.EMAIL_ADDRESS),
 			person.get(Person.SEX),
 			person.get(Person.BIRTHDATE_DD),
 			person.get(Person.BIRTHDATE_MM),
 			person.get(Person.BIRTHDATE_YYYY),
 			person.get(Person.OCCUPATION_TYPE),
 			contactRoot.get(Contact.QUARANTINE),
 			contactRoot.get(Contact.QUARANTINE_TYPE_DETAILS),
-			contactRoot.get(Contact.FOLLOW_UP_UNTIL),
+			caze.get(Case.CASE_ID_ISM),
+			caze.get(Case.ID),
+			caseLinkContactDate,
+			contactRoot.get(Contact.QUARANTINE_FROM),
 			contactRoot.get(Contact.QUARANTINE_TO),
 			contactRoot.get(Contact.END_OF_QUARANTINE_REASON),
 			contactRoot.get(Contact.END_OF_QUARANTINE_REASON_DETAILS));
@@ -282,32 +306,24 @@ public List<BAGExportContactDto> getContactExportList(int first, int max) {
 			List<Location> addresses = personAddresses.getOrDefault(contact.getPersonId(), Collections.emptyList());
 
 			addresses.stream().filter(a -> PersonAddressType.PLACE_OF_WORK.equals(a.getAddressType())).findFirst().ifPresent(workAddress -> {
-				contact.setWorkPlaceStreet(workAddress.getStreet());
-				contact.setWorkPlaceStreetNumber(workAddress.getHouseNumber());
-				contact.setWorkPlaceLocation(workAddress.getCity());
+				contact.setWorkPlaceName(TODO_VALUE);
 				contact.setWorkPlacePostalCode(workAddress.getPostalCode());
+				contact.setWorkPlaceName(TODO_VALUE);
 			});
 
-			contact.setExposureLocationYn(YesNoUnknown.NO);
 			addresses.stream().filter(a -> PersonAddressType.PLACE_OF_EXPOSURE.equals(a.getAddressType())).findFirst().ifPresent(exposureAddress -> {
-				contact.setExposureLocationYn(YesNoUnknown.YES);
-
+				contact.setExposureLocationCountry(TODO_VALUE);
+				contact.setExposureLocationType(exposureAddress.getFacilityType());
+				contact.setExposureLocationTypeDetails(exposureAddress.getFacilityDetails());
+				contact.setExposureLocationName(TODO_VALUE);
+				contact.setOtherExposureLocation(exposureAddress.getFacilityDetails());
 				contact.setExposureLocationStreet(exposureAddress.getStreet());
 				contact.setExposureLocationStreetNumber(exposureAddress.getHouseNumber());
 				contact.setExposureLocationCity(exposureAddress.getCity());
 				contact.setExposureLocationPostalCode(exposureAddress.getPostalCode());
+				contact.setExposureLocationFlightDetail(TODO_VALUE);
 			});
 
-			addresses.stream()
-				.filter(a -> PersonAddressType.PLACE_OF_ISOLATION.equals(a.getAddressType()))
-				.findFirst()
-				.ifPresent(isolationAddress -> {
-					contact.setQuarantineLocationStreet(isolationAddress.getStreet());
-					contact.setQuarantineLocationStreetNumber(isolationAddress.getHouseNumber());
-					contact.setQuarantineLocationCity(isolationAddress.getCity());
-					contact.setQuarantineLocationPostalCode(isolationAddress.getPostalCode());
-				});
-
 			List<Sample> contactSamples = samples.get(contact.getContactId());
 			if (contactSamples != null && contactSamples.size() > 0) {
 				Sample firstSample = contactSamples.get(0);
@@ -336,7 +352,6 @@ private void setCasePathogenTestData(BAGExportCaseDto caze, PathogenTest test) {
 	}
 
 	private void setContactPathogenTestData(BAGExportContactDto contact, PathogenTest test) {
-		contact.setLabReportDate(test.getTestDateTime());
 		contact.setTestType(test.getTestType());
 		contact.setTestResult(test.getTestResult());
 	}

sormas-api/src/main/resources/validations.properties

@@ -228,8 +228,8 @@
 import de.symeda.sormas.backend.sample.SampleFacadeEjb;
 import de.symeda.sormas.backend.sample.SampleFacadeEjb.SampleFacadeEjbLocal;
 import de.symeda.sormas.backend.sample.SampleService;
-import de.symeda.sormas.backend.sormastosormas.SormasToSormasFacadeEjb;
-import de.symeda.sormas.backend.sormastosormas.SormasToSormasFacadeEjb.SormasToSormasFacadeEjbLocal;
+import de.symeda.sormas.backend.sormastosormas.SormasToSormasOriginInfoFacadeEjb;
+import de.symeda.sormas.backend.sormastosormas.SormasToSormasOriginInfoFacadeEjb.SormasToSormasOriginInfoFacadeEjbLocal;
 import de.symeda.sormas.backend.sormastosormas.SormasToSormasShareInfo;
 import de.symeda.sormas.backend.symptoms.Symptoms;
 import de.symeda.sormas.backend.symptoms.SymptomsFacadeEjb;
@@ -362,7 +362,7 @@ public class CaseFacadeEjb implements CaseFacade {
 	@EJB
 	private CaseJurisdictionChecker caseJurisdictionChecker;
 	@EJB
-	private SormasToSormasFacadeEjbLocal sormasToSormasFacade;
+	private SormasToSormasOriginInfoFacadeEjbLocal originInfoFacade;
 
 	@Override
 	public List<CaseDataDto> getAllActiveCasesAfter(Date date) {
@@ -2097,7 +2097,7 @@ public Case fillOrBuildEntity(@NotNull CaseDataDto source, Case target) {
 		target.setTrimester(source.getTrimester());
 		target.setFacilityType(source.getFacilityType());
 		if (source.getSormasToSormasOriginInfo() != null) {
-			target.setSormasToSormasOriginInfo(sormasToSormasFacade.fromSormasToSormasOriginInfoDto(source.getSormasToSormasOriginInfo()));
+			target.setSormasToSormasOriginInfo(originInfoFacade.toDto(source.getSormasToSormasOriginInfo()));
 		}
 
 		// TODO this makes sure follow-up is not overriden from the mobile app side. remove once that is implemented
@@ -2361,7 +2361,7 @@ public static CaseDataDto toDto(Case source) {
 		target.setEndOfIsolationReason(source.getEndOfIsolationReason());
 		target.setEndOfIsolationReasonDetails(source.getEndOfIsolationReasonDetails());
 
-		target.setSormasToSormasOriginInfo(SormasToSormasFacadeEjb.toSormasToSormasOriginInfoDto(source.getSormasToSormasOriginInfo()));
+		target.setSormasToSormasOriginInfo(SormasToSormasOriginInfoFacadeEjb.toDto(source.getSormasToSormasOriginInfo()));
 		target.setOwnershipHandedOver(source.getSormasToSormasShares().stream().anyMatch(SormasToSormasShareInfo::isOwnershipHandedOver));
 
 		return target;