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

FINERACT-2232: DeferredIncomeApi as CapitalizedIncomeApi

Browse Source
This commit is contained in:
Jose Alberto Hernandez
2025-08-19 11:42:58 +02:00
committed by Adam Saghy
parent 77f7d9aab8
commit ea7a2589ca
9 changed files with 117 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanCapitalizedIncomeTest.java
+18 -10
View File
@@ -25,12 +25,13 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDate;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.fineract.client.models.CapitalizedIncomeDetails;
import org.apache.fineract.client.models.GetLoansLoanIdResponse;
import org.apache.fineract.client.models.GetLoansLoanIdTransactions;
import org.apache.fineract.client.models.LoanDeferredIncomeData;
import org.apache.fineract.client.models.LoanCapitalizedIncomeData;
import org.apache.fineract.client.models.PostClientsResponse;
import org.apache.fineract.client.models.PostLoanProductsRequest;
import org.apache.fineract.client.models.PostLoanProductsResponse;
@@ -89,9 +90,16 @@ public class LoanCapitalizedIncomeTest extends BaseLoanIntegrationTest {
transaction(50.0, "Capitalized Income", "01 January 2024"), //
transaction(0.55, "Capitalized Income Amortization", "01 January 2024") //
);
final LoanDeferredIncomeData loanDeferredIncomeData = loanTransactionHelper.fetchDeferredIncomeDetails(loanId);
assertTrue(loanDeferredIncomeData.getCapitalizedIncomeData().size() > 0);
final CapitalizedIncomeDetails capitalizedIncomeData = loanDeferredIncomeData.getCapitalizedIncomeData().get(0);
final LoanCapitalizedIncomeData loanCapitalizedIncomeData = loanTransactionHelper.fetchLoanCapitalizedIncomeData(loanId);
assertTrue(loanCapitalizedIncomeData.getCapitalizedIncomeData().size() > 0);
CapitalizedIncomeDetails capitalizedIncomeData = loanCapitalizedIncomeData.getCapitalizedIncomeData().get(0);
assertNotNull(capitalizedIncomeData);
assertEquals(50.0, Utils.getDoubleValue(capitalizedIncomeData.getAmount()));
assertEquals(0.55, Utils.getDoubleValue(capitalizedIncomeData.getAmortizedAmount()));
final List<CapitalizedIncomeDetails> capitalizedIncomeDetails = loanTransactionHelper.fetchCapitalizedIncomeDetails(loanId);
assertNotNull(capitalizedIncomeDetails);
assertTrue(loanCapitalizedIncomeData.getCapitalizedIncomeData().size() == capitalizedIncomeDetails.size());
capitalizedIncomeData = capitalizedIncomeDetails.get(0);
assertNotNull(capitalizedIncomeData);
assertEquals(50.0, Utils.getDoubleValue(capitalizedIncomeData.getAmount()));
assertEquals(0.55, Utils.getDoubleValue(capitalizedIncomeData.getAmortizedAmount()));
@@ -107,9 +115,9 @@ public class LoanCapitalizedIncomeTest extends BaseLoanIntegrationTest {
transaction(0.03, "Accrual", "02 January 2024"), //
transaction(0.55, "Capitalized Income Amortization", "02 January 2024") //
);
final LoanDeferredIncomeData loanDeferredIncomeData = loanTransactionHelper.fetchDeferredIncomeDetails(loanId);
assertTrue(loanDeferredIncomeData.getCapitalizedIncomeData().size() > 0);
final CapitalizedIncomeDetails capitalizedIncomeData = loanDeferredIncomeData.getCapitalizedIncomeData().get(0);
final List<CapitalizedIncomeDetails> capitalizedIncomeDetails = loanTransactionHelper.fetchCapitalizedIncomeDetails(loanId);
assertTrue(capitalizedIncomeDetails.size() > 0);
final CapitalizedIncomeDetails capitalizedIncomeData = capitalizedIncomeDetails.get(0);
assertNotNull(capitalizedIncomeData);
assertEquals(50.0, Utils.getDoubleValue(capitalizedIncomeData.getAmount()));
assertEquals(1.1, Utils.getDoubleValue(capitalizedIncomeData.getAmortizedAmount()));
@@ -198,9 +206,9 @@ public class LoanCapitalizedIncomeTest extends BaseLoanIntegrationTest {
transaction(50.0, "Capitalized Income", "01 January 2024"), //
transaction(50.0, "Capitalized Income Adjustment", "01 April 2024") //
);
final LoanDeferredIncomeData loanDeferredIncomeData = loanTransactionHelper.fetchDeferredIncomeDetails(loanId);
assertTrue(loanDeferredIncomeData.getCapitalizedIncomeData().size() > 0);
final CapitalizedIncomeDetails capitalizedIncomeData = loanDeferredIncomeData.getCapitalizedIncomeData().get(0);
final List<CapitalizedIncomeDetails> capitalizedIncomeDetails = loanTransactionHelper.fetchCapitalizedIncomeDetails(loanId);
assertTrue(capitalizedIncomeDetails.size() > 0);
final CapitalizedIncomeDetails capitalizedIncomeData = capitalizedIncomeDetails.get(0);
assertNotNull(capitalizedIncomeData);
assertEquals(50.0, Utils.getDoubleValue(capitalizedIncomeData.getAmount()));
assertEquals(50.0, Utils.getDoubleValue(capitalizedIncomeData.getAmountAdjustment()));
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/loans/LoanTransactionHelper.java
+9 -3
View File
@@ -46,6 +46,7 @@ import java.util.Map;
import lombok.extern.slf4j.Slf4j;
import org.apache.fineract.client.models.AdvancedPaymentData;
import org.apache.fineract.client.models.BuyDownFeeAmortizationDetails;
import org.apache.fineract.client.models.CapitalizedIncomeDetails;
import org.apache.fineract.client.models.CommandProcessingResult;
import org.apache.fineract.client.models.DeleteLoansLoanIdChargesChargeIdResponse;
import org.apache.fineract.client.models.DeleteLoansLoanIdResponse;
@@ -69,7 +70,7 @@ import org.apache.fineract.client.models.GetLoansLoanIdTransactionsTemplateRespo
import org.apache.fineract.client.models.GetLoansLoanIdTransactionsTransactionIdResponse;
import org.apache.fineract.client.models.GetLoansResponse;
import org.apache.fineract.client.models.InterestPauseRequestDto;
import org.apache.fineract.client.models.LoanDeferredIncomeData;
import org.apache.fineract.client.models.LoanCapitalizedIncomeData;
import org.apache.fineract.client.models.PaymentTypeData;
import org.apache.fineract.client.models.PostAddAndDeleteDisbursementDetailRequest;
import org.apache.fineract.client.models.PostLoanProductsRequest;
@@ -3048,8 +3049,13 @@ public class LoanTransactionHelper {
.ok(FineractClientHelper.getFineractClient().loanTransactions.executeLoanTransaction(loanId, request, "undo-charge-off"));
}
public LoanDeferredIncomeData fetchDeferredIncomeDetails(Long loanId) {
return Calls.ok(FineractClientHelper.getFineractClient().loanDeferredIncome.fetchDeferredIncomeDetails(loanId));
@Deprecated(forRemoval = true)
public LoanCapitalizedIncomeData fetchLoanCapitalizedIncomeData(Long loanId) {
return Calls.ok(FineractClientHelper.getFineractClient().loanCapitalizedIncome.fetchLoanCapitalizedIncomeData(loanId));
}
public List<CapitalizedIncomeDetails> fetchCapitalizedIncomeDetails(Long loanId) {
return Calls.ok(FineractClientHelper.getFineractClient().loanCapitalizedIncome.fetchCapitalizedIncomeDetails(loanId));
}
// TODO: Rewrite to use fineract-client instead!