Merge pull request SORMAS-Foundation#3635 from hzi-braunschweig/bugfix-3495-campaign-validation-error-messages

SORMAS-Foundation#3495 - Catch additional exceptions and present them to the user

Author: Martin Wahnschaffe

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

@@ -26,6 +26,7 @@ public interface Validations {
 	String campaignFormElementNotExisting = "campaignFormElementNotExisting";
 	String campaignFormElementTypeRequired = "campaignFormElementTypeRequired";
 	String campaignFormInvalidIdInListElements = "campaignFormInvalidIdInListElements";
+	String campaignFormMetaValidationUnexpectedError = "campaignFormMetaValidationUnexpectedError";
 	String campaignFormTranslationCaptionRequired = "campaignFormTranslationCaptionRequired";
 	String campaignFormTranslationIdInvalid = "campaignFormTranslationIdInvalid";
 	String campaignFormTranslationIdRequired = "campaignFormTranslationIdRequired";

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

@@ -138,3 +138,4 @@ externalJournalPersonValidationPhone = Invalid phone number.
 externalJournalPersonValidationPhoneTaken = The phone number is already in use in the symptom journal.
 externalJournalPersonValidationEmailTaken = The email address is already in use in the symptom journal.
 externalJournalPersonValidationNoEmailOrPhone = Please provide an email address or a phone number.
+campaignFormMetaValidationUnexpectedError = There was an unexpected error while trying to validate this form. Please forward the following error message to a system administrator: %s

sormas-backend/src/main/java/de/symeda/sormas/backend/campaign/form/CampaignFormMetaFacadeEjb.java

@@ -143,21 +143,25 @@ public List<CampaignFormMetaDto> getByUuids(List<String> uuids) {
 		return service.getByUuids(uuids).stream().map(campaignFormMeta -> toDto(campaignFormMeta)).collect(Collectors.toList());
 	}
 
-    @Override
-    public List<CampaignFormMetaReferenceDto> getCampaignFormMetasAsReferencesByCampaign(String uuid) {
-        return service.getCampaignFormMetasAsReferencesByCampaign(uuid);
-    }
+	@Override
+	public List<CampaignFormMetaReferenceDto> getCampaignFormMetasAsReferencesByCampaign(String uuid) {
+		return service.getCampaignFormMetasAsReferencesByCampaign(uuid);
+	}
 
 	@Override
-    public void validateAllFormMetas() {
-        List<CampaignFormMeta> forms = service.getAll();
+	public void validateAllFormMetas() {
+		List<CampaignFormMeta> forms = service.getAll();
 
 		for (CampaignFormMeta form : forms) {
 			try {
 				CampaignFormMetaDto formDto = toDto(form);
 				validateAndClean(formDto);
 			} catch (ValidationRuntimeException e) {
-				throw new ValidationRuntimeException(form.getId() + ": " + e.getMessage());
+				throw new ValidationRuntimeException(form.getFormId() + ": " + e.getMessage());
+			} catch (Exception e) {
+				throw new ValidationRuntimeException(
+					form.getFormId() + ": "
+						+ I18nProperties.getValidationError(Validations.campaignFormMetaValidationUnexpectedError, e.getMessage()));
 			}
 		}
 	}