SORMAS-Foundation#3188 remove redundant propery in sormas.properties

Author: [email protected]

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

@@ -5,10 +5,9 @@
 
 public class PatientDiaryConfig implements Serializable, Cloneable {
 
-	private static final long serialVersionUID = -1997433636517306892L;
+	private static final long serialVersionUID = 9020437984638539380L;
 
 	private String url;
-	private String externalDataUrl;
 	private String probandsUrl;
 	private String authUrl;
 	private String email;
@@ -23,14 +22,6 @@ public void setUrl(String url) {
 		this.url = url;
 	}
 
-	public String getExternalDataUrl() {
-		return externalDataUrl;
-	}
-
-	public void setExternalDataUrl(String externalDataUrl) {
-		this.externalDataUrl = externalDataUrl;
-	}
-
 	public String getProbandsUrl() {
 		return probandsUrl;
 	}
@@ -79,7 +70,7 @@ public boolean equals(Object o) {
 			return false;
 		PatientDiaryConfig that = (PatientDiaryConfig) o;
 		return Objects.equals(url, that.url)
-			&& Objects.equals(externalDataUrl, that.externalDataUrl)
+			&& Objects.equals(probandsUrl, that.probandsUrl)
 			&& Objects.equals(authUrl, that.authUrl)
 			&& Objects.equals(email, that.email)
 			&& Objects.equals(password, that.password)
@@ -88,7 +79,7 @@ public boolean equals(Object o) {
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(url, externalDataUrl, authUrl, email, password, defaultUser);
+		return Objects.hash(url, probandsUrl, authUrl, email, password, defaultUser);
 	}
 
 	@Override

sormas-backend/src/main/java/de/symeda/sormas/backend/common/ConfigFacadeEjb.java

@@ -100,7 +100,6 @@ public class ConfigFacadeEjb implements ConfigFacade {
 	public static final String INTERFACE_SYMPTOM_JOURNAL_DEFAULT_USER_PASSWORD = "interface.symptomjournal.defaultuser.password";
 
 	public static final String INTERFACE_PATIENT_DIARY_URL = "interface.patientdiary.url";
-	public static final String INTERFACE_PATIENT_DIARY_EXTERNAL_DATA_URL = "interface.patientdiary.externaldataurl";
 	public static final String INTERFACE_PATIENT_DIARY_PROBANDS_URL = "interface.patientdiary.probandsurl";
 	public static final String INTERFACE_PATIENT_DIARY_AUTH_URL = "interface.patientdiary.authurl";
 	public static final String INTERFACE_PATIENT_DIARY_EMAIL = "interface.patientdiary.email";
@@ -409,7 +408,6 @@ public SymptomJournalConfig getSymptomJournalConfig() {
 	public PatientDiaryConfig getPatientDiaryConfig() {
 		PatientDiaryConfig config = new PatientDiaryConfig();
 		config.setUrl(getProperty(INTERFACE_PATIENT_DIARY_URL, null));
-		config.setExternalDataUrl(getProperty(INTERFACE_PATIENT_DIARY_EXTERNAL_DATA_URL, null));
 		config.setProbandsUrl(getProperty(INTERFACE_PATIENT_DIARY_PROBANDS_URL, null));
 		config.setAuthUrl(getProperty(INTERFACE_PATIENT_DIARY_AUTH_URL, null));
 		config.setEmail(getProperty(INTERFACE_PATIENT_DIARY_EMAIL, null));
@@ -455,7 +453,7 @@ public void validateExternalUrls() {
 			getSymptomJournalConfig().getUrl(),
 			getSymptomJournalConfig().getAuthUrl(),
 			getPatientDiaryConfig().getUrl(),
-			getPatientDiaryConfig().getExternalDataUrl(),
+			getPatientDiaryConfig().getProbandsUrl(),
 			getPatientDiaryConfig().getAuthUrl());
 
 		urls.forEach(url -> {

sormas-backend/src/main/java/de/symeda/sormas/backend/externaljournal/ExternalJournalService.java

@@ -306,9 +306,11 @@ public PatientDiaryRegisterResult registerPatientDiaryPerson(PersonDto person) {
 	}
 
 	private Invocation.Builder getExternalDataPersonInvocationBuilder(String personUuid) {
-		String externalDataUrl = configFacade.getPatientDiaryConfig().getExternalDataUrl() + '/' + personUuid;
+		String externalDataUrl = configFacade.getPatientDiaryConfig().getProbandsUrl() + "/external-data/" + personUuid;
 		Client client = ClientBuilder.newClient();
-		return client.target(externalDataUrl).request(MediaType.APPLICATION_JSON).header("x-access-token", getPatientDiaryAuthToken());
+		return client.target(externalDataUrl)
+				.request(MediaType.APPLICATION_JSON)
+				.header("x-access-token", getPatientDiaryAuthToken());
 	}
 
 	/**
@@ -372,12 +374,15 @@ private boolean isPhoneAvailable(String phone) {
 	 */
 	public PatientDiaryPersonQueryResponse queryPatientDiary(String key, String value) {
 		try {
-			String probandsUrl = configFacade.getPatientDiaryConfig().getProbandsUrl();
+			String probandsUrl = configFacade.getPatientDiaryConfig().getProbandsUrl() + "/probands";
 			String queryParam = "\"" + key + "\" = \"" + value + "\"";
 			String encodedParams = URLEncoder.encode(queryParam, StandardCharsets.UTF_8.toString());
 			String fullUrl = probandsUrl + "?q=" + encodedParams;
 			Client client = ClientBuilder.newClient();
-			Response response = client.target(fullUrl).request(MediaType.APPLICATION_JSON).header("x-access-token", getPatientDiaryAuthToken()).get();
+			Response response = client.target(fullUrl)
+					.request(MediaType.APPLICATION_JSON)
+					.header("x-access-token", getPatientDiaryAuthToken())
+					.get();
 			return response.readEntity(PatientDiaryPersonQueryResponse.class);
 		} catch (IOException e) {
 			logger.error("Could not retrieve patient query response: {}", e.getMessage());

sormas-base/setup/sormas.properties

@@ -164,7 +164,7 @@ sms.auth.secret=
 # Website that is displayed in a new tab to show or create a climedo patient eDiary for a contact person; leave this commented
 # if you don't want to use this feature
 #interface.patientdiary.url=
-#interface.patientdiary.externaldataurl=
+#interface.patientdiary.probandsurl=
 #interface.patientdiary.authurl=
 #interface.patientdiary.email=
 #interface.patientdiary.password=