Merge pull request #103 from bcgov/develop

PCD BI's ETL

.gitignore

@@ -14,4 +14,6 @@ keys/*
 mvnw
 mvnw.cmd
 unencrypted/**
-encrypted/**
+encrypted/**
+application.properties
+log4j2.properties

openshift/app.cm.yaml

@@ -21,12 +21,6 @@ objects:
         # properties used in route
         hostname = localhost
         port = 8080
-        server-socket=5555
-        socket-read-sleep-time=100
-        max-socket-read-tries=100
-        thread-pool-size=5
-        accept-remote-connections=true
-        valid-ip-list-file=fwlist.txt
 
         chefs.http.uri=https://submit.digital.gov.bc.ca/app/api/v1/forms/%s/export?format=json&type=submissions&minDate=%s&maxDate=%s
 

pom.xml

@@ -13,9 +13,7 @@
 		<maven-compiler-plugin-version>3.8.1</maven-compiler-plugin-version>
 		<maven-resources-plugin-version>3.1.0</maven-resources-plugin-version>
 		<maven-shade-plugin-version>3.2.1</maven-shade-plugin-version>
-		<camel-maven-plugin-version>3.4.0</camel-maven-plugin-version>
-		<postgresql-version>42.2.22</postgresql-version>
-		<hibernate-entitymanager-version>5.4.32.Final</hibernate-entitymanager-version>
+		<camel-maven-plugin-version>3.4.1</camel-maven-plugin-version>
 		<mockito-core-version>3.6.28</mockito-core-version>
 		<junit-version>5.7.1</junit-version>
 		<json-smart-version>2.4.7</json-smart-version>
@@ -156,14 +154,19 @@
 			<version>${apache-commons-version}</version>
 		</dependency>
 
-	<!-- needed for decryption and file extension reader -->
+		<!-- needed for decryption and file extension reader -->
 		<dependency>
     		<groupId>commons-io</groupId>
     		<artifactId>commons-io</artifactId>
     		<version>2.11.0</version>
 		</dependency>
 
-
+		<!-- model mapping -->
+		<dependency>
+		  <groupId>org.modelmapper</groupId>
+		  <artifactId>modelmapper</artifactId>
+		  <version>3.0.0</version>
+		</dependency>
 
 	</dependencies>
 
@@ -230,9 +233,16 @@
 
 			</plugin>
 
+	      	<plugin>
+	        	<groupId>org.apache.camel</groupId>
+	        	<artifactId>camel-maven-plugin</artifactId>
+	        	<version>${camel-maven-plugin-version}</version>
+	        	<configuration>
+	          		<mainClass>ca.bc.gov.chefs.etl.ChefsETLMainMethod</mainClass>
+	        	</configuration>
+      		</plugin>
 
 		</plugins>
 	</build>
 
-
 </project>

src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java

@@ -9,11 +9,21 @@
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 
 import ca.bc.gov.chefs.etl.constant.Constants;
+import ca.bc.gov.chefs.etl.forms.aims.route.AIMSFormRoute;
 import ca.bc.gov.chefs.etl.forms.ltc.budget.route.LtcAnnualBudgetRoute;
 import ca.bc.gov.chefs.etl.forms.ltc.facility.route.FacilityFormRoute;
 import ca.bc.gov.chefs.etl.forms.ltc.quarterly.route.LtcQuarterlyYtdRoute;
 import ca.bc.gov.chefs.etl.forms.ltc.staffing.route.LtcStaffingPlanRoute;
-import ca.bc.gov.chefs.etl.forms.aims.route.AIMSFormRoute;
+import ca.bc.gov.chefs.etl.forms.pcd.chc.budget.route.ChcBudgetFormRoute;
+import ca.bc.gov.chefs.etl.forms.pcd.chc.financialReporting.route.ChcFRFormRoute;
+import ca.bc.gov.chefs.etl.forms.pcd.decisionLog.route.DecisionLogRoute;
+import ca.bc.gov.chefs.etl.forms.pcd.financialExpenseHierarchy.route.FinancialExpenseFormRoute;
+import ca.bc.gov.chefs.etl.forms.pcd.haHierarchy.route.HAHierarchyRoute;
+import ca.bc.gov.chefs.etl.forms.pcd.pcn.budget.route.PcnBudgetFormRoute;
+import ca.bc.gov.chefs.etl.forms.pcd.pcn.financialReporting.route.PcnFRFormRoute;
+import ca.bc.gov.chefs.etl.forms.pcd.statusTracker.route.StatusTrackerFormRoute;
+import ca.bc.gov.chefs.etl.forms.pcd.upcc.budget.route.UpccBudgetFormRoute;
+import ca.bc.gov.chefs.etl.forms.pcd.upcc.financialReporting.route.UpccFRFormRoute;
 /**
  * Camel Class runner.
  * */
