fix(accounting,branchday): 3-stage FD interest posting in scheduler, fix branch day close business date validation

fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccountingProcessorHelper.java

@@ -27,6 +27,7 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.fineract.accounting.closure.domain.GLClosure;
 import org.apache.fineract.accounting.closure.domain.GLClosureRepository;
@@ -83,6 +84,7 @@ import org.apache.fineract.portfolio.shareaccounts.data.ShareAccountTransactionE
 import org.springframework.dao.DataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;
 
+@Slf4j
 @RequiredArgsConstructor
 public class AccountingProcessorHelper {
 
@@ -662,16 +664,25 @@ public class AccountingProcessorHelper {
         final GLAccount payableAccount = Optional
                 .ofNullable(optionalLinkedGLAccountForSavingsProduct(savingsProductId,
                         AccrualAccountsForSavings.INTEREST_PAYABLE.getValue(), paymentTypeId))
-                .or(() -> Optional.ofNullable(namedSavingsGlAccount(savingsProductId, SAVINGS_INTEREST_PAYABLE_MAPPING)))
+                .or(() -> Optional.ofNullable(namedSavingsGlAccount(savingsProductId,
+                        SAVINGS_INTEREST_PAYABLE_MAPPING, "Fixed Deposit Interest Payable", "Interest Payable", "Interest Payable Account")))
                 .orElse(controlAccount);
-        final GLAccount paidAccount = Optional.ofNullable(namedSavingsGlAccount(savingsProductId, SAVINGS_INTEREST_PAID_MAPPING))
+        final GLAccount paidAccount = Optional.ofNullable(namedSavingsGlAccount(savingsProductId,
+                        SAVINGS_INTEREST_PAID_MAPPING, "Fixed Deposit Interest Paid", "Interest Paid", "Interest Paid Account"))
                 .orElse(payableAccount);
 
+        log.info("createInterestPostingJournalEntriesForSavings: savingsProductId={}, payableAccount=[{} - {}], paidAccount=[{} - {}], controlAccount=[{} - {}], interestExpense=[{} - {}], amount={}, isReversal={}",
+                savingsProductId, payableAccount.getId(), payableAccount.getName(), paidAccount.getId(), paidAccount.getName(),
+                controlAccount.getId(), controlAccount.getName(), interestOnSavingsAccount.getId(), interestOnSavingsAccount.getName(),
+                amount, isReversal);
+
         // A product that names no payable falls back to Savings Control above. The chain below would
         // then open with Dr Savings Control / Cr Interest On Savings and close with its exact
         // reverse, the two cancelling: the expense never charged and the member never credited. Such
         // a product has no liability to draw down, so it keeps the single pair it always posted.
         if (payableAccount.getId().equals(controlAccount.getId())) {
+            log.warn("createInterestPostingJournalEntriesForSavings: payableAccount == controlAccount [id={}], posting standard 2-leg entry",
+                    payableAccount.getId());
             postSavingsLeg(office, currencyCode, interestOnSavingsAccount, controlAccount, savingsId, transactionId, transactionDate,
                     amount, isReversal);
             return;
@@ -697,28 +708,34 @@ public class AccountingProcessorHelper {
         final boolean payableIsLiability = GLAccountType.LIABILITY.getValue().equals(payableAccount.getType());
         final BigDecimal alreadyAccrued = payableBalance(office, payableAccount, currencyCode);
         final BigDecimal shortfall = amount.subtract(alreadyAccrued).max(BigDecimal.ZERO);
+        log.info("createInterestPostingJournalEntriesForSavings: alreadyAccrued={}, shortfall={}, payableIsLiability={}, isReversal={}",
+                alreadyAccrued, shortfall, payableIsLiability, isReversal);
         if (!isReversal && payableIsLiability && shortfall.compareTo(BigDecimal.ZERO) > 0) {
-            // Dr Interest On Savings (the expense) / Cr Payable - the accrual that should have run.
+            log.info("createInterestPostingJournalEntriesForSavings: posting Stage 1 [Dr {} / Cr {} = {}]",
+                    interestOnSavingsAccount.getName(), payableAccount.getName(), shortfall);
+            // Stage 1: Dr Interest On Savings (the expense) / Cr Payable - the accrual that should have run.
             postSavingsLeg(office, currencyCode, interestOnSavingsAccount, payableAccount, savingsId, transactionId, transactionDate,
                     shortfall, false);
         }
 
-        // Out of the payable, into the interest-paid account the product names.
-        postSavingsLeg(office, currencyCode, payableAccount, interestOnSavingsAccount, savingsId, transactionId, transactionDate, amount,
-                isReversal);
-
-        // A separate paid account, where the product names one, sits between interest-paid and the
-        // member; otherwise the payout leaves straight from interest-paid.
         final boolean hasSeparatePaidAccount = !payableAccount.getId().equals(paidAccount.getId());
         if (hasSeparatePaidAccount) {
-            postSavingsLeg(office, currencyCode, interestOnSavingsAccount, paidAccount, savingsId, transactionId, transactionDate, amount,
+            log.info("createInterestPostingJournalEntriesForSavings: posting Stage 2 [Dr {} / Cr {} = {}] and Stage 3 [Dr {} / Cr {} = {}]",
+                    payableAccount.getName(), paidAccount.getName(), amount, paidAccount.getName(), controlAccount.getName(), amount);
+            // Stage 2: Out of the payable, into the interest-paid transit/clearing account
+            postSavingsLeg(office, currencyCode, payableAccount, paidAccount, savingsId, transactionId, transactionDate, amount,
+                    isReversal);
+
+            // Stage 3: Out of the interest-paid account, into the member's control account
+            postSavingsLeg(office, currencyCode, paidAccount, controlAccount, savingsId, transactionId, transactionDate, amount,
+                    isReversal);
+        } else {
+            log.info("createInterestPostingJournalEntriesForSavings: no separate paidAccount, posting direct payout [Dr {} / Cr {} = {}]",
+                    payableAccount.getName(), controlAccount.getName(), amount);
+            // Payout directly from payable into member's control account
+            postSavingsLeg(office, currencyCode, payableAccount, controlAccount, savingsId, transactionId, transactionDate, amount,
                     isReversal);
         }
-
-        // Into the member's own balance.
-        final GLAccount payoutFromAccount = hasSeparatePaidAccount ? paidAccount : interestOnSavingsAccount;
-        postSavingsLeg(office, currencyCode, payoutFromAccount, controlAccount, savingsId, transactionId, transactionDate, amount,
-                isReversal);
     }
 
     /**
@@ -792,34 +809,37 @@ public class AccountingProcessorHelper {
         return balance == null ? BigDecimal.ZERO : balance;
     }
 
-    private GLAccount namedSavingsGlAccount(final Long savingsProductId, final String accountName) {
-        if (savingsProductId == null) {
+    private GLAccount namedSavingsGlAccount(final Long savingsProductId, final String... accountNames) {
+        if (savingsProductId == null || accountNames == null || accountNames.length == 0) {
             return null;
         }
-        // The column holds an empty string on a product saved with no named mappings, and casting
-        // that to jsonb is an error rather than an empty document - so the cast is done inside a
-        // subquery that has already filtered those rows out. Postgres is free to evaluate a WHERE
-        // clause in any order, so guarding at the same query level as the cast would only work by
-        // luck.
-        final List<Long> found = jdbcTemplate.queryForList("""
-                SELECT gl.id
-                  FROM (SELECT other_gl_mappings::jsonb AS doc
-                          FROM m_savings_product
-                         WHERE id = ?
-                           AND other_gl_mappings IS NOT NULL
-                           AND other_gl_mappings <> ''
-                           AND other_gl_mappings LIKE '{%') sp
-                  CROSS JOIN LATERAL jsonb_array_elements(
-                         COALESCE(sp.doc -> 'assets',      '[]'::jsonb)
-                      || COALESCE(sp.doc -> 'liabilities', '[]'::jsonb)
-                      || COALESCE(sp.doc -> 'expenses',    '[]'::jsonb)
-                      || COALESCE(sp.doc -> 'income',      '[]'::jsonb)
-                  ) AS m(entry)
-                  JOIN acc_gl_account gl ON gl.gl_code = m.entry ->> 'glCode'
-                 WHERE m.entry ->> 'accountName' = ?
-                 LIMIT 1
-                """, Long.class, savingsProductId, accountName);
-        return found.isEmpty() ? null : glAccountRepository.findById(found.get(0)).orElse(null);
+        for (final String accountName : accountNames) {
+            if (accountName == null) {
+                continue;
+            }
+            final List<Long> found = jdbcTemplate.queryForList("""
+                    SELECT gl.id
+                      FROM (SELECT other_gl_mappings::jsonb AS doc
+                              FROM m_savings_product
+                             WHERE id = ?
+                               AND other_gl_mappings IS NOT NULL
+                               AND other_gl_mappings <> ''
+                               AND other_gl_mappings LIKE '{%') sp
+                      CROSS JOIN LATERAL jsonb_array_elements(
+                             COALESCE(sp.doc -> 'assets',      '[]'::jsonb)
+                          || COALESCE(sp.doc -> 'liabilities', '[]'::jsonb)
+                          || COALESCE(sp.doc -> 'expenses',    '[]'::jsonb)
+                          || COALESCE(sp.doc -> 'income',      '[]'::jsonb)
+                      ) AS m(entry)
+                      JOIN acc_gl_account gl ON gl.gl_code = m.entry ->> 'glCode'
+                     WHERE lower(trim(m.entry ->> 'accountName')) = lower(trim(?))
+                     LIMIT 1
+                    """, Long.class, savingsProductId, accountName);
+            if (!found.isEmpty()) {
+                return glAccountRepository.findById(found.get(0)).orElse(null);
+            }
+        }
+        return null;
     }
 
     /**

fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositProductReadPlatformServiceImpl.java

@@ -19,10 +19,13 @@
 package org.apache.fineract.portfolio.savings.service;
 
 import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import java.lang.reflect.Type;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 import lombok.RequiredArgsConstructor;
 import org.apache.fineract.accounting.common.AccountingEnumerations;
@@ -202,6 +205,31 @@ public class DepositProductReadPlatformServiceImpl implements DepositProductRead
         }
     }
 
+    private static final Type OTHER_GL_MAPPINGS_TYPE = new TypeToken<List<Map<String, Object>>>() {}.getType();
+    private static final Type OTHER_GL_MAPPINGS_MAP_TYPE = new TypeToken<Map<String, List<Map<String, Object>>>>() {}.getType();
+
+    private static List<Map<String, Object>> parseOtherGlMappings(final String otherGlMappingsJson) {
+        if (otherGlMappingsJson == null || otherGlMappingsJson.isBlank()) {
+            return null;
+        }
+        com.google.gson.JsonElement element = GSON.fromJson(otherGlMappingsJson, com.google.gson.JsonElement.class);
+        if (!element.isJsonArray()) {
+            return null;
+        }
+        return GSON.fromJson(element, OTHER_GL_MAPPINGS_TYPE);
+    }
+
+    private static Map<String, List<Map<String, Object>>> parseOtherGlMappingsAsMap(final String otherGlMappingsJson) {
+        if (otherGlMappingsJson == null || otherGlMappingsJson.isBlank()) {
+            return null;
+        }
+        com.google.gson.JsonElement element = GSON.fromJson(otherGlMappingsJson, com.google.gson.JsonElement.class);
+        if (!element.isJsonObject()) {
+            return null;
+        }
+        return GSON.fromJson(element, OTHER_GL_MAPPINGS_MAP_TYPE);
+    }
+
     private abstract static class DepositProductMapper implements RowMapper<DepositProductData> {
 
         private final String schemaSql;
@@ -221,6 +249,7 @@ public class DepositProductReadPlatformServiceImpl implements DepositProductRead
             sqlBuilder.append("sp.lockin_period_frequency as lockinPeriodFrequency,");
             sqlBuilder.append("sp.lockin_period_frequency_enum as lockinPeriodFrequencyType, ");
             sqlBuilder.append("sp.accounting_type as accountingType, ");
+            sqlBuilder.append("sp.other_gl_mappings as otherGlMappings, ");
             sqlBuilder.append("sp.min_balance_for_interest_calculation as minBalanceForInterestCalculation, ");
             sqlBuilder.append("sp.withhold_tax as withHoldTax,");
             sqlBuilder.append("tg.id as taxGroupId, tg.name as taxGroupName ");
@@ -284,10 +313,14 @@ public class DepositProductReadPlatformServiceImpl implements DepositProductRead
                 taxGroupData = TaxGroupData.lookup(taxGroupId, taxGroupName);
             }
 
-            return DepositProductData.instance(id, name, shortName, description, currency, nominalAnnualInterestRate,
+            final DepositProductData data = DepositProductData.instance(id, name, shortName, description, currency, nominalAnnualInterestRate,
                     compoundingInterestPeriodType, interestPostingPeriodType, interestCalculationType, interestCalculationDaysInYearType,
                     lockinPeriodFrequency, lockinPeriodFrequencyType, accountingRuleType, minBalanceForInterestCalculation, withHoldTax,
                     taxGroupData);
+            final String otherGlMappingsJson = rs.getString("otherGlMappings");
+            data.setOtherGlMappings(parseOtherGlMappings(otherGlMappingsJson));
+            data.setOtherGlMappingsMap(parseOtherGlMappingsAsMap(otherGlMappingsJson));
+            return data;
         }
     }