FINERACT-2312: Post interest with adjustments for savings accounts
This commit is contained in:
Juan-Pablo-Alvarez
committed by
Adam Saghy
Adam Saghy
parent
ef1e2e1095
commit
a6fa1adc99
+443
@@ -0,0 +1,443 @@
|
||||
/**
|
||||
* 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.
|
||||
*/
|
||||
package org.apache.fineract.integrationtests;
|
||||
|
||||
import io.restassured.builder.RequestSpecBuilder;
|
||||
import io.restassured.builder.ResponseSpecBuilder;
|
||||
import io.restassured.http.ContentType;
|
||||
import io.restassured.specification.RequestSpecification;
|
||||
import io.restassured.specification.ResponseSpecification;
|
||||
import java.math.BigDecimal;
|
||||
import java.math.MathContext;
|
||||
import java.math.RoundingMode;
|
||||
import java.time.LocalDate;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.time.temporal.ChronoUnit;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
import org.apache.fineract.client.models.PutGlobalConfigurationsRequest;
|
||||
import org.apache.fineract.infrastructure.businessdate.domain.BusinessDateType;
|
||||
import org.apache.fineract.infrastructure.configuration.api.GlobalConfigurationConstants;
|
||||
import org.apache.fineract.infrastructure.core.service.MathUtil;
|
||||
import org.apache.fineract.integrationtests.common.BusinessDateHelper;
|
||||
import org.apache.fineract.integrationtests.common.ClientHelper;
|
||||
import org.apache.fineract.integrationtests.common.CommonConstants;
|
||||
import org.apache.fineract.integrationtests.common.GlobalConfigurationHelper;
|
||||
import org.apache.fineract.integrationtests.common.SchedulerJobHelper;
|
||||
import org.apache.fineract.integrationtests.common.Utils;
|
||||
import org.apache.fineract.integrationtests.common.accounting.Account;
|
||||
import org.apache.fineract.integrationtests.common.accounting.AccountHelper;
|
||||
import org.apache.fineract.integrationtests.common.accounting.JournalEntryHelper;
|
||||
import org.apache.fineract.integrationtests.common.savings.SavingsAccountHelper;
|
||||
import org.apache.fineract.integrationtests.common.savings.SavingsProductHelper;
|
||||
import org.apache.fineract.portfolio.savings.SavingsAccountTransactionType;
|
||||
import org.junit.jupiter.api.Assertions;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
public class SavingsInterestPostingTest {
|
||||
|
||||
private static final Logger LOG = LoggerFactory.getLogger(SavingsInterestPostingTest.class);
|
||||
private static ResponseSpecification responseSpec;
|
||||
private static RequestSpecification requestSpec;
|
||||
private AccountHelper accountHelper;
|
||||
private SavingsAccountHelper savingsAccountHelper;
|
||||
private SchedulerJobHelper schedulerJobHelper;
|
||||
public static final String MINIMUM_OPENING_BALANCE = "1000.0";
|
||||
private GlobalConfigurationHelper globalConfigurationHelper;
|
||||
private SavingsProductHelper productHelper;
|
||||
private JournalEntryHelper journalEntryHelper;
|
||||
|
||||
@BeforeEach
|
||||
public void setup() {
|
||||
Utils.initializeRESTAssured();
|
||||
this.requestSpec = new RequestSpecBuilder().setContentType(ContentType.JSON).build();
|
||||
this.requestSpec.header("Authorization", "Basic " + Utils.loginIntoServerAndGetBase64EncodedAuthenticationKey());
|
||||
this.responseSpec = new ResponseSpecBuilder().expectStatusCode(200).build();
|
||||
this.schedulerJobHelper = new SchedulerJobHelper(this.requestSpec);
|
||||
this.accountHelper = new AccountHelper(this.requestSpec, this.responseSpec);
|
||||
this.savingsAccountHelper = new SavingsAccountHelper(this.requestSpec, this.responseSpec);
|
||||
this.journalEntryHelper = new JournalEntryHelper(this.requestSpec, this.responseSpec);
|
||||
this.globalConfigurationHelper = new GlobalConfigurationHelper();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testPostInterestWithOverdraftProduct() {
|
||||
try {
|
||||
final String amount = "10000";
|
||||
final String jobName = "Post Interest For Savings";
|
||||
|
||||
final Account assetAccount = accountHelper.createAssetAccount();
|
||||
final Account incomeAccount = accountHelper.createIncomeAccount();
|
||||
final Account expenseAccount = accountHelper.createExpenseAccount();
|
||||
final Account liabilityAccount = accountHelper.createLiabilityAccount();
|
||||
final Account interestReceivableAccount = accountHelper.createAssetAccount("interestReceivableAccount");
|
||||
final Account savingsControlAccount = accountHelper.createLiabilityAccount("Savings Control");
|
||||
final Account interestPayableAccount = accountHelper.createLiabilityAccount("Interest Payable");
|
||||
|
||||
final Integer productId = createSavingsProductWithAccrualAccountingWithOutOverdraftAllowed(
|
||||
interestPayableAccount.getAccountID().toString(), savingsControlAccount.getAccountID().toString(),
|
||||
interestReceivableAccount.getAccountID().toString(), assetAccount, incomeAccount, expenseAccount, liabilityAccount);
|
||||
|
||||
final Integer clientId = ClientHelper.createClient(requestSpec, responseSpec, "01 January 2025");
|
||||
final LocalDate startDate = LocalDate.of(LocalDate.now(Utils.getZoneIdOfTenant()).getYear(), 2, 1);
|
||||
final String startDateString = DateTimeFormatter.ofPattern("dd MMMM yyyy", Locale.US).format(startDate);
|
||||
|
||||
final Integer accountId = savingsAccountHelper.applyForSavingsApplicationOnDate(clientId, productId,
|
||||
SavingsAccountHelper.ACCOUNT_TYPE_INDIVIDUAL, startDateString);
|
||||
savingsAccountHelper.approveSavingsOnDate(accountId, startDateString);
|
||||
savingsAccountHelper.activateSavings(accountId, startDateString);
|
||||
savingsAccountHelper.depositToSavingsAccount(accountId, amount, startDateString, CommonConstants.RESPONSE_RESOURCE_ID);
|
||||
|
||||
// Simulate time passing - update business date to March
|
||||
globalConfigurationHelper.updateGlobalConfiguration(GlobalConfigurationConstants.ENABLE_BUSINESS_DATE,
|
||||
new PutGlobalConfigurationsRequest().enabled(true));
|
||||
LocalDate marchDate = LocalDate.of(startDate.getYear(), 3, 1);
|
||||
BusinessDateHelper.updateBusinessDate(requestSpec, responseSpec, BusinessDateType.BUSINESS_DATE, marchDate);
|
||||
|
||||
schedulerJobHelper.executeAndAwaitJob(jobName);
|
||||
|
||||
long days = ChronoUnit.DAYS.between(startDate, marchDate);
|
||||
BigDecimal expected = calcInterestPosting(productHelper, amount, days);
|
||||
|
||||
List<HashMap> txs = getInterestTransactions(accountId);
|
||||
for (HashMap tx : txs) {
|
||||
Assertions.assertEquals(expected, BigDecimal.valueOf(((Double) tx.get("amount"))));
|
||||
}
|
||||
|
||||
long interestCount = countInterestOnDate(accountId, marchDate);
|
||||
long overdraftCount = countOverdraftOnDate(accountId, marchDate);
|
||||
Assertions.assertEquals(1L, interestCount, "Expected exactly one INTEREST posting on posting date");
|
||||
Assertions.assertEquals(0L, overdraftCount, "Expected NO OVERDRAFT posting on posting date");
|
||||
} finally {
|
||||
globalConfigurationHelper.updateGlobalConfiguration(GlobalConfigurationConstants.ENABLE_BUSINESS_DATE,
|
||||
new PutGlobalConfigurationsRequest().enabled(false));
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testOverdraftInterestWithOverdraftProduct() {
|
||||
try {
|
||||
final String amount = "10000";
|
||||
final String jobName = "Post Interest For Savings";
|
||||
|
||||
final Account assetAccount = accountHelper.createAssetAccount();
|
||||
final Account incomeAccount = accountHelper.createIncomeAccount();
|
||||
final Account expenseAccount = accountHelper.createExpenseAccount();
|
||||
final Account liabilityAccount = accountHelper.createLiabilityAccount();
|
||||
final Account interestReceivableAccount = accountHelper.createAssetAccount("interestReceivableAccount");
|
||||
final Account savingsControlAccount = accountHelper.createLiabilityAccount("Savings Control");
|
||||
final Account interestPayableAccount = accountHelper.createLiabilityAccount("Interest Payable");
|
||||
|
||||
final Integer productId = createSavingsProductWithAccrualAccountingWithOutOverdraftAllowed(
|
||||
interestPayableAccount.getAccountID().toString(), savingsControlAccount.getAccountID().toString(),
|
||||
interestReceivableAccount.getAccountID().toString(), assetAccount, incomeAccount, expenseAccount, liabilityAccount);
|
||||
|
||||
final Integer clientId = ClientHelper.createClient(requestSpec, responseSpec, "01 January 2025");
|
||||
final LocalDate startDate = LocalDate.of(LocalDate.now(Utils.getZoneIdOfTenant()).getYear(), 2, 1);
|
||||
final String startDateString = DateTimeFormatter.ofPattern("dd MMMM yyyy", Locale.US).format(startDate);
|
||||
|
||||
final Integer accountId = savingsAccountHelper.applyForSavingsApplicationOnDate(clientId, productId,
|
||||
SavingsAccountHelper.ACCOUNT_TYPE_INDIVIDUAL, startDateString);
|
||||
savingsAccountHelper.approveSavingsOnDate(accountId, startDateString);
|
||||
savingsAccountHelper.activateSavings(accountId, startDateString);
|
||||
savingsAccountHelper.withdrawalFromSavingsAccount(accountId, amount, startDateString, CommonConstants.RESPONSE_RESOURCE_ID);
|
||||
|
||||
// Simulate time passing - update business date to March
|
||||
globalConfigurationHelper.updateGlobalConfiguration(GlobalConfigurationConstants.ENABLE_BUSINESS_DATE,
|
||||
new PutGlobalConfigurationsRequest().enabled(true));
|
||||
LocalDate marchDate = LocalDate.of(startDate.getYear(), 3, 1);
|
||||
BusinessDateHelper.updateBusinessDate(requestSpec, responseSpec, BusinessDateType.BUSINESS_DATE, marchDate);
|
||||
|
||||
schedulerJobHelper.executeAndAwaitJob(jobName);
|
||||
|
||||
long days = ChronoUnit.DAYS.between(startDate, marchDate);
|
||||
BigDecimal expected = calcOverdraftPosting(productHelper, amount, days);
|
||||
|
||||
List<HashMap> txs = getInterestTransactions(accountId);
|
||||
Assertions.assertEquals(expected, BigDecimal.valueOf(((Double) txs.get(0).get("amount"))));
|
||||
|
||||
BigDecimal runningBalance = BigDecimal.valueOf(((Double) txs.get(0).get("runningBalance")));
|
||||
Assertions.assertTrue(MathUtil.isLessThanZero(runningBalance), "Running balance is not less than zero");
|
||||
|
||||
long interestCount = countInterestOnDate(accountId, marchDate);
|
||||
long overdraftCount = countOverdraftOnDate(accountId, marchDate);
|
||||
Assertions.assertEquals(0L, interestCount, "Expected NO INTEREST posting on posting date");
|
||||
Assertions.assertEquals(1L, overdraftCount, "Expected exactly one OVERDRAFT posting on posting date");
|
||||
} finally {
|
||||
globalConfigurationHelper.updateGlobalConfiguration(GlobalConfigurationConstants.ENABLE_BUSINESS_DATE,
|
||||
new PutGlobalConfigurationsRequest().enabled(false));
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testOverdraftAndInterestPosting_WithOverdraftProduct_WhitBalanceLessZero() {
|
||||
try {
|
||||
final String amountDeposit = "10000";
|
||||
final String amountWithdrawal = "20000";
|
||||
final String jobName = "Post Interest For Savings";
|
||||
|
||||
final Account assetAccount = accountHelper.createAssetAccount();
|
||||
final Account incomeAccount = accountHelper.createIncomeAccount();
|
||||
final Account expenseAccount = accountHelper.createExpenseAccount();
|
||||
final Account liabilityAccount = accountHelper.createLiabilityAccount();
|
||||
final Account interestReceivableAccount = accountHelper.createAssetAccount("interestReceivableAccount");
|
||||
final Account savingsControlAccount = accountHelper.createLiabilityAccount("Savings Control");
|
||||
final Account interestPayableAccount = accountHelper.createLiabilityAccount("Interest Payable");
|
||||
|
||||
final Integer productId = createSavingsProductWithAccrualAccountingWithOutOverdraftAllowed(
|
||||
interestPayableAccount.getAccountID().toString(), savingsControlAccount.getAccountID().toString(),
|
||||
interestReceivableAccount.getAccountID().toString(), assetAccount, incomeAccount, expenseAccount, liabilityAccount);
|
||||
|
||||
final Integer clientId = ClientHelper.createClient(requestSpec, responseSpec, "01 January 2025");
|
||||
final LocalDate startDate = LocalDate.of(LocalDate.now(Utils.getZoneIdOfTenant()).getYear(), 2, 1);
|
||||
final String startStr = DateTimeFormatter.ofPattern("dd MMMM yyyy", Locale.US).format(startDate);
|
||||
|
||||
final Integer accountId = savingsAccountHelper.applyForSavingsApplicationOnDate(clientId, productId,
|
||||
SavingsAccountHelper.ACCOUNT_TYPE_INDIVIDUAL, startStr);
|
||||
savingsAccountHelper.approveSavingsOnDate(accountId, startStr);
|
||||
savingsAccountHelper.activateSavings(accountId, startStr);
|
||||
savingsAccountHelper.depositToSavingsAccount(accountId, amountDeposit, startStr, CommonConstants.RESPONSE_RESOURCE_ID);
|
||||
|
||||
final LocalDate withdrawalDate = LocalDate.of(startDate.getYear(), 2, 16);
|
||||
final String withdrawalStr = DateTimeFormatter.ofPattern("dd MMMM yyyy", Locale.US).format(withdrawalDate);
|
||||
savingsAccountHelper.withdrawalFromSavingsAccount(accountId, amountWithdrawal, withdrawalStr,
|
||||
CommonConstants.RESPONSE_RESOURCE_ID);
|
||||
|
||||
globalConfigurationHelper.updateGlobalConfiguration(GlobalConfigurationConstants.ENABLE_BUSINESS_DATE,
|
||||
new PutGlobalConfigurationsRequest().enabled(true));
|
||||
LocalDate marchDate = LocalDate.of(startDate.getYear(), 3, 1);
|
||||
BusinessDateHelper.updateBusinessDate(requestSpec, responseSpec, BusinessDateType.BUSINESS_DATE, marchDate);
|
||||
|
||||
schedulerJobHelper.executeAndAwaitJob(jobName);
|
||||
|
||||
List<HashMap> txs = getInterestTransactions(accountId);
|
||||
for (HashMap tx : txs) {
|
||||
BigDecimal amt = BigDecimal.valueOf(((Double) tx.get("amount")));
|
||||
@SuppressWarnings("unchecked")
|
||||
Map<String, Object> typeMap = (Map<String, Object>) tx.get("transactionType");
|
||||
SavingsAccountTransactionType type = SavingsAccountTransactionType.fromInt(((Double) typeMap.get("id")).intValue());
|
||||
|
||||
if (type.isInterestPosting()) {
|
||||
long days = ChronoUnit.DAYS.between(startDate, withdrawalDate);
|
||||
BigDecimal expected = calcInterestPosting(productHelper, amountDeposit, days);
|
||||
Assertions.assertEquals(expected, amt);
|
||||
} else {
|
||||
long days = ChronoUnit.DAYS.between(withdrawalDate, marchDate);
|
||||
BigDecimal overdraftBase = new BigDecimal(amountWithdrawal).subtract(new BigDecimal(amountDeposit));
|
||||
BigDecimal expected = calcOverdraftPosting(productHelper, overdraftBase.toString(), days);
|
||||
Assertions.assertEquals(expected, amt);
|
||||
}
|
||||
}
|
||||
|
||||
Assertions.assertEquals(1L, countInterestOnDate(accountId, marchDate), "Expected exactly one INTEREST posting on posting date");
|
||||
Assertions.assertEquals(1L, countOverdraftOnDate(accountId, marchDate),
|
||||
"Expected exactly one OVERDRAFT posting on posting date");
|
||||
} finally {
|
||||
globalConfigurationHelper.updateGlobalConfiguration(GlobalConfigurationConstants.ENABLE_BUSINESS_DATE,
|
||||
new PutGlobalConfigurationsRequest().enabled(false));
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testOverdraftAndInterestPosting_WithOverdraftProduct_WhitBalanceGreaterZero() {
|
||||
try {
|
||||
final String amountDeposit = "20000";
|
||||
final String amountWithdrawal = "10000";
|
||||
final String jobName = "Post Interest For Savings";
|
||||
|
||||
final Account assetAccount = accountHelper.createAssetAccount();
|
||||
final Account incomeAccount = accountHelper.createIncomeAccount();
|
||||
final Account expenseAccount = accountHelper.createExpenseAccount();
|
||||
final Account liabilityAccount = accountHelper.createLiabilityAccount();
|
||||
final Account interestReceivableAccount = accountHelper.createAssetAccount("interestReceivableAccount");
|
||||
final Account savingsControlAccount = accountHelper.createLiabilityAccount("Savings Control");
|
||||
final Account interestPayableAccount = accountHelper.createLiabilityAccount("Interest Payable");
|
||||
|
||||
final Integer productId = createSavingsProductWithAccrualAccountingWithOutOverdraftAllowed(
|
||||
interestPayableAccount.getAccountID().toString(), savingsControlAccount.getAccountID().toString(),
|
||||
interestReceivableAccount.getAccountID().toString(), assetAccount, incomeAccount, expenseAccount, liabilityAccount);
|
||||
|
||||
final Integer clientId = ClientHelper.createClient(requestSpec, responseSpec, "01 January 2025");
|
||||
final LocalDate startDate = LocalDate.of(LocalDate.now(Utils.getZoneIdOfTenant()).getYear(), 2, 1);
|
||||
final String startStr = DateTimeFormatter.ofPattern("dd MMMM yyyy", Locale.US).format(startDate);
|
||||
|
||||
final Integer accountId = savingsAccountHelper.applyForSavingsApplicationOnDate(clientId, productId,
|
||||
SavingsAccountHelper.ACCOUNT_TYPE_INDIVIDUAL, startStr);
|
||||
savingsAccountHelper.approveSavingsOnDate(accountId, startStr);
|
||||
savingsAccountHelper.activateSavings(accountId, startStr);
|
||||
savingsAccountHelper.withdrawalFromSavingsAccount(accountId, amountWithdrawal, startStr, CommonConstants.RESPONSE_RESOURCE_ID);
|
||||
|
||||
final LocalDate depositDate = LocalDate.of(startDate.getYear(), 2, 16);
|
||||
final String depositStr = DateTimeFormatter.ofPattern("dd MMMM yyyy", Locale.US).format(depositDate);
|
||||
savingsAccountHelper.depositToSavingsAccount(accountId, amountDeposit, depositStr, CommonConstants.RESPONSE_RESOURCE_ID);
|
||||
|
||||
globalConfigurationHelper.updateGlobalConfiguration(GlobalConfigurationConstants.ENABLE_BUSINESS_DATE,
|
||||
new PutGlobalConfigurationsRequest().enabled(true));
|
||||
LocalDate marchDate = LocalDate.of(startDate.getYear(), 3, 1);
|
||||
BusinessDateHelper.updateBusinessDate(requestSpec, responseSpec, BusinessDateType.BUSINESS_DATE, marchDate);
|
||||
|
||||
schedulerJobHelper.executeAndAwaitJob(jobName);
|
||||
|
||||
List<HashMap> txs = getInterestTransactions(accountId);
|
||||
for (HashMap tx : txs) {
|
||||
BigDecimal amt = BigDecimal.valueOf(((Double) tx.get("amount")));
|
||||
@SuppressWarnings("unchecked")
|
||||
Map<String, Object> typeMap = (Map<String, Object>) tx.get("transactionType");
|
||||
SavingsAccountTransactionType type = SavingsAccountTransactionType.fromInt(((Double) typeMap.get("id")).intValue());
|
||||
|
||||
if (type.isOverDraftInterestPosting()) {
|
||||
long days = ChronoUnit.DAYS.between(startDate, depositDate);
|
||||
BigDecimal expected = calcOverdraftPosting(productHelper, amountWithdrawal, days);
|
||||
Assertions.assertEquals(expected, amt);
|
||||
} else {
|
||||
long days = ChronoUnit.DAYS.between(depositDate, marchDate);
|
||||
BigDecimal positiveBase = new BigDecimal(amountDeposit).subtract(new BigDecimal(amountWithdrawal));
|
||||
BigDecimal expected = calcInterestPosting(productHelper, positiveBase.toString(), days);
|
||||
Assertions.assertEquals(expected, amt);
|
||||
}
|
||||
}
|
||||
|
||||
Assertions.assertEquals(1L, countOverdraftOnDate(accountId, marchDate),
|
||||
"Expected exactly one OVERDRAFT posting on posting date");
|
||||
Assertions.assertEquals(1L, countInterestOnDate(accountId, marchDate), "Expected exactly one INTEREST posting on posting date");
|
||||
} finally {
|
||||
globalConfigurationHelper.updateGlobalConfiguration(GlobalConfigurationConstants.ENABLE_BUSINESS_DATE,
|
||||
new PutGlobalConfigurationsRequest().enabled(false));
|
||||
}
|
||||
}
|
||||
|
||||
private List<HashMap> getInterestTransactions(Integer savingsAccountId) {
|
||||
List<HashMap> all = savingsAccountHelper.getSavingsTransactions(savingsAccountId);
|
||||
List<HashMap> filtered = new ArrayList<>();
|
||||
for (HashMap tx : all) {
|
||||
@SuppressWarnings("unchecked")
|
||||
Map<String, Object> txType = (Map<String, Object>) tx.get("transactionType");
|
||||
SavingsAccountTransactionType type = SavingsAccountTransactionType.fromInt(((Double) txType.get("id")).intValue());
|
||||
if (type.isInterestPosting() || type.isOverDraftInterestPosting()) {
|
||||
filtered.add(tx);
|
||||
}
|
||||
}
|
||||
return filtered;
|
||||
}
|
||||
|
||||
public Integer createSavingsProductWithAccrualAccountingWithOutOverdraftAllowed(final String interestPayableAccount,
|
||||
final String savingsControlAccount, final String interestReceivableAccount, final Account... accounts) {
|
||||
|
||||
LOG.info("------------------------------CREATING NEW SAVINGS PRODUCT WITHOUT OVERDRAFT ---------------------------------------");
|
||||
this.productHelper = new SavingsProductHelper().withOverDraftRate("100000", "21")
|
||||
.withAccountInterestReceivables(interestReceivableAccount).withSavingsControlAccountId(savingsControlAccount)
|
||||
.withInterestPayableAccountId(interestPayableAccount).withInterestCompoundingPeriodTypeAsAnnually()
|
||||
.withInterestPostingPeriodTypeAsMonthly().withInterestCalculationPeriodTypeAsDailyBalance()
|
||||
.withAccountingRuleAsAccrualBased(accounts);
|
||||
|
||||
final String savingsProductJSON = this.productHelper.build();
|
||||
return SavingsProductHelper.createSavingsProduct(savingsProductJSON, requestSpec, responseSpec);
|
||||
}
|
||||
|
||||
private BigDecimal calcInterestPosting(SavingsProductHelper productHelper, String amount, long days) {
|
||||
BigDecimal rate = productHelper.getNominalAnnualInterestRate().divide(new BigDecimal("100.00"));
|
||||
BigDecimal principal = new BigDecimal(amount);
|
||||
BigDecimal dayFactor = BigDecimal.ONE.divide(productHelper.getInterestCalculationDaysInYearType(), MathContext.DECIMAL64);
|
||||
BigDecimal dailyRate = rate.multiply(dayFactor, MathContext.DECIMAL64);
|
||||
BigDecimal periodRate = dailyRate.multiply(BigDecimal.valueOf(days), MathContext.DECIMAL64);
|
||||
return principal.multiply(periodRate, MathContext.DECIMAL64).setScale(productHelper.getDecimalCurrency(), RoundingMode.HALF_EVEN);
|
||||
}
|
||||
|
||||
private BigDecimal calcOverdraftPosting(SavingsProductHelper productHelper, String amount, long days) {
|
||||
BigDecimal rate = productHelper.getNominalAnnualInterestRateOverdraft().divide(new BigDecimal("100.00"));
|
||||
BigDecimal principal = new BigDecimal(amount);
|
||||
BigDecimal dayFactor = BigDecimal.ONE.divide(productHelper.getInterestCalculationDaysInYearType(), MathContext.DECIMAL64);
|
||||
BigDecimal dailyRate = rate.multiply(dayFactor, MathContext.DECIMAL64);
|
||||
BigDecimal periodRate = dailyRate.multiply(BigDecimal.valueOf(days), MathContext.DECIMAL64);
|
||||
return principal.multiply(periodRate, MathContext.DECIMAL64).setScale(productHelper.getDecimalCurrency(), RoundingMode.HALF_EVEN);
|
||||
}
|
||||
|
||||
// =========================
|
||||
// Helpers robustos de FECHA/TIPO
|
||||
// =========================
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private LocalDate coerceToLocalDate(HashMap tx) {
|
||||
// Posibles claves de fecha devueltas por Fineract
|
||||
String[] candidateKeys = new String[] { "date", "transactionDate", "submittedOnDate", "createdDate" };
|
||||
|
||||
for (String key : candidateKeys) {
|
||||
Object v = tx.get(key);
|
||||
if (v == null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// Caso 1: arreglo [yyyy, MM, dd]
|
||||
if (v instanceof List<?>) {
|
||||
List<?> arr = (List<?>) v;
|
||||
if (arr.size() >= 3 && arr.get(0) instanceof Number && arr.get(1) instanceof Number && arr.get(2) instanceof Number) {
|
||||
int year = ((Number) arr.get(0)).intValue();
|
||||
int month = ((Number) arr.get(1)).intValue();
|
||||
int day = ((Number) arr.get(2)).intValue();
|
||||
return LocalDate.of(year, month, day);
|
||||
}
|
||||
}
|
||||
|
||||
// Caso 2: string con distintos formatos
|
||||
if (v instanceof String) {
|
||||
String s = (String) v;
|
||||
DateTimeFormatter[] fmts = new DateTimeFormatter[] { DateTimeFormatter.ofPattern("dd MMMM yyyy", Locale.US),
|
||||
DateTimeFormatter.ofPattern("dd MMM yyyy", Locale.US), DateTimeFormatter.ofPattern("yyyy-MM-dd") };
|
||||
for (DateTimeFormatter f : fmts) {
|
||||
try {
|
||||
return LocalDate.parse(s, f);
|
||||
} catch (Exception ignore) {
|
||||
// intentionally ignored
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// Si ninguna clave/forma se pudo parsear
|
||||
return null;
|
||||
}
|
||||
|
||||
private boolean isDate(HashMap tx, LocalDate expected) {
|
||||
LocalDate got = coerceToLocalDate(tx);
|
||||
return got != null && got.isEqual(expected);
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private SavingsAccountTransactionType txType(HashMap tx) {
|
||||
Map<String, Object> typeMap = (Map<String, Object>) tx.get("transactionType");
|
||||
return SavingsAccountTransactionType.fromInt(((Double) typeMap.get("id")).intValue());
|
||||
}
|
||||
|
||||
private long countInterestOnDate(Integer accountId, LocalDate date) {
|
||||
List<HashMap> all = savingsAccountHelper.getSavingsTransactions(accountId);
|
||||
return all.stream().filter(tx -> isDate(tx, date)).map(this::txType).filter(SavingsAccountTransactionType::isInterestPosting)
|
||||
.count();
|
||||
}
|
||||
|
||||
private long countOverdraftOnDate(Integer accountId, LocalDate date) {
|
||||
List<HashMap> all = savingsAccountHelper.getSavingsTransactions(accountId);
|
||||
return all.stream().filter(tx -> isDate(tx, date)).map(this::txType)
|
||||
.filter(SavingsAccountTransactionType::isOverDraftInterestPosting).count();
|
||||
}
|
||||
}
|
||||
+11
-2
@@ -168,8 +168,8 @@ public class SavingsProductHelper {
|
||||
map.put("interestReceivableAccountId", this.interestReceivableAccountId);
|
||||
}
|
||||
if (this.accountingRule.equals(ACCRUAL_PERIODIC)) {
|
||||
if (this.interestReceivableAccountId != null) {
|
||||
map.put("interestReceivableAccountId", this.interestReceivableAccountId);
|
||||
if (this.savingsControlAccountId != null) {
|
||||
map.put("savingsControlAccountId", this.savingsControlAccountId);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -202,6 +202,11 @@ public class SavingsProductHelper {
|
||||
return this;
|
||||
}
|
||||
|
||||
public SavingsProductHelper withInterestCompoundingPeriodTypeAsAnnually() {
|
||||
this.interestCompoundingPeriodType = ANNUAL;
|
||||
return this;
|
||||
}
|
||||
|
||||
public SavingsProductHelper withInterestPostingPeriodTypeAsMonthly() {
|
||||
this.interestPostingPeriodType = MONTHLY;
|
||||
return this;
|
||||
@@ -357,6 +362,10 @@ public class SavingsProductHelper {
|
||||
return new BigDecimal(nominalAnnualInterestRate);
|
||||
}
|
||||
|
||||
public BigDecimal getNominalAnnualInterestRateOverdraft() {
|
||||
return new BigDecimal(nominalAnnualInterestRateOverdraft);
|
||||
}
|
||||
|
||||
public BigDecimal getInterestCalculationDaysInYearType() {
|
||||
return new BigDecimal(interestCalculationDaysInYearType);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user