SORMAS-Foundation#3368 - fix validation of campaign dashboard elements sub-tabs

Author: barnabartha

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

@@ -206,12 +206,7 @@ protected void validate(CampaignDto campaignDto) {
 		final List<CampaignDashboardElement> campaignDashboardElements = campaignDto.getCampaignDashboardElements();
 		if (campaignDashboardElements != null) {
 
-            final Map<String, Boolean> oneSubTabIsNotNullOrEmptyMap = new HashMap<>();
-            campaignDashboardElements.stream().forEach(cde -> {
-                if (!oneSubTabIsNotNullOrEmptyMap.containsKey(cde.getTabId())){
-                    oneSubTabIsNotNullOrEmptyMap.put(cde.getTabId(), false);
-                }
-            });
+			final Map<String, Boolean> oneSubTabIsNotNullOrEmptyMap = new HashMap<>();
 
 			for (CampaignDashboardElement cde : campaignDashboardElements) {
 				final String diagramId = cde.getDiagramId();
@@ -233,15 +228,23 @@ protected void validate(CampaignDto campaignDto) {
 				}
 
 				if (cde.getSubTabId() == null || cde.getSubTabId().isEmpty()) {
-					if (oneSubTabIsNotNullOrEmptyMap.get(cde.getTabId())) {
+					if (oneSubTabIsNotNullOrEmptyMap.containsKey(cde.getTabId()) && oneSubTabIsNotNullOrEmptyMap.get(cde.getTabId())) {
 						throw new ValidationRuntimeException(
 							I18nProperties.getValidationError(
 								Validations.campaignDashboardChartValueNull,
 								CampaignDashboardElement.SUB_TAB_ID,
 								campaignDto.getName()));
 					}
+					oneSubTabIsNotNullOrEmptyMap.put(cde.getTabId(), false);
 				} else {
-                    oneSubTabIsNotNullOrEmptyMap.put(cde.getTabId(), true);
+					if (oneSubTabIsNotNullOrEmptyMap.containsKey(cde.getTabId()) && !oneSubTabIsNotNullOrEmptyMap.get(cde.getTabId())) {
+						throw new ValidationRuntimeException(
+							I18nProperties.getValidationError(
+								Validations.campaignDashboardChartValueNull,
+								CampaignDashboardElement.SUB_TAB_ID,
+								campaignDto.getName()));
+					}
+					oneSubTabIsNotNullOrEmptyMap.put(cde.getTabId(), true);
 				}
 
 				if (cde.getOrder() == null) {

sormas-backend/src/test/java/de/symeda/sormas/backend/campaign/CampaignFacadeEjbTest.java

@@ -47,8 +47,8 @@ public void testCampaignDashboardElementsValidation() {
 		final CampaignDto campaign = creator.createCampaign(user);
 		final ArrayList<CampaignDashboardElement> campaignDashboardElements = new ArrayList<>();
 		campaignDashboardElements.add(new CampaignDashboardElement("diagram1", "tab1", null, 1, 50, 50));
-		campaignDashboardElements.add(new CampaignDashboardElement("diagram2", "tab1", null, 1, 50, 50));
-		campaignDashboardElements.add(new CampaignDashboardElement("diagram3", "tab2", null, 1, 50, 50));
+		campaignDashboardElements.add(new CampaignDashboardElement("diagram2", "tab1", null, 2, 50, 50));
+		campaignDashboardElements.add(new CampaignDashboardElement("diagram3", "tab2", null, 3, 50, 50));
 		campaign.setCampaignDashboardElements(campaignDashboardElements);
 
 		getCampaignDiagramDefinitionFacade().save(creator.createCampaignDiagramDefinition("diagram1", "Diagram one"));
@@ -64,6 +64,7 @@ public void testCampaignDashboardElementsValidation() {
 		campaign.getCampaignDashboardElements().get(0).setSubTabId("subTab1");
 		try {
 			((CampaignFacadeEjb.CampaignFacadeEjbLocal) getCampaignFacade()).validate(campaign);
+			Assert.fail("Campaign dashboard elements subTabId is missing. Validation should catch this!");
 		} catch (ValidationRuntimeException e) {
 			Assert.assertEquals("Campaign dashboard elements subTabId of campaign CampaignName are missing!", e.getMessage());
 		}
@@ -72,6 +73,7 @@ public void testCampaignDashboardElementsValidation() {
 		campaign.getCampaignDashboardElements().get(1).setSubTabId("subTab2");
 		try {
 			((CampaignFacadeEjb.CampaignFacadeEjbLocal) getCampaignFacade()).validate(campaign);
+			Assert.fail("Campaign dashboard elements subTabId is missing. Validation should catch this!");
 		} catch (ValidationRuntimeException e) {
 			Assert.assertEquals("Campaign dashboard elements subTabId of campaign CampaignName are missing!", e.getMessage());
 		}
@@ -92,9 +94,11 @@ public void testCampaignDashboardElementsValidation() {
 			Assert.fail(e.getMessage());
 		}
 
-		campaign.getCampaignDashboardElements().get(0).setDiagramId("nonExistingDiagramId");
+		final String nonExistingDiagramId = "nonExistingDiagramId";
+		campaign.getCampaignDashboardElements().get(0).setDiagramId(nonExistingDiagramId);
 		try {
 			((CampaignFacadeEjb.CampaignFacadeEjbLocal) getCampaignFacade()).validate(campaign);
+			Assert.fail("Diagram " + nonExistingDiagramId + " does not exist. Validation should catch this!");
 		} catch (ValidationRuntimeException e) {
 			Assert.assertEquals("Diagram nonExistingDiagramId from campaign CampaignName does not exist!", e.getMessage());
 		}