SORMAS-Foundation#3368 - add validations to campaign form data

Author: barnabartha

sormas-api/src/main/java/de/symeda/sormas/api/campaign/CampaignDto.java

@@ -21,6 +21,7 @@ public class CampaignDto extends EntityDto {
 	public static final String START_DATE = "startDate";
 	public static final String END_DATE = "endDate";
 	public static final String CREATING_USER = "creatingUser";
+	public static final String CAMPAIGN_FORM_METAS = "campaignFormMetas";
 
 	private String name;
 	private String description;

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

@@ -17,6 +17,8 @@ public interface Validations {
 	String campaignDashboardChartIdDoesNotExist = "campaignDashboardChartIdDoesNotExist";
 	String campaignDashboardChartPercentage = "campaignDashboardChartPercentage";
 	String campaignDashboardChartValueNull = "campaignDashboardChartValueNull";
+	String campaignDashboardDataFormValueDuplicate = "campaignDashboardDataFormValueDuplicate";
+	String campaignDashboardDataFormValueNull = "campaignDashboardDataFormValueNull";
 	String campaignFormDependingOnNotFound = "campaignFormDependingOnNotFound";
 	String campaignFormDependingOnValuesMissing = "campaignFormDependingOnValuesMissing";
 	String campaignFormElementDuplicateId = "campaignFormElementDuplicateId";

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

@@ -112,6 +112,8 @@ campaignFormTranslationLanguageCodeRequired = All translations must specify a la
 campaignFormElementDuplicateId = Field IDs need to be unique, but the campaign form contains at least two fields with ID %s.
 errorsInForm = There are errors in the form you tried to save. Please check the fields highlighted in red and make sure to only enter valid values.
 campaignFormInvalidIdInListElements = The ID %s in the campaign form list definition is not associated to any element of the form.
+campaignDashboardDataFormValueNull = Campaign dashboard data form element is missing!
+campaignDashboardDataFormValueDuplicate = Campaign dashboard data form element must be unique!
 campaignDashboardChartPercentage = Value must be a number that is multiple of 5!
 campaignDashboardChartValueNull = Campaign dashboard elements %s of campaign %s are missing!
 campaignDashboardChartIdDoesNotExist = Diagram %s from campaign %s does not exist!

sormas-backend/src/main/java/de/symeda/sormas/backend/campaign/CampaignFacadeEjb.java

@@ -264,8 +264,17 @@ protected void validate(CampaignDto campaignDto) {
 						I18nProperties
 							.getValidationError(Validations.campaignDashboardChartValueNull, CampaignDashboardElement.WIDTH, campaignDto.getName()));
 				}
-
 			}
+
+			campaignDto.getCampaignFormMetas().forEach(campaignFormMetaReferenceDto -> {
+				if (campaignFormMetaReferenceDto == null || campaignFormMetaReferenceDto.getUuid() == null) {
+					throw new ValidationRuntimeException(
+						I18nProperties.getValidationError(
+							Validations.campaignDashboardDataFormValueNull,
+							CampaignDto.CAMPAIGN_FORM_METAS,
+							campaignDto.getName()));
+				}
+			});
 		}
 	}
 

sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/campaigns/CampaignFormsGridComponent.java

@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 
 import com.vaadin.data.Binder;
 import com.vaadin.ui.Button;
@@ -12,6 +13,7 @@
 import de.symeda.sormas.api.i18n.Captions;
 import de.symeda.sormas.api.i18n.I18nProperties;
 import de.symeda.sormas.api.i18n.Strings;
+import de.symeda.sormas.api.i18n.Validations;
 import de.symeda.sormas.ui.utils.AbstractEditableGrid;
 
 @SuppressWarnings("serial")
@@ -29,7 +31,7 @@ public CampaignFormsGridComponent(
 	protected Button.ClickListener newRowEvent() {
 		return event -> {
 			final ArrayList<CampaignFormMetaReferenceDto> gridItems = getItems();
-			gridItems.add(new CampaignFormMetaReferenceDto());
+			gridItems.add(new CampaignFormMetaReferenceDto(UUID.randomUUID().toString(), ""));
 			grid.setItems(gridItems);
 		};
 	}
@@ -39,11 +41,20 @@ protected Binder<CampaignFormMetaReferenceDto> addColumnsBinder(List<CampaignFor
 		final Binder<CampaignFormMetaReferenceDto> binder = new Binder<>();
 
 		ComboBox<CampaignFormMetaReferenceDto> formCombo = new ComboBox<>(Strings.entityCampaignDataForm, allElements);
-		Binder.Binding<CampaignFormMetaReferenceDto, CampaignFormMetaReferenceDto> formBind = binder
-			.bind(formCombo, campaignFormMetaReferenceDto -> campaignFormMetaReferenceDto, (bindedCampaignFormMeta, selectedCampaignFormMeta) -> {
+
+		Binder.Binding<CampaignFormMetaReferenceDto, CampaignFormMetaReferenceDto> formBind = binder.forField(formCombo)
+			.withValidator(
+				campaignFormMetaReferenceDto -> campaignFormMetaReferenceDto != null && campaignFormMetaReferenceDto.getUuid() != null,
+				I18nProperties.getValidationError(Validations.campaignDashboardDataFormValueNull))
+			.withValidator(campaignFormMetaReferenceDto -> {
+				ArrayList<CampaignFormMetaReferenceDto> items = getItems();
+				return !items.contains(campaignFormMetaReferenceDto);
+			}, I18nProperties.getValidationError(Validations.campaignDashboardDataFormValueDuplicate))
+			.bind(campaignFormMetaReferenceDto -> campaignFormMetaReferenceDto, (bindedCampaignFormMeta, selectedCampaignFormMeta) -> {
 				bindedCampaignFormMeta.setUuid(selectedCampaignFormMeta.getUuid());
 				bindedCampaignFormMeta.setCaption(selectedCampaignFormMeta.getCaption());
 			});
+		formCombo.setEmptySelectionAllowed(false);
 		Grid.Column<CampaignFormMetaReferenceDto, String> formColumn =
 			grid.addColumn(campaignFormMetaReferenceDto -> campaignFormMetaReferenceDto.getCaption())
 				.setCaption(I18nProperties.getString(Strings.entityCampaignDataForm));