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

FINERACT-2232: Add missing fields on the Capitalized Income and Adjustment transactions

Browse Source
This commit is contained in:
Jose Alberto Hernandez
2025-06-12 23:47:49 +02:00
committed by Adam Saghy
parent c490e167b8
commit de580c2cef
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-progressive-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/service/CapitalizedIncomeWritePlatformServiceImpl.java
+10 -3
View File
@@ -104,6 +104,9 @@ public class CapitalizedIncomeWritePlatformServiceImpl implements CapitalizedInc
return new CommandProcessingResultBuilder() //
.withEntityId(capitalizedIncomeTransaction.getId()) //
.withEntityExternalId(capitalizedIncomeTransaction.getExternalId()) //
.withOfficeId(loan.getOfficeId()) //
.withClientId(loan.getClientId()) //
.withLoanId(loan.getId()) //
.build();
}
@@ -150,9 +153,13 @@ public class CapitalizedIncomeWritePlatformServiceImpl implements CapitalizedInc
MathUtil.negativeToZero(capitalizedIncomeBalance.getUnrecognizedAmount().subtract(transactionAmount)));
capitalizedIncomeBalanceRepository.save(capitalizedIncomeBalance);
return new CommandProcessingResultBuilder().withLoanId(loan.getId()).withLoanExternalId(loan.getExternalId())
.withEntityId(savedCapitalizedIncomeAdjustment.getId())
.withEntityExternalId(savedCapitalizedIncomeAdjustment.getExternalId()).build();
return new CommandProcessingResultBuilder() //
.withEntityId(savedCapitalizedIncomeAdjustment.getId()) //
.withEntityExternalId(savedCapitalizedIncomeAdjustment.getExternalId()) //
.withOfficeId(loan.getOfficeId()) //
.withClientId(loan.getClientId()) //
.withLoanId(loan.getId()) //
.build();
}
private void recalculateLoanTransactions(Loan loan, LocalDate transactionDate, LoanTransaction transaction) {
integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanCapitalizedIncomeTest.java
+9 -1
View File
@@ -18,6 +18,7 @@
*/
package org.apache.fineract.integrationtests;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.math.BigDecimal;
@@ -165,7 +166,11 @@ public class LoanCapitalizedIncomeTest extends BaseLoanIntegrationTest {
"1 January 2024", 50.0);
capitalizedIncomeIdRef.set(capitalizedIncomeResponse.getResourceId());
loanTransactionHelper.capitalizedIncomeAdjustment(loanId, capitalizedIncomeIdRef.get(), "1 April 2024", 50.0);
PostLoansLoanIdTransactionsResponse capitalizedIncomeAdjustmentResponse = loanTransactionHelper
.capitalizedIncomeAdjustment(loanId, capitalizedIncomeIdRef.get(), "1 April 2024", 50.0);
assertNotNull(capitalizedIncomeAdjustmentResponse.getLoanId());
assertNotNull(capitalizedIncomeAdjustmentResponse.getClientId());
assertNotNull(capitalizedIncomeAdjustmentResponse.getOfficeId());
verifyTransactions(loanId, //
transaction(100.0, "Disbursement", "01 January 2024"), //
@@ -409,6 +414,9 @@ public class LoanCapitalizedIncomeTest extends BaseLoanIntegrationTest {
disburseLoan(loanId, BigDecimal.valueOf(100), "1 January 2024");
PostLoansLoanIdTransactionsResponse capitalizedIncomeResponse = loanTransactionHelper.addCapitalizedIncome(loanId,
"1 January 2024", 100.0);
assertNotNull(capitalizedIncomeResponse.getLoanId());
assertNotNull(capitalizedIncomeResponse.getClientId());
assertNotNull(capitalizedIncomeResponse.getOfficeId());
capitalizedIncomeIdRef.set(capitalizedIncomeResponse.getResourceId());
// random midday COB run