Merge pull request #13757 from SORMAS-Foundation/epipulse-no-config-message

obinna-h-n · web-flow · commit ed406cdcbf30 · 2025-12-01T13:23:10.000+01:00
eipipulse - show specific error message if any reference data table is missing
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/epipulse/EpipulseExportFacade.java b/sormas-api/src/main/java/de/symeda/sormas/api/epipulse/EpipulseExportFacade.java
@@ -39,4 +39,6 @@ public interface EpipulseExportFacade extends DeletableFacade {
 	void cancelEpipulseExport(String uuid);
 
 	void deleteEpipulseExport(String uuid);
+
+	boolean configured();
 }
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java
@@ -1407,6 +1407,7 @@ public interface Strings {
 	String messageEpipulseExportDownloadNoFileName = "messageEpipulseExportDownloadNoFileName";
 	String messageEpipulseExportNoCancel = "messageEpipulseExportNoCancel";
 	String messageEpipulseExportNoDelete = "messageEpipulseExportNoDelete";
+	String messageEpipulseInvalidConfigError = "messageEpipulseInvalidConfigError";
 	String messageErrorReportNotAvailable = "messageErrorReportNotAvailable";
 	String messageEventArchived = "messageEventArchived";
 	String messageEventCreated = "messageEventCreated";
diff --git a/sormas-api/src/main/resources/strings.properties b/sormas-api/src/main/resources/strings.properties
@@ -2002,3 +2002,4 @@ messageEpipulseExportDeleteConfirmationCaption=Confirm deletion
 messageEpipulseExportDeleteConfirmationDescription=Are you sure you want to delete this EpiPulse Export?
 messageEpipulseExportDeleted=Export deleted successfully
 messageEpipulseExportNoDelete=Export cannot be deleted at this time.
+messageEpipulseInvalidConfigError=<b>Invalid Epipulse Configuration!</b><br/>Incomplete Reference data configuration. Please contact your admin and inform them about this issue.
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/epipulse/EpipulseExportFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/epipulse/EpipulseExportFacadeEjb.java
@@ -337,6 +337,11 @@ private void validate(EpipulseExportDto epipulseExportDto) throws ValidationRunt
 		}
 	}
 
+	@Override
+	public boolean configured() {
+		return epipulseExportService.configured();
+	}
+
 	@RightsAllowed({
 		UserRight._EPIPULSE_EXPORT_CREATE })
 	@Override
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/epipulse/EpipulseExportService.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/epipulse/EpipulseExportService.java
@@ -15,7 +15,10 @@
 
 package de.symeda.sormas.backend.epipulse;
 
+import java.util.Arrays;
+import java.util.List;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 
 import javax.ejb.LocalBean;
 import javax.ejb.Stateless;
@@ -77,6 +80,34 @@ public Predicate buildCriteriaFilter(EpipulseExportCriteria criteria, EpipulseEx
 		return filter;
 	}
 