@@ -35,13 +45,23 @@ public class ChefsETLMainMethod {
 	public static void main(String... args) throws Exception {
 		Main main = new Main();
 		Security.addProvider(new BouncyCastleProvider());
-		// TODO : remove next line, for testing purposes only!
-		//FileUtil.decryptAllFiles("encrypted/ltc-quarterly/230414140122", "encrypted/ltc-quarterly/230414140122/test");
 		main.configure().addRoutesBuilder(AIMSFormRoute.class);
 		main.configure().addRoutesBuilder(FacilityFormRoute.class);
 		main.configure().addRoutesBuilder(LtcQuarterlyYtdRoute.class);
 		main.configure().addRoutesBuilder(LtcStaffingPlanRoute.class);
 		main.configure().addRoutesBuilder(LtcAnnualBudgetRoute.class);
+
+		/* --------------PCDBI ROUTES --------------- */
+		main.configure().addRoutesBuilder(DecisionLogRoute.class);
+		main.configure().addRoutesBuilder(HAHierarchyRoute.class);
+		main.configure().addRoutesBuilder(StatusTrackerFormRoute.class);
+		main.configure().addRoutesBuilder(UpccBudgetFormRoute.class);
+		main.configure().addRoutesBuilder(UpccFRFormRoute.class);
+		main.configure().addRoutesBuilder(PcnBudgetFormRoute.class);
+		main.configure().addRoutesBuilder(PcnFRFormRoute.class);
+		main.configure().addRoutesBuilder(FinancialExpenseFormRoute.class);
+		main.configure().addRoutesBuilder(ChcBudgetFormRoute.class);
+		main.configure().addRoutesBuilder(ChcFRFormRoute.class);
 		main.run(args);
 	}
 }

src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java

@@ -39,6 +39,9 @@ public class Constants {
 	public final static String DEFAULT_NA_VALUE = "Not Applicable";
 	public final static String DEFAULT_OTHER_VALUE = "Other";
 
+	public final static String GUID_SUFFIX = "guid.suffix";
+	public final static String SEPARATE_LTC_AND_PCD_ENC_FOLDERS = "separate.ltc.and.pcd.enc.folders";
+
 	/* AIMS */
 	public final static String AIMS_USERNAME = "aims.username";
 	public final static String AIMS_PASSWORD = "aims.password";
@@ -120,7 +123,6 @@ public class Constants {
 	public final static String LTC_STAFF_PLAN_SUM_SUBTOTALS= "LTC_STAFF_PLAN_SUM_SUBTOTALS";
 
 	/* Annual Budget forms */
-
 	public final static String LTC_BUDGET_DIRECT_CARE_HRS = "LTC_BUDGET_DIRECT_CARE_HRS";
 	public final static String LTC_BUDGET_COMP_HRS = "LTC_BUDGET_COMP_HRS";
 	public final static String LTC_BUDGET_COMP_SAL = "LTC_BUDGET_COMP_SAL";
@@ -179,8 +181,6 @@ public class Constants {
 	/* public Encryption Key */
 	public final static String PUBLIC_KEY_NAME_PROPERTY = "public-key-file-name";
 	public final static String PUBLIC_KEY_PATH = FileUtil.buildPublicKeyPath(PUBLIC_KEY_NAME_PROPERTY);
-
-
 
 	static {
 
@@ -189,7 +189,7 @@ public class Constants {
 		UNENC_FILE_PATH.put(LTC_STAFFING_PLAN_DIR, LTC_STAFFING_PLAN_UNENCRYPTED_FP);
 		UNENC_FILE_PATH.put(LTC_BUDGET_DIR, LTC_BUDGET_UNENCRYPTED_FP);
 		UNENC_FILE_PATH.put(AIMS_DIR,AIMS_UNENCRYPTED_FP);
-		
+
 		ENC_FILE_PATH.put(AIMS_DIR, AIMS_ENCRYPTED_FP);
 		ENC_FILE_PATH.put(LTC_FACILITY_DIR, LTC_FACILITY_ENCRYPTED_FP);
 		ENC_FILE_PATH.put(LTC_QUARTERLY_DIR, LTC_QUARTERLY_YTD_ENCRYPTED_FP);
@@ -317,7 +317,6 @@ public class Constants {
 		LTC_YTD_OLD_KEYS_COMPATIBILITY.put("compH_sum2-4","compHAlliedProf_sum2");
 		LTC_YTD_OLD_KEYS_COMPATIBILITY.put("compH_sum2-5","compHAlliedNP_sum2");
 
-
 		HEADERS.put("TestModel#Main", new String[] { "confirmationId", "formName", "version", "createdAt", "fullName",
 				"username", "email", "status", "assignee", "assigneeEmail", });
 
@@ -549,6 +548,7 @@ public class Constants {
 			"Confirmation_ID", "Staffing_plan_Num", "Staff_hrs_Pos_Type", "Staff_hrs_Service_Contract_Out", 
 			"Staff_hrs_Legal_Name_Contract_Service", "Staff_hrs_Percent_Service_Contract_Out"
 		});
+
 		HEADERS.put(LTC_STAFF_PLAN_SUM_SUBTOTALS, new String[]{
 			"Confirmation_ID", "Staffing_plan_Num", "Staff_Plan_Sum_Subtotal_type", "Sum_Pos_annual", 
 			"Sum_Pos_inhouse", "Sum_Pos_contracted"
@@ -653,5 +653,6 @@ public class Constants {
 				"SUB_TOTAL_DIR_CARE_COST_HOURLY_RATE_STAFF",
 				"SUB_TOTAL_DIR_CARE_COST_HOURLY_RATE_CONTRACTED",
 		});
+
 	}
 }