FINERACT-2649: Migrate Tier 3 loan integration tests to Feign client by DeathGun44 · Pull Request #6084 · apache/fineract

DeathGun44 · 2026-07-03T12:06:31Z

Description

This PR transitions 56 test classes (encompassing approximately 277 test methods) to utilize the Feign client, entirely removing their dependency on REST-assured.

Note on Behavior: The core test behavior and assertions remain completely unchanged. This is strictly a refactor of the underlying HTTP client layer.

Targeted commits

I've split this work into 13 commits, grouped logically by test area (reschedule, chargebacks, APA, down-payments, etc.) to keep things manageable for review.

This will ensure that if CI fails or issues arise later, it is much easier to isolate and track down the specific batch that introduced the regression.

Scope

Included in this PR:

Comprehensive Loan Rescheduling and Re-aging tests (including Center/Group reschedules).
Chargeback integration scenarios (non-APA workflows, overpaid loans, payment type constraints).
Down-payment workflows (product configuration, transaction typing, undo disbursal, and repayment schedules).
Advanced Payment Allocation (APA) coverage for write-offs, transaction reprocessing, and external-id support.
Client loan lifecycle tests (credit balance refund, multiple disbursements, floating rates, and date validations).
Reverse-replay transaction relations and loan summary tests.
Standardization of BigDecimal precision assertions across migrated Feign tests.

Bug Fix: Incorrect journal entry assertions in `UndoLoanDisbursalWithDownPaymentIntegrationTest`

During the migration, the stricter Feign verifyJournalEntries() (which performs exact 1-to-1 matching with count validation) exposed a pre-existing bug on develop in two test methods:

testUndoDisbursalForLoanWithSingleDisbursalAutoDownPaymentEnabledAndHasManualTransactions
testUndoDisbursalForLoanWithMultiDisbursalAutoDownPaymentEnabledAndHasManualTransactions

Both tests make a manual repayment of 100.0 after disbursement, then undo the disbursal. The "repayment entries compensated" journal entry assertions incorrectly expected 250.0 (the down-payment amount) instead of 100.0 (the actual repayment amount). The old REST-assured based verifyJournalEntries() had more lenient matching semantics that masked this error. Fixed as part of the migration commit.

Infrastructure Enhancements

This PR builds upon the shared Feign test infrastructure from earlier batches, adding and extending several utilities to streamline testing:

InternalLoanReAgeApi: Supports specific internal API flows related to the re-aging of loans.
FeignGroupCenterHelper: Provides utilities for managing group and center associations during loan testing.
FeignRawHttpHelper: Safely handles edge cases that require raw HTTP requests to bypass strict Swagger model limitations (e.g., floating rate properties), utilizing fineract.it.url securely.
Business Date Context (runAt): Expanded the FeignLoanTestBase to cleanly execute nested operations under specific simulated business dates.
Event Verification: Integrated Awaitility-based assertions for robust verification of asynchronous business events.
Shared Builders & Validators: Expanded Feign loan helpers for external-ids, re-amortizations, write-offs, and credit allocations.

Checklist

Please make sure these boxes are checked before submitting your pull request - thanks!

Write the commit message as per our guidelines
Acknowledge that we will not review PRs that are not passing the build ("green") - it is your responsibility to get a proposed PR to pass the build, not primarily the project's maintainers.
Create/update unit or integration tests for verifying the changes made.
Follow our coding conventions.
Add required Swagger annotation and update API documentation at fineract-provider/src/main/resources/static/legacy-docs/apiLive.htm with details of any API changes
This PR must not be a "code dump". Large changes can be made in a branch, with assistance. Ask for help on the developer mailing list.

Your assigned reviewer(s) will follow our guidelines for code reviews.

DeathGun44 · 2026-07-03T15:06:41Z

the test is failing and the issue is in develop itself, because a reversal of a 100.0 repayment should produce 100.0 journal entries, not 250.0. i am adding a fix for it in the pr and describing it in the description aswell

