From f8162a90eba8f179ed6b483deb51be59e70e3616 Mon Sep 17 00:00:00 2001
From: taskain7 <taskain@gmail.com>
Date: Mon, 6 Feb 2023 17:54:55 +0100
Subject: [PATCH] [FINERACT-1880] Fix for parameter value field type mismatch
 in JobParameter

---
 .../AsyncLoanCOBExecutorServiceImpl.java      |  2 +-
 .../service/LoanCOBCatchUpServiceImpl.java    |  2 +-
 .../db/changelog/tenant/changelog-tenant.xml  |  1 +
 ...ter_value_type_in_job_parameters_table.xml | 30 +++++++++++++++++++
 4 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 fineract-provider/src/main/resources/db/changelog/tenant/parts/0091_modify_parameter_value_type_in_job_parameters_table.xml

diff --git a/fineract-provider/src/main/java/org/apache/fineract/cob/service/AsyncLoanCOBExecutorServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/cob/service/AsyncLoanCOBExecutorServiceImpl.java
index 8c84d0c15..d8ea6c2e4 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/cob/service/AsyncLoanCOBExecutorServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/cob/service/AsyncLoanCOBExecutorServiceImpl.java
@@ -101,7 +101,7 @@ public class AsyncLoanCOBExecutorServiceImpl implements AsyncLoanCOBExecutorServ
         JobParameter jobParameter = new JobParameter();
         jobParameter.setJobId(scheduledJobDetail.getId());
         jobParameter.setParameterName(LoanCOBConstant.IS_CATCH_UP_PARAMETER_NAME);
-        jobParameter.setParameterValue("1");
+        jobParameter.setParameterValue("true");
         jobParameterRepository.save(jobParameter);
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/cob/service/LoanCOBCatchUpServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/cob/service/LoanCOBCatchUpServiceImpl.java
index 30870bb8a..0fe1e8103 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/cob/service/LoanCOBCatchUpServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/cob/service/LoanCOBCatchUpServiceImpl.java
@@ -67,7 +67,7 @@ public class LoanCOBCatchUpServiceImpl implements LoanCOBCatchUpService {
     @Override
     public IsCatchUpRunningDTO isCatchUpRunning() {
         List<Long> runningCatchUpExecutionIds = jobExecutionRepository.getRunningJobsByExecutionParameter(LoanCOBConstant.JOB_NAME,
-                LoanCOBConstant.IS_CATCH_UP_PARAMETER_NAME, "1");
+                LoanCOBConstant.IS_CATCH_UP_PARAMETER_NAME, "true");
         if (CollectionUtils.isNotEmpty(runningCatchUpExecutionIds)) {
             JobExecution jobExecution = jobExplorer.getJobExecution(runningCatchUpExecutionIds.get(0));
             String executionDateString = (String) jobExecution.getExecutionContext().get(LoanCOBConstant.BUSINESS_DATE_PARAMETER_NAME);
diff --git a/fineract-provider/src/main/resources/db/changelog/tenant/changelog-tenant.xml b/fineract-provider/src/main/resources/db/changelog/tenant/changelog-tenant.xml
index 7786690da..ec1c1fcd8 100644
--- a/fineract-provider/src/main/resources/db/changelog/tenant/changelog-tenant.xml
+++ b/fineract-provider/src/main/resources/db/changelog/tenant/changelog-tenant.xml
@@ -110,4 +110,5 @@
     <include file="parts/0088_drop_m_loan_transaction_version_column.xml" relativeToChangelogFile="true" />
     <include file="parts/0089_add_update_loan_arrears_aging_business_step.xml" relativeToChangelogFile="true" />
     <include file="parts/0090_add_report_export_s3_folder_configuration.xml" relativeToChangelogFile="true" />
+    <include file="parts/0091_modify_parameter_value_type_in_job_parameters_table.xml" relativeToChangelogFile="true" />
 </databaseChangeLog>
diff --git a/fineract-provider/src/main/resources/db/changelog/tenant/parts/0091_modify_parameter_value_type_in_job_parameters_table.xml b/fineract-provider/src/main/resources/db/changelog/tenant/parts/0091_modify_parameter_value_type_in_job_parameters_table.xml
new file mode 100644
index 000000000..5db7aa475
--- /dev/null
+++ b/fineract-provider/src/main/resources/db/changelog/tenant/parts/0091_modify_parameter_value_type_in_job_parameters_table.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements. See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership. The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License. You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied. See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.1.xsd">
+    <changeSet id="1" author="fineract">
+        <modifyDataType columnName="parameter_value"
+                        newDataType="text"
+                        tableName="job_parameters"/>
+    </changeSet>
+</databaseChangeLog>