Skip to content

FINERACT-2455: Working Capital Loan - Repayment - on closed loans #6032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
somasorosdpc wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

FINERACT-2455: Working Capital Loan - Repayment - on closed loans #6032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 81 additions & 0 deletions ...e-tests-runner/src/test/resources/features/WorkingCapitalLoanRepaymentOverpayment.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
@WorkingCapital
@WorkingCapitalLoanRepaymentOverpaymentFeature
Feature: Working Capital Loan Repayment - Overpayment

@TestRailId:TODO_ADD_3
Scenario: Verify fully repaid Working Capital loan accepts repayment and its status goes to overpaid
When Admin sets the business date to "01 January 2026"
And Admin creates a client with random data
And Admin creates a working capital loan with the following data:
| LoanProduct | submittedOnDate | expectedDisbursementDate | principalAmount | totalPaymentVolume | periodPaymentRate | discount |
| WCLP | 01 January 2026 | 01 January 2026 | 9000 | 100000 | 18 | 0 |
And Admin successfully approves the working capital loan on "01 January 2026" with "9000" amount and expected disbursement date on "01 January 2026"
Then Working capital loan approval was successful
And Working capital loan account has the correct data:
| product.name | submittedOnDate | expectedDisbursementDate | status | proposedPrincipal | approvedPrincipal | totalPaymentVolume | periodPaymentRate | discountApproved |
| WCLP | 2026-01-01 | 2026-01-01 | Approved | 9000.0 | 9000.0 | 100000.0 | 18.0 | null |
When Admin successfully disburse the Working Capital loan on "01 January 2026" with "9000" EUR transaction amount
Then Working Capital loan status will be "ACTIVE"
And Verify Working Capital loan disbursement was successful
And Working capital loan account has the correct data:
| product.name | submittedOnDate | expectedDisbursementDate | status | principal | approvedPrincipal | totalPaymentVolume | periodPaymentRate | discount |
| WCLP | 2026-01-01 | 2026-01-01 | Active | 9000.0 | 9000.0 | 100000.0 | 18.0 | null |

When Admin sets the business date to "20 January 2026"
And Admin runs inline COB job for Working Capital Loan by loanId
And Customer makes repayment on "20 January 2026" with 9000.0 transaction amount on Working Capital loan

And Working capital loan account has the correct data:
| product.name | submittedOnDate | expectedDisbursementDate | status | principal | approvedPrincipal | totalPaymentVolume | periodPaymentRate | discount | totalPaidPrincipal | overpaymentAmount |
| WCLP | 2026-01-01 | 2026-01-01 | Closed (obligations met) | 9000.0 | 9000.0 | 100000.0 | 18.0 | null | 9000.0 | 0.0 |

Then Working Capital loan status will be "CLOSED_OBLIGATIONS_MET"

When Admin sets the business date to "21 January 2026"
And Admin runs inline COB job for Working Capital Loan by loanId
And Customer makes repayment on "21 January 2026" with 199.0 transaction amount on Working Capital loan

And Working capital loan account has the correct data:
| product.name | submittedOnDate | expectedDisbursementDate | status | principal | approvedPrincipal | totalPaymentVolume | periodPaymentRate | discount | totalPaidPrincipal | overpaymentAmount |
| WCLP | 2026-01-01 | 2026-01-01 | Overpaid | 9000.0 | 9000.0 | 100000.0 | 18.0 | null | 9000.0 | 199.0 |
Then Working Capital loan status will be "OVERPAID"


