From cab103b60661968c89b4a073fa497cc7cc6b684f Mon Sep 17 00:00:00 2001
From: Naphlin Akena <naphlin@fiter.io>
Date: Fri, 20 Dec 2024 15:36:01 +0000
Subject: [PATCH] Merged PR 7999: Sync with fiter code 20122024

Related work items: #1338, #1339, #1340, #1343, #1344, #1345, #1347, #1348, #1349, #1350, #1351, #1352, #1353, #1354, #1355, #1356, #1357, #1358, #1361, #1362, #1363, #1364, #1365, #1366, #1367, #1368, #1369, #1371, #1374, #1375, #1381, #1382, #1383, #1384, #1385, #1388, #1391, #1403, #1417, #29692
---
 ...initionCommandFromApiJsonDeserializer.java |  23 ++--
 .../db/changelog/tenant/changelog-tenant.xml  |   3 +
 ...3000000_EA_110_delete_blocking_reasons.xml |  39 ++++++
 ...143000001_EA_111_delete_interest_rates.xml |  37 ++++++
 ...71143000002_EA_111_add_detalles_column.xml | 121 ++++++++++++++++++
 5 files changed, 214 insertions(+), 9 deletions(-)
 create mode 100644 fineract-provider/src/main/resources/db/changelog/tenant/parts/202412171143000000_EA_110_delete_blocking_reasons.xml
 create mode 100644 fineract-provider/src/main/resources/db/changelog/tenant/parts/202412171143000001_EA_111_delete_interest_rates.xml
 create mode 100644 fineract-provider/src/main/resources/db/changelog/tenant/parts/202412171143000002_EA_111_add_detalles_column.xml

diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/serialization/ChargeDefinitionCommandFromApiJsonDeserializer.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/serialization/ChargeDefinitionCommandFromApiJsonDeserializer.java
index e7012df8840..a6a812b6386 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/serialization/ChargeDefinitionCommandFromApiJsonDeserializer.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/serialization/ChargeDefinitionCommandFromApiJsonDeserializer.java
@@ -39,7 +39,11 @@
 import org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException;
 import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper;
 import org.apache.fineract.portfolio.charge.api.ChargesApiConstants;
