From 2a4009faa147a631670ea1eec6eff838785094ff Mon Sep 17 00:00:00 2001
From: Muhimbura Brian Mart <brianmigel@gmail.com>
Date: Mon, 5 Aug 2024 18:02:15 +0300
Subject: [PATCH 1/2] FSF 22

---
 ...ificationChecklistWritePlatformServiceImpl.java |  2 +-
 .../tenant/parts/0134_HardPolicyFixes.xml          | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/prequalification/service/PrequalificationChecklistWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/prequalification/service/PrequalificationChecklistWritePlatformServiceImpl.java
index 7ca4083e892..9cf7635c6d7 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/prequalification/service/PrequalificationChecklistWritePlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/prequalification/service/PrequalificationChecklistWritePlatformServiceImpl.java
@@ -441,7 +441,7 @@ SELECT COUNT(*)
 
         final Map<String, String> reportParams = new HashMap<>();
         reportParams.put("${loanProductId}", productId);
-        reportParams.put("${categorization}", clientParams.getCategorization());
+        reportParams.put("${categorization}", clientData.getCategorization());
         reportParams.put("${investmentPlan}", Long.toString(investmentPlanCount));
         reportParams.put("${photographs}", Long.toString(photographsCount));
         reportParams.put("${requestedAmount}", clientData.getRequestedAmount().toPlainString());
diff --git a/fineract-provider/src/main/resources/db/changelog/tenant/parts/0134_HardPolicyFixes.xml b/fineract-provider/src/main/resources/db/changelog/tenant/parts/0134_HardPolicyFixes.xml
index 6d8af02b55c..a8e3a4a05ab 100644
--- a/fineract-provider/src/main/resources/db/changelog/tenant/parts/0134_HardPolicyFixes.xml
+++ b/fineract-provider/src/main/resources/db/changelog/tenant/parts/0134_HardPolicyFixes.xml
@@ -253,5 +253,19 @@
         </sql>
     </changeSet>
 
+    <changeSet id="8" author="fineract">
+        <sql>
+            <![CDATA[
+            UPDATE stretchy_report SET report_sql = " SELECT CASE
+                       WHEN (${loanProductId} IN (9)) AND ${categorization} = 'RECREDITO' AND ${requestedAmount} <= 6000  THEN 'GREEN'
+                       WHEN (${loanProductId} IN (2,8)) AND ${requestedAmount} <= 6000 THEN 'GREEN'
+                       WHEN (${loanProductId} IN (2,9,8,4,5,7)) AND (${photographs} <= 0  OR ${investmentPlan} <= 0) THEN 'RED'
+                       ELSE 'GREEN'
+                    END AS color"
+            WHERE report_name = "Mandatory to attach photographs and investment plan Policy Check";
+            ]]>
+        </sql>
+    </changeSet>
+
 
 </databaseChangeLog>

From e4091e22fb87a16d6308b6b399181916854bcdd2 Mon Sep 17 00:00:00 2001
From: Muhimbura Brian Mart <brianmigel@gmail.com>
Date: Mon, 5 Aug 2024 18:05:01 +0300
Subject: [PATCH 2/2] FSF 22

---
 .../PrequalificationChecklistWritePlatformServiceImpl.java       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/prequalification/service/PrequalificationChecklistWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/prequalification/service/PrequalificationChecklistWritePlatformServiceImpl.java
index 9cf7635c6d7..dd3bd786b20 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/prequalification/service/PrequalificationChecklistWritePlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/prequalification/service/PrequalificationChecklistWritePlatformServiceImpl.java
@@ -416,7 +416,6 @@ CASE WHEN (mlag.current_credit_value <= 0) THEN 0
      * Mandatory to attach photographs and investment plan
      */
     private CheckValidationColor runCheck4(final ClientData clientData) {
-        final ClientData clientParams = retrieveClientParams(clientData.getClientId(), clientData.getProductId());
         final String reportName = Policies.FOUR.getName() + " Policy Check";
         final String productId = Long.toString(clientData.getProductId());
         final Long loanId = clientData.getLoanId();