+	public boolean configured() {
+		try {
+			//@formatter:off
+            List<String> requiredTables =
+                    Arrays.asList(
+                            EpipulseDatasourceConfiguration.TABLE_NAME,
+                            EpipulseLocationConfiguration.TABLE_NAME,
+                            EpipulseSubjectcodeConfiguration.TABLE_NAME
+                    );
+
+            String query = "SELECT COUNT(*) " +
+                    "FROM information_schema.tables " +
+                    "WHERE table_schema = 'public' " +
+                    "AND table_name IN (" +
+                    String.join(",", requiredTables.stream()
+                            .map(table -> "'" + table + "'")
+                            .collect(Collectors.toList())) +
+                    ")";
+            //@formatter:on
+
+			Number count = (Number) em.createNativeQuery(query).getSingleResult();
+			return count.intValue() == requiredTables.size();
+		} catch (Exception e) {
+			logger.warning("Error checking epipulse configuration tables: " + e.getMessage());
+			return false;
+		}
+	}
+
 	public boolean isArchived(String uuid) {
 
 		CriteriaBuilder cb = em.getCriteriaBuilder();
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/epipulse/EpiPulseExportController.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/epipulse/EpiPulseExportController.java
@@ -50,48 +50,56 @@ public EpiPulseExportController() {
 
 	public void create(Runnable callback) {
 
-		EpipulseEditForm createForm = new EpipulseEditForm(true);
-		createForm.setValue(EpipulseExportDto.build(UserProvider.getCurrent().getUserReference()));
-		final CommitDiscardWrapperComponent<EpipulseEditForm> editView = new CommitDiscardWrapperComponent<EpipulseEditForm>(
-			createForm,
-			UiUtil.permitted(UserRight.EPIPULSE_EXPORT_CREATE),
-			createForm.getFieldGroup());
-
-		editView.addCommitListener(() -> {
-			if (!createForm.getFieldGroup().isModified()) {
-				EpipulseExportDto dto = createForm.getValue();
-				dto.setStatus(EpipulseExportStatus.PENDING);
-				dto.setStatusChangeDate(new Date());
-
-				EpipulseExportDto savedEpipulseExport = FacadeProvider.getEpipulseExportFacade().saveEpipulseExport(dto);
-
-				Notification notification;
-				if (savedEpipulseExport != null) {
-					notification = new Notification(
-						I18nProperties.getString(Strings.messageEpipulseExportCreatedCaption),
-						I18nProperties.getString(Strings.messageEpipulseExportCreatedDescription),
-						Notification.Type.TRAY_NOTIFICATION,
-						true);
-					notification.setDelayMsec(-1);
-				} else {
-					notification = new Notification(
-						"",
-						I18nProperties.getString(Strings.messageEpipulseExportCreatedError),
-						Notification.Type.ERROR_MESSAGE,
-						true);
-					notification.setDelayMsec(-1);
-				}
-
-				notification.show(Page.getCurrent());
+		boolean configured = FacadeProvider.getEpipulseExportFacade().configured();
+		if (configured) {
+			EpipulseEditForm createForm = new EpipulseEditForm(true);
+			createForm.setValue(EpipulseExportDto.build(UserProvider.getCurrent().getUserReference()));
+			final CommitDiscardWrapperComponent<EpipulseEditForm> editView = new CommitDiscardWrapperComponent<EpipulseEditForm>(
+				createForm,
+				UiUtil.permitted(UserRight.EPIPULSE_EXPORT_CREATE),
+				createForm.getFieldGroup());
+
+			editView.addCommitListener(() -> {
+				if (!createForm.getFieldGroup().isModified()) {
+					EpipulseExportDto dto = createForm.getValue();
+					dto.setStatus(EpipulseExportStatus.PENDING);
+					dto.setStatusChangeDate(new Date());
+
+					EpipulseExportDto savedEpipulseExport = FacadeProvider.getEpipulseExportFacade().saveEpipulseExport(dto);
+
+					Notification notification;
+					if (savedEpipulseExport != null) {
+						notification = new Notification(
+							I18nProperties.getString(Strings.messageEpipulseExportCreatedCaption),
+							I18nProperties.getString(Strings.messageEpipulseExportCreatedDescription),
+							Notification.Type.TRAY_NOTIFICATION,
+							true);
+						notification.setDelayMsec(-1);
+					} else {
+						notification = new Notification(
+							"",
+							I18nProperties.getString(Strings.messageEpipulseExportCreatedError),
+							Notification.Type.ERROR_MESSAGE,
+							true);
+						notification.setDelayMsec(-1);
+					}
+
+					notification.show(Page.getCurrent());
+
+					if (callback != null) {
+						callback.run();
+					}
 
-				if (callback != null) {
-					callback.run();
 				}
+			});
 
-			}
-		});
-
-		VaadinUiUtil.showModalPopupWindow(editView, I18nProperties.getString(Strings.headingCreateNewEpipulseExport));
+			VaadinUiUtil.showModalPopupWindow(editView, I18nProperties.getString(Strings.headingCreateNewEpipulseExport));
+		} else {
+			Notification notification =
+				new Notification("", I18nProperties.getString(Strings.messageEpipulseInvalidConfigError), Notification.Type.ERROR_MESSAGE, true);
+			notification.setDelayMsec(-1);
+			notification.show(Page.getCurrent());
+		}
 	}
 
 	public void view(EpipulseExportIndexDto exportIndexDto, Runnable callback) {

Original file line number	Diff line number	Diff line change
`@@ -39,4 +39,6 @@ public interface EpipulseExportFacade extends DeletableFacade {`
`39`	`39`	`void cancelEpipulseExport(String uuid);`
`40`	`40`
`41`	`41`	`void deleteEpipulseExport(String uuid);`
	`42`	`+`
	`43`	`+ boolean configured();`
`42`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -337,6 +337,11 @@ private void validate(EpipulseExportDto epipulseExportDto) throws ValidationRunt`
`337`	`337`	`}`
`338`	`338`	`}`
`339`	`339`
	`340`	`+ @Override`
	`341`	`+ public boolean configured() {`
	`342`	`+ return epipulseExportService.configured();`
	`343`	`+ }`
	`344`	`+`
`340`	`345`	`@RightsAllowed({`
`341`	`346`	`UserRight._EPIPULSE_EXPORT_CREATE })`
`342`	`347`	`@Override`