SORMAS-Foundation#3217 perform validation before persisting person entity

Author: [email protected]

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

@@ -39,6 +39,7 @@ public interface Validations {
 	String externalJournalPersonValidationBirthdate = "externalJournalPersonValidationBirthdate";
 	String externalJournalPersonValidationEmail = "externalJournalPersonValidationEmail";
 	String externalJournalPersonValidationError = "externalJournalPersonValidationError";
+	String externalJournalPersonValidationNoEmailOrPhone = "externalJournalPersonValidationNoEmailOrPhone";
 	String externalJournalPersonValidationPhone = "externalJournalPersonValidationPhone";
 	String futureDate = "futureDate";
 	String futureDateStrict = "futureDateStrict";

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

@@ -123,3 +123,4 @@ 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.

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

@@ -337,13 +337,18 @@ public ExternalPersonValidation validatePatientDiaryPerson(PersonDto person) {
 		if (ObjectUtils.anyNotNull(person.getBirthdateDD(), person.getBirthdateMM(), person.getBirthdateYYYY())) {
 			validBirthdate = ObjectUtils.allNotNull(person.getBirthdateDD(), person.getBirthdateMM(), person.getBirthdateYYYY());
 		}
-		boolean valid = validEmail && validPhone && validBirthdate;
-		String message = getValidationMessage(validEmail, validPhone, validBirthdate);
+		boolean hasPhoneOrEmail = !StringUtils.isAllEmpty(email, phone);
+		boolean valid = hasPhoneOrEmail && validEmail && validPhone && validBirthdate;
+		String message = getValidationMessage(hasPhoneOrEmail, validEmail, validPhone, validBirthdate);
 		return new ExternalPersonValidation(valid, message);
 	}
 
-	private String getValidationMessage(boolean validEmail, boolean validPhone, boolean validBirthdate) {
+	private String getValidationMessage(boolean hasPhoneOrEmail, boolean validEmail, boolean validPhone, boolean validBirthdate) {
 		StringBuilder message = new StringBuilder();
+		if (!hasPhoneOrEmail) {
+			message.append(I18nProperties.getValidationError(Validations.externalJournalPersonValidationNoEmailOrPhone));
+			message.append('\n');
+		}
 		if (!validEmail) {
 			message.append(I18nProperties.getValidationError(Validations.externalJournalPersonValidationEmail));
 			message.append('\n');

sormas-backend/src/main/java/de/symeda/sormas/backend/person/PersonFacadeEjb.java

@@ -307,14 +307,14 @@ public PersonDto savePerson(PersonDto source) throws ValidationRuntimeException
 
 		validate(source);
 
-		person = fillOrBuildEntity(source, person);
-
-		personService.ensurePersisted(person);
-
 		if (existingPerson != null) {
 			handleExternalJournalPerson(existingPerson, source);
 		}
 
+		person = fillOrBuildEntity(source, person);
+
+		personService.ensurePersisted(person);
+
 		onPersonChanged(existingPerson, person);
 
 		return convertToDto(person, Pseudonymizer.getDefault(userService::hasRight), existingPerson == null || isPersonInJurisdiction(person));