@TestRailId:TODO_ADD_4
Scenario: Verify overpaid Working Capital loan accepts repayment and its status is overpaid
When Admin sets the business date to "01 January 2026"
And Admin creates a client with random data
And Admin creates a working capital loan with the following data:
| LoanProduct | submittedOnDate | expectedDisbursementDate | principalAmount | totalPaymentVolume | periodPaymentRate | discount |
| WCLP | 01 January 2026 | 01 January 2026 | 9000 | 100000 | 18 | 0 |
And Admin successfully approves the working capital loan on "01 January 2026" with "9000" amount and expected disbursement date on "01 January 2026"
Then Working capital loan approval was successful
And Working capital loan account has the correct data:
| product.name | submittedOnDate | expectedDisbursementDate | status | proposedPrincipal | approvedPrincipal | totalPaymentVolume | periodPaymentRate | discountApproved |
| WCLP | 2026-01-01 | 2026-01-01 | Approved | 9000.0 | 9000.0 | 100000.0 | 18.0 | null |
When Admin successfully disburse the Working Capital loan on "01 January 2026" with "9000" EUR transaction amount
Then Working Capital loan status will be "ACTIVE"
And Verify Working Capital loan disbursement was successful
And Working capital loan account has the correct data:
| product.name | submittedOnDate | expectedDisbursementDate | status | principal | approvedPrincipal | totalPaymentVolume | periodPaymentRate | discount |
| WCLP | 2026-01-01 | 2026-01-01 | Active | 9000.0 | 9000.0 | 100000.0 | 18.0 | null |

When Admin sets the business date to "20 January 2026"
And Admin runs inline COB job for Working Capital Loan by loanId
And Customer makes repayment on "20 January 2026" with 9200.0 transaction amount on Working Capital loan

And Working capital loan account has the correct data:
| product.name | submittedOnDate | expectedDisbursementDate | status | principal | approvedPrincipal | totalPaymentVolume | periodPaymentRate | discount | totalPaidPrincipal | overpaymentAmount |
| WCLP | 2026-01-01 | 2026-01-01 | Overpaid | 9000.0 | 9000.0 | 100000.0 | 18.0 | null | 9000.0 | 200.0 |

Then Working Capital loan status will be "OVERPAID"

When Admin sets the business date to "21 January 2026"
And Admin runs inline COB job for Working Capital Loan by loanId
And Customer makes repayment on "21 January 2026" with 199.0 transaction amount on Working Capital loan

And Working capital loan account has the correct data:
| product.name | submittedOnDate | expectedDisbursementDate | status | principal | approvedPrincipal | totalPaymentVolume | periodPaymentRate | discount | totalPaidPrincipal | overpaymentAmount |
| WCLP | 2026-01-01 | 2026-01-01 | Overpaid | 9000.0 | 9000.0 | 100000.0 | 18.0 | null | 9000.0 | 399.0 |

Then Working Capital loan status will be "OVERPAID"
2 changes: 1 addition & 1 deletion ...fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanLifecycleStateMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ private LoanStatus getNextStatus(final WorkingCapitalLoanEvent event, final Work
case LOAN_DISBURSED -> from.isApproved() ? LoanStatus.ACTIVE : null;
case LOAN_DISBURSAL_UNDO -> from.isActive() ? LoanStatus.APPROVED : null;
case LOAN_REPAID_IN_FULL -> from.isActive() ? LoanStatus.CLOSED_OBLIGATIONS_MET : null;
case LOAN_OVERPAID -> (from.isActive() || from.isOverpaid()) ? LoanStatus.OVERPAID : null;
case LOAN_OVERPAID -> (from.isActive() || from.isClosedObligationsMet() || from.isOverpaid()) ? LoanStatus.OVERPAID : null;
case LOAN_CREDIT_BALANCE_REFUND_IN_FULL -> from.isOverpaid() ? LoanStatus.CLOSED_OBLIGATIONS_MET : null;
};
}
Expand Down
3 changes: 2 additions & 1 deletion .../fineract/portfolio/workingcapitalloan/serialization/WorkingCapitalLoanDataValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,7 +693,8 @@ public void validateRepayment(final String json, final WorkingCapitalLoan loan,
throwExceptionIfValidationWarningsExist(dataValidationErrors);

if (LoanTransactionType.REPAYMENT.equals(goodwillCredit)) {
if (loan.getLoanStatus() != LoanStatus.ACTIVE && loan.getLoanStatus() != LoanStatus.OVERPAID) {
if (!LoanStatus.ACTIVE.equals(loan.getLoanStatus()) && !LoanStatus.CLOSED_OBLIGATIONS_MET.equals(loan.getLoanStatus())
&& !LoanStatus.OVERPAID.equals(loan.getLoanStatus())) {
throw new PlatformApiDataValidationException("validation.msg.wc.loan.transition.not.allowed",
"Repayment is allowed only for active/overpaid loans", WorkingCapitalLoanConstants.loanStatusParamName);
}
Expand Down