CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 64 Packages Projects Releases Wiki Activity

FINERACT-1971: update installment accrued portions on charge accrual

Browse Source
This commit is contained in:
adam.magyari
2024-12-10 15:04:01 +01:00
committed by Adam Saghy
parent bc2ef08e0c
commit d0006a2169
2 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java
+7
View File
@@ -769,6 +769,13 @@ public class Loan extends AbstractAuditableWithUTCDateTimeCustom<Long> {
transactionDate, feeCharges, penaltyCharges, externalId);
Integer installmentNumber = null;
final LoanRepaymentScheduleInstallment installmentForCharge = this.getRelatedRepaymentScheduleInstallment(loanCharge.getDueDate());
if (installmentForCharge != null) {
installmentForCharge.updateAccrualPortion(installmentForCharge.getInterestAccrued(this.getCurrency()),
installmentForCharge.getFeeAccrued(this.getCurrency()).add(feeCharges),
installmentForCharge.getPenaltyAccrued(this.getCurrency()).add(penaltyCharges));
installmentNumber = installmentForCharge.getInstallmentNumber();
}
final LoanChargePaidBy loanChargePaidBy = new LoanChargePaidBy(applyLoanChargeTransaction, loanCharge,
loanCharge.getAmount(getCurrency()).getAmount(), installmentNumber);
applyLoanChargeTransaction.getLoanChargesPaid().add(loanChargePaidBy);
integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanChargeProgressiveTest.java
+24
View File
@@ -25,7 +25,9 @@ import org.apache.fineract.client.models.GetLoansLoanIdResponse;
import org.apache.fineract.client.models.PostChargesResponse;
import org.apache.fineract.client.models.PostLoanProductsResponse;
import org.apache.fineract.client.models.PostLoansResponse;
import org.apache.fineract.infrastructure.configuration.api.GlobalConfigurationConstants;
import org.apache.fineract.integrationtests.common.ClientHelper;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -65,4 +67,26 @@ public class LoanChargeProgressiveTest extends BaseLoanIntegrationTest {
validateRepaymentPeriod(loanDetails2, 5, LocalDate.of(2024, 10, 2), 0, 20, 0, 0);
});
}
@Test
public void immediateChargeAccrualPostMaturityTest() {
runAt("03 October 2024", () -> {
executeInlineCOB(loanId);
globalConfigurationHelper.manageConfigurations(GlobalConfigurationConstants.ENABLE_IMMEDIATE_CHARGE_ACCRUAL_POST_MATURITY,
true);
final PostChargesResponse chargeResponse = createCharge(20.0d, "EUR");
addLoanCharge(loanId, chargeResponse.getResourceId(), "03 October 2024", 20.0d);
final GetLoansLoanIdResponse loanDetails = loanTransactionHelper.getLoanDetails(loanId);
Assertions.assertTrue(
loanDetails.getTransactions().stream().anyMatch(t -> t.getType().getAccrual() && t.getAmount().equals(20.0d)));
});
runAt("04 October 2024", () -> {
globalConfigurationHelper.manageConfigurations(GlobalConfigurationConstants.ENABLE_IMMEDIATE_CHARGE_ACCRUAL_POST_MATURITY,
false);
executeInlineCOB(loanId);
final GetLoansLoanIdResponse loanDetails = loanTransactionHelper.getLoanDetails(loanId);
Assertions.assertTrue(
loanDetails.getTransactions().stream().anyMatch(t -> t.getType().getAccrual() && t.getAmount().equals(20.0d)));
});
}
}