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

FINERACT-2081: Loan account approval and disburse validation error code changed

Browse Source
This commit is contained in:
Jose Alberto Hernandez
2024-08-23 21:06:45 +02:00
committed by Adam Saghy
parent 3456e1eb81
commit 4698764e07
3 changed files with 242 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/serialization/LoanApplicationValidator.java
+3 -3
View File
@@ -2032,7 +2032,7 @@ public final class LoanApplicationValidator {
compareApprovedToProposedPrincipal(loan, approvedLoanAmount);
}
if (expectedDisbursementDate != null) {
if (approvedOnDate != null && expectedDisbursementDate != null) {
if (DateUtils.isBefore(expectedDisbursementDate, approvedOnDate)) {
final String errorMessage = "The expected disbursement date " + expectedDisbursementDate
+ " should be either on or after the approval date: " + approvedOnDate;
@@ -2041,7 +2041,7 @@ public final class LoanApplicationValidator {
}
}
if (client != null && client.getOfficeJoiningDate() != null) {
if (client != null && client.getOfficeJoiningDate() != null && approvedOnDate != null) {
final LocalDate clientOfficeJoiningDate = client.getOfficeJoiningDate();
if (DateUtils.isBefore(approvedOnDate, clientOfficeJoiningDate)) {
throw new InvalidLoanStateTransitionException("approval", "cannot.be.before.client.transfer.date",
@@ -2050,7 +2050,7 @@ public final class LoanApplicationValidator {
}
}
if (DateUtils.isDateInTheFuture(approvedOnDate)) {
if (approvedOnDate != null && DateUtils.isDateInTheFuture(approvedOnDate)) {
final String errorMessage = "The date on which a loan is approved cannot be in the future.";
throw new InvalidLoanStateTransitionException("approval", "cannot.be.a.future.date", errorMessage, approvedOnDate);
}
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/serialization/LoanTransactionValidator.java
+1 -1
View File
@@ -225,7 +225,7 @@ public final class LoanTransactionValidator {
}
LocalDate approvedOnDate = loan.getApprovedOnDate();
if (DateUtils.isBefore(actualDisbursementDate, approvedOnDate)) {
if (actualDisbursementDate != null && DateUtils.isBefore(actualDisbursementDate, approvedOnDate)) {
final String errorMessage = "The date on which a loan is disbursed cannot be before its approval date: " + approvedOnDate;
throw new InvalidLoanStateTransitionException("disbursal", "cannot.be.before.approval.date", errorMessage,
actualDisbursementDate, approvedOnDate);