Added fix for ASCII characters. (#171)

Added null safety for missing property. Code cleanup. Co-authored-by: weskubo-cgi <[email protected]>
bcgov · Feb 5, 2025 · c7c4631 · c7c4631
1 parent 3081680
commit c7c4631
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 11 deletions.
diff --git a/...a/ca/bc/gov/chefs/etl/forms/ltc/budget/processor/LtcAnnualBudgetApiResponseProcessor.java b/...a/ca/bc/gov/chefs/etl/forms/ltc/budget/processor/LtcAnnualBudgetApiResponseProcessor.java
@@ -1,7 +1,6 @@
 package ca.bc.gov.chefs.etl.forms.ltc.budget.processor;
 
 import java.util.ArrayList;
-
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -36,7 +35,6 @@
 import ca.bc.gov.chefs.etl.forms.ltc.budget.model.LtcBudgetRevTotals;
 import ca.bc.gov.chefs.etl.forms.ltc.budget.model.LtcBudgetSubmission;
 import ca.bc.gov.chefs.etl.forms.ltc.budget.model.LtcBudgetSumTotals;
-import ca.bc.gov.chefs.etl.forms.ltc.quarterly.model.LtcYtdCompHrs;
 import ca.bc.gov.chefs.etl.util.CSVUtil;
 import ca.bc.gov.chefs.etl.util.FileUtil;
 import ca.bc.gov.chefs.etl.util.JsonUtil;
@@ -49,6 +47,7 @@ public class LtcAnnualBudgetApiResponseProcessor implements Processor {
 	public void process(Exchange exchange) throws Exception {
 		String payload = exchange.getIn().getBody(String.class);
 		payload = JsonUtil.preProcess(payload);
+		payload = JsonUtil.fixUnicodeCharacters(payload);
 		payload = JsonUtil.roundDigitsNumber(payload);
 		ObjectMapper mapper = new ObjectMapper();
 		List<Root> ltcBudgetForms = mapper.readValue(payload, new TypeReference<List<Root>>() {

diff --git a/...n/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiProcessor.java b/...n/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiProcessor.java
@@ -1,6 +1,4 @@
 package ca.bc.gov.chefs.etl.forms.ltc.facility.processor;
-import java.util.Map;
-
 import ca.bc.gov.chefs.etl.constant.Constants;
 import ca.bc.gov.chefs.etl.core.processor.BaseApiProcessor;
 

diff --git a/...a/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java b/...a/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java
@@ -27,6 +27,7 @@ public class FacilityInfoFormApiResponseProcessor implements Processor {
 	@Override
 	public void process(Exchange exchange) throws Exception {
 		String payload = exchange.getIn().getBody(String.class);
+		payload = JsonUtil.fixUnicodeCharacters(payload);
 		payload = JsonUtil.roundDigitsNumber(payload);
 		payload = JsonUtil.ltcFacilityBackwardCompatibility(payload);
 		ObjectMapper mapper = new ObjectMapper();

diff --git a/...a/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/...a/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java
@@ -64,6 +64,7 @@ public class LtcQuarterlyYtdApiResponseProcessor implements Processor {
 	public void process(Exchange exchange) throws Exception {
 		String payload = exchange.getIn().getBody(String.class);
 		payload = JsonUtil.preProcess(payload);
+		payload = JsonUtil.fixUnicodeCharacters(payload);
 		payload = JsonUtil.roundDigitsNumber(payload);
 		payload = JsonUtil.ltcYTDBackwardCompatibility(payload);
 		ObjectMapper mapper = new ObjectMapper();
@@ -158,7 +159,7 @@ private String resolveOperatingSurplusBeforeDepreciation(Root root) {
 		String submissionsNeedRecalculation = getValue(YTD_SUBMISSIONS_NEEDS_RECALCULATIONS_EX);
 
 		// If the form confirmation id in list of error forms, recalculate
-		if (submissionsNeedRecalculation.contains(root.getForm().getConfirmationId())){
+		if (StringUtils.contains(submissionsNeedRecalculation, root.getForm().getConfirmationId())){
 			Double opEx_sum14 = calculateOpExSum14(root);
 			//  Due to incorrect sum14, the total needs to be recalculated
 			Double opEx_YTD_total = parseDoubleHandleNull(root.getOpRev_YTD6()) + parseDoubleHandleNull(root.getOpEx_sum11())
@@ -192,7 +193,7 @@ private String resolveTotalOperatingSurplus(Root root) {
 		String submissionsNeedRecalculation = getValue(YTD_SUBMISSIONS_NEEDS_RECALCULATIONS_EX);
 
 		// If the form confirmation id in list of error forms, recalculate
-		if (submissionsNeedRecalculation.contains(root.getForm().getConfirmationId())){
+		if (StringUtils.contains(submissionsNeedRecalculation, root.getForm().getConfirmationId())){
 			Double opEx_sum14 = calculateOpExSum14(root);
 			//  Due to incorrect sum14, the total needs to be recalculated
 			Double opEx_YTD_total = parseDoubleHandleNull(root.getOpRev_YTD6()) + parseDoubleHandleNull(root.getOpEx_sum11())
@@ -227,7 +228,7 @@ private String resolveTotalOperatingSurplus(Root root) {
 	private String calculateTotalCompHrsStaff(Root root, List<LtcYtdCompHrs> ltcYtdCompHrs) {
 		String submissionsNeedRecalculation = getValue(YTD_SUBMISSIONS_NEEDS_RECALCULATIONS_COMP);
 
-		if (submissionsNeedRecalculation.contains(root.getForm().getConfirmationId())){
+		if (StringUtils.contains(submissionsNeedRecalculation, root.getForm().getConfirmationId())){
 			Double total = 0.0;
 			for (LtcYtdCompHrs ltcYtdCompHr : ltcYtdCompHrs) {
 				total += parseDoubleHandleNull(ltcYtdCompHr.getCompHrsStaffYtd());
@@ -241,7 +242,7 @@ private String calculateTotalCompHrsStaff(Root root, List<LtcYtdCompHrs> ltcYtdC
 	private String calculateTotalCompHrsContracted(Root root, List<LtcYtdCompHrs> ltcYtdCompHrs) {
 		String submissionsNeedRecalculation = getValue(YTD_SUBMISSIONS_NEEDS_RECALCULATIONS_COMP);
 
-		if (submissionsNeedRecalculation.contains(root.getForm().getConfirmationId())){
+		if (StringUtils.contains(submissionsNeedRecalculation, root.getForm().getConfirmationId())){
 			Double total = 0.0;
 			for (LtcYtdCompHrs ltcYtdCompHr : ltcYtdCompHrs) {
 				total += parseDoubleHandleNull(ltcYtdCompHr.getCompHrsContractServicesYtd());
@@ -255,7 +256,7 @@ private String calculateTotalCompHrsContracted(Root root, List<LtcYtdCompHrs> lt
 	private String calculateTotalCompHrsTotal(Root root, List<LtcYtdCompHrs> ltcYtdCompHrs) {
 		String submissionsNeedRecalculation = getValue(YTD_SUBMISSIONS_NEEDS_RECALCULATIONS_COMP);
 
-		if (submissionsNeedRecalculation.contains(root.getForm().getConfirmationId())){
+		if (StringUtils.contains(submissionsNeedRecalculation, root.getForm().getConfirmationId())){
 			Double total = 0.0;
 			for (LtcYtdCompHrs ltcYtdCompHr : ltcYtdCompHrs) {
 				total += parseDoubleHandleNull(ltcYtdCompHr.getCompTotalWorkedHrsYtd());

diff --git a/...ca/bc/gov/chefs/etl/forms/ltc/staffing/processor/LTCStaffingPlanApiResponseProcessor.java b/...ca/bc/gov/chefs/etl/forms/ltc/staffing/processor/LTCStaffingPlanApiResponseProcessor.java
@@ -38,6 +38,7 @@ public class LTCStaffingPlanApiResponseProcessor implements Processor {
 	@SuppressWarnings("unchecked")
 	public void process(Exchange exchange) throws Exception {
 		String payload = exchange.getIn().getBody(String.class);
+		payload = JsonUtil.fixUnicodeCharacters(payload);
 		payload = JsonUtil.roundDigitsNumber(payload);
 		payload = StaffingPlanUtil.normaliseDoesTheStaffingPatternProvide(payload);
 		ObjectMapper mapper = new ObjectMapper();

diff --git a/...in/java/ca/bc/gov/chefs/etl/forms/ltc/staffing/processor/LtcStaffingPlanApiProcessor.java b/...in/java/ca/bc/gov/chefs/etl/forms/ltc/staffing/processor/LtcStaffingPlanApiProcessor.java
@@ -1,7 +1,5 @@
 package ca.bc.gov.chefs.etl.forms.ltc.staffing.processor;
 
-import java.util.Map;
-
 import ca.bc.gov.chefs.etl.constant.Constants;
 import ca.bc.gov.chefs.etl.core.processor.BaseApiProcessor;