Merge pull request #13649 from SORMAS-Foundation/feature-13631-epipulse-export-module

release test fixes

Author: obinna-h-n

sormas-api/src/main/java/de/symeda/sormas/api/epipulse/EpipulseDiseaseExportFacade.java

@@ -20,5 +20,5 @@
 @Remote
 public interface EpipulseDiseaseExportFacade {
 
-	public void exportPertussisCaseBased(String uuid);
+	public void startPertussisExport(String uuid);
 }

sormas-backend/src/main/java/de/symeda/sormas/backend/epipulse/EpipulseDatasourceConfiguration.java

@@ -25,6 +25,8 @@
 @Entity(name = "epipulse_datasource_configuration")
 public class EpipulseDatasourceConfiguration extends AbstractDomainObject {
 
+	public static final String TABLE_NAME = "epipulse_datasource_configuration";
+
 	private String countryIso2Code;
 	private String datasource;
 	private String name;

sormas-backend/src/main/java/de/symeda/sormas/backend/epipulse/EpipulseDiseaseExportFacadeEjb.java

@@ -58,7 +58,7 @@ public class EpipulseDiseaseExportFacadeEjb implements EpipulseDiseaseExportFaca
 	@EJB
 	private ConfigFacadeEjb.ConfigFacadeEjbLocal configFacadeEjb;
 
-	public void exportPertussisCaseBased(String uuid) {
+	public void startPertussisExport(String uuid) {
 
 		CSVWriter writer = null;
 		EpipulseExport epipulseExport = null;

sormas-backend/src/main/java/de/symeda/sormas/backend/epipulse/EpipulseExportTimerEjb.java

@@ -65,7 +65,7 @@ public void exportDiseaseTimeout(Timer timer) {
 
 			switch (subjectCode) {
 			case PERT:
-				diseaseExportFacadeEjb.exportPertussisCaseBased(uuid);
+				diseaseExportFacadeEjb.startPertussisExport(uuid);
 				break;
 			default:
 				logger.warn("No export for subject code: {}", subjectCodeStr);

sormas-backend/src/main/java/de/symeda/sormas/backend/epipulse/EpipulseLocationConfiguration.java

@@ -25,6 +25,8 @@
 @Entity(name = "epipulse_location_configuration")
 public class EpipulseLocationConfiguration extends AbstractDomainObject {
 
+	public static final String TABLE_NAME = "epipulse_location_configuration";
+
 	private String type;
 	private String code;
 	private String name;

sormas-backend/src/main/java/de/symeda/sormas/backend/epipulse/EpipulseSubjectcodeConfiguration.java

@@ -25,6 +25,8 @@
 @Entity(name = "epipulse_subjectcode_configuration")
 public class EpipulseSubjectcodeConfiguration extends AbstractDomainObject {
 
+	public static final String TABLE_NAME = "epipulse_subjectcode_configuration";
+
 	private String subjectcode;
 	private String name;
 	private String disease;

sormas-backend/src/main/resources/META-INF/glassfish-ejb-jar.xml

@@ -1198,6 +1198,26 @@
         <group-name>SYSTEM_CONFIGURATION</group-name>
     </security-role-mapping>
 
+    <security-role-mapping>
+        <role-name>EPIPULSE_EXPORT_VIEW</role-name>
+        <group-name>EPIPULSE_EXPORT_VIEW</group-name>
+    </security-role-mapping>
+
+    <security-role-mapping>
+        <role-name>EPIPULSE_EXPORT_CREATE</role-name>
+        <group-name>EPIPULSE_EXPORT_CREATE</group-name>
+    </security-role-mapping>
+
+    <security-role-mapping>
+        <role-name>EPIPULSE_EXPORT_DOWNLOAD</role-name>
+        <group-name>EPIPULSE_EXPORT_DOWNLOAD</group-name>
+    </security-role-mapping>
+
+    <security-role-mapping>
+        <role-name>EPIPULSE_EXPORT_DELETE</role-name>
+        <group-name>EPIPULSE_EXPORT_DELETE</group-name>
+    </security-role-mapping>
+
 	<!-- SYSTEM ROLE -->
 	<security-role-mapping>
 		<role-name>SYSTEM</role-name>

sormas-backend/src/test/java/de/symeda/sormas/backend/common/HistoryTablesTest.java

@@ -33,12 +33,19 @@
 import de.hilling.junit.cdi.annotations.BypassTestInterceptor;
 import de.symeda.sormas.backend.adverseeventsfollowingimmunization.entity.Aefi;
 import de.symeda.sormas.backend.adverseeventsfollowingimmunization.entity.AefiInvestigation;
+import de.symeda.sormas.backend.epipulse.EpipulseDatasourceConfiguration;
+import de.symeda.sormas.backend.epipulse.EpipulseLocationConfiguration;
+import de.symeda.sormas.backend.epipulse.EpipulseSubjectcodeConfiguration;
 
 @ExtendWith(CdiTestJunitExtension.class)
 public class HistoryTablesTest {
 
-	private static final List<String> NO_HISTORY_REQUIRED_TABLES =
-		Arrays.asList(Aefi.AEFI_VACCINATIONS_TABLE_NAME, AefiInvestigation.AEFI_INVESTIGATION_VACCINATIONS_TABLE_NAME);
+	private static final List<String> NO_HISTORY_REQUIRED_TABLES = Arrays.asList(
+		Aefi.AEFI_VACCINATIONS_TABLE_NAME,
+		AefiInvestigation.AEFI_INVESTIGATION_VACCINATIONS_TABLE_NAME,
+		EpipulseSubjectcodeConfiguration.TABLE_NAME,
+		EpipulseDatasourceConfiguration.TABLE_NAME,
+		EpipulseLocationConfiguration.TABLE_NAME);
 
 	/**
 	 * Test that the *_history tables have the same columns as the corresponding production tables

sormas-backend/src/test/java/de/symeda/sormas/backend/importexport/DatabaseExportServiceTest.java

@@ -29,6 +29,10 @@
 import de.symeda.sormas.backend.docgeneration.DocumentTemplate;
 import de.symeda.sormas.backend.environment.Environment;
 import de.symeda.sormas.backend.environment.environmentsample.EnvironmentSample;
+import de.symeda.sormas.backend.epipulse.EpipulseDatasourceConfiguration;
+import de.symeda.sormas.backend.epipulse.EpipulseExport;
+import de.symeda.sormas.backend.epipulse.EpipulseLocationConfiguration;
+import de.symeda.sormas.backend.epipulse.EpipulseSubjectcodeConfiguration;
 import de.symeda.sormas.backend.immunization.entity.DirectoryImmunization;
 import de.symeda.sormas.backend.manualmessagelog.ManualMessageLog;
 import de.symeda.sormas.backend.selfreport.SelfReport;
@@ -76,7 +80,11 @@ public void testGetConfigFullyDefined() {
 		AefiInvestigation.class,
 		DocumentTemplate.class,
 		Survey.class,
-		SurveyToken.class);
+		SurveyToken.class,
+		EpipulseExport.class,
+		EpipulseSubjectcodeConfiguration.class,
+		EpipulseDatasourceConfiguration.class,
+		EpipulseLocationConfiguration.class);
 
 	@Test
 	public void test_all_entities_have_export_configuration() {

sormas-rest/src/main/webapp/WEB-INF/glassfish-web.xml

@@ -1202,4 +1202,24 @@
         <group-name>SYSTEM_CONFIGURATION</group-name>
     </security-role-mapping>
 
+    <security-role-mapping>
+        <role-name>EPIPULSE_EXPORT_VIEW</role-name>
+        <group-name>EPIPULSE_EXPORT_VIEW</group-name>
+    </security-role-mapping>
+
+    <security-role-mapping>
+        <role-name>EPIPULSE_EXPORT_CREATE</role-name>
+        <group-name>EPIPULSE_EXPORT_CREATE</group-name>
+    </security-role-mapping>
+
+    <security-role-mapping>
+        <role-name>EPIPULSE_EXPORT_DOWNLOAD</role-name>
+        <group-name>EPIPULSE_EXPORT_DOWNLOAD</group-name>
+    </security-role-mapping>
+
+    <security-role-mapping>
+        <role-name>EPIPULSE_EXPORT_DELETE</role-name>
+        <group-name>EPIPULSE_EXPORT_DELETE</group-name>
+    </security-role-mapping>
+
 </glassfish-web-app>