Merge pull request SORMAS-Foundation#3345 from hzi-braunschweig/bugfix-3259-CampaignDashboardElementNullFix

SORMAS-Foundation#3259 - add validation also when fetching dashboard elements to avoid…

Author: BarnaBartha

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

@@ -243,12 +243,15 @@ public CampaignDto getByUuid(String uuid) {
 	public List<CampaignDashboardElement> getCampaignDashboardElements(String campaignUuid) {
 		final List<CampaignDashboardElement> result = new ArrayList<>();
 		if (campaignUuid != null) {
-			List<CampaignDashboardElement> dashboardElements = campaignService.getByUuid(campaignUuid).getDashboardElements();
+			final Campaign campaign = campaignService.getByUuid(campaignUuid);
+			validate(toDto(campaign));
+			List<CampaignDashboardElement> dashboardElements = campaign.getDashboardElements();
 			if (dashboardElements != null) {
 				result.addAll(dashboardElements);
 			}
 		} else {
-			campaignService.getAll().forEach(campaign -> {
+			campaignService.getAllActive().forEach(campaign -> {
+				validate(toDto(campaign));
 				if (campaign.getDashboardElements() != null) {
 					result.addAll(campaign.getDashboardElements());
 				}

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

@@ -14,8 +14,6 @@
 import de.symeda.sormas.api.EntityRelevanceStatus;
 import de.symeda.sormas.api.campaign.CampaignCriteria;
 import de.symeda.sormas.api.utils.DataHelper;
-import de.symeda.sormas.backend.campaign.data.CampaignFormData;
-import de.symeda.sormas.backend.caze.Case;
 import de.symeda.sormas.backend.common.AbstractAdoService;
 import de.symeda.sormas.backend.common.AbstractCoreAdoService;
 import de.symeda.sormas.backend.common.AbstractDomainObject;
@@ -115,4 +113,15 @@ public List<Campaign> getAllAfter(Date since, User user) {
 		List<Campaign> resultList = em.createQuery(cq).getResultList();
 		return resultList;
 	}
+
+	public List<Campaign> getAllActive() {
+
+		CriteriaBuilder cb = em.getCriteriaBuilder();
+		CriteriaQuery<Campaign> cq = cb.createQuery(getElementClass());
+		Root<Campaign> from = cq.from(getElementClass());
+		cq.where(cb.isFalse(from.get(Campaign.DELETED)));
+		cq.orderBy(cb.desc(from.get(AbstractDomainObject.CHANGE_DATE)));
+
+		return em.createQuery(cq).getResultList();
+	}
 }

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

@@ -33,6 +33,7 @@ protected Binder<CampaignDashboardElement> addColumnsBinder(List<CampaignDashboa
 
 		final List<String> existingDiagramIds = allElements.stream()
 			.map(campaignDiagramDefinitionDto -> campaignDiagramDefinitionDto.getDiagramId())
+			.filter(s -> StringUtils.isNotEmpty(s))
 			.distinct()
 			.collect(Collectors.toList());
 		final ComboBox<String> diagramIdCombo = new ComboBox<>(Captions.campaignDashboardChart, existingDiagramIds);