This is an automated email from the ASF dual-hosted git repository.
adamsaghy pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git
The following commit(s) were added to refs/heads/develop by this push:
new 6994bc687 PS-2245: Negative amount for Accrual Activity
6994bc687 is described below
commit 6994bc687b489f5de846e91497ea75d885790198
Author: Marta Jankovics <[email protected]>
AuthorDate: Tue Jan 14 14:01:41 2025 +0100
PS-2245: Negative amount for Accrual Activity
---
.../test/data/loanproduct/DefaultLoanProduct.java | 1 +
.../global/LoanProductGlobalInitializerStep.java | 25 ++
.../fineract/test/support/TestContextKey.java | 1 +
.../resources/features/LoanAccrualActivity.feature | 344 ++++++++++++++++++++-
.../LoanAccrualActivityProcessingServiceImpl.java | 28 +-
5 files changed, 384 insertions(+), 15 deletions(-)
diff --git
a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/loanproduct/DefaultLoanProduct.java
b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/loanproduct/DefaultLoanProduct.java
index 4d609db15..88cf7d808 100644
---
a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/loanproduct/DefaultLoanProduct.java
+++
b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/loanproduct/DefaultLoanProduct.java
@@ -76,6 +76,7 @@ public enum DefaultLoanProduct implements LoanProduct {
LP2_ADV_PYMNT_INTEREST_DAILY_INTEREST_RECALCULATION_ZERO_INTEREST_CHARGE_OFF_BEHAVIOUR,
//
LP2_ADV_PYMNT_ZERO_INTEREST_CHARGE_OFF_BEHAVIOUR, //
LP2_ADV_PYMNT_INTEREST_DAILY_INTEREST_RECALCULATION_ACCELERATE_MATURITY_CHARGE_OFF_BEHAVIOUR,
//
+ LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_ACCRUAL_ACTIVITY, //
;
@Override
diff --git
a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/LoanProductGlobalInitializerStep.java
b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/LoanProductGlobalInitializerStep.java
index 0a831c43f..fe2a113eb 100644
---
a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/LoanProductGlobalInitializerStep.java
+++
b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/LoanProductGlobalInitializerStep.java
@@ -1162,6 +1162,31 @@ public class LoanProductGlobalInitializerStep implements
FineractGlobalInitializ
TestContext.INSTANCE.set(
TestContextKey.DEFAULT_LOAN_PRODUCT_CREATE_RESPONSE_LP2_ADV_PYMNT_INTEREST_DAILY_INTEREST_RECALCULATION_ZERO_INTEREST_CHARGE_OFF_BEHAVIOUR,
responseLoanProductsRequestAdvCustomAccelerateMaturityChargeOffBehaviourProgressiveLoanSchedule);
+
+ // LP2 with progressive loan schedule + horizontal + interest EMI +
360/30 + accrual activity
+ String name54 =
DefaultLoanProduct.LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_ACCRUAL_ACTIVITY.getName();
+ PostLoanProductsRequest
loanProductsRequestLP2AdvancedPaymentInterestEmi36030AccrualActivity =
loanProductsRequestFactory
+ .defaultLoanProductsRequestLP2Emi()//
+ .name(name54)//
+ .enableAccrualActivityPosting(true)//
+ .daysInYearType(DaysInYearType.DAYS360.value)//
+ .daysInMonthType(DaysInMonthType.DAYS30.value)//
+ .isInterestRecalculationEnabled(true)//
+ .preClosureInterestCalculationStrategy(1)//
+ .rescheduleStrategyMethod(4)//
+ .interestRecalculationCompoundingMethod(0)//
+ .recalculationRestFrequencyType(2)//
+ .recalculationRestFrequencyInterval(1)//
+ .paymentAllocation(List.of(//
+ createPaymentAllocation("DEFAULT",
"NEXT_INSTALLMENT"), //
+ createPaymentAllocation("GOODWILL_CREDIT",
"LAST_INSTALLMENT"), //
+ createPaymentAllocation("MERCHANT_ISSUED_REFUND",
"REAMORTIZATION"), //
+ createPaymentAllocation("PAYOUT_REFUND",
"NEXT_INSTALLMENT")));//
+ Response<PostLoanProductsResponse>
responseLoanProductsRequestLP2AdvancedPaymentInterestEmi36030AccrualActivity =
loanProductsApi
+
.createLoanProduct(loanProductsRequestLP2AdvancedPaymentInterestEmi36030AccrualActivity).execute();
+ TestContext.INSTANCE.set(
+
TestContextKey.DEFAULT_LOAN_PRODUCT_CREATE_RESPONSE_LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_ACCRUAL_ACTIVITY,
+
responseLoanProductsRequestLP2AdvancedPaymentInterestEmi36030AccrualActivity);
}
public static AdvancedPaymentData createPaymentAllocation(String
transactionType, String futureInstallmentAllocationRule,
diff --git
a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/support/TestContextKey.java
b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/support/TestContextKey.java
index b5afb4c16..7fa9c8372 100644
---
a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/support/TestContextKey.java
+++
b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/support/TestContextKey.java
@@ -87,6 +87,7 @@ public abstract class TestContextKey {
public static final String
DEFAULT_LOAN_PRODUCT_CREATE_RESPONSE_LP2_ADV_PYMNT_INTEREST_RECALCULATION_DAILY_EMI_360_30_MULTIDISBURSE_DOWNPAYMENT
=
"loanProductCreateResponseLP2AdvancedPaymentInterestRecalculationDailyEmi36030MultiDisburseDownPayment";
public static final String
DEFAULT_LOAN_PRODUCT_CREATE_RESPONSE_LP2_ADV_PYMNT_INTEREST_DAILY_EMI_ACTUAL_ACTUAL
= "loanProductCreateResponseLP2AdvancedPaymentInterestDailyEmiActualActual";
public static final String
DEFAULT_LOAN_PRODUCT_CREATE_RESPONSE_LP2_ADV_PYMNT_INTEREST_DAILY_EMI_ACTUAL_ACTUAL_ACCRUAL_ACTIVITY
=
"loanProductCreateResponseLP2AdvancedPaymentInterestDailyEmiActualActualAccrualActivity";
+ public static final String
DEFAULT_LOAN_PRODUCT_CREATE_RESPONSE_LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_ACCRUAL_ACTIVITY
= "loanProductCreateResponseLP2AdvancedPaymentInterestEmi36030AccrualActivity";
public static final String
DEFAULT_LOAN_PRODUCT_CREATE_RESPONSE_LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30 =
"loanProductCreateResponseLP2AdvancedPaymentInterestDailyEmi36030";
public static final String
DEFAULT_LOAN_PRODUCT_CREATE_RESPONSE_LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_INTEREST_RECALCULATION_DAILY_TILL_PRECLOSE
=
"loanProductCreateResponseLP2AdvancedPaymentInterestDailyEmi36030InterestRecalculationDailyTillPreClose";
public static final String
DEFAULT_LOAN_PRODUCT_CREATE_RESPONSE_LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_INTEREST_RECALCULATION_DAILY_TILL_PRECLOSE_LAST_INSTALLMENT
=
"loanProductCreateResponseLP2AdvancedPaymentInterestDailyEmi36030InterestRecalculationDailyTillPreCloseLastInstallment";
diff --git
a/fineract-e2e-tests-runner/src/test/resources/features/LoanAccrualActivity.feature
b/fineract-e2e-tests-runner/src/test/resources/features/LoanAccrualActivity.feature
index 7f6544b30..7240be4e5 100644
---
a/fineract-e2e-tests-runner/src/test/resources/features/LoanAccrualActivity.feature
+++
b/fineract-e2e-tests-runner/src/test/resources/features/LoanAccrualActivity.feature
@@ -2211,4 +2211,346 @@ Feature: LoanAccrualActivity
| 24 January 2024 | Accrual | 0.7 | 0.0 | 0.7 |
0.0 | 0.0 | 0.0 | false | false |
| 25 January 2024 | Accrual | 0.69 | 0.0 | 0.69 |
0.0 | 0.0 | 0.0 | false | false |
| 26 January 2024 | Accrual | 0.7 | 0.0 | 0.7 |
0.0 | 0.0 | 0.0 | false | false |
- | 27 January 2024 | Accrual | 0.7 | 0.0 | 0.7 |
0.0 | 0.0 | 0.0 | false | false |
\ No newline at end of file
+ | 27 January 2024 | Accrual | 0.7 | 0.0 | 0.7 |
0.0 | 0.0 | 0.0 | false | false |
+
+ @TestRailId:C3275
+# PS-2245
+ Scenario: Verify non negative amount for Accrual Activity on backdated
repayment
+ When Admin sets the business date to "09 December 2024"
+ When Admin creates a client with random data
+ When Admin creates a fully customized loan with the following data:
+ | 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 |
+ | LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_ACCRUAL_ACTIVITY | 09
December 2024 | 800 | 33.3 | DECLINING_BALANCE |
DAILY | EQUAL_INSTALLMENTS | 6 | MONTHS
| 1 | MONTHS | 6 | 0
| 0 | 0 |
ADVANCED_PAYMENT_ALLOCATION |
+ And Admin successfully approves the loan on "09 December 2024" with "800"
amount and expected disbursement date on "09 December 2024"
+ When Admin successfully disburse the loan on "09 December 2024" with "800"
EUR transaction amount
+ Then Loan Repayment schedule has 6 periods, with the following data for
periods:
+ | Nr | Days | Date | Paid date | Balance of loan |
Principal due | Interest | Fees | Penalties | Due | Paid | In advance | Late
| Outstanding |
+ | | | 09 December 2024 | | 800.0 |
| | 0.0 | | 0.0 | 0.0 | | |
|
+ | 1 | 31 | 09 January 2025 | | 675.62 | 124.38
| 22.2 | 0.0 | 0.0 | 146.58 | 0.0 | 0.0 | 0.0 |
146.58 |
+ | 2 | 31 | 09 February 2025 | | 547.79 | 127.83
| 18.75 | 0.0 | 0.0 | 146.58 | 0.0 | 0.0 | 0.0 |
146.58 |
+ | 3 | 28 | 09 March 2025 | | 416.41 | 131.38
| 15.2 | 0.0 | 0.0 | 146.58 | 0.0 | 0.0 | 0.0 |
146.58 |
+ | 4 | 31 | 09 April 2025 | | 281.39 | 135.02
| 11.56 | 0.0 | 0.0 | 146.58 | 0.0 | 0.0 | 0.0 |
146.58 |
+ | 5 | 30 | 09 May 2025 | | 142.62 | 138.77
| 7.81 | 0.0 | 0.0 | 146.58 | 0.0 | 0.0 | 0.0 |
146.58 |
+ | 6 | 31 | 09 June 2025 | | 0.0 | 142.62
| 3.96 | 0.0 | 0.0 | 146.58 | 0.0 | 0.0 | 0.0 |
146.58 |
+ Then Loan Repayment schedule has the following data in Total row:
+ | Principal due | Interest | Fees | Penalties | Due | Paid | In
advance | Late | Outstanding |
+ | 800.0 | 79.48 | 0.0 | 0.0 | 879.48 | 0.0 | 0.0
| 0.0 | 879.48 |
+ Then Loan Transactions tab has the following data:
+ | Transaction date | Transaction Type | Amount | Principal | Interest |
Fees | Penalties | Loan Balance | Reverted | Replayed |
+ | 09 December 2024 | Disbursement | 800.0 | 0.0 | 0.0 |
0.0 | 0.0 | 800.0 | false | false |
+ When Admin sets the business date to "11 December 2024"
+ And Admin runs inline COB job for Loan
+ Then Loan Transactions tab has the following data:
+ | Transaction date | Transaction Type | Amount | Principal | Interest |
Fees | Penalties | Loan Balance | Reverted | Replayed |
+ | 09 December 2024 | Disbursement | 800.0 | 0.0 | 0.0 |
0.0 | 0.0 | 800.0 | false | false |
+ | 10 December 2024 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ When Admin sets the business date to "08 January 2025"
+ And Admin runs inline COB job for Loan
+ Then Loan Transactions tab has the following data:
+ | Transaction date | Transaction Type | Amount | Principal | Interest |
Fees | Penalties | Loan Balance | Reverted | Replayed |
+ | 09 December 2024 | Disbursement | 800.0 | 0.0 | 0.0 |
0.0 | 0.0 | 800.0 | false | false |
+ | 10 December 2024 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 11 December 2024 | Accrual | 0.71 | 0.0 | 0.71 |
0.0 | 0.0 | 0.0 | false | false |
+ | 12 December 2024 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 13 December 2024 | Accrual | 0.71 | 0.0 | 0.71 |
0.0 | 0.0 | 0.0 | false | false |
+ | 14 December 2024 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 15 December 2024 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 16 December 2024 | Accrual | 0.71 | 0.0 | 0.71 |
0.0 | 0.0 | 0.0 | false | false |
+ | 17 December 2024 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 18 December 2024 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 19 December 2024 | Accrual | 0.71 | 0.0 | 0.71 |
0.0 | 0.0 | 0.0 | false | false |
+ | 20 December 2024 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 21 December 2024 | Accrual | 0.71 | 0.0 | 0.71 |
0.0 | 0.0 | 0.0 | false | false |
+ | 22 December 2024 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 23 December 2024 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 24 December 2024 | Accrual | 0.71 | 0.0 | 0.71 |
0.0 | 0.0 | 0.0 | false | false |
+ | 25 December 2024 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 26 December 2024 | Accrual | 0.71 | 0.0 | 0.71 |
0.0 | 0.0 | 0.0 | false | false |
+ | 27 December 2024 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 28 December 2024 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 29 December 2024 | Accrual | 0.71 | 0.0 | 0.71 |
0.0 | 0.0 | 0.0 | false | false |
+ | 30 December 2024 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 31 December 2024 | Accrual | 0.71 | 0.0 | 0.71 |
0.0 | 0.0 | 0.0 | false | false |
+ | 01 January 2025 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 02 January 2025 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 03 January 2025 | Accrual | 0.71 | 0.0 | 0.71 |
0.0 | 0.0 | 0.0 | false | false |
+ | 04 January 2025 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 05 January 2025 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 06 January 2025 | Accrual | 0.71 | 0.0 | 0.71 |
0.0 | 0.0 | 0.0 | false | false |
+ | 07 January 2025 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ When Admin sets the business date to "09 January 2025"
+ And Admin runs inline COB job for Loan
+ And Customer makes "AUTOPAY" repayment on "09 January 2025" with 146.58
EUR transaction amount
+ Then Loan Repayment schedule has 6 periods, with the following data for
periods:
+ | Nr | Days | Date | Paid date | Balance of loan |
Principal due | Interest | Fees | Penalties | Due | Paid | In advance |
Late | Outstanding |
+ | | | 09 December 2024 | | 800.0 |
| | 0.0 | | 0.0 | 0.0 | |
| |
+ | 1 | 31 | 09 January 2025 | 09 January 2025| 675.62 |
124.38 | 22.2 | 0.0 | 0.0 | 146.58 | 146.58 | 0.0 |
0.0 | 0.0 |
+ | 2 | 31 | 09 February 2025 | | 547.79 |
127.83 | 18.75 | 0.0 | 0.0 | 146.58 | 0.0 | 0.0 |
0.0 | 146.58 |
+ | 3 | 28 | 09 March 2025 | | 416.41 |
131.38 | 15.2 | 0.0 | 0.0 | 146.58 | 0.0 | 0.0 |
0.0 | 146.58 |
+ | 4 | 31 | 09 April 2025 | | 281.39 |
135.02 | 11.56 | 0.0 | 0.0 | 146.58 | 0.0 | 0.0 |
0.0 | 146.58 |
+ | 5 | 30 | 09 May 2025 | | 142.62 |
138.77 | 7.81 | 0.0 | 0.0 | 146.58 | 0.0 | 0.0 |
0.0 | 146.58 |
+ | 6 | 31 | 09 June 2025 | | 0.0 |
142.62 | 3.96 | 0.0 | 0.0 | 146.58 | 0.0 | 0.0 |
0.0 | 146.58 |
+ Then Loan Repayment schedule has the following data in Total row:
+ | Principal due | Interest | Fees | Penalties | Due | Paid | In
advance | Late | Outstanding |
+ | 800.0 | 79.48 | 0.0 | 0.0 | 879.48 | 146.58 | 0.0
| 0.0 | 732.90 |
+ When Admin sets the business date to "10 January 2025"
+ And Admin runs inline COB job for Loan
+ Then Loan Transactions tab has the following data:
+ | Transaction date | Transaction Type | Amount | Principal | Interest |
Fees | Penalties | Loan Balance | Reverted | Replayed |
+ | 09 December 2024 | Disbursement | 800.0 | 0.0 | 0.0 |
0.0 | 0.0 | 800.0 | false | false |
+ | 10 December 2024 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 11 December 2024 | Accrual | 0.71 | 0.0 | 0.71 |
0.0 | 0.0 | 0.0 | false | false |
+ | 12 December 2024 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 13 December 2024 | Accrual | 0.71 | 0.0 | 0.71 |
0.0 | 0.0 | 0.0 | false | false |
+ | 14 December 2024 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 15 December 2024 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 16 December 2024 | Accrual | 0.71 | 0.0 | 0.71 |
0.0 | 0.0 | 0.0 | false | false |
+ | 17 December 2024 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 18 December 2024 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 19 December 2024 | Accrual | 0.71 | 0.0 | 0.71 |
0.0 | 0.0 | 0.0 | false | false |
+ | 20 December 2024 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 21 December 2024 | Accrual | 0.71 | 0.0 | 0.71 |
0.0 | 0.0 | 0.0 | false | false |
+ | 22 December 2024 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 23 December 2024 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 24 December 2024 | Accrual | 0.71 | 0.0 | 0.71 |
0.0 | 0.0 | 0.0 | false | false |
+ | 25 December 2024 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 26 December 2024 | Accrual | 0.71 | 0.0 | 0.71 |
0.0 | 0.0 | 0.0 | false | false |
+ | 27 December 2024 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 28 December 2024 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 29 December 2024 | Accrual | 0.71 | 0.0 | 0.71 |
0.0 | 0.0 | 0.0 | false | false |
+ | 30 December 2024 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 31 December 2024 | Accrual | 0.71 | 0.0 | 0.71 |
0.0 | 0.0 | 0.0 | false | false |
+ | 01 January 2025 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 02 January 2025 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 03 January 2025 | Accrual | 0.71 | 0.0 | 0.71 |
0.0 | 0.0 | 0.0 | false | false |
+ | 04 January 2025 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 05 January 2025 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 06 January 2025 | Accrual | 0.71 | 0.0 | 0.71 |
0.0 | 0.0 | 0.0 | false | false |
+ | 07 January 2025 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 08 January 2025 | Accrual | 0.71 | 0.0 | 0.71 |
0.0 | 0.0 | 0.0 | false | false |
+ | 09 January 2025 | Repayment | 146.58 | 124.38 | 22.2 |
0.0 | 0.0 | 675.62 | false | false |
+ | 09 January 2025 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 09 January 2025 | Accrual Activity | 22.2 | 0.0 | 22.2 |
0.0 | 0.0 | 0.0 | false | false |
+ When Admin sets the business date to "11 January 2025"
+ And Admin runs inline COB job for Loan
+ And Customer makes "AUTOPAY" repayment on "10 January 2025" with 676.22
EUR transaction amount
+ Then Loan status will be "CLOSED_OBLIGATIONS_MET"
+ Then Loan Repayment schedule has 6 periods, with the following data for
periods:
+ | Nr | Days | Date | Paid date | Balance of loan |
Principal due | Interest | Fees | Penalties | Due | Paid | In advance |
Late | Outstanding |
+ | | | 09 December 2024 | | 800.0 |
| | 0.0 | | 0.0 | 0.0 | |
| |
+ | 1 | 31 | 09 January 2025 | 09 January 2025| 675.62 |
124.38 | 22.2 | 0.0 | 0.0 | 146.58 | 146.58 | 0.0 |
0.0 | 0.0 |
+ | 2 | 31 | 09 February 2025 | 10 January 2025| 529.64 |
145.98 | 0.6 | 0.0 | 0.0 | 146.58 | 146.58 | 146.58 |
0.0 | 0.0 |
+ | 3 | 28 | 09 March 2025 | 10 January 2025| 383.06 |
146.58 | 0.0 | 0.0 | 0.0 | 146.58 | 146.58 | 146.58 |
0.0 | 0.0 |
+ | 4 | 31 | 09 April 2025 | 10 January 2025| 236.48 |
146.58 | 0.0 | 0.0 | 0.0 | 146.58 | 146.58 | 146.58 |
0.0 | 0.0 |
+ | 5 | 30 | 09 May 2025 | 10 January 2025| 89.9 |
146.58 | 0.0 | 0.0 | 0.0 | 146.58 | 146.58 | 146.58 |
0.0 | 0.0 |
+ | 6 | 31 | 09 June 2025 | 10 January 2025| 0.0 |
89.9 | 0.0 | 0.0 | 0.0 | 89.9 | 89.9 | 89.9 |
0.0 | 0.0 |
+ Then Loan Repayment schedule has the following data in Total row:
+ | Principal due | Interest | Fees | Penalties | Due | Paid | In
advance | Late | Outstanding |
+ | 800.0 | 22.8 | 0.0 | 0.0 | 822.8 | 822.8 |
676.22 | 0.0 | 0.0 |
+ Then Loan Transactions tab has the following data:
+ | Transaction date | Transaction Type | Amount | Principal | Interest |
Fees | Penalties | Loan Balance | Reverted | Replayed |
+ | 09 December 2024 | Disbursement | 800.0 | 0.0 | 0.0 |
0.0 | 0.0 | 800.0 | false | false |
+ | 10 December 2024 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 11 December 2024 | Accrual | 0.71 | 0.0 | 0.71 |
0.0 | 0.0 | 0.0 | false | false |
+ | 12 December 2024 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 13 December 2024 | Accrual | 0.71 | 0.0 | 0.71 |
0.0 | 0.0 | 0.0 | false | false |
+ | 14 December 2024 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 15 December 2024 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 16 December 2024 | Accrual | 0.71 | 0.0 | 0.71 |
0.0 | 0.0 | 0.0 | false | false |
+ | 17 December 2024 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 18 December 2024 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 19 December 2024 | Accrual | 0.71 | 0.0 | 0.71 |
0.0 | 0.0 | 0.0 | false | false |
+ | 20 December 2024 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 21 December 2024 | Accrual | 0.71 | 0.0 | 0.71 |
0.0 | 0.0 | 0.0 | false | false |
+ | 22 December 2024 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 23 December 2024 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 24 December 2024 | Accrual | 0.71 | 0.0 | 0.71 |
0.0 | 0.0 | 0.0 | false | false |
+ | 25 December 2024 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 26 December 2024 | Accrual | 0.71 | 0.0 | 0.71 |
0.0 | 0.0 | 0.0 | false | false |
+ | 27 December 2024 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 28 December 2024 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 29 December 2024 | Accrual | 0.71 | 0.0 | 0.71 |
0.0 | 0.0 | 0.0 | false | false |
+ | 30 December 2024 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 31 December 2024 | Accrual | 0.71 | 0.0 | 0.71 |
0.0 | 0.0 | 0.0 | false | false |
+ | 01 January 2025 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 02 January 2025 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 03 January 2025 | Accrual | 0.71 | 0.0 | 0.71 |
0.0 | 0.0 | 0.0 | false | false |
+ | 04 January 2025 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 05 January 2025 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 06 January 2025 | Accrual | 0.71 | 0.0 | 0.71 |
0.0 | 0.0 | 0.0 | false | false |
+ | 07 January 2025 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 08 January 2025 | Accrual | 0.71 | 0.0 | 0.71 |
0.0 | 0.0 | 0.0 | false | false |
+ | 09 January 2025 | Repayment | 146.58 | 124.38 | 22.2 |
0.0 | 0.0 | 675.62 | false | false |
+ | 09 January 2025 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 09 January 2025 | Accrual Activity | 22.2 | 0.0 | 22.2 |
0.0 | 0.0 | 0.0 | false | false |
+ | 10 January 2025 | Accrual | 0.6 | 0.0 | 0.6 |
0.0 | 0.0 | 0.0 | false | false |
+ | 10 January 2025 | Repayment | 676.22 | 675.62 | 0.6 |
0.0 | 0.0 | 0.0 | false | false |
+ | 10 January 2025 | Accrual Activity | 0.6 | 0.0 | 0.6 |
0.0 | 0.0 | 0.0 | false | false |
+
+ @TestRailId:C3276
+# PS-2245
+ Scenario: Verify non negative amount for Accrual Activity on backdated
repayment and accrual adjustment
+ When Admin sets the business date to "09 December 2024"
+ When Admin creates a client with random data
+ When Admin creates a fully customized loan with the following data:
+ | 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 |
+ | LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_ACCRUAL_ACTIVITY | 09
December 2024 | 800 | 33.3 | DECLINING_BALANCE |
DAILY | EQUAL_INSTALLMENTS | 6 | MONTHS
| 1 | MONTHS | 6 | 0
| 0 | 0 |
ADVANCED_PAYMENT_ALLOCATION |
+ And Admin successfully approves the loan on "09 December 2024" with "800"
amount and expected disbursement date on "09 December 2024"
+ When Admin successfully disburse the loan on "09 December 2024" with "800"
EUR transaction amount
+ Then Loan Repayment schedule has 6 periods, with the following data for
periods:
+ | Nr | Days | Date | Paid date | Balance of loan |
Principal due | Interest | Fees | Penalties | Due | Paid | In advance | Late
| Outstanding |
+ | | | 09 December 2024 | | 800.0 |
| | 0.0 | | 0.0 | 0.0 | | |
|
+ | 1 | 31 | 09 January 2025 | | 675.62 | 124.38
| 22.2 | 0.0 | 0.0 | 146.58 | 0.0 | 0.0 | 0.0 |
146.58 |
+ | 2 | 31 | 09 February 2025 | | 547.79 | 127.83
| 18.75 | 0.0 | 0.0 | 146.58 | 0.0 | 0.0 | 0.0 |
146.58 |
+ | 3 | 28 | 09 March 2025 | | 416.41 | 131.38
| 15.2 | 0.0 | 0.0 | 146.58 | 0.0 | 0.0 | 0.0 |
146.58 |
+ | 4 | 31 | 09 April 2025 | | 281.39 | 135.02
| 11.56 | 0.0 | 0.0 | 146.58 | 0.0 | 0.0 | 0.0 |
146.58 |
+ | 5 | 30 | 09 May 2025 | | 142.62 | 138.77
| 7.81 | 0.0 | 0.0 | 146.58 | 0.0 | 0.0 | 0.0 |
146.58 |
+ | 6 | 31 | 09 June 2025 | | 0.0 | 142.62
| 3.96 | 0.0 | 0.0 | 146.58 | 0.0 | 0.0 | 0.0 |
146.58 |
+ Then Loan Repayment schedule has the following data in Total row:
+ | Principal due | Interest | Fees | Penalties | Due | Paid | In
advance | Late | Outstanding |
+ | 800.0 | 79.48 | 0.0 | 0.0 | 879.48 | 0.0 | 0.0
| 0.0 | 879.48 |
+ Then Loan Transactions tab has the following data:
+ | Transaction date | Transaction Type | Amount | Principal | Interest |
Fees | Penalties | Loan Balance | Reverted | Replayed |
+ | 09 December 2024 | Disbursement | 800.0 | 0.0 | 0.0 |
0.0 | 0.0 | 800.0 | false | false |
+ When Admin sets the business date to "08 January 2025"
+ And Admin runs inline COB job for Loan
+ Then Loan Transactions tab has the following data:
+ | Transaction date | Transaction Type | Amount | Principal | Interest |
Fees | Penalties | Loan Balance | Reverted | Replayed |
+ | 09 December 2024 | Disbursement | 800.0 | 0.0 | 0.0 |
0.0 | 0.0 | 800.0 | false | false |
+ | 07 January 2025 | Accrual | 20.77 | 0.0 | 20.77 |
0.0 | 0.0 | 0.0 | false | false |
+ When Admin sets the business date to "09 January 2025"
+ And Admin runs inline COB job for Loan
+ And Customer makes "AUTOPAY" repayment on "09 January 2025" with 146.58
EUR transaction amount
+ Then Loan Repayment schedule has 6 periods, with the following data for
periods:
+ | Nr | Days | Date | Paid date | Balance of loan |
Principal due | Interest | Fees | Penalties | Due | Paid | In advance |
Late | Outstanding |
+ | | | 09 December 2024 | | 800.0 |
| | 0.0 | | 0.0 | 0.0 | |
| |
+ | 1 | 31 | 09 January 2025 | 09 January 2025| 675.62 |
124.38 | 22.2 | 0.0 | 0.0 | 146.58 | 146.58 | 0.0 |
0.0 | 0.0 |
+ | 2 | 31 | 09 February 2025 | | 547.79 |
127.83 | 18.75 | 0.0 | 0.0 | 146.58 | 0.0 | 0.0 |
0.0 | 146.58 |
+ | 3 | 28 | 09 March 2025 | | 416.41 |
131.38 | 15.2 | 0.0 | 0.0 | 146.58 | 0.0 | 0.0 |
0.0 | 146.58 |
+ | 4 | 31 | 09 April 2025 | | 281.39 |
135.02 | 11.56 | 0.0 | 0.0 | 146.58 | 0.0 | 0.0 |
0.0 | 146.58 |
+ | 5 | 30 | 09 May 2025 | | 142.62 |
138.77 | 7.81 | 0.0 | 0.0 | 146.58 | 0.0 | 0.0 |
0.0 | 146.58 |
+ | 6 | 31 | 09 June 2025 | | 0.0 |
142.62 | 3.96 | 0.0 | 0.0 | 146.58 | 0.0 | 0.0 |
0.0 | 146.58 |
+ Then Loan Repayment schedule has the following data in Total row:
+ | Principal due | Interest | Fees | Penalties | Due | Paid | In
advance | Late | Outstanding |
+ | 800.0 | 79.48 | 0.0 | 0.0 | 879.48 | 146.58 | 0.0
| 0.0 | 732.90 |
+ When Admin sets the business date to "10 January 2025"
+ And Admin runs inline COB job for Loan
+ Then Loan Transactions tab has the following data:
+ | Transaction date | Transaction Type | Amount | Principal | Interest |
Fees | Penalties | Loan Balance | Reverted | Replayed |
+ | 09 December 2024 | Disbursement | 800.0 | 0.0 | 0.0 |
0.0 | 0.0 | 800.0 | false | false |
+ | 07 January 2025 | Accrual | 20.77 | 0.0 | 20.77 |
0.0 | 0.0 | 0.0 | false | false |
+ | 08 January 2025 | Accrual | 0.71 | 0.0 | 0.71 |
0.0 | 0.0 | 0.0 | false | false |
+ | 09 January 2025 | Repayment | 146.58 | 124.38 | 22.2 |
0.0 | 0.0 | 675.62 | false | false |
+ | 09 January 2025 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 09 January 2025 | Accrual Activity | 22.2 | 0.0 | 22.2 |
0.0 | 0.0 | 0.0 | false | false |
+ When Admin sets the business date to "11 January 2025"
+ And Admin runs inline COB job for Loan
+ And Customer makes "AUTOPAY" repayment on "09 January 2025" with 675.62
EUR transaction amount
+ Then Loan status will be "CLOSED_OBLIGATIONS_MET"
+ Then Loan Repayment schedule has 6 periods, with the following data for
periods:
+ | Nr | Days | Date | Paid date | Balance of loan |
Principal due | Interest | Fees | Penalties | Due | Paid | In advance |
Late | Outstanding |
+ | | | 09 December 2024 | | 800.0 |
| | 0.0 | | 0.0 | 0.0 | |
| |
+ | 1 | 31 | 09 January 2025 | 09 January 2025| 675.62 |
124.38 | 22.2 | 0.0 | 0.0 | 146.58 | 146.58 | 0.0 |
0.0 | 0.0 |
+ | 2 | 31 | 09 February 2025 | 09 January 2025| 529.04 |
146.58 | 0.0 | 0.0 | 0.0 | 146.58 | 146.58 | 146.58 |
0.0 | 0.0 |
+ | 3 | 28 | 09 March 2025 | 09 January 2025| 382.46 |
146.58 | 0.0 | 0.0 | 0.0 | 146.58 | 146.58 | 146.58 |
0.0 | 0.0 |
+ | 4 | 31 | 09 April 2025 | 09 January 2025| 235.88 |
146.58 | 0.0 | 0.0 | 0.0 | 146.58 | 146.58 | 146.58 |
0.0 | 0.0 |
+ | 5 | 30 | 09 May 2025 | 09 January 2025| 89.3 |
146.58 | 0.0 | 0.0 | 0.0 | 146.58 | 146.58 | 146.58 |
0.0 | 0.0 |
+ | 6 | 31 | 09 June 2025 | 09 January 2025| 0.0 |
89.3 | 0.0 | 0.0 | 0.0 | 89.3 | 89.3 | 89.3 |
0.0 | 0.0 |
+ Then Loan Repayment schedule has the following data in Total row:
+ | Principal due | Interest | Fees | Penalties | Due | Paid | In
advance | Late | Outstanding |
+ | 800.0 | 22.2 | 0.0 | 0.0 | 822.2 | 822.2 |
675.62 | 0.0 | 0.0 |
+ Then Loan Transactions tab has the following data:
+ | Transaction date | Transaction Type | Amount | Principal | Interest
| Fees | Penalties | Loan Balance | Reverted | Replayed |
+ | 09 December 2024 | Disbursement | 800.0 | 0.0 | 0.0
| 0.0 | 0.0 | 800.0 | false | false |
+ | 07 January 2025 | Accrual | 20.77 | 0.0 | 20.77
| 0.0 | 0.0 | 0.0 | false | false |
+ | 08 January 2025 | Accrual | 0.71 | 0.0 | 0.71
| 0.0 | 0.0 | 0.0 | false | false |
+ | 09 January 2025 | Repayment | 146.58 | 124.38 | 22.2
| 0.0 | 0.0 | 675.62 | false | false |
+ | 09 January 2025 | Accrual | 0.72 | 0.0 | 0.72
| 0.0 | 0.0 | 0.0 | false | false |
+ | 09 January 2025 | Accrual Activity | 22.2 | 0.0 | 22.2
| 0.0 | 0.0 | 0.0 | false | false |
+ | 09 January 2025 | Repayment | 675.62 | 675.62 | 0.0
| 0.0 | 0.0 | 0.0 | false | false |
+ | 10 January 2025 | Accrual | 0.6 | 0.0 | 0.6
| 0.0 | 0.0 | 0.0 | false | false |
+ | 11 January 2025 | Accrual Adjustment | 0.6 | 0.0 | 0.6
| 0.0 | 0.0 | 0.0 | false | false |
+
+ @TestRailId:C3276
+# PS-2245
+ Scenario: Verify non negative amount for Accrual Activity on backdated
repayment, accrual adjustment and revert activity
+ When Admin sets the business date to "09 December 2024"
+ When Admin creates a client with random data
+ When Admin creates a fully customized loan with the following data:
+ | 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 |
+ | LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_ACCRUAL_ACTIVITY | 09
December 2024 | 800 | 33.3 | DECLINING_BALANCE |
DAILY | EQUAL_INSTALLMENTS | 6 | MONTHS
| 1 | MONTHS | 6 | 0
| 0 | 0 |
ADVANCED_PAYMENT_ALLOCATION |
+ And Admin successfully approves the loan on "09 December 2024" with "800"
amount and expected disbursement date on "09 December 2024"
+ When Admin successfully disburse the loan on "09 December 2024" with "800"
EUR transaction amount
+ Then Loan Repayment schedule has 6 periods, with the following data for
periods:
+ | Nr | Days | Date | Paid date | Balance of loan |
Principal due | Interest | Fees | Penalties | Due | Paid | In advance | Late
| Outstanding |
+ | | | 09 December 2024 | | 800.0 |
| | 0.0 | | 0.0 | 0.0 | | |
|
+ | 1 | 31 | 09 January 2025 | | 675.62 | 124.38
| 22.2 | 0.0 | 0.0 | 146.58 | 0.0 | 0.0 | 0.0 |
146.58 |
+ | 2 | 31 | 09 February 2025 | | 547.79 | 127.83
| 18.75 | 0.0 | 0.0 | 146.58 | 0.0 | 0.0 | 0.0 |
146.58 |
+ | 3 | 28 | 09 March 2025 | | 416.41 | 131.38
| 15.2 | 0.0 | 0.0 | 146.58 | 0.0 | 0.0 | 0.0 |
146.58 |
+ | 4 | 31 | 09 April 2025 | | 281.39 | 135.02
| 11.56 | 0.0 | 0.0 | 146.58 | 0.0 | 0.0 | 0.0 |
146.58 |
+ | 5 | 30 | 09 May 2025 | | 142.62 | 138.77
| 7.81 | 0.0 | 0.0 | 146.58 | 0.0 | 0.0 | 0.0 |
146.58 |
+ | 6 | 31 | 09 June 2025 | | 0.0 | 142.62
| 3.96 | 0.0 | 0.0 | 146.58 | 0.0 | 0.0 | 0.0 |
146.58 |
+ Then Loan Repayment schedule has the following data in Total row:
+ | Principal due | Interest | Fees | Penalties | Due | Paid | In
advance | Late | Outstanding |
+ | 800.0 | 79.48 | 0.0 | 0.0 | 879.48 | 0.0 | 0.0
| 0.0 | 879.48 |
+ Then Loan Transactions tab has the following data:
+ | Transaction date | Transaction Type | Amount | Principal | Interest |
Fees | Penalties | Loan Balance | Reverted | Replayed |
+ | 09 December 2024 | Disbursement | 800.0 | 0.0 | 0.0 |
0.0 | 0.0 | 800.0 | false | false |
+ When Admin sets the business date to "08 January 2025"
+ And Admin runs inline COB job for Loan
+ Then Loan Transactions tab has the following data:
+ | Transaction date | Transaction Type | Amount | Principal | Interest |
Fees | Penalties | Loan Balance | Reverted | Replayed |
+ | 09 December 2024 | Disbursement | 800.0 | 0.0 | 0.0 |
0.0 | 0.0 | 800.0 | false | false |
+ | 07 January 2025 | Accrual | 20.77 | 0.0 | 20.77 |
0.0 | 0.0 | 0.0 | false | false |
+ When Admin sets the business date to "09 January 2025"
+ And Admin runs inline COB job for Loan
+ And Customer makes "AUTOPAY" repayment on "09 January 2025" with 146.58
EUR transaction amount
+ Then Loan Repayment schedule has 6 periods, with the following data for
periods:
+ | Nr | Days | Date | Paid date | Balance of loan |
Principal due | Interest | Fees | Penalties | Due | Paid | In advance |
Late | Outstanding |
+ | | | 09 December 2024 | | 800.0 |
| | 0.0 | | 0.0 | 0.0 | |
| |
+ | 1 | 31 | 09 January 2025 | 09 January 2025| 675.62 |
124.38 | 22.2 | 0.0 | 0.0 | 146.58 | 146.58 | 0.0 |
0.0 | 0.0 |
+ | 2 | 31 | 09 February 2025 | | 547.79 |
127.83 | 18.75 | 0.0 | 0.0 | 146.58 | 0.0 | 0.0 |
0.0 | 146.58 |
+ | 3 | 28 | 09 March 2025 | | 416.41 |
131.38 | 15.2 | 0.0 | 0.0 | 146.58 | 0.0 | 0.0 |
0.0 | 146.58 |
+ | 4 | 31 | 09 April 2025 | | 281.39 |
135.02 | 11.56 | 0.0 | 0.0 | 146.58 | 0.0 | 0.0 |
0.0 | 146.58 |
+ | 5 | 30 | 09 May 2025 | | 142.62 |
138.77 | 7.81 | 0.0 | 0.0 | 146.58 | 0.0 | 0.0 |
0.0 | 146.58 |
+ | 6 | 31 | 09 June 2025 | | 0.0 |
142.62 | 3.96 | 0.0 | 0.0 | 146.58 | 0.0 | 0.0 |
0.0 | 146.58 |
+ Then Loan Repayment schedule has the following data in Total row:
+ | Principal due | Interest | Fees | Penalties | Due | Paid | In
advance | Late | Outstanding |
+ | 800.0 | 79.48 | 0.0 | 0.0 | 879.48 | 146.58 | 0.0
| 0.0 | 732.90 |
+ When Admin sets the business date to "10 January 2025"
+ And Admin runs inline COB job for Loan
+ Then Loan Transactions tab has the following data:
+ | Transaction date | Transaction Type | Amount | Principal | Interest |
Fees | Penalties | Loan Balance | Reverted | Replayed |
+ | 09 December 2024 | Disbursement | 800.0 | 0.0 | 0.0 |
0.0 | 0.0 | 800.0 | false | false |
+ | 07 January 2025 | Accrual | 20.77 | 0.0 | 20.77 |
0.0 | 0.0 | 0.0 | false | false |
+ | 08 January 2025 | Accrual | 0.71 | 0.0 | 0.71 |
0.0 | 0.0 | 0.0 | false | false |
+ | 09 January 2025 | Repayment | 146.58 | 124.38 | 22.2 |
0.0 | 0.0 | 675.62 | false | false |
+ | 09 January 2025 | Accrual | 0.72 | 0.0 | 0.72 |
0.0 | 0.0 | 0.0 | false | false |
+ | 09 January 2025 | Accrual Activity | 22.2 | 0.0 | 22.2 |
0.0 | 0.0 | 0.0 | false | false |
+ When Admin sets the business date to "11 January 2025"
+ And Admin runs inline COB job for Loan
+ And Customer makes "AUTOPAY" repayment on "08 January 2025" with 675.03
EUR transaction amount
+ Then Loan status will be "CLOSED_OBLIGATIONS_MET"
+ Then Loan Repayment schedule has 6 periods, with the following data for
periods:
+ | Nr | Days | Date | Paid date | Balance of loan |
Principal due | Interest | Fees | Penalties | Due | Paid | In advance |
Late | Outstanding |
+ | | | 09 December 2024 | | 800.0 |
| | 0.0 | | 0.0 | 0.0 | |
| |
+ | 1 | 31 | 09 January 2025 | 08 January 2025| 674.9 |
125.1 | 21.48 | 0.0 | 0.0 | 146.58 | 146.58 | 146.58 |
0.0 | 0.0 |
+ | 2 | 31 | 09 February 2025 | 08 January 2025| 528.32 |
146.58 | 0.0 | 0.0 | 0.0 | 146.58 | 146.58 | 146.58 |
0.0 | 0.0 |
+ | 3 | 28 | 09 March 2025 | 08 January 2025| 381.74 |
146.58 | 0.0 | 0.0 | 0.0 | 146.58 | 146.58 | 146.58 |
0.0 | 0.0 |
+ | 4 | 31 | 09 April 2025 | 08 January 2025| 235.16 |
146.58 | 0.0 | 0.0 | 0.0 | 146.58 | 146.58 | 146.58 |
0.0 | 0.0 |
+ | 5 | 30 | 09 May 2025 | 09 January 2025| 88.71 |
146.45 | 0.13 | 0.0 | 0.0 | 146.58 | 146.58 | 146.58 |
0.0 | 0.0 |
+ | 6 | 31 | 09 June 2025 | 09 January 2025| 0.0 |
88.71 | 0.0 | 0.0 | 0.0 | 88.71 | 88.71 | 88.71 |
0.0 | 0.0 |
+ Then Loan Repayment schedule has the following data in Total row:
+ | Principal due | Interest | Fees | Penalties | Due | Paid | In
advance | Late | Outstanding |
+ | 800.0 | 21.61 | 0.0 | 0.0 | 821.61 | 821.61 |
821.61 | 0.0 | 0.0 |
+ Then Loan Transactions tab has the following data:
+ | Transaction date | Transaction Type | Amount | Principal | Interest
| Fees | Penalties | Loan Balance | Reverted | Replayed |
+ | 09 December 2024 | Disbursement | 800.0 | 0.0 | 0.0
| 0.0 | 0.0 | 800.0 | false | false |
+ | 07 January 2025 | Accrual | 20.77 | 0.0 | 20.77
| 0.0 | 0.0 | 0.0 | false | false |
+ | 08 January 2025 | Accrual | 0.71 | 0.0 | 0.71
| 0.0 | 0.0 | 0.0 | false | false |
+ | 08 January 2025 | Repayment | 675.03 | 653.55 | 21.48
| 0.0 | 0.0 | 146.45 | false | false |
+ | 08 January 2025 | Accrual Activity | 21.61 | 0.0 | 21.61
| 0.0 | 0.0 | 0.0 | false | false |
+ | 09 January 2025 | Repayment | 146.58 | 146.45 | 0.13
| 0.0 | 0.0 | 0.0 | false | true |
+ | 09 January 2025 | Accrual | 0.72 | 0.0 | 0.72
| 0.0 | 0.0 | 0.0 | false | false |
+ | 10 January 2025 | Accrual | 0.6 | 0.0 | 0.6
| 0.0 | 0.0 | 0.0 | false | false |
+ | 11 January 2025 | Accrual Adjustment | 1.19 | 0.0 | 1.19
| 0.0 | 0.0 | 0.0 | false | false |
diff --git
a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanAccrualActivityProcessingServiceImpl.java
b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanAccrualActivityProcessingServiceImpl.java
index 2f2373966..1beed3c0d 100644
---
a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanAccrualActivityProcessingServiceImpl.java
+++
b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanAccrualActivityProcessingServiceImpl.java
@@ -92,9 +92,9 @@ public class LoanAccrualActivityProcessingServiceImpl
implements LoanAccrualActi
if
(!loan.getLoanProductRelatedDetail().isEnableAccrualActivityPosting()) {
return;
}
- LocalDate date = loan.isOverPaid() ? loan.getOverpaidOnDate() :
loan.getClosedOnDate();
+ LocalDate transactionDate = loan.isOverPaid() ?
loan.getOverpaidOnDate() : loan.getClosedOnDate();
// reverse after closure activities
- loan.getLoanTransactions(t -> t.isAccrualActivity() && !t.isReversed()
&& t.getDateOf().isAfter(date))
+ loan.getLoanTransactions(t -> t.isAccrualActivity() && !t.isReversed()
&& t.getDateOf().isAfter(transactionDate))
.forEach(this::reverseAccrualActivityTransaction);
// calculate activity amounts
@@ -107,25 +107,25 @@ public class LoanAccrualActivityProcessingServiceImpl
implements LoanAccrualActi
penaltyChargesPortion = MathUtil.add(penaltyChargesPortion,
installment.getPenaltyCharges());
interestPortion = MathUtil.add(interestPortion,
installment.getInterestCharged());
}
- List<LoanTransaction> accrualActivities =
loan.getLoanTransactions().stream().filter(LoanTransaction::isAccrualActivity)
- .filter(LoanTransaction::isNotReversed).toList();
+ List<LoanTransaction> accrualActivities = loan.getLoanTransactions(t
-> t.isAccrualActivity() && !t.isReversed());
// subtract already posted activities
for (LoanTransaction accrualActivity : accrualActivities) {
- feeChargesPortion = MathUtil.subtract(feeChargesPortion,
accrualActivity.getFeeChargesPortion());
- penaltyChargesPortion = MathUtil.subtract(penaltyChargesPortion,
accrualActivity.getPenaltyChargesPortion());
- interestPortion = MathUtil.subtract(interestPortion,
accrualActivity.getInterestPortion());
+ if (MathUtil.isLessThan(feeChargesPortion,
accrualActivity.getFeeChargesPortion())
+ || MathUtil.isLessThan(penaltyChargesPortion,
accrualActivity.getPenaltyChargesPortion())
+ || MathUtil.isLessThan(interestPortion,
accrualActivity.getInterestPortion())) {
+ reverseAccrualActivityTransaction(accrualActivity);
+ } else {
+ feeChargesPortion = MathUtil.subtract(feeChargesPortion,
accrualActivity.getFeeChargesPortion());
+ penaltyChargesPortion =
MathUtil.subtract(penaltyChargesPortion,
accrualActivity.getPenaltyChargesPortion());
+ interestPortion = MathUtil.subtract(interestPortion,
accrualActivity.getInterestPortion());
+ }
}
BigDecimal transactionAmount = MathUtil.add(feeChargesPortion,
penaltyChargesPortion, interestPortion);
if (!MathUtil.isGreaterThanZero(transactionAmount)) {
return;
}
- if (MathUtil.isLessThanZero(feeChargesPortion) ||
MathUtil.isLessThanZero(penaltyChargesPortion)
- || MathUtil.isLessThanZero(interestPortion)) {
- // TODO reverse latest accrual activity if any amount is negative
- return;
- }
- LoanTransaction newActivity = new LoanTransaction(loan,
loan.getOffice(), LoanTransactionType.ACCRUAL_ACTIVITY.getValue(), date,
- transactionAmount, null, interestPortion, feeChargesPortion,
penaltyChargesPortion, null, false, null,
+ LoanTransaction newActivity = new LoanTransaction(loan,
loan.getOffice(), LoanTransactionType.ACCRUAL_ACTIVITY.getValue(),
+ transactionDate, transactionAmount, null, interestPortion,
feeChargesPortion, penaltyChargesPortion, null, false, null,
externalIdFactory.create());
makeAccrualActivityTransaction(loan, newActivity);
}