-import org.apache.fineract.portfolio.charge.domain.*;
+import org.apache.fineract.portfolio.charge.domain.ChargeAppliesTo;
+import org.apache.fineract.portfolio.charge.domain.ChargeCalculationType;
+import org.apache.fineract.portfolio.charge.domain.ChargeInsuranceType;
+import org.apache.fineract.portfolio.charge.domain.ChargePaymentMode;
+import org.apache.fineract.portfolio.charge.domain.ChargeTimeType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -508,7 +512,8 @@ private void validateChargeInsuranceDetails(ChargeCalculationType calculationTyp
         if (!penalty) {
             if (calculationType.isVoluntaryInsurance()) {
                 final String insuranceName = this.fromApiJsonHelper.extractStringNamed(ChargesApiConstants.insuranceNameParamName, element);
-                baseDataValidator.reset().parameter(ChargesApiConstants.insuranceNameParamName).value(insuranceName).notBlank()
+
+                baseDataValidator.reset().parameter(ChargesApiConstants.insuranceNameParamName).value(insuranceName)
                         .notExceedingLengthOf(100);
 
                 final Long insuranceChargedAs = this.fromApiJsonHelper.extractLongNamed(ChargesApiConstants.insuranceChargedAsParamName,
@@ -541,28 +546,28 @@ private void validateChargeInsuranceDetails(ChargeCalculationType calculationTyp
 
                 final Integer daysInArrears = this.fromApiJsonHelper.extractIntegerWithLocaleNamed(ChargesApiConstants.DAYS_IN_ARREARS,
                         element.getAsJsonObject());
-                baseDataValidator.reset().parameter(ChargesApiConstants.DAYS_IN_ARREARS).value(daysInArrears).notNull()
+
+                baseDataValidator.reset().parameter(ChargesApiConstants.DAYS_IN_ARREARS).value(daysInArrears)
+
                         .integerEqualToOrGreaterThanNumber(1);
             }
             if (calculationType.isInsurance()) {
 
                 final String insuranceCompany = this.fromApiJsonHelper.extractStringNamed(ChargesApiConstants.insuranceCompanyParamName,
                         element);
-                baseDataValidator.reset().parameter(ChargesApiConstants.insuranceCompanyParamName).value(insuranceCompany).notBlank()
+                baseDataValidator.reset().parameter(ChargesApiConstants.insuranceCompanyParamName).value(insuranceCompany)
                         .notExceedingLengthOf(100);
 
                 final String insurerName = this.fromApiJsonHelper.extractStringNamed(ChargesApiConstants.insurerNameParamName, element);
-                baseDataValidator.reset().parameter(ChargesApiConstants.insurerNameParamName).value(insurerName).notBlank()
-                        .notExceedingLengthOf(100);
+                baseDataValidator.reset().parameter(ChargesApiConstants.insurerNameParamName).value(insurerName).notExceedingLengthOf(100);
 
                 final Long insuranceCode = this.fromApiJsonHelper.extractLongNamed(ChargesApiConstants.insuranceCodeParamName,
                         element.getAsJsonObject());
-                baseDataValidator.reset().parameter(ChargesApiConstants.insuranceCodeParamName).value(insuranceCode).notNull()
-                        .longGreaterThanZero();
+                baseDataValidator.reset().parameter(ChargesApiConstants.insuranceCodeParamName).value(insuranceCode).longGreaterThanZero();
 
                 final Integer daysInArrears = this.fromApiJsonHelper.extractIntegerWithLocaleNamed(ChargesApiConstants.DAYS_IN_ARREARS,
                         element.getAsJsonObject());
-                baseDataValidator.reset().parameter(ChargesApiConstants.DAYS_IN_ARREARS).value(daysInArrears).notNull()
+                baseDataValidator.reset().parameter(ChargesApiConstants.DAYS_IN_ARREARS).value(daysInArrears)
                         .integerEqualToOrGreaterThanNumber(1);
 
             }
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 c23345cb22e..8ccb9e604d3 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
@@ -335,4 +335,7 @@
     <include file="parts/20241209011009142_EA_49_tipo_identificacion.xml" relativeToChangelogFile="true"/>
     <include file="parts/2024070222441925_SU_272_add_column_point_of_sales_code.xml" relativeToChangelogFile="true" />
     <include file="parts/202412131143000000_EA_66_add_min_max_interest.xml" relativeToChangelogFile="true"/>
+    <include file="parts/202412171143000000_EA_110_delete_blocking_reasons.xml" relativeToChangelogFile="true"/>
+    <include file="parts/202412171143000001_EA_111_delete_interest_rates.xml" relativeToChangelogFile="true"/>
+    <include file="parts/202412171143000002_EA_111_add_detalles_column.xml" relativeToChangelogFile="true" />
 </databaseChangeLog>
diff --git a/fineract-provider/src/main/resources/db/changelog/tenant/parts/202412171143000000_EA_110_delete_blocking_reasons.xml b/fineract-provider/src/main/resources/db/changelog/tenant/parts/202412171143000000_EA_110_delete_blocking_reasons.xml
new file mode 100644
index 00000000000..be8fe19ffa1
--- /dev/null
+++ b/fineract-provider/src/main/resources/db/changelog/tenant/parts/202412171143000000_EA_110_delete_blocking_reasons.xml
@@ -0,0 +1,39 @@
+<?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 author="fineract" id="1" >
+        <sql>
+            <![CDATA[
+                delete from m_client_block_list;
+                delete from m_client_blocking_reason ;
+                update m_client set blocking_reason_id = null;
+                update m_loan set block_status_id = null;
+                delete from m_credit_blocking_reason;
+                delete from m_blocking_reason_setting;
+            ]]>
+        </sql>
+
+    </changeSet>
+</databaseChangeLog>
diff --git a/fineract-provider/src/main/resources/db/changelog/tenant/parts/202412171143000001_EA_111_delete_interest_rates.xml b/fineract-provider/src/main/resources/db/changelog/tenant/parts/202412171143000001_EA_111_delete_interest_rates.xml
new file mode 100644
index 00000000000..907c3e0aac8
--- /dev/null
+++ b/fineract-provider/src/main/resources/db/changelog/tenant/parts/202412171143000001_EA_111_delete_interest_rates.xml
@@ -0,0 +1,37 @@
+<?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 author="fineract" id="2" >
+        <sql>
+            <![CDATA[
+                update m_product_loan set interest_rate_id = null;
+                update m_charge  set interest_rate_id = null;
+                delete from m_interest_rate_history ;
+                delete from m_interest_rate ;
+            ]]>
+        </sql>
+
+    </changeSet>
+</databaseChangeLog>
diff --git a/fineract-provider/src/main/resources/db/changelog/tenant/parts/202412171143000002_EA_111_add_detalles_column.xml b/fineract-provider/src/main/resources/db/changelog/tenant/parts/202412171143000002_EA_111_add_detalles_column.xml
new file mode 100644
index 00000000000..9764a611e2d
--- /dev/null
+++ b/fineract-provider/src/main/resources/db/changelog/tenant/parts/202412171143000002_EA_111_add_detalles_column.xml
@@ -0,0 +1,121 @@
+<?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 author="fineract" id="1" >
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <tableExists tableName="Detalles de Contacto"/>
+            </not>
+        </preConditions>
+        <sql>
+            <![CDATA[
+                    CREATE TABLE "Detalles de Contacto" (
+                    "client_id" BIGINT NOT NULL REFERENCES m_client(id),
+                    "YesNo_cd_Requiere Visita" INTEGER,
+                    "Canal de visita_cd_Canal de visita" INTEGER,
+                    "Causal Rechazo Visita_cd_Causal Rechazo Visita" INTEGER,
+                    "Observacion Rechazo Visita" TEXT,
+                    "Usuario asignado" TEXT,
+                    "Correo Usuario Asignado" TEXT,
+                    "Fecha Inicio Contactabilidad" TEXT,
+                    "Validacion contactabilidad" TEXT,
+                    "Causal Rechazo Contactabilidad" TEXT,
+                    "Observacion Rechazo Contactabilidad" TEXT,
+                    "Observacion Contactabilidad" TEXT,
+                    "Segunda Observacion Contactabilidad" TEXT,
+                    "Tercera Observacion Contactabilidad" TEXT,
+                    "Telefono de Contactabilidad" TEXT,
+                    "Fecha Fin Contactabilidad" DATE,
+                    "created_at" TIMESTAMP,
+                    "updated_at" TIMESTAMP
+                );
+            ]]>
+        </sql>
+
+    </changeSet>
+    <changeSet author="fineract" id="2" >
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <tableExists tableName="Detalles_de_Contacto"/>
+            </not>
+        </preConditions>
+        <sql>
+            <![CDATA[
+                CREATE TABLE "Detalles_de_Contacto" (
+                "client_id" BIGINT NOT NULL REFERENCES m_client(id),
+                "YesNo_cd_Requiere Visita" INTEGER,
+                "Canal de visita_cd_Canal de visita" INTEGER,
+                "Causal Rechazo Visita_cd_Causal Rechazo Visita" INTEGER,
+                "Observacion Rechazo Visita" TEXT,
+                "Usuario asignado" TEXT,
+                "Correo Usuario Asignado" TEXT,
+                "Fecha Inicio Contactabilidad" TEXT,
+                "Validacion contactabilidad" TEXT,
+                "Causal Rechazo Contactabilidad" TEXT,
+                "Observacion Rechazo Contactabilidad" TEXT,
+                "Observacion Contactabilidad" TEXT,
+                "Segunda Observacion Contactabilidad" TEXT,
+                "Tercera Observacion Contactabilidad" TEXT,
+                "Telefono de Contactabilidad" TEXT,
+                "Fecha Fin Contactabilidad" DATE,
+                "created_at" TIMESTAMP,
+                "updated_at" TIMESTAMP);
+
+            ]]>
+        </sql>
+
+    </changeSet>
+
+    <changeSet id="3" author="fineract">
+        <preConditions onFail="MARK_RAN">
+            <sqlCheck expectedResult="0">
+                <![CDATA[
+                    Select count(1) from x_registered_table where registered_table_name = 'Detalles de Contacto';
+                ]]>
+            </sqlCheck>
+        </preConditions>
+        <sql>
+            <![CDATA[
+            INSERT INTO x_registered_table (registered_table_name, application_table_name, entity_subtype, category) VALUES('Detalles de Contacto', 'm_client', 'Entity', 100);
+            ]]>
+        </sql>
+    </changeSet>
+
+    <changeSet id="4" author="fineract">
+        <preConditions onFail="MARK_RAN">
+            <sqlCheck expectedResult="0">
+                <![CDATA[
+                    Select count(1) from x_registered_table where registered_table_name = 'Detalles_de_Contacto';
+                ]]>
+            </sqlCheck>
+        </preConditions>
+        <sql>
+            <![CDATA[
+            INSERT INTO x_registered_table (registered_table_name, application_table_name, entity_subtype, category) VALUES('Detalles_de_Contacto', 'm_client', 'Person', 100);
+            ]]>
+        </sql>
+    </changeSet>
+
+</databaseChangeLog>