Merge branch 'development' into feature-3195-Unit-tests-for-the-ExternalVisitsRessource

Author: FredrikSchäferVitagroup

SERVER_CUSTOMIZATION.md

@@ -15,5 +15,5 @@ public interface ExternalJournalFacade {
 
 	RegisterResult registerPatientDiaryPerson(PersonDto person);
 
-	boolean isPersonExportable(PersonDto person);
+	ExternalPersonValidation validatePatientDiaryPerson(PersonDto person);
 }

sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/ExternalJournalFacade.java

@@ -0,0 +1,30 @@
+package de.symeda.sormas.api.externaljournal;
+
+import java.io.Serializable;
+
+public class ExternalPersonValidation implements Serializable {
+
+    private boolean valid;
+    private String message;
+
+    public ExternalPersonValidation(boolean valid, String message) {
+        this.valid = valid;
+        this.message = message;
+    }
+
+    public boolean isValid() {
+        return valid;
+    }
+
+    public void setValid(boolean valid) {
+        this.valid = valid;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}

sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/ExternalPersonValidation.java

@@ -12,6 +12,7 @@ public class PatientDiaryConfig implements Serializable, Cloneable {
 	private String authUrl;
 	private String email;
 	private String password;
+	private UserConfig defaultUser;
 
 	public String getUrl() {
 		return url;
@@ -53,6 +54,14 @@ public void setPassword(String password) {
 		this.password = password;
 	}
 
+	public UserConfig getDefaultUser() {
+		return defaultUser;
+	}
+
+	public void setDefaultUser(UserConfig defaultUser) {
+		this.defaultUser = defaultUser;
+	}
+
 	@Override
 	public boolean equals(Object o) {
 		if (this == o)
@@ -64,12 +73,13 @@ public boolean equals(Object o) {
 			&& Objects.equals(externalDataUrl, that.externalDataUrl)
 			&& Objects.equals(authUrl, that.authUrl)
 			&& Objects.equals(email, that.email)
-			&& Objects.equals(password, that.password);
+			&& Objects.equals(password, that.password)
+			&& Objects.equals(defaultUser, that.defaultUser);
 	}
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(url, externalDataUrl, authUrl, email, password);
+		return Objects.hash(url, externalDataUrl, authUrl, email, password, defaultUser);
 	}
 
 	@Override

sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/PatientDiaryConfig.java

@@ -11,6 +11,7 @@ public class SymptomJournalConfig implements Serializable, Cloneable {
 	private String authUrl;
 	private String clientId;
 	private String secret;
+	private UserConfig defaultUser;
 
 	public String getUrl() {
 		return url;
@@ -44,6 +45,14 @@ public void setSecret(String secret) {
 		this.secret = secret;
 	}
 
+	public UserConfig getDefaultUser() {
+		return defaultUser;
+	}
+
+	public void setDefaultUser(UserConfig defaultUser) {
+		this.defaultUser = defaultUser;
+	}
+
 	@Override
 	public boolean equals(Object o) {
 		if (this == o)
@@ -54,12 +63,13 @@ public boolean equals(Object o) {
 		return Objects.equals(url, that.url)
 			&& Objects.equals(authUrl, that.authUrl)
 			&& Objects.equals(clientId, that.clientId)
-			&& Objects.equals(secret, that.secret);
+			&& Objects.equals(secret, that.secret)
+			&& Objects.equals(defaultUser, that.defaultUser);
 	}
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(url, authUrl, clientId, secret);
+		return Objects.hash(url, authUrl, clientId, secret, defaultUser);
 	}
 
 	@Override

sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/SymptomJournalConfig.java

@@ -0,0 +1,63 @@
+/*
+ * 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.externaljournal;
+
+import java.util.Objects;
+
+/**
+ * @author Alex Vidrean
+ * @since 28-Oct-20
+ */
+public class UserConfig {
+
+	private String username;
+
+	private String password;
+
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public String getPassword() {
+		return password;
+	}
+
+	public void setPassword(String password) {
+		this.password = password;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o)
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
+		UserConfig that = (UserConfig) o;
+		return Objects.equals(username, that.username) && Objects.equals(password, that.password);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(username, password);
+	}
+}

sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/UserConfig.java

@@ -1092,7 +1092,6 @@ public interface Captions {
 	String PathogenTests = "PathogenTests";
 	String patientDiaryPersonNotExportable = "patientDiaryPersonNotExportable";
 	String patientDiaryRegistrationError = "patientDiaryRegistrationError";
-	String patientDiaryRegistrationSuccess = "patientDiaryRegistrationSuccess";
 	String Person = "Person";
 	String Person_address = "Person.address";
 	String Person_addresses = "Person.addresses";

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

@@ -36,7 +36,11 @@ public interface Validations {
 	String emptyOverwrittenFollowUpUntilDate = "emptyOverwrittenFollowUpUntilDate";
 	String errorsInForm = "errorsInForm";
 	String exportNoNameSpecified = "exportNoNameSpecified";
-	String externalJournalPersonValidation = "externalJournalPersonValidation";
+	String externalJournalPersonValidationBirthdate = "externalJournalPersonValidationBirthdate";
+	String externalJournalPersonValidationEmail = "externalJournalPersonValidationEmail";
+	String externalJournalPersonValidationError = "externalJournalPersonValidationError";
+	String externalJournalPersonValidationNoEmailOrPhone = "externalJournalPersonValidationNoEmailOrPhone";
+	String externalJournalPersonValidationPhone = "externalJournalPersonValidationPhone";
 	String futureDate = "futureDate";
 	String futureDateStrict = "futureDateStrict";
 	String importAreaAlreadyExists = "importAreaAlreadyExists";

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

@@ -1950,6 +1950,5 @@ BAGExport=BAG Export
 SurvnetGateway.title=SurvNet
 SurvnetGateway.send=send to own SurvNet instance
 
-patientDiaryRegistrationSuccess=Successfully registered person in the patient diary.
 patientDiaryRegistrationError=Could not register person in the patient diary.
 patientDiaryPersonNotExportable=Cannot export the person to the patient diary. The person needs a valid birthdate and either a valid phone number or email address.

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

@@ -123,4 +123,8 @@ sormasToSormasSenderNameMissing = Sender name is missing
 sormasToSormasSampleExists = This sample already exists
 validPhoneNumber = %s must be a valid phone number
 validEmailAddress = %s must be a valid email address
-externalJournalPersonValidation = Persons exported to an external journal need a valid birthdate and either a valid phone number or email address.
+externalJournalPersonValidationBirthdate = Invalid birthdate.
+externalJournalPersonValidationEmail = Invalid email address.
+externalJournalPersonValidationError = Invalid data provided for person exported to external journal:
+externalJournalPersonValidationPhone = Invalid phone number.
+externalJournalPersonValidationNoEmailOrPhone = Please provide an email address or a phone number.