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

[FINERACT-1953] Matured on date fix

Browse Source
This commit is contained in:
taskain7
2023-07-18 17:24:56 +02:00
committed by Adam Saghy
parent d40c023a0d
commit 88635972eb
2 changed files with 12 additions and 1 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
+1 -1
View File
@@ -7124,7 +7124,7 @@ public class Loan extends AbstractAuditableWithUTCDateTimeCustom {
} }
public void handleMaturityDateActivate() { public void handleMaturityDateActivate() {
if (this.expectedMaturityDate != null && this.actualMaturityDate == null) { if (this.expectedMaturityDate != null && !this.expectedMaturityDate.equals(this.actualMaturityDate)) {
this.actualMaturityDate = this.expectedMaturityDate; this.actualMaturityDate = this.expectedMaturityDate;
} }
} }
integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanTransactionChargebackTest.java
+11
View File
@@ -293,6 +293,8 @@ public class LoanTransactionChargebackTest {
getLoansLoanIdResponse = loanTransactionHelper.getLoan(requestSpec, responseSpec, loanId); getLoansLoanIdResponse = loanTransactionHelper.getLoan(requestSpec, responseSpec, loanId);
assertNotNull(getLoansLoanIdResponse); assertNotNull(getLoansLoanIdResponse);
loanTransactionHelper.validateLoanStatus(getLoansLoanIdResponse, "loanStatusType.closed.obligations.met"); loanTransactionHelper.validateLoanStatus(getLoansLoanIdResponse, "loanStatusType.closed.obligations.met");
assertNotNull(getLoansLoanIdResponse.getTimeline());
assertEquals(todaysDate, getLoansLoanIdResponse.getTimeline().getActualMaturityDate());
reviewLoanTransactionRelations(loanId, transactionId, 0, Double.valueOf("0.00")); reviewLoanTransactionRelations(loanId, transactionId, 0, Double.valueOf("0.00"));
@@ -308,6 +310,10 @@ public class LoanTransactionChargebackTest {
loanTransactionHelper.validateLoanPrincipalOustandingBalance(getLoansLoanIdResponse, Double.valueOf("500.00")); loanTransactionHelper.validateLoanPrincipalOustandingBalance(getLoansLoanIdResponse, Double.valueOf("500.00"));
assertNotNull(getLoansLoanIdResponse.getTimeline());
assertEquals(getLoansLoanIdResponse.getTimeline().getExpectedMaturityDate(),
getLoansLoanIdResponse.getTimeline().getActualMaturityDate());
// N+1 Scenario // N+1 Scenario
loanTransactionHelper.printRepaymentSchedule(getLoansLoanIdResponse); loanTransactionHelper.printRepaymentSchedule(getLoansLoanIdResponse);
getLoanRepaymentSchedule = getLoansLoanIdResponse.getRepaymentSchedule(); getLoanRepaymentSchedule = getLoansLoanIdResponse.getRepaymentSchedule();
@@ -397,6 +403,11 @@ public class LoanTransactionChargebackTest {
loanTransactionHelper.validateLoanStatus(getLoansLoanIdResponse, "loanStatusType.active"); loanTransactionHelper.validateLoanStatus(getLoansLoanIdResponse, "loanStatusType.active");
loanTransactionHelper.validateLoanPrincipalOustandingBalance(getLoansLoanIdResponse, Double.valueOf("100.00")); loanTransactionHelper.validateLoanPrincipalOustandingBalance(getLoansLoanIdResponse, Double.valueOf("100.00"));
assertNotNull(getLoansLoanIdResponse.getTimeline());
assertEquals(getLoansLoanIdResponse.getTimeline().getExpectedMaturityDate(),
getLoansLoanIdResponse.getTimeline().getActualMaturityDate());
GetJournalEntriesTransactionIdResponse journalEntries = journalEntryHelper GetJournalEntriesTransactionIdResponse journalEntries = journalEntryHelper
.getJournalEntries("L" + chargebackTransactionId.toString()); .getJournalEntries("L" + chargebackTransactionId.toString());
assertEquals(3L, journalEntries.getTotalFilteredRecords()); assertEquals(3L, journalEntries.getTotalFilteredRecords());