FINERACT-2541: added e2e test for validation of owner to owner transfer functionality

ruzeynalov · ruzeynalov · commit 58ada946de61 · 2026-03-24T11:51:17.000+01:00
diff --git a/config/docker/compose/activemq.yml b/config/docker/compose/activemq.yml
@@ -24,3 +24,4 @@ services:
     ports:
       - "6161:6161"
       - "61616:61616"
+      - "8161:8161"
diff --git a/config/docker/compose/fineract.yml b/config/docker/compose/fineract.yml
@@ -16,6 +16,8 @@
 # under the License.
 #
 
+version: "3.8"
+
 services:
   fineract:
     image: fineract:latest
@@ -24,7 +26,6 @@ services:
       - ${PWD}/config/docker/logback/logback-override.xml:/app/logback-override.xml
       - ${PWD}/config/docker/aws/etc/credentials:/etc/aws/credentials:ro
       - ${PWD}/build/fineract/logs:/var/logs/fineract:rw
-      # - ${PWD}/build/fineract/tmp:/tmp:rw
     healthcheck:
       test: ["CMD", 'sh', '-c', 'echo -e "Checking for the availability of Fineract server deployment"; while ! nc -z "localhost" 8443; do sleep 1; printf "-"; done; echo -e " >> Fineract server has started";' ]
       timeout: 1s
diff --git a/config/docker/env/fineract-common.env b/config/docker/env/fineract-common.env
@@ -18,8 +18,8 @@
 #
 
 # ... following variables are optional; "application.properties" contains reasonable defaults (same as here)
-FINERACT_USER=1000
-FINERACT_GROUP=1000
+FINERACT_USER=rzeinalov
+FINERACT_GROUP=staff
 FINERACT_HIKARI_MINIMUM_IDLE=3
 FINERACT_HIKARI_MAXIMUM_POOL_SIZE=10
 FINERACT_HIKARI_IDLE_TIMEOUT=60000
@@ -50,6 +50,7 @@ FINERACT_DEFAULT_TENANTDB_DESCRIPTION=Default Demo Tenant
 FINERACT_DEFAULT_TENANTDB_HOSTNAME=db
 FINERACT_DEFAULT_TENANTDB_PWD=skdcnwauicn2ucnaecasdsajdnizucawencascdca
 FINERACT_DEFAULT_MASTER_PASSWORD=fineract
+FINERACT_MODULE_LOAN_ORIGINATION_ENABLED=true
 FINERACT_MANAGEMENT_ENDPOINT_WEB_EXPOSURE_INCLUDE=health,info,prometheus
 FINERACT_MANAGEMENT_METRICS_TAGS_APPLICATION=fineract
 FINERACT_REMOTE_JOB_MESSAGE_HANDLER_SPRING_EVENTS_ENABLED=true
diff --git a/docker-compose-postgresql-activemq.yml b/docker-compose-postgresql-activemq.yml
@@ -50,7 +50,7 @@ services:
       service: fineract
     deploy:
       mode: replicated
-      replicas: 2
+      replicas: 1
     ports:
       - "8444-8445:8443"
     depends_on:
diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/AssetExternalizationErrorMessage.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/AssetExternalizationErrorMessage.java
@@ -31,6 +31,7 @@ public enum AssetExternalizationErrorMessage {
     LOAN_CLOSED_OBLIGATIONS_MET_INVALID("Loan status CLOSED_OBLIGATIONS_MET is not valid for transfer."), //
     LOAN_SUBMITTED_AND_PENDING_APPROVAL_INVALID("Loan status SUBMITTED_AND_PENDING_APPROVAL is not valid for transfer."), //
     LOAN_APPROVED_INVALID("Loan status APPROVED is not valid for transfer."), //
+    ALREADY_IN_PROGRESS("This loan cannot be sold, there is already an in progress transfer"), //
     INVALID_REQUEST("The request was invalid. This typically will happen due to validation errors which are provided."); //
 
     public final String value;
diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/messaging/event/EventCheckHelper.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/messaging/event/EventCheckHelper.java
@@ -166,11 +166,11 @@ public void loanStatusChangedEventCheck(Long loanId) {
     }
 
     private void loanAccountDataV1Check(Class<? extends AbstractLoanEvent> eventClazz, Long loanId) {
-        GetLoansLoanIdResponse body = ok(() -> fineractClient.loans().retrieveLoan(loanId,
-                Map.of("staffInSelectedOfficeOnly", false, "associations", "all", "exclude", "", "fields", "")));
-
         eventAssertion.assertEvent(eventClazz, loanId)//
                 .extractingData(loanAccountDataV1 -> {
+                    // Query API after event arrives to ensure both snapshots reflect the same settled state
+                    GetLoansLoanIdResponse body = ok(() -> fineractClient.loans().retrieveLoan(loanId,
+                            Map.of("staffInSelectedOfficeOnly", false, "associations", "all", "exclude", "", "fields", "")));
                     Long idActual = loanAccountDataV1.getId();
                     Long idExpected = body.getId();
                     Long statusIdActual = loanAccountDataV1.getStatus().getId().longValue();
diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/assetexternalization/AssetExternalizationStepDef.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/assetexternalization/AssetExternalizationStepDef.java
@@ -159,6 +159,11 @@ private void createAssetExternalizationRequestByLoanId(DataTable table, String t
         } else if ((transferData.get(0).equals(TRANSACTION_TYPE_SALE) || transferData.get(0).equals(TRANSACTION_TYPE_INTERMEDIARY_SALE))) {
             String ownerExternalId;
             if (regenerateOwner) {
+                // For owner-to-owner transfers: preserve the current owner as previous owner
+                String currentOwner = testContext().get(TestContextKey.ASSET_EXTERNALIZATION_OWNER_EXTERNAL_ID);
+                if (currentOwner != null && !transferData.get(0).equals(TRANSACTION_TYPE_INTERMEDIARY_SALE)) {
+                    testContext().set(TestContextKey.ASSET_EXTERNALIZATION_PREVIOUS_OWNER_EXTERNAL_ID, currentOwner);
+                }
                 ownerExternalId = Utils.randomStringGenerator(OWNER_EXTERNAL_ID_PREFIX, 10);
             } else {
                 ownerExternalId = testContext().get(TestContextKey.ASSET_EXTERNALIZATION_OWNER_EXTERNAL_ID);
@@ -369,13 +374,20 @@ private void checkExternalAssetDetails(Long loanId, String loanExternalId, PageE
                     previousAssetOwner = null;
                     transferExternalId = testContext().get(TestContextKey.ASSET_EXTERNALIZATION_SALES_TRANSFER_EXTERNAL_ID_FROM_RESPONSE);
                 }
-            } else { // in case transfer has previous intermediarySale transfer
+            } else { // in case transfer has previous intermediarySale or owner-to-owner transfer
                 if (transactionType.equalsIgnoreCase(TRANSACTION_TYPE_SALE)
                         && (status.equals(ExternalTransferData.StatusEnum.ACTIVE.getValue())
                                 || status.equals(ExternalTransferData.StatusEnum.PENDING.getValue()))) {
                     ownerExternalId = ownerExternalIdStored;
                     previousAssetOwner = intermediarySaleAssetOwner;
                     transferExternalId = testContext().get(TestContextKey.ASSET_EXTERNALIZATION_SALES_TRANSFER_EXTERNAL_ID_FROM_RESPONSE);
+                } else if (transactionType.equalsIgnoreCase(TRANSACTION_TYPE_SALE)
+                        && (status.equals(ExternalTransferData.StatusEnum.DECLINED.getValue())
+                                || status.equals(ExternalTransferData.StatusEnum.CANCELLED.getValue()))) {
+                    // DECLINED and CANCELLED records have previousOwner = null in the API response
+                    ownerExternalId = ownerExternalIdStored;
+                    previousAssetOwner = null;
+                    transferExternalId = testContext().get(TestContextKey.ASSET_EXTERNALIZATION_SALES_TRANSFER_EXTERNAL_ID_FROM_RESPONSE);
                 } else if (transactionType.equalsIgnoreCase(TRANSACTION_TYPE_BUYBACK)
                         && (status.equals(ExternalTransferData.StatusEnum.BUYBACK.getValue())
                                 || status.equals(ExternalTransferData.StatusEnum.BUYBACK_INTERMEDIATE.getValue()))) {
diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanRepaymentStepDef.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanRepaymentStepDef.java
@@ -104,6 +104,13 @@ public void makeLoanRepaymentAndCheckOwner(String repaymentType, String transact
         makeRepayment(repaymentType, transactionDate, transactionAmount, transferExternalOwnerId);
     }
 
+    @And("Customer makes {string} repayment on {string} with {double} EUR transaction amount and check previous external owner")
+    public void makeLoanRepaymentAndCheckPreviousOwner(String repaymentType, String transactionDate, double transactionAmount)
+            throws IOException {
+        String previousOwnerId = testContext().get(TestContextKey.ASSET_EXTERNALIZATION_PREVIOUS_OWNER_EXTERNAL_ID);
+        makeRepayment(repaymentType, transactionDate, transactionAmount, previousOwnerId);
+    }
+
     private void makeRepayment(String repaymentType, String transactionDate, double transactionAmount, String transferExternalOwnerId)
             throws IOException {
         eventStore.reset();
diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanStepDef.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanStepDef.java
@@ -389,6 +389,14 @@ public void createTransactionWithAutoIdempotencyKeyWithExternalOwner(String tran
                 transactionAmount, transferExternalOwnerId);
     }
 
+    @When("Customer makes {string} transaction with {string} payment type on {string} with {double} EUR transaction amount and system-generated Idempotency key and check previous external owner")
+    public void createTransactionWithAutoIdempotencyKeyWithPreviousExternalOwner(String transactionTypeInput, String transactionPaymentType,
+            String transactionDate, double transactionAmount) throws IOException {
+        String previousOwnerId = testContext().get(TestContextKey.ASSET_EXTERNALIZATION_PREVIOUS_OWNER_EXTERNAL_ID);
+        createTransactionWithAutoIdempotencyKeyAndWithExternalOwner(transactionTypeInput, transactionPaymentType, transactionDate,
+                transactionAmount, previousOwnerId);
+    }
+
     @When("Customer makes {string} transaction with {string} payment type on {string} with {double} EUR transaction amount and system-generated Idempotency key and interestRefundCalculation {booleanValue}")
     public void createTransactionWithAutoIdempotencyKeyAndWithInterestRefundCalculationFlagProvided(final String transactionTypeInput,
             final String transactionPaymentType, final String transactionDate, final double transactionAmount,
@@ -5133,6 +5141,7 @@ public void adminAddsCapitalizedIncomeAdjustmentToTheLoan(final String transacti
 
         testContext().set(TestContextKey.LOAN_CAPITALIZED_INCOME_ADJUSTMENT_RESPONSE, adjustmentResponse);
         log.debug("Capitalized Income Adjustment created: Transaction ID {}", adjustmentResponse.getResourceId());
+        eventCheckHelper.loanBalanceChangedEventCheck(loanId);
     }
 
     @And("Admin adds capitalized income adjustment of capitalized income transaction made on {string} with {string} payment type to the loan on {string} with {string} EUR transaction amount")
@@ -5165,6 +5174,7 @@ public void adminAddsCapitalizedIncomeAdjustmentToTheLoan(final String originalT
         testContext().set(TestContextKey.LOAN_CAPITALIZED_INCOME_ADJUSTMENT_RESPONSE, adjustmentResponse);
         assert adjustmentResponse != null;
         log.debug("Capitalized Income Adjustment created: Transaction ID {}", adjustmentResponse.getResourceId());
+        eventCheckHelper.loanBalanceChangedEventCheck(loanId);
     }
 
     @Then("Loan's available disbursement amount is {string}")
@@ -5201,6 +5211,7 @@ public void adminAddsCapitalizedIncomeAdjustmentToTheLoanWithCapitalizedIncomeDa
 
         testContext().set(TestContextKey.LOAN_CAPITALIZED_INCOME_ADJUSTMENT_RESPONSE, adjustmentResponse);
         log.debug("Capitalized Income Adjustment created: Transaction ID {}", adjustmentResponse.getResourceId());
+        eventCheckHelper.loanBalanceChangedEventCheck(loanId);
     }
 
     @And("Admin adds invalid capitalized income adjustment with {string} payment type to the loan on {string} with {string} EUR transaction amount")
diff --git a/fineract-e2e-tests-core/src/test/resources/fineract-test-application.properties b/fineract-e2e-tests-core/src/test/resources/fineract-test-application.properties
@@ -23,20 +23,20 @@ fineract-test.api.password=${TEST_PASSWORD:password}
 fineract-test.api.strong-password=${TEST_STRONG_PASSWORD:A1b2c3d4e5f$}
 fineract-test.api.tenant-id=${TEST_TENANT_ID:default}
 
-fineract-test.initialization.enabled=${INITIALIZATION_ENABLED:false}
+fineract-test.initialization.enabled=${INITIALIZATION_ENABLED:true}
 
 fineract-test.testrail.enabled=${TESTRAIL_ENABLED:false}
 fineract-test.testrail.base-url=${TESTRAIL_BASEURL:}
 fineract-test.testrail.username=${TESTRAIL_USERNAME:}
 fineract-test.testrail.password=${TESTRAIL_PASSWORD:}
 fineract-test.testrail.run-id=${TESTRAIL_RUN_ID:0}
 
-fineract-test.messaging.jms.broker-url=${ACTIVEMQ_BROKER_URL:}
-fineract-test.messaging.jms.broker-username=${ACTIVEMQ_BROKER_USERNAME:}
-fineract-test.messaging.jms.broker-password=${ACTIVEMQ_BROKER_PASSWORD:}
-fineract-test.messaging.jms.topic-name=${ACTIVEMQ_TOPIC_NAME:}
+fineract-test.messaging.jms.broker-url=${ACTIVEMQ_BROKER_URL:tcp://localhost:61616}
+fineract-test.messaging.jms.broker-username=${ACTIVEMQ_BROKER_USERNAME:admin}
+fineract-test.messaging.jms.broker-password=${ACTIVEMQ_BROKER_PASSWORD:admin}
+fineract-test.messaging.jms.topic-name=${ACTIVEMQ_TOPIC_NAME:events}
 
-fineract-test.event.verification-enabled=${EVENT_VERIFICATION_ENABLED:false}
+fineract-test.event.verification-enabled=${EVENT_VERIFICATION_ENABLED:true}
 fineract-test.event.wait-timeout-in-ms=${POLLING_EVENT_WAIT_TIMEOUT_IN_MS:5000}
 fineract-test.event.delay-in-ms=${POLLING_EVENT_WAIT_TIMEOUT_IN_MS:100}
 fineract-test.event.interval-in-ms=${POLLING_EVENT_WAIT_TIMEOUT_IN_MS:100}
diff --git a/fineract-e2e-tests-runner/src/test/resources/features/AssetExternalization-Part1.feature b/fineract-e2e-tests-runner/src/test/resources/features/AssetExternalization-Part1.feature
@@ -1811,67 +1811,3 @@ Feature: Asset Externalization - Part1
 
     When Loan Pay-off is made on "26 June 2025"
     Then Loan's all installments have obligations met
-
-  Scenario: Verify that when a loan with PENDING owner-to-owner SALES is fully paid asset transfer is DECLINED and original owner remains active
-    When Admin sets the business date to "1 May 2023"
-    When Admin creates a client with random data
-    When Admin creates a new default Loan with date: "1 May 2023"
-    And Admin successfully approves the loan on "1 May 2023" with "1000" amount and expected disbursement date on "1 May 2023"
-    When Admin successfully disburse the loan on "1 May 2023" with "1000" EUR transaction amount
-    Then Loan status will be "ACTIVE"
-    When Admin makes asset externalization request by Loan ID with unique ownerExternalId, system-generated transferExternalId and the following data:
-      | Transaction type | settlementDate | purchasePriceRatio |
-      | sale             | 2023-05-21     | 1                  |
-    Then Asset externalization response has the correct Loan ID, transferExternalId
-    When Admin sets the business date to "22 May 2023"
-    When Admin runs inline COB job for Loan
-    Then LoanOwnershipTransferBusinessEvent is created
-    Then LoanAccountSnapshotBusinessEvent is created
-    Then Fetching Asset externalization details by loan id gives numberOfElements: 2 with correct ownerExternalId and the following data:
-      | settlementDate | purchasePriceRatio | status  | effectiveFrom | effectiveTo | Transaction type |
-      | 2023-05-21     | 1                  | PENDING | 2023-05-01    | 2023-05-21  | SALE             |
-      | 2023-05-21     | 1                  | ACTIVE  | 2023-05-22    | 9999-12-31  | SALE             |
-    When Admin sets the business date to "25 May 2023"
-    When Admin makes asset externalization request by Loan ID with unique ownerExternalId, system-generated transferExternalId and the following data:
-      | Transaction type | settlementDate | purchasePriceRatio |
-      | sale             | 2023-06-14     | 1                  |
-    Then Asset externalization response has the correct Loan ID, transferExternalId
-    When Admin sets the business date to "28 May 2023"
-    And Customer makes "AUTOPAY" repayment on "28 May 2023" with 1000 EUR transaction amount
-    Then Loan status will be "CLOSED_OBLIGATIONS_MET"
-    Then Fetching Asset externalization details by loan id gives numberOfElements: 4 with correct ownerExternalId and the following data:
-      | settlementDate | purchasePriceRatio | status   | effectiveFrom | effectiveTo | Transaction type |
-      | 2023-06-14     | 1                  | DECLINED | 2023-05-28    | 2023-05-28  | SALE             |
-    Then LoanOwnershipTransferBusinessEvent with transfer status: "DECLINED" and transfer status reason "BALANCE_ZERO" is created
-
-  Scenario: Verify that when a loan with PENDING owner-to-owner SALES is overpaid asset transfer is DECLINED and original owner remains active
-    When Admin sets the business date to "1 May 2023"
-    When Admin creates a client with random data
-    When Admin creates a new default Loan with date: "1 May 2023"
-    And Admin successfully approves the loan on "1 May 2023" with "1000" amount and expected disbursement date on "1 May 2023"
-    When Admin successfully disburse the loan on "1 May 2023" with "1000" EUR transaction amount
-    Then Loan status will be "ACTIVE"
-    When Admin makes asset externalization request by Loan ID with unique ownerExternalId, system-generated transferExternalId and the following data:
-      | Transaction type | settlementDate | purchasePriceRatio |
-      | sale             | 2023-05-21     | 1                  |
-    Then Asset externalization response has the correct Loan ID, transferExternalId
-    When Admin sets the business date to "22 May 2023"
-    When Admin runs inline COB job for Loan
-    Then LoanOwnershipTransferBusinessEvent is created
-    Then LoanAccountSnapshotBusinessEvent is created
-    Then Fetching Asset externalization details by loan id gives numberOfElements: 2 with correct ownerExternalId and the following data:
-      | settlementDate | purchasePriceRatio | status  | effectiveFrom | effectiveTo | Transaction type |
-      | 2023-05-21     | 1                  | PENDING | 2023-05-01    | 2023-05-21  | SALE             |
-      | 2023-05-21     | 1                  | ACTIVE  | 2023-05-22    | 9999-12-31  | SALE             |
-    When Admin sets the business date to "25 May 2023"
-    When Admin makes asset externalization request by Loan ID with unique ownerExternalId, system-generated transferExternalId and the following data:
-      | Transaction type | settlementDate | purchasePriceRatio |
-      | sale             | 2023-06-14     | 1                  |
-    Then Asset externalization response has the correct Loan ID, transferExternalId
-    When Admin sets the business date to "28 May 2023"
-    And Customer makes "AUTOPAY" repayment on "28 May 2023" with 1200 EUR transaction amount
-    Then Loan status will be "OVERPAID"
-    Then Fetching Asset externalization details by loan id gives numberOfElements: 4 with correct ownerExternalId and the following data:
-      | settlementDate | purchasePriceRatio | status   | effectiveFrom | effectiveTo | Transaction type |
-      | 2023-06-14     | 1                  | DECLINED | 2023-05-28    | 2023-05-28  | SALE             |
-    Then LoanOwnershipTransferBusinessEvent with transfer status: "DECLINED" and transfer status reason "BALANCE_NEGATIVE" is created
diff --git a/fineract-e2e-tests-runner/src/test/resources/features/AssetExternalization-Part2.feature b/fineract-e2e-tests-runner/src/test/resources/features/AssetExternalization-Part2.feature
