SORMAS-Foundation#3136 share case/contacts in bulk

Author: lgal

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

@@ -269,6 +269,7 @@ public interface Captions {
 	String CaseData_sharedToCountry = "CaseData.sharedToCountry";
 	String CaseData_smallpoxVaccinationReceived = "CaseData.smallpoxVaccinationReceived";
 	String CaseData_smallpoxVaccinationScar = "CaseData.smallpoxVaccinationScar";
+	String CaseData_sormasToSormasOriginInfo = "CaseData.sormasToSormasOriginInfo";
 	String CaseData_surveillanceOfficer = "CaseData.surveillanceOfficer";
 	String CaseData_symptoms = "CaseData.symptoms";
 	String CaseData_therapy = "CaseData.therapy";

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

@@ -175,6 +175,7 @@ public interface Strings {
 	String errorSormasToSormasResult = "errorSormasToSormasResult";
 	String errorSormasToSormasSend = "errorSormasToSormasSend";
 	String errorSormasToSormasServerAccess = "errorSormasToSormasServerAccess";
+	String errorSormasToSormasShare = "errorSormasToSormasShare";
 	String errorViewNotFound = "errorViewNotFound";
 	String errorWasReported = "errorWasReported";
 	String forCase = "forCase";

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

@@ -21,8 +21,8 @@ public class SormasToSormasApiConstants {
 
 	public static final String RESOURCE_PATH = "/sormasToSormas";
 
-	public static final String CASE_ENDPOINT = "/case";
+	public static final String CASE_ENDPOINT = "/cases";
 
-	public static final String CONTACT_ENDPOINT = "/contact";
+	public static final String CONTACT_ENDPOINT = "/contacts";
 
 }

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

@@ -16,23 +16,25 @@
 package de.symeda.sormas.api.sormastosormas;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 public class SormasToSormasErrorResponse implements Serializable {
 
-	private String message;
+	private Map<String, Map<String, List<String>>> errors;
 
 	public SormasToSormasErrorResponse() {
 	}
 
-	public SormasToSormasErrorResponse(String message) {
-		this.message = message;
+	public SormasToSormasErrorResponse(Map<String, Map<String, List<String>>> errors) {
+		this.errors = errors;
 	}
 
-	public String getMessage() {
-		return message;
+	public Map<String, Map<String, List<String>>> getErrors() {
+		return errors;
 	}
 
-	public void setMessage(String message) {
-		this.message = message;
+	public void setErrors(Map<String, Map<String, List<String>>> errors) {
+		this.errors = errors;
 	}
 }

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

@@ -15,9 +15,27 @@
 
 package de.symeda.sormas.api.sormastosormas;
 
+import java.util.List;
+import java.util.Map;
+
 public class SormasToSormasException extends Exception {
 
+	private Map<String, Map<String, List<String>>> errors;
+
 	public SormasToSormasException(String message) {
 		super(message);
 	}
+
+	public SormasToSormasException(String message, Map<String, Map<String, List<String>>> errors) {
+		super(message);
+		this.errors = errors;
+	}
+
+	public Map<String, Map<String, List<String>>> getErrors() {
+		return errors;
+	}
+
+	public void setErrors(Map<String, Map<String, List<String>>> errors) {
+		this.errors = errors;
+	}
 }

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

@@ -22,13 +22,13 @@
 @Remote
 public interface SormasToSormasFacade {
 
-	void saveSharedCase(SormasToSormasEncryptedDataDto encryptedData) throws SormasToSormasException;
+	void saveSharedCases(SormasToSormasEncryptedDataDto encryptedData) throws SormasToSormasException, SormasToSormasValidationException;
 
-	void saveSharedContact(SormasToSormasEncryptedDataDto sharedContact) throws SormasToSormasException;
+	void saveSharedContacts(SormasToSormasEncryptedDataDto sharedContact) throws SormasToSormasException, SormasToSormasValidationException;
 
-	void shareCase(String uuid, SormasToSormasOptionsDto options) throws SormasToSormasException;
+	void shareCases(List<String> caseUuids, SormasToSormasOptionsDto options) throws SormasToSormasException;
 
-	void shareContact(String uuid, SormasToSormasOptionsDto options) throws SormasToSormasException;
+	void shareContacts(List<String> contactUuids, SormasToSormasOptionsDto options) throws SormasToSormasException;
 
 	List<ServerAccessDataReferenceDto> getAvailableOrganizations();
 

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

@@ -0,0 +1,32 @@
+/*
+ * 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 java.util.List;
+import java.util.Map;
+
+public class SormasToSormasValidationException extends Exception {
+
+	private final Map<String, Map<String, List<String>>> errors;
+
+	public SormasToSormasValidationException(Map<String, Map<String, List<String>>> errors) {
+		this.errors = errors;
+	}
+
+	public Map<String, Map<String, List<String>>> getErrors() {
+		return errors;
+	}
+}

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

@@ -376,6 +376,7 @@ CaseData.quarantineReasonBeforeIsolation=Reason why the case was in quarantine b
 CaseData.quarantineReasonBeforeIsolationDetails=Other reason
 CaseData.endOfIsolationReason=Reason for end of isolation
 CaseData.endOfIsolationReasonDetails=Other reason
+CaseData.sormasToSormasOriginInfo=Shared by
 
 # CaseExport
 CaseExport.address=Address

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

@@ -221,6 +221,7 @@ errorWasReported = The error was automatically reported to the support.
 errorInvalidValue = Invalid value
 errorCaseDuplicateDeletion = The duplicate case could not be deleted due to an internal error.
 errorCaseMerging = The cases could not be merged due to an internal error.
+errorSormasToSormasShare = The shared data could not be saved due to some errors.
 errorSormasToSormasServerAccess = The selected health department is not configured. Please contact an admin and tell them about this issue.
 errorSormasToSormasSend = Unexpected error occurred while sharing. Please contact an admin and tell them about this issue.
 errorSormasToSormasConnection = Connection refused by the target health department.