Aman-Mittal

I am still reviewing this one.....

adamsaghy · 2026-07-06T09:27:55Z

@DeathGun44 Please rebase.

…elpers Signed-off-by: DeathGun44 <krishnamewara841@gmail.com>

Signed-off-by: DeathGun44 <krishnamewara841@gmail.com>

… Feign Signed-off-by: DeathGun44 <krishnamewara841@gmail.com>

…sts to Feign Signed-off-by: DeathGun44 <krishnamewara841@gmail.com>

…to Feign Signed-off-by: DeathGun44 <krishnamewara841@gmail.com>

… dates Signed-off-by: DeathGun44 <krishnamewara841@gmail.com>

… Feign Signed-off-by: DeathGun44 <krishnamewara841@gmail.com>

… and down-payment schedule tests to Feign Signed-off-by: DeathGun44 <krishnamewara841@gmail.com>

…ests to Feign Signed-off-by: DeathGun44 <krishnamewara841@gmail.com>

…d Feign tests Signed-off-by: DeathGun44 <krishnamewara841@gmail.com>

Signed-off-by: DeathGun44 <krishnamewara841@gmail.com>

DeathGun44 · 2026-07-06T09:45:45Z

@adamsaghy Done!

budaidev

The PR has a massive scope and a lot of changes, so the lot of comments doesn't mean it's bad, but I would advise to fix those to keep the refactor clean. The direction is really good.

Also please avoid any behavior changes in the test, by modifying or removing assertations, because it could lead silent errors.

budaidev · 2026-07-06T16:02:18Z

