Skip to content

Commit caf79e3

Browse files
oleksii-novikov-onixoleksii-novikov-onix
committed
FINERACT-2319: Repayment allocation prefers future dated penalty first
1 parent 4c3da5b commit caf79e3

4 files changed

Lines changed: 126 additions & 1 deletion

File tree

‎fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/loanproduct/DefaultLoanProduct.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ public enum DefaultLoanProduct implements LoanProduct {
5555
LP2_DOWNPAYMENT_ADV_PMT_ALLOC_FIXED_LENGTH, //
5656
LP2_DOWNPAYMENT_AUTO_ADVANCED_PAYMENT_ALLOCATION_REPAYMENT_START_SUBMITTED, //
5757
LP2_DOWNPAYMENT_INTEREST_FLAT_ADV_PMT_ALLOC, //
58+
LP2_NO_INTEREST_ADV_PMT_ALLOC, //
5859
LP2_ADV_PYMNT_INTEREST_RECALCULATION_DAILY_EMI_360_30_MULTIDISBURSE_DOWNPAYMENT, //
5960
LP2_ADV_PYMNT_INTEREST_RECALCULATION_DAILY_EMI_360_30_MULTIDISBURSE_AUTO_DOWNPAYMENT, //
6061
LP2_ADV_PYMNT_INTEREST_DAILY_EMI_ACTUAL_ACTUAL, //
@@ -104,6 +105,7 @@ public enum DefaultLoanProduct implements LoanProduct {
104105
LP2_ADV_PYMNT_ACCELERATE_MATURITY_CHARGE_OFF_BEHAVIOUR, //
105106
LP2_NO_INTEREST_RECALCULATION_CHARGEBACK_ALLOCATION_INTEREST_FIRST, //
106107
LP2_NO_INTEREST_RECALCULATION_CHARGEBACK_ALLOCATION_PRINCIPAL_FIRST, //
108+
LP2_NO_INTEREST_RECALCULATION_ALLOCATION_PENALTY_FIRST, //
107109
LP2_ADV_PYMNT_INTEREST_DAILY_INTEREST_RECALC_EMI_360_30_CHARGEBACK_INTEREST_PENALTY_FEE_PRINCIPAL, //
108110
LP2_ADV_PYMNT_INTEREST_DAILY_INTEREST_RECALC_EMI_360_30_CHARGEBACK_INTEREST_FEE_PRINCIPAL, //
109111
LP2_ADV_PYMNT_INTEREST_DAILY_INTEREST_RECALC_EMI_360_30_CHARGEBACK_PRINCIPAL_INTEREST_FEE, //

‎fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/LoanProductGlobalInitializerStep.java‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2953,6 +2953,38 @@ public void initialize() throws Exception {
29532953
.createLoanProduct(loanProductsRequestLP2ProgressiveAdvPaymentBuyDownFees).execute();
29542954
TestContext.INSTANCE.set(TestContextKey.DEFAULT_LOAN_PRODUCT_CREATE_RESPONSE_LP2_PROGRESSIVE_ADV_PYMNT_BUYDOWN_FEES,
29552955
responseLoanProductsRequestLP2ProgressiveAdvPaymentBuyDownFees);
2956+
2957+
// LP2 without Down-payment + interest recalculation disabled + advanced payment allocation + progressive loan
2958+
// schedule + horizontal + allocation penalty first
2959+
// (LP2_NO_INTEREST_RECALCULATION_ALLOCATION_PENALTY_FIRST)
2960+
String name115 = DefaultLoanProduct.LP2_NO_INTEREST_RECALCULATION_ALLOCATION_PENALTY_FIRST.getName();
2961+
PostLoanProductsRequest loanProductsRequestNoInterestRecalculationAllocationPenaltyFirst = loanProductsRequestFactory
2962+
.defaultLoanProductsRequestLP2()//
2963+
.name(name115)//
2964+
.transactionProcessingStrategyCode(ADVANCED_PAYMENT_ALLOCATION.getValue())//
2965+
.loanScheduleType("PROGRESSIVE") //
2966+
.loanScheduleProcessingType("HORIZONTAL")//
2967+
.enableDownPayment(false)//
2968+
.enableAutoRepaymentForDownPayment(null)//
2969+
.disbursedAmountPercentageForDownPayment(null)//
2970+
.paymentAllocation(List.of(//
2971+
createPaymentAllocation("DEFAULT", "LAST_INSTALLMENT",
2972+
LoanProductPaymentAllocationRule.AllocationTypesEnum.PAST_DUE_PENALTY, //
2973+
LoanProductPaymentAllocationRule.AllocationTypesEnum.PAST_DUE_INTEREST, //
2974+
LoanProductPaymentAllocationRule.AllocationTypesEnum.PAST_DUE_PRINCIPAL, //
2975+
LoanProductPaymentAllocationRule.AllocationTypesEnum.PAST_DUE_FEE, //
2976+
LoanProductPaymentAllocationRule.AllocationTypesEnum.DUE_PENALTY, //
2977+
LoanProductPaymentAllocationRule.AllocationTypesEnum.DUE_INTEREST, //
2978+
LoanProductPaymentAllocationRule.AllocationTypesEnum.DUE_PRINCIPAL, //
2979+
LoanProductPaymentAllocationRule.AllocationTypesEnum.DUE_FEE, //
2980+
LoanProductPaymentAllocationRule.AllocationTypesEnum.IN_ADVANCE_PENALTY, //
2981+
LoanProductPaymentAllocationRule.AllocationTypesEnum.IN_ADVANCE_INTEREST, //
2982+
LoanProductPaymentAllocationRule.AllocationTypesEnum.IN_ADVANCE_PRINCIPAL, //
2983+
LoanProductPaymentAllocationRule.AllocationTypesEnum.IN_ADVANCE_FEE)));//
2984+
Response<PostLoanProductsResponse> responseLoanProductsRequestNoInterestRecalculationAllocationPenaltyFirst = loanProductsApi
2985+
.createLoanProduct(loanProductsRequestNoInterestRecalculationAllocationPenaltyFirst).execute();
2986+
TestContext.INSTANCE.set(TestContextKey.LP2_NO_INTEREST_RECALCULATION_ALLOCATION_PENALTY_FIRST_RESPONSE,
2987+
responseLoanProductsRequestNoInterestRecalculationAllocationPenaltyFirst);
29562988
}
29572989

29582990
public static AdvancedPaymentData createPaymentAllocation(String transactionType, String futureInstallmentAllocationRule,

‎fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/support/TestContextKey.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ public abstract class TestContextKey {
162162
public static final String DEFAULT_LOAN_PRODUCT_CREATE_RESPONSE_LP2_ADV_PYMNT_360_30_INTEREST_RECALCULATION_ZERO_INTEREST_CHARGE_OFF_ACCRUAL_ACTIVITY = "loanProductCreateResponseLP2AdvancedPaymentInterestDailyInterestRecalculationZeroInterestChargeOffBehaviourAccrualActivity";
163163
public static final String LP2_NO_INTEREST_RECALCULATION_CHARGEBACK_ALLOCATION_INTEREST_FIRST_RESPONSE = "loanProductCreateResponseLP2NoInterestRecalculationChargebackAllocationInterestFirst";
164164
public static final String LP2_NO_INTEREST_RECALCULATION_CHARGEBACK_ALLOCATION_PRINCIPAL_FIRST_RESPONSE = "loanProductCreateResponseLP2NoInterestRecalculationChargebackAllocationPrincipalFirst";
165+
public static final String LP2_NO_INTEREST_RECALCULATION_ALLOCATION_PENALTY_FIRST_RESPONSE = "loanProductCreateResponseLP2NoInterestRecalculationAllocationPenaltyFirst";
165166
public static final String DEFAULT_LOAN_PRODUCT_CREATE_RESPONSE_LP2_ADV_PYMNT_INTEREST_DAILY_INTEREST_RECALCULATION_ACCELERATE_MATURITY_CHARGE_OFF_BEHAVIOUR_LAST_INSTALLMENT_STRATEGY = "loanProductCreateResponseLP2AdvancedPaymentInterestDailyInterestRecalculationAccelerateMaturityChargeOffBehaviourLastInstallmentStrategy";
166167
public static final String DEFAULT_LOAN_PRODUCT_CREATE_RESPONSE_LP2_ADV_PYMNT_ACCELERATE_MATURITY_CHARGE_OFF_BEHAVIOUR_LAST_INSTALLMENT_STRATEGY = "loanProductCreateResponseLP2AdvancedPaymentAccelerateMaturityChargeOffBehaviourLastInstallmentStrategy";
167168
public static final String DEFAULT_LOAN_PRODUCT_CREATE_RESPONSE_LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_IR_DAILY_TILL_REST_FREQUENCY_DATE_LAST_INSTALLMENT = "loanProductCreateResponseLP2AdvancedPaymentInterestDailyEmi36030InterestRecalculationDailyTillRestFrequencyDateLastInstallment";

‎fineract-e2e-tests-runner/src/test/resources/features/LoanRepayment.feature‎

Lines changed: 91 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5405,4 +5405,94 @@ Feature: LoanRepayment
54055405
| Transaction date | Transaction Type | Amount | Principal | Interest | Fees | Penalties | Loan Balance | Reverted | Replayed |
54065406
| 01 January 2024 | Disbursement | 100.0 | 0.0 | 0.0 | 0.0 | 0.0 | 100.0 | false | false |
54075407
| 01 February 2024 | Repayment | 40.0 | 39.42 | 0.58 | 0.0 | 0.0 | 60.58 | false | false |
5408-
When Admin set "LP2_ADV_CUSTOM_PMT_ALLOC_PROGRESSIVE_LOAN_SCHEDULE_HORIZONTAL" loan product "DEFAULT" transaction type to "NEXT_INSTALLMENT" future installment allocation rule
5408+
When Admin set "LP2_ADV_CUSTOM_PMT_ALLOC_PROGRESSIVE_LOAN_SCHEDULE_HORIZONTAL" loan product "DEFAULT" transaction type to "NEXT_INSTALLMENT" future installment allocation rule
5409+
5410+
Scenario: Verify progressive loan repayment reversals with penalty charge and backdated repayment
5411+
When Admin sets the business date to "20 October 2024"
5412+
When Admin creates a client with random data
5413+
When Admin creates a fully customized loan with the following data:
5414+
| LoanProduct | submitted on date | with Principal | ANNUAL interest rate % | interest type | interest calculation period | amortization type | loanTermFrequency | loanTermFrequencyType | repaymentEvery | repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | graceOnInterestPayment | interest free period | Payment strategy |
5415+
| LP2_NO_INTEREST_RECALCULATION_ALLOCATION_PENALTY_FIRST | 20 October 2024 | 100 | 0 | FLAT | SAME_AS_REPAYMENT_PERIOD | EQUAL_INSTALLMENTS | 30 | DAYS | 30 | DAYS | 1 | 0 | 0 | 0 | ADVANCED_PAYMENT_ALLOCATION |
5416+
And Admin successfully approves the loan on "20 October 2024" with "100" amount and expected disbursement date on "20 October 2024"
5417+
And Admin successfully disburse the loan on "20 October 2024" with "100" EUR transaction amount
5418+
Then Loan Repayment schedule has 1 periods, with the following data for periods:
5419+
| Nr | Days | Date | Paid date | Balance of loan | Principal due | Interest | Fees | Penalties | Due | Paid | In advance | Late | Outstanding |
5420+
| | | 20 October 2024 | | 100.0 | | | 0.0 | | 0.0 | 0.0 | | | |
5421+
| 1 | 30 | 19 November 2024 | | 0.0 | 100.0 | 0.0 | 0.0 | 0.0 | 100.0 | 0.0 | 0.0 | 0.0 | 100.0 |
5422+
Then Loan Repayment schedule has the following data in Total row:
5423+
| Principal due | Interest | Fees | Penalties | Due | Paid | In advance | Late | Outstanding |
5424+
| 100.0 | 0.0 | 0.0 | 0.0 | 100.0 | 0.0 | 0.0 | 0.0 | 100.0 |
5425+
5426+
When Admin sets the business date to "22 October 2024"
5427+
And Customer makes "AUTOPAY" repayment on "22 October 2024" with 100 EUR transaction amount
5428+
Then Loan status will be "CLOSED_OBLIGATIONS_MET"
5429+
Then Loan Repayment schedule has 1 periods, with the following data for periods:
5430+
| Nr | Days | Date | Paid date | Balance of loan | Principal due | Interest | Fees | Penalties | Due | Paid | In advance | Late | Outstanding |
5431+
| | | 20 October 2024 | | 100.0 | | | 0.0 | | 0.0 | 0.0 | | | |
5432+
| 1 | 30 | 19 November 2024 | 22 October 2024 | 0.0 | 100.0 | 0.0 | 0.0 | 0.0 | 100.0 | 100.0 | 100.0 | 0.0 | 0.0 |
5433+
Then Loan Transactions tab has the following data:
5434+
| Transaction date | Transaction Type | Amount | Principal | Interest | Fees | Penalties | Loan Balance |
5435+
| 20 October 2024 | Disbursement | 100.0 | 0.0 | 0.0 | 0.0 | 0.0 | 100.0 |
5436+
| 22 October 2024 | Repayment | 100.0 | 100.0 | 0.0 | 0.0 | 0.0 | 0.0 |
5437+
5438+
When Admin sets the business date to "24 October 2024"
5439+
And Customer makes a repayment undo on "22 October 2024"
5440+
Then Loan status will be "ACTIVE"
5441+
And Loan has 100 outstanding amount
5442+
Then Loan Repayment schedule has 1 periods, with the following data for periods:
5443+
| Nr | Days | Date | Paid date | Balance of loan | Principal due | Interest | Fees | Penalties | Due | Paid | In advance | Late | Outstanding |
5444+
| | | 20 October 2024 | | 100.0 | | | 0.0 | | 0.0 | 0.0 | | | |
5445+
| 1 | 30 | 19 November 2024 | | 0.0 | 100.0 | 0.0 | 0.0 | 0.0 | 100.0 | 0.0 | 0.0 | 0.0 | 100.0 |
5446+
Then Loan Transactions tab has the following data:
5447+
| Transaction date | Transaction Type | Amount | Principal | Interest | Fees | Penalties | Loan Balance | Reverted |
5448+
| 20 October 2024 | Disbursement | 100.0 | 0.0 | 0.0 | 0.0 | 0.0 | 100.0 | false |
5449+
| 22 October 2024 | Repayment | 100.0 | 100.0 | 0.0 | 0.0 | 0.0 | 0.0 | true |
5450+
5451+
When Admin sets the business date to "26 October 2024"
5452+
And Customer makes "AUTOPAY" repayment on "26 October 2024" with 100 EUR transaction amount
5453+
Then Loan status will be "CLOSED_OBLIGATIONS_MET"
5454+
Then Loan Repayment schedule has 1 periods, with the following data for periods:
5455+
| Nr | Days | Date | Paid date | Balance of loan | Principal due | Interest | Fees | Penalties | Due | Paid | In advance | Late | Outstanding |
5456+
| | | 20 October 2024 | | 100.0 | | | 0.0 | | 0.0 | 0.0 | | | |
5457+
| 1 | 30 | 19 November 2024 | 26 October 2024 | 0.0 | 100.0 | 0.0 | 0.0 | 0.0 | 100.0 | 100.0 | 100.0 | 0.0 | 0.0 |
5458+
Then Loan Transactions tab has the following data:
5459+
| Transaction date | Transaction Type | Amount | Principal | Interest | Fees | Penalties | Loan Balance | Reverted |
5460+
| 20 October 2024 | Disbursement | 100.0 | 0.0 | 0.0 | 0.0 | 0.0 | 100.0 | false |
5461+
| 22 October 2024 | Repayment | 100.0 | 100.0 | 0.0 | 0.0 | 0.0 | 0.0 | true |
5462+
| 26 October 2024 | Repayment | 100.0 | 100.0 | 0.0 | 0.0 | 0.0 | 0.0 | false |
5463+
5464+
When Admin sets the business date to "28 October 2024"
5465+
And Customer makes a repayment undo on "26 October 2024"
5466+
Then Loan status will be "ACTIVE"
5467+
And Loan has 100 outstanding amount
5468+
Then Loan Repayment schedule has 1 periods, with the following data for periods:
5469+
| Nr | Days | Date | Paid date | Balance of loan | Principal due | Interest | Fees | Penalties | Due | Paid | In advance | Late | Outstanding |
5470+
| | | 20 October 2024 | | 100.0 | | | 0.0 | | 0.0 | 0.0 | | | |
5471+
| 1 | 30 | 19 November 2024 | | 0.0 | 100.0 | 0.0 | 0.0 | 0.0 | 100.0 | 0.0 | 0.0 | 0.0 | 100.0 |
5472+
5473+
When Admin adds "LOAN_NSF_FEE" due date charge with "28 October 2024" due date and 10 EUR transaction amount
5474+
Then Loan Repayment schedule has 1 periods, with the following data for periods:
5475+
| Nr | Days | Date | Paid date | Balance of loan | Principal due | Interest | Fees | Penalties | Due | Paid | In advance | Late | Outstanding |
5476+
| | | 20 October 2024 | | 100.0 | | | 0.0 | | 0.0 | 0.0 | | | |
5477+
| 1 | 30 | 19 November 2024 | | 0.0 | 100.0 | 0.0 | 0.0 | 10.0 | 110.0 | 0.0 | 0.0 | 0.0 | 110.0 |
5478+
Then Loan Repayment schedule has the following data in Total row:
5479+
| Principal due | Interest | Fees | Penalties | Due | Paid | In advance | Late | Outstanding |
5480+
| 100.0 | 0.0 | 0.0 | 10.0 | 110.0 | 0.0 | 0.0 | 0.0 | 110.0 |
5481+
5482+
And Customer makes "AUTOPAY" repayment on "26 October 2024" with 101 EUR transaction amount
5483+
Then Loan Repayment schedule has 1 periods, with the following data for periods:
5484+
| Nr | Days | Date | Paid date | Balance of loan | Principal due | Interest | Fees | Penalties | Due | Paid | In advance | Late | Outstanding |
5485+
| | | 20 October 2024 | | 100.0 | | | 0.0 | | 0.0 | 0.0 | | | |
5486+
| 1 | 30 | 19 November 2024 | | 0.0 | 100.0 | 0.0 | 0.0 | 10.0 | 110.0 | 101.0 | 101.0 | 0.0 | 9.0 |
5487+
Then Loan Repayment schedule has the following data in Total row:
5488+
| Principal due | Interest | Fees | Penalties | Due | Paid | In advance | Late | Outstanding |
5489+
| 100.0 | 0.0 | 0.0 | 10.0 | 110.0 | 101.0 | 101.0 | 0.0 | 9.0 |
5490+
Then Loan Transactions tab has the following data:
5491+
| Transaction date | Transaction Type | Amount | Principal | Interest | Fees | Penalties | Loan Balance | Reverted |
5492+
| 20 October 2024 | Disbursement | 100.0 | 0.0 | 0.0 | 0.0 | 0.0 | 100.0 | false |
5493+
| 22 October 2024 | Repayment | 100.0 | 100.0 | 0.0 | 0.0 | 0.0 | 0.0 | true |
5494+
| 26 October 2024 | Repayment | 100.0 | 100.0 | 0.0 | 0.0 | 0.0 | 0.0 | true |
5495+
| 26 October 2024 | Repayment | 101.0 | 91.0 | 0.0 | 0.0 | 10.0 | 9.0 | false |
5496+
5497+
When Customer makes "AUTOPAY" repayment on "27 October 2024" with 9 EUR transaction amount
5498+
Then Loan status will be "CLOSED_OBLIGATIONS_MET"

0 commit comments

Comments
 (0)