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

FINERACT-2326: Fix for loading loan summaries for multiple loans

Browse Source
This commit is contained in:
Arnold Galovics
2025-09-10 21:21:32 +02:00
committed by Arnold Gálovics
parent 2ea85ea37d
commit 0c0d8592bb
2 changed files with 87 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-progressive-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/repository/CustomizedLoanCapitalizedIncomeBalanceRepositoryImpl.java
+1 -1
View File
@@ -49,7 +49,7 @@ public class CustomizedLoanCapitalizedIncomeBalanceRepositoryImpl implements Cus
loanIds = new ArrayList<>(loanIds); loanIds = new ArrayList<>(loanIds);
TypedQuery<LoanTransactionRepaymentPeriodData> query = entityManager.createQuery( TypedQuery<LoanTransactionRepaymentPeriodData> query = entityManager.createQuery(
LoanCapitalizedIncomeBalanceRepository.FIND_BALANCE_REPAYMENT_SCHEDULE_DATA + " WHERE lcib.loan.id IN (:loanIds)", LoanCapitalizedIncomeBalanceRepository.FIND_BALANCE_REPAYMENT_SCHEDULE_DATA + " WHERE lcib.loan.id IN :loanIds",
LoanTransactionRepaymentPeriodData.class); LoanTransactionRepaymentPeriodData.class);
query.setParameter("loanIds", loanIds); query.setParameter("loanIds", loanIds);
List<LoanTransactionRepaymentPeriodData> result = query.getResultList(); List<LoanTransactionRepaymentPeriodData> result = query.getResultList();
integration-tests/src/test/java/org/apache/fineract/integrationtests/loan/LoanApiIntegrationTest.java
+86
View File
@@ -214,6 +214,92 @@ public class LoanApiIntegrationTest extends BaseLoanIntegrationTest {
}); });
} }
@Test
public void test_retrieveLoansWithSummaryForMultipleLoans_Works() {
AtomicLong createdClientId = new AtomicLong();
AtomicLong createdLoanId = new AtomicLong();
AtomicLong createdLoanId2 = new AtomicLong();
runAt("01 January 2023", () -> {
// Create Client
Long clientId = clientHelper.createClient(ClientHelper.defaultClientCreationRequest()).getClientId();
createdClientId.getAndSet(clientId);
int numberOfRepayments = 3;
int repaymentEvery = 1;
// Create Loan Product
PostLoanProductsRequest product = createOnePeriod30DaysLongNoInterestPeriodicAccrualProduct() //
.numberOfRepayments(numberOfRepayments) //
.repaymentEvery(repaymentEvery) //
.installmentAmountInMultiplesOf(null) //
.repaymentFrequencyType(RepaymentFrequencyType.MONTHS.longValue()) //
.interestType(InterestType.DECLINING_BALANCE)//
.interestRatePerPeriod(10.0)//
.interestCalculationPeriodType(InterestCalculationPeriodType.DAILY)//
.interestRecalculationCompoundingMethod(InterestRecalculationCompoundingMethod.NONE)//
.rescheduleStrategyMethod(RescheduleStrategyMethod.ADJUST_LAST_UNPAID_PERIOD)//
.isInterestRecalculationEnabled(true)//
.recalculationRestFrequencyInterval(1)//
.recalculationRestFrequencyType(RecalculationRestFrequencyType.DAILY)//
.rescheduleStrategyMethod(RescheduleStrategyMethod.REDUCE_EMI_AMOUNT)//
.allowPartialPeriodInterestCalcualtion(false)//
.disallowExpectedDisbursements(false)//
.allowApprovedDisbursedAmountsOverApplied(false)//
.overAppliedNumber(null)//
.overAppliedCalculationType(null)//
.multiDisburseLoan(null);//
PostLoanProductsResponse loanProductResponse = loanProductHelper.createLoanProduct(product);
Long loanProductId = loanProductResponse.getResourceId();
// Apply and Approve Loan
double amount = 5000.0;
PostLoansRequest applicationRequest = applyLoanRequest(clientId, loanProductId, "01 January 2023", amount, numberOfRepayments)//
.repaymentEvery(repaymentEvery)//
.interestRatePerPeriod(BigDecimal.valueOf(10.0))//
.loanTermFrequency(numberOfRepayments)//
.repaymentFrequencyType(RepaymentFrequencyType.MONTHS)//
.loanTermFrequencyType(RepaymentFrequencyType.MONTHS)//
.interestType(InterestType.DECLINING_BALANCE)//
.interestCalculationPeriodType(InterestCalculationPeriodType.DAILY);//
PostLoansRequest applicationRequest2 = applyLoanRequest(clientId, loanProductId, "01 January 2023", amount, numberOfRepayments)//
.repaymentEvery(repaymentEvery)//
.interestRatePerPeriod(BigDecimal.valueOf(10.0))//
.loanTermFrequency(numberOfRepayments)//
.repaymentFrequencyType(RepaymentFrequencyType.MONTHS)//
.loanTermFrequencyType(RepaymentFrequencyType.MONTHS)//
.interestType(InterestType.DECLINING_BALANCE)//
.interestCalculationPeriodType(InterestCalculationPeriodType.DAILY);//
PostLoansResponse postLoansResponse = loanTransactionHelper.applyLoan(applicationRequest);
PostLoansResponse postLoansResponse2 = loanTransactionHelper.applyLoan(applicationRequest2);
PostLoansLoanIdResponse approvedLoanResult = loanTransactionHelper.approveLoan(postLoansResponse.getResourceId(),
approveLoanRequest(amount, "01 January 2023"));
PostLoansLoanIdResponse approvedLoanResult2 = loanTransactionHelper.approveLoan(postLoansResponse2.getResourceId(),
approveLoanRequest(amount, "01 January 2023"));
Long loanId = approvedLoanResult.getLoanId();
createdLoanId.getAndSet(loanId);
Long loanId2 = approvedLoanResult2.getLoanId();
createdLoanId2.getAndSet(loanId2);
// disburse Loan
disburseLoan(loanId, BigDecimal.valueOf(amount), "01 January 2023");
disburseLoan(loanId2, BigDecimal.valueOf(amount), "01 January 2023");
});
runAt("01 February 2023", () -> {
GetLoansResponse loansLoanIdResponse = loanTransactionHelper.retrieveAllLoans(null, "summary", createdClientId.get());
loansLoanIdResponse.getPageItems().stream().forEach(r -> {
BigDecimal totalUnpaidPayableDueInterest = r.getSummary().getTotalUnpaidPayableDueInterest();
assertThat(totalUnpaidPayableDueInterest).isEqualByComparingTo(BigDecimal.valueOf(509.59));
});
});
}
@Test @Test
public void test_retrieveLoansWithSummaryWithoutDisbursement_Works() { public void test_retrieveLoansWithSummaryWithoutDisbursement_Works() {
AtomicLong createdLoanId = new AtomicLong(); AtomicLong createdLoanId = new AtomicLong();