SORMAS-Foundation#3599 refactor patient diary validation, check if email/phone is taken by current person

vlad.ciucescu@fxbits.io · vlad.ciucescu@fxbits.io · commit 8fe90ba43419 · 2020-11-27T13:05:58.000+02:00
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/ExternalJournalFacade.java b/sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/ExternalJournalFacade.java
@@ -2,7 +2,8 @@
 
 import javax.ejb.Remote;
 
-import de.symeda.sormas.api.person.PersonDto;
+import de.symeda.sormas.api.externaljournal.patientdiary.PatientDiaryRegisterResult;
+import de.symeda.sormas.api.externaljournal.patientdiary.PatientDiaryPersonDto;
 
 @Remote
 public interface ExternalJournalFacade {
@@ -13,7 +14,7 @@ public interface ExternalJournalFacade {
 
 	PatientDiaryPersonDto getPatientDiaryPerson(String personUuid);
 
-	PatientDiaryRegisterResult registerPatientDiaryPerson(PersonDto person);
+	PatientDiaryRegisterResult registerPatientDiaryPerson(de.symeda.sormas.api.person.PersonDto person);
 
-	PatientDiaryPersonValidation validatePatientDiaryPerson(PersonDto person);
+	ExternalJournalValidation validatePatientDiaryPerson(de.symeda.sormas.api.person.PersonDto person);
 }
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/ExternalJournalValidation.java b/sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/ExternalJournalValidation.java
@@ -2,12 +2,12 @@
 
 import java.io.Serializable;
 
-public class PatientDiaryPersonValidation implements Serializable {
+public class ExternalJournalValidation implements Serializable {
 
     private boolean valid;
     private String message;
 
-    public PatientDiaryPersonValidation(boolean valid, String message) {
+    public ExternalJournalValidation(boolean valid, String message) {
         this.valid = valid;
         this.message = message;
     }
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/patientdiary/PatientDiaryContactInformation.java b/sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/patientdiary/PatientDiaryContactInformation.java
@@ -1,8 +1,11 @@
-package de.symeda.sormas.api.externaljournal;
+package de.symeda.sormas.api.externaljournal.patientdiary;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 import java.io.Serializable;
 
-class PatientDiaryContactInformation implements Serializable {
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class PatientDiaryContactInformation implements Serializable {
 
 	private static final long serialVersionUID = -144631462985961640L;
 
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/patientdiary/PatientDiaryIdatId.java b/sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/patientdiary/PatientDiaryIdatId.java
@@ -0,0 +1,20 @@
+package de.symeda.sormas.api.externaljournal.patientdiary;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+import java.io.Serializable;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class PatientDiaryIdatId implements Serializable {
+    private static final long serialVersionUID = -2785744892381447672L;
+
+    private PatientDiaryPersonDto idat;
+
+    public PatientDiaryPersonDto getIdat() {
+        return idat;
+    }
+
+    public void setIdat(PatientDiaryPersonDto idat) {
+        this.idat = idat;
+    }
+}
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/patientdiary/PatientDiaryPersonData.java b/sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/patientdiary/PatientDiaryPersonData.java
@@ -1,4 +1,4 @@
-package de.symeda.sormas.api.externaljournal;
+package de.symeda.sormas.api.externaljournal.patientdiary;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
@@ -10,6 +10,7 @@ public class PatientDiaryPersonData implements Serializable {
     private static final long serialVersionUID = -1036432520752506284L;
 
     private String _id;
+    private PatientDiaryIdatId idatId;
     // Other returned fields are ignored. Add as needed
 
     public String get_id() {
@@ -19,4 +20,12 @@ public String get_id() {
     public void set_id(String _id) {
         this._id = _id;
     }
+
+    public PatientDiaryIdatId getIdatId() {
+        return idatId;
+    }
+
+    public void setIdatId(PatientDiaryIdatId idatId) {
+        this.idatId = idatId;
+    }
 }
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/patientdiary/PatientDiaryPersonDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/patientdiary/PatientDiaryPersonDto.java
@@ -1,4 +1,4 @@
-package de.symeda.sormas.api.externaljournal;
+package de.symeda.sormas.api.externaljournal.patientdiary;
 
 import java.io.Serializable;
 
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/patientdiary/PatientDiaryPhone.java b/sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/patientdiary/PatientDiaryPhone.java
@@ -1,4 +1,4 @@
-package de.symeda.sormas.api.externaljournal;
+package de.symeda.sormas.api.externaljournal.patientdiary;
 
 import java.io.Serializable;
 
@@ -51,4 +51,4 @@ public String getDialCode() {
     public void setDialCode(String dialCode) {
         this.dialCode = dialCode;
     }
-}
+}
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/patientdiary/PatientDiaryQueryResponse.java b/sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/patientdiary/PatientDiaryQueryResponse.java
@@ -1,9 +1,9 @@
-package de.symeda.sormas.api.externaljournal;
+package de.symeda.sormas.api.externaljournal.patientdiary;
 
 import java.io.Serializable;
 import java.util.List;
 
-public class PatientDiaryPersonQueryResponse implements Serializable {
+public class PatientDiaryQueryResponse implements Serializable {
 
 	private static final long serialVersionUID = -1089320137577059438L;
 
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/patientdiary/PatientDiaryRegisterResult.java b/sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/patientdiary/PatientDiaryRegisterResult.java
@@ -1,4 +1,4 @@
-package de.symeda.sormas.api.externaljournal;
+package de.symeda.sormas.api.externaljournal.patientdiary;
 
 import java.io.Serializable;
 
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/patientdiary/PatientDiaryValidationError.java b/sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/patientdiary/PatientDiaryValidationError.java
@@ -0,0 +1,23 @@
+package de.symeda.sormas.api.externaljournal.patientdiary;
+
+import de.symeda.sormas.api.i18n.Validations;
+
+public enum PatientDiaryValidationError {
+
+    NO_PHONE_OR_EMAIL(Validations.externalJournalPersonValidationNoEmailOrPhone),
+    INVALID_EMAIL(Validations.externalJournalPersonValidationEmail),
+    INVALID_PHONE(Validations.externalJournalPersonValidationPhone),
+    INVALID_BIRTHDATE(Validations.externalJournalPersonValidationBirthdate),
+    EMAIL_TAKEN(Validations.externalJournalPersonValidationEmailTaken),
+    PHONE_TAKEN(Validations.externalJournalPersonValidationPhoneTaken);
+
+    public String errorLanguageKey;
+
+    PatientDiaryValidationError(String errorLanguageKey) {
+        this.errorLanguageKey = errorLanguageKey;
+    }
+
+    public String getErrorLanguageKey() {
+        return errorLanguageKey;
+    }
+}
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externaljournal/ExternalJournalFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externaljournal/ExternalJournalFacadeEjb.java
@@ -4,10 +4,9 @@
 import javax.ejb.Stateless;
 
 import de.symeda.sormas.api.externaljournal.ExternalJournalFacade;
-import de.symeda.sormas.api.externaljournal.PatientDiaryPersonDto;
-import de.symeda.sormas.api.externaljournal.PatientDiaryPersonValidation;
-import de.symeda.sormas.api.externaljournal.PatientDiaryRegisterResult;
-import de.symeda.sormas.api.person.PersonDto;
+import de.symeda.sormas.api.externaljournal.patientdiary.PatientDiaryPersonDto;
+import de.symeda.sormas.api.externaljournal.ExternalJournalValidation;
+import de.symeda.sormas.api.externaljournal.patientdiary.PatientDiaryRegisterResult;
 
 @Stateless(name = "ExternalJournalFacade")
 public class ExternalJournalFacadeEjb implements ExternalJournalFacade {
@@ -31,12 +30,12 @@ public PatientDiaryPersonDto getPatientDiaryPerson(String personUuid) {
 	}
 
 	@Override
-	public PatientDiaryRegisterResult registerPatientDiaryPerson(PersonDto person) {
+	public PatientDiaryRegisterResult registerPatientDiaryPerson(de.symeda.sormas.api.person.PersonDto person) {
 		return externalJournalService.registerPatientDiaryPerson(person);
 	}
 
 	@Override
-	public PatientDiaryPersonValidation validatePatientDiaryPerson(PersonDto person) {
+	public ExternalJournalValidation validatePatientDiaryPerson(de.symeda.sormas.api.person.PersonDto person) {
 		return externalJournalService.validatePatientDiaryPerson(person);
 	}
 
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externaljournal/ExternalJournalService.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externaljournal/ExternalJournalService.java
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/person/PersonFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/person/PersonFacadeEjb.java
diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/externaljournal/ExternalJournalServiceTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/externaljournal/ExternalJournalServiceTest.java
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/contact/ContactController.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/contact/ContactController.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package de.symeda.sormas.api.externaljournal;`
	`1`	`+package de.symeda.sormas.api.externaljournal.patientdiary;`
`2`	`2`
`3`	`3`	`import java.io.Serializable;`
`4`	`4`