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

FINERACT-1971: Fix next payment due date loan delinquent detail

Browse Source
This commit is contained in:
Ruchi Dhamankar
2024-01-12 15:57:06 +01:00
committed by Adam Saghy
parent e3a771aa71
commit 0672996678
9 changed files with 425 additions and 6 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
+36 -1
View File
@@ -190,6 +190,8 @@ public class Loan extends AbstractAuditableWithUTCDateTimeCustom {
public static final String WRITTEN_OFF_ON_DATE = "writtenOffOnDate";
public static final String FEE = "fee";
public static final String PENALTIES = "penalties";
public static final String EARLIEST_UNPAID_DATE = "earliest-unpaid-date";
public static final String NEXT_UNPAID_DUE_DATE = "next-unpaid-due-date";
/** Disable optimistic locking till batch jobs failures can be fixed **/
@Version
int version;
@@ -3624,7 +3626,40 @@ public class Loan extends AbstractAuditableWithUTCDateTimeCustom {
return isChronologicallyLatestRepaymentOrWaiver;
}
public LocalDate possibleNextRepaymentDate() {
public LocalDate possibleNextRepaymentDate(final String nextPaymentDueDateConfig) {
LocalDate nextPossibleRepaymentDate = null;
if (EARLIEST_UNPAID_DATE.equalsIgnoreCase(nextPaymentDueDateConfig)) {
nextPossibleRepaymentDate = getEarliestUnpaidInstallmentDate();
} else if (NEXT_UNPAID_DUE_DATE.equalsIgnoreCase(nextPaymentDueDateConfig)) {
nextPossibleRepaymentDate = getNextUnpaidInstallmentDueDate();
}
return nextPossibleRepaymentDate;
}
private LocalDate getNextUnpaidInstallmentDueDate() {
LocalDate nextUnpaidInstallmentDate = null;
List<LoanRepaymentScheduleInstallment> installments = getRepaymentScheduleInstallments();
LocalDate currentBusinessDate = DateUtils.getBusinessLocalDate();
LocalDate expectedMaturityDate = determineExpectedMaturityDate();
for (final LoanRepaymentScheduleInstallment installment : installments) {
boolean isCurrentDateBeforeInstallmentAndLoanPeriod = DateUtils.isBefore(currentBusinessDate, installment.getDueDate())
&& DateUtils.isBefore(currentBusinessDate, expectedMaturityDate);
if (installment.isDownPayment()) {
isCurrentDateBeforeInstallmentAndLoanPeriod = DateUtils.isEqual(currentBusinessDate, installment.getDueDate())
&& DateUtils.isBefore(currentBusinessDate, expectedMaturityDate);
}
if (isCurrentDateBeforeInstallmentAndLoanPeriod) {
if (installment.isNotFullyPaidOff()) {
nextUnpaidInstallmentDate = installment.getDueDate();
break;
}
}
}
return nextUnpaidInstallmentDate;
}
private LocalDate getEarliestUnpaidInstallmentDate() {
LocalDate earliestUnpaidInstallmentDate = DateUtils.getBusinessLocalDate();
List<LoanRepaymentScheduleInstallment> installments = getRepaymentScheduleInstallments();
for (final LoanRepaymentScheduleInstallment installment : installments) {