+     */
+    public Long createLoanProductFromJson(String loanProductJson) {
+        try {
+            String sanitizedJson = loanProductJson.replaceAll("(?<=\\d),(?=\\d{3})", "");


Here, any numeric array/sequence where a value with ≥3 digits follows a comma gets silently merged. For example: {"loanIds":[5,1000]} → {"loanIds":[51000]}. I don't think this is the indended behaviour here.

budaidev · 2026-07-06T16:02:24Z

+
+    public <T> T getLoanProductError(String loanProductJson, String jsonAttributeToGetBack) {
+        try {
+            String sanitizedJson = loanProductJson.replaceAll("(?<=\\d),(?=\\d{3})", "");


Here, any numeric array/sequence where a value with ≥3 digits follows a comma gets silently merged. For example: {"loanIds":[5,1000]} → {"loanIds":[51000]}. I don't think this is the indended behaviour here.

budaidev · 2026-07-06T16:05:08Z

@@ -114,12 +155,11 @@ public static void setupHelpers() {
        codeHelper = new FeignCodeHelper(client);
        globalConfigurationHelper = new FeignGlobalConfigurationHelper(client);
        schedulerHelper = new FeignSchedulerHelper(client);
+        externalEventHelper = new FeignExternalEventHelper(client);
+        accounts = new LoanTestAccounts(accountHelper);


accounts = new LoanTestAccounts(accountHelper) is now eager in @BeforeAll (was lazy in getAccounts()). That's ~21 create-GL-account calls and 21 junk accounts per test class — for all 56 classes this PR moves onto the base, including ones that never touch accounting. Please restore lazy initialization.

budaidev · 2026-07-06T18:54:51Z

+        this.overpaymentAccount = getAccounts().getOverpaymentAccount();
    }

+    private ClientHelper clientHelper;


unused here, no init no usage

budaidev · 2026-07-06T19:58:21Z

        this.accountHelper = new AccountHelper(this.requestSpec, this.responseSpec);
        this.assetAccount = this.accountHelper.createAssetAccount();
        this.incomeAccount = this.accountHelper.createIncomeAccount();
        this.expenseAccount = this.accountHelper.createExpenseAccount();
        this.overpaymentAccount = this.accountHelper.createLiabilityAccount();
    }

+    private ClientHelper clientHelper;


unused here, it shadows the parent classes field

budaidev · 2026-07-06T20:19:13Z

    public void testCenterReschedulingMultiTrancheLoansWithInterestRecalculationEnabled() {
-
-        Integer officeId = new OfficeHelper().createOffice(LocalDate.of(2007, 7, 1)).getResourceId().intValue();
+        Long officeId = new FeignOfficeHelper(fineractClient()).createOffice(LocalDate.of(2007, Month.JULY, 1)).getResourceId();


Direct new FeignOfficeHelper(fineractClient()) in the test (helpers belong in the base per the test-infra conventions)

budaidev · 2026-07-06T20:20:46Z

+        Long loanProductId = createLoanProduct(product);
+        GetLoanProductsProductIdResponse retrievedProduct = retrieveLoanProduct(loanProductId);
+        assertNotNull(retrievedProduct);
+        return loanProductId;
    }

    private Long addChargeWithCurrency(Long loanId, boolean isPenalty, double amount, String dueDate, String currencyCode) {


ignores isPenalty and always creates a fee. Branch to the penalty builder or drop the parameter

budaidev · 2026-07-06T20:22:34Z

-            Integer penalty = ChargesHelper.createCharges(requestSpec, responseSpec,
-                    ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "10", true));
-
+            Long penalty = createLoanSpecifiedDueDateCharge(10.0);


budaidev · 2026-07-06T20:24:02Z

-        Assertions.assertNotNull(deletedFinancialActivityAccountId);
-        Assertions.assertEquals(financialActivityAccountId, deletedFinancialActivityAccountId);
+    @AfterEach
+    public void tearDownFinancialActivityAccounts() {


AfterEach now deletes all financial-activity mappings after every test (original: one mapping once in AfterAll) and mapLiabilityTransferFinancialActivity(Long) ignores its parameter; new FinancialActivityAccountHelper(null) is fragile. Also the savings product lost withMinimumOpenningBalance("10000.0").

budaidev · 2026-07-06T20:25:33Z

+        return ok(() -> fineractClient.rescheduleLoans().createLoanRescheduleRequest(request));
+    }
+
+    public CallFailedRuntimeException createRescheduleRequestExpectingError(PostCreateRescheduleLoansRequest request) {


createRescheduleRequestExpectingError is dead code with a latent bug: the recalc path throws AssertionError (RestAssured expectStatusCode(200)), which FeignCalls.fail() doesn't catch — it can never return the expected exception. Remove or implement via Feign

DeathGun44 force-pushed the FINERACT-2649/batch-migrate-loan-tests-to-feign-s3 branch from 9276e89 to 1d32a0e Compare July 3, 2026 15:11

adamsaghy reviewed Jul 3, 2026

View reviewed changes

Comment thread fineract-provider/src/test/java/org/apache/fineract/batch/command/CommandStrategyUtilsTest.java Outdated

Aman-Mittal reviewed Jul 3, 2026

View reviewed changes

Aman-Mittal requested a review from budaidev July 3, 2026 15:56

Aman-Mittal reviewed Jul 3, 2026

View reviewed changes

Comment thread ...ion-tests/src/test/java/org/apache/fineract/integrationtests/SmsCampaignIntegrationTest.java

Aman-Mittal added the java Pull requests that update Java code label Jul 3, 2026

Aman-Mittal reviewed Jul 4, 2026

View reviewed changes

Comment thread ...tests/src/test/java/org/apache/fineract/integrationtests/client/feign/FeignLoanTestBase.java Outdated

Aman-Mittal reviewed Jul 4, 2026

View reviewed changes

Comment thread ...tests/src/test/java/org/apache/fineract/integrationtests/client/feign/FeignLoanTestBase.java Outdated

DeathGun44 force-pushed the FINERACT-2649/batch-migrate-loan-tests-to-feign-s3 branch from 1d32a0e to ba3e948 Compare July 5, 2026 19:29

budaidev requested changes Jul 5, 2026

View reviewed changes

Comment thread ...src/test/java/org/apache/fineract/integrationtests/client/feign/helpers/FeignLoanHelper.java

DeathGun44 force-pushed the FINERACT-2649/batch-migrate-loan-tests-to-feign-s3 branch from ba3e948 to 07c5b62 Compare July 5, 2026 22:17

DeathGun44 added 13 commits July 6, 2026 15:14

FINERACT-2649: Add reAmortize, writeOff and credit allocation Feign h…

a948f3d

…elpers Signed-off-by: DeathGun44 <krishnamewara841@gmail.com>

FINERACT-2649: Migrate reschedule core integration tests to Feign

f5b061b

Signed-off-by: DeathGun44 <krishnamewara841@gmail.com>

FINERACT-2649: Migrate reAmortize and center reschedule tests to Feign

ffdd1df

Signed-off-by: DeathGun44 <krishnamewara841@gmail.com>

FINERACT-2649: Migrate non-APA chargeback integration tests to Feign

07366d9

Signed-off-by: DeathGun44 <krishnamewara841@gmail.com>

FINERACT-2649: Migrate down-payment product and loan summary tests to…

057fac9

… Feign Signed-off-by: DeathGun44 <krishnamewara841@gmail.com>

FINERACT-2649: Migrate down-payment transaction and undo disbursal te…

428a547

…sts to Feign Signed-off-by: DeathGun44 <krishnamewara841@gmail.com>

FINERACT-2649: Migrate APA write-off and transaction reprocess tests …

bc0405c

…to Feign Signed-off-by: DeathGun44 <krishnamewara841@gmail.com>

FINERACT-2649: Extend Feign loan helpers for external-id and business…

fc10eab

… dates Signed-off-by: DeathGun44 <krishnamewara841@gmail.com>

FINERACT-2649: Migrate APA, external-id and transaction loan tests to…

2036701

… Feign Signed-off-by: DeathGun44 <krishnamewara841@gmail.com>

FINERACT-2649: Migrate client loan credit balance, APA charge payment…

8ff387a

… and down-payment schedule tests to Feign Signed-off-by: DeathGun44 <krishnamewara841@gmail.com>

FINERACT-2649: Migrate charge, disbursement and reverse-replay loan t…

9704e03

…ests to Feign Signed-off-by: DeathGun44 <krishnamewara841@gmail.com>

FINERACT-2649: Standardize BigDecimal precision assertions in migrate…

e8e821c

…d Feign tests Signed-off-by: DeathGun44 <krishnamewara841@gmail.com>

FINERACT-2649: Migrate core LoanAccount tests to Feign

94261bf

Signed-off-by: DeathGun44 <krishnamewara841@gmail.com>

DeathGun44 force-pushed the FINERACT-2649/batch-migrate-loan-tests-to-feign-s3 branch from 07c5b62 to 94261bf Compare July 6, 2026 09:45

adamsaghy requested a review from budaidev July 6, 2026 13:43

budaidev requested changes Jul 6, 2026

View reviewed changes

Uh oh!

Conversation

DeathGun44 commented Jul 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Targeted commits

Scope

Bug Fix: Incorrect journal entry assertions in UndoLoanDisbursalWithDownPaymentIntegrationTest

Infrastructure Enhancements

Checklist

Uh oh!

DeathGun44 commented Jul 3, 2026

Uh oh!

Uh oh!

Aman-Mittal left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

adamsaghy commented Jul 6, 2026

Uh oh!

DeathGun44 commented Jul 6, 2026

Uh oh!

budaidev left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

DeathGun44 commented Jul 3, 2026 •

edited

Loading

Bug Fix: Incorrect journal entry assertions in `UndoLoanDisbursalWithDownPaymentIntegrationTest`