From 71ceabec1a532902670abd0c6a3f76a8761f0904 Mon Sep 17 00:00:00 2001
From: Abhinav Mishra <abhinav@fynarfin.in>
Date: Fri, 19 Apr 2024 12:50:23 +0530
Subject: [PATCH 01/11] conflict resolve

---
 .circleci/config.yml                          |   4 +-
 build.gradle                                  |   1 +
 src/main/resources/application.yaml           |   3 +
 .../cucumber/stepdef/GSMATransferStepDef.java |  43 +++
 .../stepdef/PayerFundTransferStepDef.java     |  66 +++++
 ...ansactioClosedLoopMojaloopFundTransfer.csv |   9 +
 .../batch_demo_csv/batchTransaction.csv       |   4 +
 .../batchTransactionGsmaClosedLoop.csv        |  16 +-
 ...batchTransactionGsmaClosedLoopMojaloop.csv |  14 +
 src/test/java/resources/bulkPayment.feature   | 262 +++++++++++++++++-
 src/test/java/resources/mojaloop.feature      |   4 +-
 11 files changed, 409 insertions(+), 17 deletions(-)
 create mode 100644 src/test/java/resources/batch_demo_csv/batchTransactioClosedLoopMojaloopFundTransfer.csv
 create mode 100644 src/test/java/resources/batch_demo_csv/batchTransaction.csv
 create mode 100644 src/test/java/resources/batch_demo_csv/batchTransactionGsmaClosedLoopMojaloop.csv

diff --git a/.circleci/config.yml b/.circleci/config.yml
index aa89477fd..56b8feecd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -227,7 +227,7 @@ jobs:
             export CALLBACK_URL="https://$NGROK_PUBLIC_URL"
             echo -n "Public url ."
             echo $CALLBACK_URL
-            ./gradlew test -Dcucumber.filter.tags="@gov"
+            ./gradlew test -Dcucumber.filter.tags="@gov1"
             echo -n "Test execution is completed, kill ngrok"
             pkill ngrok
       - store_test_results:
@@ -327,7 +327,7 @@ workflows:
             - Ngrok
       - test-chart-gov:
           requires:
-            - test-chart-ams
+            - deploying-bpmns
           context:
             - AWS
             - Helm
diff --git a/build.gradle b/build.gradle
index dfdc50234..c5edad8c8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -149,6 +149,7 @@ dependencies {
     testImplementation "com.github.tomakehurst:wiremock-jre8:2.35.0"
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     implementation 'org.mifos:ph-ee-connector-common:1.8.1-SNAPSHOT'
+    implementation 'org.springframework.boot:spring-boot-starter-web'
     testImplementation "com.google.truth:truth:1.1.3"
     testImplementation 'com.google.code.gson:gson:2.9.0'
     testImplementation('io.rest-assured:rest-assured:5.1.1') {
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index 2df866732..969c43848 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -1,3 +1,6 @@
+server:
+  port: 8083
+
 operations-app:
   contactpoint: "https://ops-bk.sandbox.fynarfin.io"
   dpgcontactpoint: "https://ops-bk-dpg.sandbox.fynarfin.io"
diff --git a/src/test/java/org/mifos/integrationtest/cucumber/stepdef/GSMATransferStepDef.java b/src/test/java/org/mifos/integrationtest/cucumber/stepdef/GSMATransferStepDef.java
index 6932f99df..68d7aabcb 100644
--- a/src/test/java/org/mifos/integrationtest/cucumber/stepdef/GSMATransferStepDef.java
+++ b/src/test/java/org/mifos/integrationtest/cucumber/stepdef/GSMATransferStepDef.java
@@ -714,6 +714,28 @@ public void iCallTheBalanceApiForPayeeBalanceForCombinedTestsCases(String id) th
 
     }
 
+    @Then("I call the balance api for payee {string} balance for all combine test cases")
+    public void iCallTheBalanceApiForPayeeBalanceForAllCombinedTestsCases(String id) throws JsonProcessingException {
+        RequestSpecification requestSpec = Utils.getDefaultSpec(scenarioScopeState.tenant);
+        String finalEndpoint = amsBalanceEndpoint;
+        if (scenarioScopeState.payeeIdentifierforBatch == null) {
+            scenarioScopeState.payeeIdentifierforBatch = new String[15];
+        }
+        scenarioScopeState.payeeIdentifierforBatch[Integer.parseInt(id)] = scenarioScopeState.payeeIdentifier;
+        finalEndpoint = finalEndpoint.replace("{IdentifierType}", "MSISDN");
+        finalEndpoint = finalEndpoint.replace("{IdentifierId}", creditParty.isEmpty() ? scenarioScopeState.payeeIdentifier : creditParty);
+        logger.info("Endpoint: " + finalEndpoint);
+        scenarioScopeState.response = RestAssured.given(requestSpec).baseUri(amsBaseUrl).body("").expect()
+                .spec(new ResponseSpecBuilder().expectStatusCode(200).build()).when().get(finalEndpoint).andReturn().asString();
+        logger.info("Balance Response: " + scenarioScopeState.response);
+        InteropAccountDTO interopAccountDTO = objectMapper.readValue(scenarioScopeState.response, InteropAccountDTO.class);
+        assertThat(
+                interopAccountDTO.getAvailableBalance().intValue() >= scenarioScopeState.initialBalForPayeeForBatch[Integer.parseInt(id)])
+                .isTrue();
+
+    }
+
+
     @Then("I call the balance api for payee with id {string} balance after credit")
     public void iCallTheBalanceApiForPayeeBalanceAfterCredit(String id) throws JsonProcessingException {
         RequestSpecification requestSpec = Utils.getDefaultSpec(scenarioScopeState.tenant);
@@ -773,6 +795,27 @@ public void iCallTheBalanceApiForPayerBalanceForCombinedTestCases(String id) thr
 
     }
 
+    @Then("I call the balance api for payer {string} balance for all combine test cases")
+    public void iCallTheBalanceApiForAllPayerBalanceForCombinedTestCases(String id) throws JsonProcessingException {
+        RequestSpecification requestSpec = Utils.getDefaultSpec(scenarioScopeState.tenant);
+        String finalEndpoint = amsBalanceEndpoint;
+        if (scenarioScopeState.payerIdentifierforBatch == null) {
+            scenarioScopeState.payerIdentifierforBatch = new String[15];
+        }
+        scenarioScopeState.payerIdentifierforBatch[Integer.parseInt(id)] = scenarioScopeState.payerIdentifier;
+        finalEndpoint = finalEndpoint.replace("{IdentifierType}", "MSISDN");
+        finalEndpoint = finalEndpoint.replace("{IdentifierId}", debitParty.isEmpty() ? scenarioScopeState.payerIdentifier : debitParty);
+        logger.info("Endpoint: " + finalEndpoint);
+        scenarioScopeState.response = RestAssured.given(requestSpec).baseUri(amsBaseUrl).body("").expect()
+                .spec(new ResponseSpecBuilder().expectStatusCode(200).build()).when().get(finalEndpoint).andReturn().asString();
+        logger.info("Balance Response: " + scenarioScopeState.response);
+        InteropAccountDTO interopAccountDTO = objectMapper.readValue(scenarioScopeState.response, InteropAccountDTO.class);
+        assertThat(
+                interopAccountDTO.getAvailableBalance().intValue() >= scenarioScopeState.initialBalForPayerForBatch[Integer.parseInt(id)])
+                .isTrue();
+
+    }
+
     @Then("I call the balance api for payer with id {string} balance after debit")
     public void iCallTheBalanceApiForPayerBalanceAfterDebit(String id) throws JsonProcessingException {
         RequestSpecification requestSpec = Utils.getDefaultSpec(scenarioScopeState.tenant);
diff --git a/src/test/java/org/mifos/integrationtest/cucumber/stepdef/PayerFundTransferStepDef.java b/src/test/java/org/mifos/integrationtest/cucumber/stepdef/PayerFundTransferStepDef.java
index c2bde221d..8bc74d9a7 100644
--- a/src/test/java/org/mifos/integrationtest/cucumber/stepdef/PayerFundTransferStepDef.java
+++ b/src/test/java/org/mifos/integrationtest/cucumber/stepdef/PayerFundTransferStepDef.java
@@ -541,6 +541,20 @@ public void addRowToCsvFileForCombinedTestCases(String paymentMode, int transfer
         scenarioScopeState.gsmaP2PAmtDebitForBatch[id + 1] = transferAmount;
     }
 
+    @Then("add row to csv with current payer and payee, payment mode as {string} and transfer amount {int} and id {int} for all combine test cases")
+    public void addRowToCsvFileForAllCombinedTestCases(String paymentMode, int transferAmount, int id) throws IOException {
+
+        String[] row = { String.valueOf(id), UUID.randomUUID().toString(), paymentMode, "msisdn", scenarioScopeState.payerIdentifier,
+                "msisdn", scenarioScopeState.payeeIdentifier, String.valueOf(transferAmount), "USD", "Test Payee Payment" };
+        String filePath = Utils.getAbsoluteFilePathToResource(scenarioScopeState.filename);
+        csvHelper.addRow(filePath, row);
+        scenarioScopeState.gsmaP2PAmtDebit = scenarioScopeState.gsmaP2PAmtDebit + transferAmount;
+        if (scenarioScopeState.gsmaP2PAmtDebitForBatch == null) {
+            scenarioScopeState.gsmaP2PAmtDebitForBatch = new int[14];
+        }
+        scenarioScopeState.gsmaP2PAmtDebitForBatch[id + 1] = transferAmount;
+    }
+
     @Then("add last row to csv with current payer and payee, payment mode as {string} and transfer amount {int} and id {int}")
     public void addLastRowToCsvFile(String paymentMode, int transferAmount, int id) throws IOException {
 
@@ -605,4 +619,56 @@ public void consolidatedPayeeCreationStepsForCombinedTestsCases(String client, S
         }
     }
 
+    @When("I create and setup a {string} with id {string} and account balance of {int} for multiple payment mode bulk test cases")
+    public void consolidatedPayeeCreationStepsForMultpliePaymentModeTestsCases(String client, String id, int amount) throws JsonProcessingException {
+        setTenantForPayer(client);
+        callCreateClientEndpoint(client);
+        callCreateSavingsProductEndpoint(client);
+        callCreateSavingsAccountEndpoint(client);
+        callCreateInteropIdentifierEndpoint(client);
+        callApproveSavingsEndpoint("approve", client);
+        callSavingsActivateEndpoint("activate", client);
+        callDepositAccountEndpoint("deposit", amount, client);
+        if (client.equals("payer")) {
+            if (scenarioScopeState.initialBalForPayerForBatch == null) {
+                scenarioScopeState.initialBalForPayerForBatch = new int[14];
+            }
+            scenarioScopeState.initialBalForPayerForBatch[Integer.parseInt(id)] = amount;
+            assertThat(scenarioScopeState.initialBalForPayerForBatch[Integer.parseInt(id)]).isNotNull();
+
+        } else if (client.equals("payee")) {
+            if (scenarioScopeState.initialBalForPayeeForBatch == null) {
+                scenarioScopeState.initialBalForPayeeForBatch = new int[9];
+            }
+            scenarioScopeState.initialBalForPayeeForBatch[Integer.parseInt(id)] = amount;
+            assertThat(scenarioScopeState.initialBalForPayeeForBatch[Integer.parseInt(id)]).isNotNull();
+        }
+    }
+
+    @When("I create and setup a {string} with id {string} and account balance of {int} for all combine test cases")
+    public void consolidatedPayeeCreationStepsForAllCombinedTestsCases(String client, String id, int amount) throws JsonProcessingException {
+        setTenantForPayer(client);
+        callCreateClientEndpoint(client);
+        callCreateSavingsProductEndpoint(client);
+        callCreateSavingsAccountEndpoint(client);
+        callCreateInteropIdentifierEndpoint(client);
+        callApproveSavingsEndpoint("approve", client);
+        callSavingsActivateEndpoint("activate", client);
+        callDepositAccountEndpoint("deposit", amount, client);
+        if (client.equals("payer")) {
+            if (scenarioScopeState.initialBalForPayerForBatch == null) {
+                scenarioScopeState.initialBalForPayerForBatch = new int[15];
+            }
+            scenarioScopeState.initialBalForPayerForBatch[Integer.parseInt(id)] = amount;
+            assertThat(scenarioScopeState.initialBalForPayerForBatch[Integer.parseInt(id)]).isNotNull();
+
+        } else if (client.equals("payee")) {
+            if (scenarioScopeState.initialBalForPayeeForBatch == null) {
+                scenarioScopeState.initialBalForPayeeForBatch = new int[15];
+            }
+            scenarioScopeState.initialBalForPayeeForBatch[Integer.parseInt(id)] = amount;
+            assertThat(scenarioScopeState.initialBalForPayeeForBatch[Integer.parseInt(id)]).isNotNull();
+        }
+    }
+
 }
diff --git a/src/test/java/resources/batch_demo_csv/batchTransactioClosedLoopMojaloopFundTransfer.csv b/src/test/java/resources/batch_demo_csv/batchTransactioClosedLoopMojaloopFundTransfer.csv
new file mode 100644
index 000000000..ae1332a03
--- /dev/null
+++ b/src/test/java/resources/batch_demo_csv/batchTransactioClosedLoopMojaloopFundTransfer.csv
@@ -0,0 +1,9 @@
+id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
+0,bf5e4189-cfa4-4e1b-af87-b759d0cbf5b7,closedloop,msisdn,3860,msisdn,3543,10,USD,Test Payee Payment
+1,2b161d23-b2f2-47ae-91e9-a99a30600c9d,closedloop,msisdn,3861,msisdn,3544,5,USD,Test Payee Payment
+2,936b2c6f-92fe-4a86-85a3-48611fe8b56a,closedloop,msisdn,3862,msisdn,3545,5,USD,Test Payee Payment
+3,f6a7aced-60fb-4542-bb78-cec4b6e9a83c,closedloop,msisdn,3863,msisdn,3546,5,USD,Test Payee Payment
+4,d5c48256-6689-4ff5-ba5a-1c0b0d0ae444,closedloop,msisdn,3864,msisdn,3547,5,USD,Test Payee Payment
+5,954495f6-d544-4a50-bfc1-862c34a2e569,mojaloop,msisdn,3865,msisdn,3548,3,USD,Test Payee Payment
+6,c0c4f551-a48a-4d79-a71d-6cad8f124897,mojaloop,msisdn,3866,msisdn,3548,2,USD,Test Payee Payment
+7,0df72164-6bf4-4a4e-941d-520466747fe7,mojaloop,msisdn,3867,msisdn,3549,1,USD,Test Payee Payment
\ No newline at end of file
diff --git a/src/test/java/resources/batch_demo_csv/batchTransaction.csv b/src/test/java/resources/batch_demo_csv/batchTransaction.csv
new file mode 100644
index 000000000..72a0e2525
--- /dev/null
+++ b/src/test/java/resources/batch_demo_csv/batchTransaction.csv
@@ -0,0 +1,4 @@
+id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
+0,52c36327-2c70-48d1-aaa1-a6b3fe447fcd,mojaloop,msisdn,58,msisdn,53,3,USD,Test Payee Payment
+1,0bdc4f1e-b287-408e-a1e1-9d9238ec90ac,mojaloop,msisdn,59,msisdn,53,2,USD,Test Payee Payment
+2,3cc19513-7988-40cc-9858-24bdaa8b48fd,mojaloop,msisdn,60,msisdn,54,1,USD,Test Payee Payment
\ No newline at end of file
diff --git a/src/test/java/resources/batch_demo_csv/batchTransactionGsmaClosedLoop.csv b/src/test/java/resources/batch_demo_csv/batchTransactionGsmaClosedLoop.csv
index 3d4e2284b..28675884f 100644
--- a/src/test/java/resources/batch_demo_csv/batchTransactionGsmaClosedLoop.csv
+++ b/src/test/java/resources/batch_demo_csv/batchTransactionGsmaClosedLoop.csv
@@ -1,9 +1,9 @@
 id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
-0,ead8a498-5f97-44ed-866e-b5729f9dc71c,closedloop,msisdn,2936,msisdn,2716,10,USD,Test Payee Payment
-1,7ca27144-5994-4107-ad54-9160fbb3f6e7,closedloop,msisdn,2937,msisdn,2717,5,USD,Test Payee Payment
-2,3731d077-bede-4708-bbb1-e237d1d5c13d,closedloop,msisdn,2938,msisdn,2718,5,USD,Test Payee Payment
-3,e475fcde-4bf8-4fba-b2df-acbb452ffb19,closedloop,msisdn,2939,msisdn,2719,5,USD,Test Payee Payment
-4,89246be1-3211-4fea-850e-d34d20617e31,closedloop,msisdn,2940,msisdn,2720,5,USD,Test Payee Payment
-5,a644c842-7b81-4b66-b10b-c1ccdc5b776e,gsma,msisdn,2941,msisdn,2721,6,USD,Test Payee Payment
-6,a1019717-1cdc-4a6c-82ca-15a6295fc21b,gsma,msisdn,2942,msisdn,2722,7,USD,Test Payee Payment
-7,0430429d-e8ec-4fdd-b56d-37da165c236f,gsma,msisdn,2943,msisdn,2723,8,USD,Test Payee Payment
\ No newline at end of file
+0,05cd9734-f25e-462d-a6ad-88606b66c19a,closedloop,msisdn,3852,msisdn,3535,10,USD,Test Payee Payment
+1,f868df3a-2b0f-4c72-ad67-0708c3dbfa46,closedloop,msisdn,3853,msisdn,3536,5,USD,Test Payee Payment
+2,9f2d8f3e-1d4b-4dfd-a441-764ee0a7f102,closedloop,msisdn,3854,msisdn,3537,5,USD,Test Payee Payment
+3,345deafc-a280-4cf9-bdea-24ce04d62255,closedloop,msisdn,3855,msisdn,3538,5,USD,Test Payee Payment
+4,f7959697-29bd-42ed-bd87-f814c6ff693b,closedloop,msisdn,3856,msisdn,3539,5,USD,Test Payee Payment
+5,8b8c6cfd-4108-41e3-a326-4ed386657cb7,gsma,msisdn,3857,msisdn,3540,6,USD,Test Payee Payment
+6,b0e78317-541b-4602-80e0-f529124a87a5,gsma,msisdn,3858,msisdn,3541,7,USD,Test Payee Payment
+7,190a3682-6b97-4bb4-819a-7f29b9bc3513,gsma,msisdn,3859,msisdn,3542,8,USD,Test Payee Payment
\ No newline at end of file
diff --git a/src/test/java/resources/batch_demo_csv/batchTransactionGsmaClosedLoopMojaloop.csv b/src/test/java/resources/batch_demo_csv/batchTransactionGsmaClosedLoopMojaloop.csv
new file mode 100644
index 000000000..7c2f420c2
--- /dev/null
+++ b/src/test/java/resources/batch_demo_csv/batchTransactionGsmaClosedLoopMojaloop.csv
@@ -0,0 +1,14 @@
+id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
+0,7971c60a-4deb-4c41-96db-ca361024cc41,closedloop,msisdn,86,msisdn,77,10,USD,Test Payee Payment
+1,77776b64-4e2c-40fc-a341-f4e8c9c44e19,closedloop,msisdn,87,msisdn,78,5,USD,Test Payee Payment
+2,4337f8b1-c1b7-4cec-9cad-0d3e5e6de84f,closedloop,msisdn,88,msisdn,79,5,USD,Test Payee Payment
+3,dca79c67-07e2-4532-8aa4-94e15e336786,closedloop,msisdn,89,msisdn,80,5,USD,Test Payee Payment
+4,1d4054ad-8355-4c43-ad3c-b18eddd6d44d,closedloop,msisdn,90,msisdn,81,5,USD,Test Payee Payment
+5,90835b3d-1e9a-4a4f-8480-e197bd405775,gsma,msisdn,91,msisdn,82,6,USD,Test Payee Payment
+6,8f1e68e8-c8fe-4be5-8ec1-87fa443bdc8e,gsma,msisdn,92,msisdn,83,7,USD,Test Payee Payment
+7,d35c95ad-2f77-4c54-9e63-50e4376d4c4c,gsma,msisdn,93,msisdn,84,8,USD,Test Payee Payment
+8,bf2e059d-8ed1-4221-a8be-79bc5a154676,gsma,msisdn,94,msisdn,85,9,USD,Test Payee Payment
+9,00054598-a5c0-41d5-af84-6a13fed4ca4c,gsma,msisdn,95,msisdn,86,10,USD,Test Payee Payment
+10,de95b7c1-0e2f-4701-9472-5f1c7ea97a43,mojaloop,msisdn,96,msisdn,87,3,USD,Test Payee Payment
+11,02ba2cb9-07d9-4f99-b23d-170f0fecab47,mojaloop,msisdn,97,msisdn,87,2,USD,Test Payee Payment
+12,9f27d14e-8f18-4300-a4fa-f7260b49803e,mojaloop,msisdn,98,msisdn,88,1,USD,Test Payee Payment
\ No newline at end of file
diff --git a/src/test/java/resources/bulkPayment.feature b/src/test/java/resources/bulkPayment.feature
index 262c916e9..09412bb92 100644
--- a/src/test/java/resources/bulkPayment.feature
+++ b/src/test/java/resources/bulkPayment.feature
@@ -1,4 +1,4 @@
-@gov @ext
+@gov1
 Feature: Test ability to make payment to individual with bank account
 
   Scenario: Input CSV file using the batch transaction API and poll batch summary API till we get completed status
@@ -31,10 +31,10 @@ Feature: Test ability to make payment to individual with bank account
     And I create a list of payee identifiers from csv file
     When I can inject MockServer
     Then I can start mock server
-    And I can register the stub with "/registerBeneficiary" endpoint for "PUT" request with status of 200
-    And I create a IdentityMapperDTO for registering beneficiary
-    Then I call the register beneficiary API with expected status of 202 and stub "/registerBeneficiary"
-    And I should be able to verify that the "PUT" method to "/registerBeneficiary" endpoint received a request with successfull registration
+#    And I can register the stub with "/registerBeneficiary" endpoint for "PUT" request with status of 200
+#    And I create a IdentityMapperDTO for registering beneficiary
+#    Then I call the register beneficiary API with expected status of 202 and stub "/registerBeneficiary"
+#    And I should be able to verify that the "PUT" method to "/registerBeneficiary" endpoint received a request with successfull registration
     And I create a new clientCorrelationId
     And I have private key
     And I generate signature
@@ -160,3 +160,255 @@ Feature: Test ability to make payment to individual with bank account
     And Status of transaction is "COMPLETED"
     And My total txns 8 and successful txn count in response should Match
 
+
+  Scenario: Bulk Transfer with Closedloop and Real Mojaloop
+      #payer 1 creation
+    Given I have Fineract-Platform-TenantId as "payerfsp2"
+    When I create and setup a "payer" with id "1" and account balance of 100 for combine test cases
+    Given I have tenant as "payerfsp"
+    Then I call the balance api for payer "1" balance for combine test cases
+    #payee 1 creation
+    When I create and setup a "payee" with id "1" and account balance of 10 for combine test cases
+    Given I have tenant as "payeefsp3"
+    Then I call the balance api for payee "1" balance for combine test cases
+
+    Then Create a csv file with file name "batchTransactioClosedLoopMojaloopFundTransfer.csv"
+    Then add row to csv with current payer and payee, payment mode as "closedloop" and transfer amount 10 and id 0 for combine test cases
+
+    #payer 2 creation
+    Given I have Fineract-Platform-TenantId as "payerfsp2"
+    When I create and setup a "payer" with id "2" and account balance of 50 for combine test cases
+    Given I have tenant as "payerfsp"
+    Then I call the balance api for payer "2" balance for combine test cases
+    #payee 2 creation
+    When I create and setup a "payee" with id "2" and account balance of 20 for combine test cases
+    Given I have tenant as "payeefsp3"
+    Then I call the balance api for payee "2" balance for combine test cases
+
+    Then add row to csv with current payer and payee, payment mode as "closedloop" and transfer amount 5 and id 1 for combine test cases
+
+        #payer 3 creation
+    Given I have Fineract-Platform-TenantId as "payerfsp2"
+    When I create and setup a "payer" with id "3" and account balance of 50 for combine test cases
+    Given I have tenant as "payerfsp"
+    Then I call the balance api for payer "3" balance
+    #payee 3 creation
+    When I create and setup a "payee" with id "3" and account balance of 20 for combine test cases
+    Given I have tenant as "payeefsp3"
+    Then I call the balance api for payee "3" balance for combine test cases
+
+    Then add row to csv with current payer and payee, payment mode as "closedloop" and transfer amount 5 and id 2 for combine test cases
+
+        #payer 4 creation
+    Given I have Fineract-Platform-TenantId as "payerfsp2"
+    When I create and setup a "payer" with id "4" and account balance of 50 for combine test cases
+    Given I have tenant as "payerfsp"
+    Then I call the balance api for payer "4" balance for combine test cases
+    #payee 4 creation
+    When I create and setup a "payee" with id "4" and account balance of 20 for combine test cases
+    Given I have tenant as "payeefsp3"
+    Then I call the balance api for payee "4" balance for combine test cases
+
+    Then add row to csv with current payer and payee, payment mode as "closedloop" and transfer amount 5 and id 3 for combine test cases
+    #payer 5 creation
+    Given I have Fineract-Platform-TenantId as "payerfsp2"
+    When I create and setup a "payer" with id "5" and account balance of 50 for combine test cases
+    Given I have tenant as "payerfsp"
+    Then I call the balance api for payer "5" balance for combine test cases
+    #payee 5 creation
+    When I create and setup a "payee" with id "5" and account balance of 20 for combine test cases
+    Given I have tenant as "payeefsp3"
+    Then I call the balance api for payee "5" balance for combine test cases
+
+    Then add row to csv with current payer and payee, payment mode as "closedloop" and transfer amount 5 and id 4 for combine test cases
+    #Mojaloop
+    Given I am setting up Mojaloop
+    #payer and payee 6 for mojaloop [1]
+    When I create and setup a "payer" with account balance of 12
+    When I create and setup a "payee" with account balance of 10
+    Then I add "payer" to als
+    Then I add "payee" to als
+    Then add row to csv with current payer and payee, payment mode as "mojaloop" and transfer amount 3 and id 5 for combine test cases
+
+    #payer and payee 7 for mojaloop [2]
+    Then I add "payer" to als
+    When I create and setup a "payer" with account balance of 120
+    Then add row to csv with current payer and payee, payment mode as "mojaloop" and transfer amount 2 and id 6 for combine test cases
+
+    When I create and setup a "payer" with account balance of 66
+    When I create and setup a "payee" with account balance of 10
+    Then I add "payer" to als
+    Then I add "payee" to als
+    Then add last row to csv with current payer and payee, payment mode as "mojaloop" and transfer amount 1 and id 7
+
+    Given I have Fineract-Platform-TenantId for "payer"
+    And I create a new clientCorrelationId
+    And I have private key
+    And I generate signature
+    When I call the batch transactions endpoint with expected status of 202
+    Then I should get non empty response
+    And I am able to parse batch transactions response
+    And I fetch batch ID from batch transaction API's response
+    Then I will sleep for 10000 millisecond
+    Given I have tenant as "paymentbb1"
+    When I call the batch summary API with expected status of 200 with total successfull 8 txns
+    Then I am able to parse batch summary response
+    And Status of transaction is "COMPLETED"
+    And My total txns 8 and successful txn count in response should Match
+
+
+  Scenario: Bulk Transfer with ClosedLoop, Real mojaloop and Real GSMA
+    #payer 1 creation
+    Given I have Fineract-Platform-TenantId as "payerfsp2"
+    When I create and setup a "payer" with id "1" and account balance of 100 for all combine test cases
+    Given I have tenant as "payerfsp"
+    Then I call the balance api for payer "1" balance for all combine test cases
+    #payee 1 creation
+    When I create and setup a "payee" with id "1" and account balance of 10 for all combine test cases
+    Given I have tenant as "payeefsp3"
+    Then I call the balance api for payee "1" balance for all combine test cases
+
+    Then Create a csv file with file name "batchTransactionGsmaClosedLoopMojaloop.csv"
+    Then add row to csv with current payer and payee, payment mode as "closedloop" and transfer amount 10 and id 0 for all combine test cases
+
+    #payer 2 creation
+    Given I have Fineract-Platform-TenantId as "payerfsp2"
+    When I create and setup a "payer" with id "2" and account balance of 50 for all combine test cases
+    Given I have tenant as "payerfsp"
+    Then I call the balance api for payer "2" balance for all combine test cases
+    #payee 2 creation
+    When I create and setup a "payee" with id "2" and account balance of 20 for all combine test cases
+    Given I have tenant as "payeefsp3"
+    Then I call the balance api for payee "2" balance for all combine test cases
+
+    Then add row to csv with current payer and payee, payment mode as "closedloop" and transfer amount 5 and id 1 for all combine test cases
+
+        #payer 3 creation
+    Given I have Fineract-Platform-TenantId as "payerfsp2"
+    When I create and setup a "payer" with id "3" and account balance of 50 for all combine test cases
+    Given I have tenant as "payerfsp"
+    Then I call the balance api for payer "3" balance for all combine test cases
+    #payee 3 creation
+    When I create and setup a "payee" with id "3" and account balance of 20 for all combine test cases
+    Given I have tenant as "payeefsp3"
+    Then I call the balance api for payee "3" balance for all combine test cases
+
+    Then add row to csv with current payer and payee, payment mode as "closedloop" and transfer amount 5 and id 2 for all combine test cases
+
+        #payer 4 creation
+    Given I have Fineract-Platform-TenantId as "payerfsp2"
+    When I create and setup a "payer" with id "4" and account balance of 50 for all combine test cases
+    Given I have tenant as "payerfsp"
+    Then I call the balance api for payer "4" balance for all combine test cases
+    #payee 4 creation
+    When I create and setup a "payee" with id "4" and account balance of 20 for all combine test cases
+    Given I have tenant as "payeefsp3"
+    Then I call the balance api for payee "4" balance for all combine test cases
+
+    Then add row to csv with current payer and payee, payment mode as "closedloop" and transfer amount 5 and id 3 for all combine test cases
+    #payer 5 creation
+    Given I have Fineract-Platform-TenantId as "payerfsp2"
+    When I create and setup a "payer" with id "5" and account balance of 50 for all combine test cases
+    Given I have tenant as "payerfsp"
+    Then I call the balance api for payer "5" balance for all combine test cases
+    #payee 5 creation
+    When I create and setup a "payee" with id "5" and account balance of 20 for all combine test cases
+    Given I have tenant as "payeefsp3"
+    Then I call the balance api for payee "5" balance for all combine test cases
+
+    Then add row to csv with current payer and payee, payment mode as "closedloop" and transfer amount 5 and id 4 for all combine test cases
+
+        #payer 6 creation
+    Given I have Fineract-Platform-TenantId as "payerfsp2"
+    When I create and setup a "payer" with id "6" and account balance of 50 for all combine test cases
+    Given I have tenant as "payerfsp"
+    Then I call the balance api for payer "6" balance for all combine test cases
+    #payee 6 creation
+    When I create and setup a "payee" with id "6" and account balance of 20 for all combine test cases
+    Given I have tenant as "payeefsp3"
+    Then I call the balance api for payee "6" balance for all combine test cases
+
+    Then add row to csv with current payer and payee, payment mode as "gsma" and transfer amount 6 and id 5 for all combine test cases
+
+        #payer 7 creation
+    Given I have Fineract-Platform-TenantId as "payerfsp2"
+    When I create and setup a "payer" with id "7" and account balance of 50 for all combine test cases
+    Given I have tenant as "payerfsp"
+    Then I call the balance api for payer "7" balance for all combine test cases
+    #payee 7 creation
+    When I create and setup a "payee" with id "7" and account balance of 20 for all combine test cases
+    Given I have tenant as "payeefsp3"
+    Then I call the balance api for payee "7" balance for all combine test cases
+
+    Then add row to csv with current payer and payee, payment mode as "gsma" and transfer amount 7 and id 6 for all combine test cases
+    #payer 8 creation
+    Given I have Fineract-Platform-TenantId as "payerfsp2"
+    When I create and setup a "payer" with id "8" and account balance of 30 for all combine test cases
+    Given I have tenant as "payerfsp"
+    Then I call the balance api for payer "8" balance for all combine test cases
+    #payee 8 creation
+    When I create and setup a "payee" with id "8" and account balance of 30 for all combine test cases
+    Given I have tenant as "payeefsp3"
+    Then I call the balance api for payee "8" balance for all combine test cases
+
+    Then add row to csv with current payer and payee, payment mode as "gsma" and transfer amount 8 and id 7 for all combine test cases
+
+            #payer 9 creation
+    Given I have Fineract-Platform-TenantId as "payerfsp2"
+    When I create and setup a "payer" with id "9" and account balance of 50 for all combine test cases
+    Given I have tenant as "payerfsp"
+    Then I call the balance api for payer "9" balance for all combine test cases
+    #payee 9 creation
+    When I create and setup a "payee" with id "9" and account balance of 20 for all combine test cases
+    Given I have tenant as "payeefsp3"
+    Then I call the balance api for payee "9" balance for all combine test cases
+
+    Then add row to csv with current payer and payee, payment mode as "gsma" and transfer amount 9 and id 8 for all combine test cases
+    #payer 10 creation
+    Given I have Fineract-Platform-TenantId as "payerfsp2"
+    When I create and setup a "payer" with id "10" and account balance of 30 for all combine test cases
+    Given I have tenant as "payerfsp"
+    Then I call the balance api for payer "10" balance for all combine test cases
+    #payee 10 creation
+    When I create and setup a "payee" with id "10" and account balance of 30 for all combine test cases
+    Given I have tenant as "payeefsp3"
+    Then I call the balance api for payee "10" balance for all combine test cases
+
+    Then add row to csv with current payer and payee, payment mode as "gsma" and transfer amount 10 and id 9 for all combine test cases
+
+    #Mojaloop batch setup
+    Given I am setting up Mojaloop
+    #payer and payee 10 for mojaloop [1]
+    When I create and setup a "payer" with account balance of 12
+    When I create and setup a "payee" with account balance of 10
+    Then I add "payer" to als
+    Then I add "payee" to als
+    Then add row to csv with current payer and payee, payment mode as "mojaloop" and transfer amount 3 and id 10 for all combine test cases
+
+    #payer and payee 11 for mojaloop [2]
+    Then I add "payer" to als
+    When I create and setup a "payer" with account balance of 120
+    Then add row to csv with current payer and payee, payment mode as "mojaloop" and transfer amount 2 and id 11 for all combine test cases
+
+    #payer and payee 12 for mojaloop [3]
+    When I create and setup a "payer" with account balance of 66
+    When I create and setup a "payee" with account balance of 10
+    Then I add "payer" to als
+    Then I add "payee" to als
+    Then add last row to csv with current payer and payee, payment mode as "mojaloop" and transfer amount 1 and id 12
+
+    #batch process
+    Given I have tenant as "payerfsp"
+    And I have the demo csv file "batchTransactionGsmaClosedLoopMojaloop.csv"
+    And I generate clientCorrelationId
+    And I have private key
+    And I generate signature
+    When I call the batch transactions endpoint with expected status of 202
+    And I am able to parse batch transactions response
+    And I fetch batch ID from batch transaction API's response
+    Then I will sleep for 10000 millisecond
+    When I call the batch summary API with expected status of 200 with total successfull 13 txns
+    Then I should get non empty response
+    Then I am able to parse batch summary response
+    And Status of transaction is "COMPLETED"
+    And My total txns 13 and successful txn count in response should Match
diff --git a/src/test/java/resources/mojaloop.feature b/src/test/java/resources/mojaloop.feature
index 3cae45cf8..715a6725a 100644
--- a/src/test/java/resources/mojaloop.feature
+++ b/src/test/java/resources/mojaloop.feature
@@ -1,4 +1,4 @@
-@gov @ext
+@gov1 @ext
 Feature: Mojaloop test
 
   Scenario: ML connector partial payee party lookup test
@@ -125,7 +125,7 @@ Feature: Mojaloop test
     When I call the batch transactions endpoint with expected status of 202
     And I am able to parse batch transactions response
     And I fetch batch ID from batch transaction API's response
-#    Then I will sleep for 10000 millisecond
+    Then I will sleep for 10000 millisecond
     When I call the batch aggregate API with expected status of 200 with total 3 txns
     Then I should get non empty response
     Then I am able to parse batch summary response

From c127648a17890aec4c7f3ef2f9b07043c6b5ba6a Mon Sep 17 00:00:00 2001
From: Abhinav Mishra <abhinav@fynarfin.in>
Date: Fri, 19 Apr 2024 12:53:41 +0530
Subject: [PATCH 02/11] Conflict resolve

---
 src/test/java/resources/bulkPayment.feature | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/test/java/resources/bulkPayment.feature b/src/test/java/resources/bulkPayment.feature
index 09412bb92..54c15bd63 100644
--- a/src/test/java/resources/bulkPayment.feature
+++ b/src/test/java/resources/bulkPayment.feature
@@ -31,10 +31,10 @@ Feature: Test ability to make payment to individual with bank account
     And I create a list of payee identifiers from csv file
     When I can inject MockServer
     Then I can start mock server
-#    And I can register the stub with "/registerBeneficiary" endpoint for "PUT" request with status of 200
-#    And I create a IdentityMapperDTO for registering beneficiary
-#    Then I call the register beneficiary API with expected status of 202 and stub "/registerBeneficiary"
-#    And I should be able to verify that the "PUT" method to "/registerBeneficiary" endpoint received a request with successfull registration
+    And I can register the stub with "/registerBeneficiary" endpoint for "PUT" request with status of 200
+    And I create a IdentityMapperDTO for registering beneficiary
+    Then I call the register beneficiary API with expected status of 202 and stub "/registerBeneficiary"
+    And I should be able to verify that the "PUT" method to "/registerBeneficiary" endpoint received a request with successfull registration
     And I create a new clientCorrelationId
     And I have private key
     And I generate signature

From 863a6c20624a07eed2350806f68af55b4903ac87 Mon Sep 17 00:00:00 2001
From: Abhinav Mishra <abhinav@fynarfin.in>
Date: Fri, 19 Apr 2024 13:15:57 +0530
Subject: [PATCH 03/11] Updated tenant config

---
 ...ansactioClosedLoopMojaloopFundTransfer.csv | 16 ++++++------
 .../batch_demo_csv/batchTransaction.csv       |  6 ++---
 ...batchTransactionGsmaClosedLoopMojaloop.csv | 26 +++++++++----------
 src/test/java/resources/bulkPayment.feature   | 10 +++----
 4 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/test/java/resources/batch_demo_csv/batchTransactioClosedLoopMojaloopFundTransfer.csv b/src/test/java/resources/batch_demo_csv/batchTransactioClosedLoopMojaloopFundTransfer.csv
index ae1332a03..d7d27498a 100644
--- a/src/test/java/resources/batch_demo_csv/batchTransactioClosedLoopMojaloopFundTransfer.csv
+++ b/src/test/java/resources/batch_demo_csv/batchTransactioClosedLoopMojaloopFundTransfer.csv
@@ -1,9 +1,9 @@
 id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
-0,bf5e4189-cfa4-4e1b-af87-b759d0cbf5b7,closedloop,msisdn,3860,msisdn,3543,10,USD,Test Payee Payment
-1,2b161d23-b2f2-47ae-91e9-a99a30600c9d,closedloop,msisdn,3861,msisdn,3544,5,USD,Test Payee Payment
-2,936b2c6f-92fe-4a86-85a3-48611fe8b56a,closedloop,msisdn,3862,msisdn,3545,5,USD,Test Payee Payment
-3,f6a7aced-60fb-4542-bb78-cec4b6e9a83c,closedloop,msisdn,3863,msisdn,3546,5,USD,Test Payee Payment
-4,d5c48256-6689-4ff5-ba5a-1c0b0d0ae444,closedloop,msisdn,3864,msisdn,3547,5,USD,Test Payee Payment
-5,954495f6-d544-4a50-bfc1-862c34a2e569,mojaloop,msisdn,3865,msisdn,3548,3,USD,Test Payee Payment
-6,c0c4f551-a48a-4d79-a71d-6cad8f124897,mojaloop,msisdn,3866,msisdn,3548,2,USD,Test Payee Payment
-7,0df72164-6bf4-4a4e-941d-520466747fe7,mojaloop,msisdn,3867,msisdn,3549,1,USD,Test Payee Payment
\ No newline at end of file
+0,cc027d54-05cd-4804-b991-4d3f334ac942,closedloop,msisdn,120,msisdn,107,10,USD,Test Payee Payment
+1,e81d7ff8-67d2-4f0b-b2ae-66c30964787e,closedloop,msisdn,121,msisdn,108,5,USD,Test Payee Payment
+2,93011c44-30f5-49b7-a806-04d64af4ec87,closedloop,msisdn,122,msisdn,109,5,USD,Test Payee Payment
+3,61eaa203-9523-4281-a72e-e3f5bc2905d3,closedloop,msisdn,123,msisdn,110,5,USD,Test Payee Payment
+4,b68cd4b7-8c7d-48e1-b68f-a530019753e0,closedloop,msisdn,124,msisdn,111,5,USD,Test Payee Payment
+5,8b600aec-5062-455c-bc18-34dda2d0eb80,mojaloop,msisdn,125,msisdn,112,3,USD,Test Payee Payment
+6,6ed4341b-9ece-4898-a9dd-60804bba8c1e,mojaloop,msisdn,126,msisdn,112,2,USD,Test Payee Payment
+7,b26802a4-6692-4e57-8a5b-9fcc5085062c,mojaloop,msisdn,127,msisdn,113,1,USD,Test Payee Payment
\ No newline at end of file
diff --git a/src/test/java/resources/batch_demo_csv/batchTransaction.csv b/src/test/java/resources/batch_demo_csv/batchTransaction.csv
index 72a0e2525..74628adee 100644
--- a/src/test/java/resources/batch_demo_csv/batchTransaction.csv
+++ b/src/test/java/resources/batch_demo_csv/batchTransaction.csv
@@ -1,4 +1,4 @@
 id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
-0,52c36327-2c70-48d1-aaa1-a6b3fe447fcd,mojaloop,msisdn,58,msisdn,53,3,USD,Test Payee Payment
-1,0bdc4f1e-b287-408e-a1e1-9d9238ec90ac,mojaloop,msisdn,59,msisdn,53,2,USD,Test Payee Payment
-2,3cc19513-7988-40cc-9858-24bdaa8b48fd,mojaloop,msisdn,60,msisdn,54,1,USD,Test Payee Payment
\ No newline at end of file
+0,0264c6af-76d4-4591-bc79-f0d47859fe2d,mojaloop,msisdn,117,msisdn,105,3,USD,Test Payee Payment
+1,d31dacb6-459f-4fc5-8c4d-891f41813fc3,mojaloop,msisdn,118,msisdn,105,2,USD,Test Payee Payment
+2,1910e3de-1fee-4d33-8ab3-888268937f0f,mojaloop,msisdn,119,msisdn,106,1,USD,Test Payee Payment
\ No newline at end of file
diff --git a/src/test/java/resources/batch_demo_csv/batchTransactionGsmaClosedLoopMojaloop.csv b/src/test/java/resources/batch_demo_csv/batchTransactionGsmaClosedLoopMojaloop.csv
index 7c2f420c2..33fbdbacd 100644
--- a/src/test/java/resources/batch_demo_csv/batchTransactionGsmaClosedLoopMojaloop.csv
+++ b/src/test/java/resources/batch_demo_csv/batchTransactionGsmaClosedLoopMojaloop.csv
@@ -1,14 +1,14 @@
 id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
-0,7971c60a-4deb-4c41-96db-ca361024cc41,closedloop,msisdn,86,msisdn,77,10,USD,Test Payee Payment
-1,77776b64-4e2c-40fc-a341-f4e8c9c44e19,closedloop,msisdn,87,msisdn,78,5,USD,Test Payee Payment
-2,4337f8b1-c1b7-4cec-9cad-0d3e5e6de84f,closedloop,msisdn,88,msisdn,79,5,USD,Test Payee Payment
-3,dca79c67-07e2-4532-8aa4-94e15e336786,closedloop,msisdn,89,msisdn,80,5,USD,Test Payee Payment
-4,1d4054ad-8355-4c43-ad3c-b18eddd6d44d,closedloop,msisdn,90,msisdn,81,5,USD,Test Payee Payment
-5,90835b3d-1e9a-4a4f-8480-e197bd405775,gsma,msisdn,91,msisdn,82,6,USD,Test Payee Payment
-6,8f1e68e8-c8fe-4be5-8ec1-87fa443bdc8e,gsma,msisdn,92,msisdn,83,7,USD,Test Payee Payment
-7,d35c95ad-2f77-4c54-9e63-50e4376d4c4c,gsma,msisdn,93,msisdn,84,8,USD,Test Payee Payment
-8,bf2e059d-8ed1-4221-a8be-79bc5a154676,gsma,msisdn,94,msisdn,85,9,USD,Test Payee Payment
-9,00054598-a5c0-41d5-af84-6a13fed4ca4c,gsma,msisdn,95,msisdn,86,10,USD,Test Payee Payment
-10,de95b7c1-0e2f-4701-9472-5f1c7ea97a43,mojaloop,msisdn,96,msisdn,87,3,USD,Test Payee Payment
-11,02ba2cb9-07d9-4f99-b23d-170f0fecab47,mojaloop,msisdn,97,msisdn,87,2,USD,Test Payee Payment
-12,9f27d14e-8f18-4300-a4fa-f7260b49803e,mojaloop,msisdn,98,msisdn,88,1,USD,Test Payee Payment
\ No newline at end of file
+0,0a65b743-8b7b-4ae7-b0ce-64132c727a9f,closedloop,msisdn,128,msisdn,114,10,USD,Test Payee Payment
+1,bfa3dcde-4e6a-4668-85fe-f39969c41e34,closedloop,msisdn,129,msisdn,115,5,USD,Test Payee Payment
+2,2a9f3ff7-21a8-4b20-9738-df5f050d1ddf,closedloop,msisdn,130,msisdn,116,5,USD,Test Payee Payment
+3,b0715fd8-4eb9-46a5-82ba-ac9869e5ff0d,closedloop,msisdn,131,msisdn,117,5,USD,Test Payee Payment
+4,161001c8-c506-46cc-9faf-83a142784685,closedloop,msisdn,132,msisdn,118,5,USD,Test Payee Payment
+5,9a2651fa-36d7-473e-99c1-31200117e4f3,gsma,msisdn,133,msisdn,119,6,USD,Test Payee Payment
+6,07dbea6c-a5ab-44ff-819e-7b5af76f72a7,gsma,msisdn,134,msisdn,120,7,USD,Test Payee Payment
+7,a1311ad7-7ccb-4f8a-84b2-973def3c2c9d,gsma,msisdn,135,msisdn,121,8,USD,Test Payee Payment
+8,902d7bb1-5de9-4cdc-a52a-8cb8bd8ec777,gsma,msisdn,136,msisdn,122,9,USD,Test Payee Payment
+9,aa78efa0-91cf-4e84-881e-421e2e0d5757,gsma,msisdn,137,msisdn,123,10,USD,Test Payee Payment
+10,36c14061-fec2-498f-bd7f-78906306b4a7,mojaloop,msisdn,138,msisdn,124,3,USD,Test Payee Payment
+11,e5c72833-11ab-4390-af5a-b0ae88cb24e5,mojaloop,msisdn,139,msisdn,124,2,USD,Test Payee Payment
+12,c5319133-c40a-4dcc-b332-c9b6c27df1bd,mojaloop,msisdn,140,msisdn,125,1,USD,Test Payee Payment
\ No newline at end of file
diff --git a/src/test/java/resources/bulkPayment.feature b/src/test/java/resources/bulkPayment.feature
index 54c15bd63..34b2696e3 100644
--- a/src/test/java/resources/bulkPayment.feature
+++ b/src/test/java/resources/bulkPayment.feature
@@ -7,10 +7,10 @@ Feature: Test ability to make payment to individual with bank account
     And I create a list of payee identifiers from csv file
     When I can inject MockServer
     Then I can start mock server
-    And I can register the stub with "/registerBeneficiary" endpoint for "PUT" request with status of 200
-    And I create a IdentityMapperDTO for registering beneficiary
-    Then I call the register beneficiary API with expected status of 202 and stub "/registerBeneficiary"
-    And I should be able to verify that the "PUT" method to "/registerBeneficiary" endpoint received a request with successfull registration
+#    And I can register the stub with "/registerBeneficiary" endpoint for "PUT" request with status of 200
+#    And I create a IdentityMapperDTO for registering beneficiary
+#    Then I call the register beneficiary API with expected status of 202 and stub "/registerBeneficiary"
+#    And I should be able to verify that the "PUT" method to "/registerBeneficiary" endpoint received a request with successfull registration
     And I create a new clientCorrelationId
     And I have private key
     And I generate signature
@@ -250,7 +250,7 @@ Feature: Test ability to make payment to individual with bank account
     And I am able to parse batch transactions response
     And I fetch batch ID from batch transaction API's response
     Then I will sleep for 10000 millisecond
-    Given I have tenant as "paymentbb1"
+    Given I have tenant as "payerfsp"
     When I call the batch summary API with expected status of 200 with total successfull 8 txns
     Then I am able to parse batch summary response
     And Status of transaction is "COMPLETED"

From e68a2329a255f866633cb1dce668acb9946f4d68 Mon Sep 17 00:00:00 2001
From: Abhinav Mishra <abhinav@fynarfin.in>
Date: Fri, 19 Apr 2024 15:15:00 +0530
Subject: [PATCH 04/11] Test run -2

---
 ...batchTransactionGsmaClosedLoopMojaloop.csv | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/test/java/resources/batch_demo_csv/batchTransactionGsmaClosedLoopMojaloop.csv b/src/test/java/resources/batch_demo_csv/batchTransactionGsmaClosedLoopMojaloop.csv
index 33fbdbacd..0f460e020 100644
--- a/src/test/java/resources/batch_demo_csv/batchTransactionGsmaClosedLoopMojaloop.csv
+++ b/src/test/java/resources/batch_demo_csv/batchTransactionGsmaClosedLoopMojaloop.csv
@@ -1,14 +1,8 @@
 id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
-0,0a65b743-8b7b-4ae7-b0ce-64132c727a9f,closedloop,msisdn,128,msisdn,114,10,USD,Test Payee Payment
-1,bfa3dcde-4e6a-4668-85fe-f39969c41e34,closedloop,msisdn,129,msisdn,115,5,USD,Test Payee Payment
-2,2a9f3ff7-21a8-4b20-9738-df5f050d1ddf,closedloop,msisdn,130,msisdn,116,5,USD,Test Payee Payment
-3,b0715fd8-4eb9-46a5-82ba-ac9869e5ff0d,closedloop,msisdn,131,msisdn,117,5,USD,Test Payee Payment
-4,161001c8-c506-46cc-9faf-83a142784685,closedloop,msisdn,132,msisdn,118,5,USD,Test Payee Payment
-5,9a2651fa-36d7-473e-99c1-31200117e4f3,gsma,msisdn,133,msisdn,119,6,USD,Test Payee Payment
-6,07dbea6c-a5ab-44ff-819e-7b5af76f72a7,gsma,msisdn,134,msisdn,120,7,USD,Test Payee Payment
-7,a1311ad7-7ccb-4f8a-84b2-973def3c2c9d,gsma,msisdn,135,msisdn,121,8,USD,Test Payee Payment
-8,902d7bb1-5de9-4cdc-a52a-8cb8bd8ec777,gsma,msisdn,136,msisdn,122,9,USD,Test Payee Payment
-9,aa78efa0-91cf-4e84-881e-421e2e0d5757,gsma,msisdn,137,msisdn,123,10,USD,Test Payee Payment
-10,36c14061-fec2-498f-bd7f-78906306b4a7,mojaloop,msisdn,138,msisdn,124,3,USD,Test Payee Payment
-11,e5c72833-11ab-4390-af5a-b0ae88cb24e5,mojaloop,msisdn,139,msisdn,124,2,USD,Test Payee Payment
-12,c5319133-c40a-4dcc-b332-c9b6c27df1bd,mojaloop,msisdn,140,msisdn,125,1,USD,Test Payee Payment
\ No newline at end of file
+0,c4ea5a61-1c0a-4c20-9ab1-f2b9c40b621c,closedloop,msisdn,209,msisdn,193,10,USD,Test Payee Payment
+1,b587bb1b-6695-4d83-b383-dc80b14ea265,closedloop,msisdn,210,msisdn,194,5,USD,Test Payee Payment
+2,2e3dcd14-6a92-4c29-ab91-5aa1bed22f5d,closedloop,msisdn,211,msisdn,195,5,USD,Test Payee Payment
+3,54ed73e3-83d5-4837-aae7-dacf62dc18ab,closedloop,msisdn,212,msisdn,196,5,USD,Test Payee Payment
+4,78071c4c-0dfd-4ae7-8e5c-f61a6f7b472a,closedloop,msisdn,213,msisdn,197,5,USD,Test Payee Payment
+5,8fe2dc95-bf1d-476d-8c45-12622d11d298,gsma,msisdn,214,msisdn,198,6,USD,Test Payee Payment
+6,1a9d3b6a-68ea-41c2-a96f-426759107b23,gsma,msisdn,215,msisdn,199,7,USD,Test Payee Payment

From 9a3aca56bb293b435c34167e12b4698d03a69727 Mon Sep 17 00:00:00 2001
From: Abhinav Mishra <abhinav@fynarfin.in>
Date: Fri, 19 Apr 2024 15:32:27 +0530
Subject: [PATCH 05/11] Test run 2

---
 build.gradle                                  |  1 -
 ...batchTransactionGsmaClosedLoopMojaloop.csv | 20 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index c5edad8c8..dfdc50234 100644
--- a/build.gradle
+++ b/build.gradle
@@ -149,7 +149,6 @@ dependencies {
     testImplementation "com.github.tomakehurst:wiremock-jre8:2.35.0"
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     implementation 'org.mifos:ph-ee-connector-common:1.8.1-SNAPSHOT'
-    implementation 'org.springframework.boot:spring-boot-starter-web'
     testImplementation "com.google.truth:truth:1.1.3"
     testImplementation 'com.google.code.gson:gson:2.9.0'
     testImplementation('io.rest-assured:rest-assured:5.1.1') {
diff --git a/src/test/java/resources/batch_demo_csv/batchTransactionGsmaClosedLoopMojaloop.csv b/src/test/java/resources/batch_demo_csv/batchTransactionGsmaClosedLoopMojaloop.csv
index 0f460e020..bedc587e8 100644
--- a/src/test/java/resources/batch_demo_csv/batchTransactionGsmaClosedLoopMojaloop.csv
+++ b/src/test/java/resources/batch_demo_csv/batchTransactionGsmaClosedLoopMojaloop.csv
@@ -1,8 +1,14 @@
 id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
-0,c4ea5a61-1c0a-4c20-9ab1-f2b9c40b621c,closedloop,msisdn,209,msisdn,193,10,USD,Test Payee Payment
-1,b587bb1b-6695-4d83-b383-dc80b14ea265,closedloop,msisdn,210,msisdn,194,5,USD,Test Payee Payment
-2,2e3dcd14-6a92-4c29-ab91-5aa1bed22f5d,closedloop,msisdn,211,msisdn,195,5,USD,Test Payee Payment
-3,54ed73e3-83d5-4837-aae7-dacf62dc18ab,closedloop,msisdn,212,msisdn,196,5,USD,Test Payee Payment
-4,78071c4c-0dfd-4ae7-8e5c-f61a6f7b472a,closedloop,msisdn,213,msisdn,197,5,USD,Test Payee Payment
-5,8fe2dc95-bf1d-476d-8c45-12622d11d298,gsma,msisdn,214,msisdn,198,6,USD,Test Payee Payment
-6,1a9d3b6a-68ea-41c2-a96f-426759107b23,gsma,msisdn,215,msisdn,199,7,USD,Test Payee Payment
+0,3e340d67-ecfa-4cfd-a44a-fd8f8ddd009a,closedloop,msisdn,222,msisdn,205,10,USD,Test Payee Payment
+1,62d0e1db-df4b-4659-bf35-2bdeeaaf00fb,closedloop,msisdn,223,msisdn,206,5,USD,Test Payee Payment
+2,0620b8f1-c054-46ef-a23a-520848811241,closedloop,msisdn,224,msisdn,207,5,USD,Test Payee Payment
+3,fb56be3e-e84d-4b64-83de-711958a1f5dd,closedloop,msisdn,225,msisdn,208,5,USD,Test Payee Payment
+4,61b90e75-846f-40ff-a0c7-1da9606c320a,closedloop,msisdn,226,msisdn,209,5,USD,Test Payee Payment
+5,84c5dd3f-a5a3-430a-8bd1-6c7f53b32654,gsma,msisdn,227,msisdn,210,6,USD,Test Payee Payment
+6,99ca4c0a-ff6f-4db5-9a35-a7525ea28810,gsma,msisdn,228,msisdn,211,7,USD,Test Payee Payment
+7,2675ddd7-39ff-4be4-b2b2-0de587dc1a56,gsma,msisdn,229,msisdn,212,8,USD,Test Payee Payment
+8,2a1ff283-ac56-4572-a80f-aa3a57a26120,gsma,msisdn,230,msisdn,213,9,USD,Test Payee Payment
+9,ea300c47-4dc0-410e-92a4-d050e7685f35,gsma,msisdn,231,msisdn,214,10,USD,Test Payee Payment
+10,424d0cad-31ae-42f9-be2a-1d809d2a3aa8,mojaloop,msisdn,232,msisdn,215,3,USD,Test Payee Payment
+11,b0c9006d-71e7-4d20-86fc-ef7f874109e1,mojaloop,msisdn,233,msisdn,215,2,USD,Test Payee Payment
+12,074e6889-f91f-49cb-87a5-1823c59c929b,mojaloop,msisdn,234,msisdn,216,1,USD,Test Payee Payment
\ No newline at end of file

From a8172dcf47dc0317d8867a333560bcd317316d95 Mon Sep 17 00:00:00 2001
From: Abhinav Mishra <abhinav@fynarfin.in>
Date: Fri, 19 Apr 2024 16:14:15 +0530
Subject: [PATCH 06/11] Added default config

---
 .circleci/config.yml                        | 4 ++--
 src/main/resources/application.yaml         | 3 ---
 src/test/java/resources/bulkPayment.feature | 2 +-
 src/test/java/resources/mojaloop.feature    | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 56b8feecd..aa89477fd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -227,7 +227,7 @@ jobs:
             export CALLBACK_URL="https://$NGROK_PUBLIC_URL"
             echo -n "Public url ."
             echo $CALLBACK_URL
-            ./gradlew test -Dcucumber.filter.tags="@gov1"
+            ./gradlew test -Dcucumber.filter.tags="@gov"
             echo -n "Test execution is completed, kill ngrok"
             pkill ngrok
       - store_test_results:
@@ -327,7 +327,7 @@ workflows:
             - Ngrok
       - test-chart-gov:
           requires:
-            - deploying-bpmns
+            - test-chart-ams
           context:
             - AWS
             - Helm
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index 969c43848..2df866732 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -1,6 +1,3 @@
-server:
-  port: 8083
-
 operations-app:
   contactpoint: "https://ops-bk.sandbox.fynarfin.io"
   dpgcontactpoint: "https://ops-bk-dpg.sandbox.fynarfin.io"
diff --git a/src/test/java/resources/bulkPayment.feature b/src/test/java/resources/bulkPayment.feature
index 34b2696e3..5721dc90f 100644
--- a/src/test/java/resources/bulkPayment.feature
+++ b/src/test/java/resources/bulkPayment.feature
@@ -1,4 +1,4 @@
-@gov1
+@gov @ext
 Feature: Test ability to make payment to individual with bank account
 
   Scenario: Input CSV file using the batch transaction API and poll batch summary API till we get completed status
diff --git a/src/test/java/resources/mojaloop.feature b/src/test/java/resources/mojaloop.feature
index 715a6725a..08205166b 100644
--- a/src/test/java/resources/mojaloop.feature
+++ b/src/test/java/resources/mojaloop.feature
@@ -1,4 +1,4 @@
-@gov1 @ext
+@gov @ext
 Feature: Mojaloop test
 
   Scenario: ML connector partial payee party lookup test

From edcbc31b3c06ab8d15b596547910f73c5e6764f7 Mon Sep 17 00:00:00 2001
From: Abhinav Mishra <abhinav@fynarfin.in>
Date: Fri, 19 Apr 2024 16:15:14 +0530
Subject: [PATCH 07/11] Added default config

---
 src/test/java/resources/bulkPayment.feature | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/test/java/resources/bulkPayment.feature b/src/test/java/resources/bulkPayment.feature
index 5721dc90f..05ba06d20 100644
--- a/src/test/java/resources/bulkPayment.feature
+++ b/src/test/java/resources/bulkPayment.feature
@@ -7,10 +7,10 @@ Feature: Test ability to make payment to individual with bank account
     And I create a list of payee identifiers from csv file
     When I can inject MockServer
     Then I can start mock server
-#    And I can register the stub with "/registerBeneficiary" endpoint for "PUT" request with status of 200
-#    And I create a IdentityMapperDTO for registering beneficiary
-#    Then I call the register beneficiary API with expected status of 202 and stub "/registerBeneficiary"
-#    And I should be able to verify that the "PUT" method to "/registerBeneficiary" endpoint received a request with successfull registration
+    And I can register the stub with "/registerBeneficiary" endpoint for "PUT" request with status of 200
+    And I create a IdentityMapperDTO for registering beneficiary
+    Then I call the register beneficiary API with expected status of 202 and stub "/registerBeneficiary"
+    And I should be able to verify that the "PUT" method to "/registerBeneficiary" endpoint received a request with successfull registration
     And I create a new clientCorrelationId
     And I have private key
     And I generate signature

From be94bc8fc606a9b87b74d5b198a60ee1978a329e Mon Sep 17 00:00:00 2001
From: Abhinav Mishra <abhinav@fynarfin.in>
Date: Fri, 19 Apr 2024 17:11:28 +0530
Subject: [PATCH 08/11] Out of index in bug

---
 .../cucumber/stepdef/GSMATransferStepDef.java |  4 +--
 .../stepdef/PayerFundTransferStepDef.java     | 10 +++----
 ...ansactioClosedLoopMojaloopFundTransfer.csv | 16 ++++++------
 .../batchTransactionGsmaClosedLoop.csv        | 16 ++++++------
 ...batchTransactionGsmaClosedLoopMojaloop.csv | 26 +++++++++----------
 src/test/java/resources/bulkPayment.feature   |  2 +-
 6 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/test/java/org/mifos/integrationtest/cucumber/stepdef/GSMATransferStepDef.java b/src/test/java/org/mifos/integrationtest/cucumber/stepdef/GSMATransferStepDef.java
index 68d7aabcb..566816a72 100644
--- a/src/test/java/org/mifos/integrationtest/cucumber/stepdef/GSMATransferStepDef.java
+++ b/src/test/java/org/mifos/integrationtest/cucumber/stepdef/GSMATransferStepDef.java
@@ -718,7 +718,7 @@ public void iCallTheBalanceApiForPayeeBalanceForCombinedTestsCases(String id) th
     public void iCallTheBalanceApiForPayeeBalanceForAllCombinedTestsCases(String id) throws JsonProcessingException {
         RequestSpecification requestSpec = Utils.getDefaultSpec(scenarioScopeState.tenant);
         String finalEndpoint = amsBalanceEndpoint;
-        if (scenarioScopeState.payeeIdentifierforBatch == null) {
+        if (scenarioScopeState.payeeIdentifierforBatch == null || id.equals("1")) {
             scenarioScopeState.payeeIdentifierforBatch = new String[15];
         }
         scenarioScopeState.payeeIdentifierforBatch[Integer.parseInt(id)] = scenarioScopeState.payeeIdentifier;
@@ -799,7 +799,7 @@ public void iCallTheBalanceApiForPayerBalanceForCombinedTestCases(String id) thr
     public void iCallTheBalanceApiForAllPayerBalanceForCombinedTestCases(String id) throws JsonProcessingException {
         RequestSpecification requestSpec = Utils.getDefaultSpec(scenarioScopeState.tenant);
         String finalEndpoint = amsBalanceEndpoint;
-        if (scenarioScopeState.payerIdentifierforBatch == null) {
+        if (scenarioScopeState.payerIdentifierforBatch == null || id.equals("1")) {
             scenarioScopeState.payerIdentifierforBatch = new String[15];
         }
         scenarioScopeState.payerIdentifierforBatch[Integer.parseInt(id)] = scenarioScopeState.payerIdentifier;
diff --git a/src/test/java/org/mifos/integrationtest/cucumber/stepdef/PayerFundTransferStepDef.java b/src/test/java/org/mifos/integrationtest/cucumber/stepdef/PayerFundTransferStepDef.java
index 8bc74d9a7..9a1736fdd 100644
--- a/src/test/java/org/mifos/integrationtest/cucumber/stepdef/PayerFundTransferStepDef.java
+++ b/src/test/java/org/mifos/integrationtest/cucumber/stepdef/PayerFundTransferStepDef.java
@@ -549,7 +549,7 @@ public void addRowToCsvFileForAllCombinedTestCases(String paymentMode, int trans
         String filePath = Utils.getAbsoluteFilePathToResource(scenarioScopeState.filename);
         csvHelper.addRow(filePath, row);
         scenarioScopeState.gsmaP2PAmtDebit = scenarioScopeState.gsmaP2PAmtDebit + transferAmount;
-        if (scenarioScopeState.gsmaP2PAmtDebitForBatch == null) {
+        if (scenarioScopeState.gsmaP2PAmtDebitForBatch == null || id == 1) {
             scenarioScopeState.gsmaP2PAmtDebitForBatch = new int[14];
         }
         scenarioScopeState.gsmaP2PAmtDebitForBatch[id + 1] = transferAmount;
@@ -656,15 +656,15 @@ public void consolidatedPayeeCreationStepsForAllCombinedTestsCases(String client
         callSavingsActivateEndpoint("activate", client);
         callDepositAccountEndpoint("deposit", amount, client);
         if (client.equals("payer")) {
-            if (scenarioScopeState.initialBalForPayerForBatch == null) {
-                scenarioScopeState.initialBalForPayerForBatch = new int[15];
+            if (scenarioScopeState.initialBalForPayerForBatch == null || id.equals("1")) {
+                scenarioScopeState.initialBalForPayerForBatch = new int[14];
             }
             scenarioScopeState.initialBalForPayerForBatch[Integer.parseInt(id)] = amount;
             assertThat(scenarioScopeState.initialBalForPayerForBatch[Integer.parseInt(id)]).isNotNull();
 
         } else if (client.equals("payee")) {
-            if (scenarioScopeState.initialBalForPayeeForBatch == null) {
-                scenarioScopeState.initialBalForPayeeForBatch = new int[15];
+            if (scenarioScopeState.initialBalForPayeeForBatch == null || id.equals("1")) {
+                scenarioScopeState.initialBalForPayeeForBatch = new int[14];
             }
             scenarioScopeState.initialBalForPayeeForBatch[Integer.parseInt(id)] = amount;
             assertThat(scenarioScopeState.initialBalForPayeeForBatch[Integer.parseInt(id)]).isNotNull();
diff --git a/src/test/java/resources/batch_demo_csv/batchTransactioClosedLoopMojaloopFundTransfer.csv b/src/test/java/resources/batch_demo_csv/batchTransactioClosedLoopMojaloopFundTransfer.csv
index d7d27498a..eba49b9b0 100644
--- a/src/test/java/resources/batch_demo_csv/batchTransactioClosedLoopMojaloopFundTransfer.csv
+++ b/src/test/java/resources/batch_demo_csv/batchTransactioClosedLoopMojaloopFundTransfer.csv
@@ -1,9 +1,9 @@
 id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
-0,cc027d54-05cd-4804-b991-4d3f334ac942,closedloop,msisdn,120,msisdn,107,10,USD,Test Payee Payment
-1,e81d7ff8-67d2-4f0b-b2ae-66c30964787e,closedloop,msisdn,121,msisdn,108,5,USD,Test Payee Payment
-2,93011c44-30f5-49b7-a806-04d64af4ec87,closedloop,msisdn,122,msisdn,109,5,USD,Test Payee Payment
-3,61eaa203-9523-4281-a72e-e3f5bc2905d3,closedloop,msisdn,123,msisdn,110,5,USD,Test Payee Payment
-4,b68cd4b7-8c7d-48e1-b68f-a530019753e0,closedloop,msisdn,124,msisdn,111,5,USD,Test Payee Payment
-5,8b600aec-5062-455c-bc18-34dda2d0eb80,mojaloop,msisdn,125,msisdn,112,3,USD,Test Payee Payment
-6,6ed4341b-9ece-4898-a9dd-60804bba8c1e,mojaloop,msisdn,126,msisdn,112,2,USD,Test Payee Payment
-7,b26802a4-6692-4e57-8a5b-9fcc5085062c,mojaloop,msisdn,127,msisdn,113,1,USD,Test Payee Payment
\ No newline at end of file
+0,26cd00a1-58e1-404c-98ae-8f6d29e9811d,closedloop,msisdn,500,msisdn,464,10,USD,Test Payee Payment
+1,1a0029c7-2d0a-476c-8fc4-57c87fa1aba6,closedloop,msisdn,501,msisdn,465,5,USD,Test Payee Payment
+2,e82f7481-e558-4c27-873d-a6613a52570f,closedloop,msisdn,502,msisdn,466,5,USD,Test Payee Payment
+3,d800302f-daeb-44a5-967a-1f743735903e,closedloop,msisdn,503,msisdn,467,5,USD,Test Payee Payment
+4,ca231223-336f-4dcb-93f0-79eed9329735,closedloop,msisdn,504,msisdn,468,5,USD,Test Payee Payment
+5,f9b77072-dc7c-432d-a523-847c20256d1d,mojaloop,msisdn,505,msisdn,469,3,USD,Test Payee Payment
+6,8317eff8-dd00-4054-9a9e-b2bee04d6462,mojaloop,msisdn,506,msisdn,469,2,USD,Test Payee Payment
+7,0f5d17fc-7184-42b5-bec8-67c51cacb0e5,mojaloop,msisdn,507,msisdn,470,1,USD,Test Payee Payment
\ No newline at end of file
diff --git a/src/test/java/resources/batch_demo_csv/batchTransactionGsmaClosedLoop.csv b/src/test/java/resources/batch_demo_csv/batchTransactionGsmaClosedLoop.csv
index 28675884f..c19bd5cad 100644
--- a/src/test/java/resources/batch_demo_csv/batchTransactionGsmaClosedLoop.csv
+++ b/src/test/java/resources/batch_demo_csv/batchTransactionGsmaClosedLoop.csv
@@ -1,9 +1,9 @@
 id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
-0,05cd9734-f25e-462d-a6ad-88606b66c19a,closedloop,msisdn,3852,msisdn,3535,10,USD,Test Payee Payment
-1,f868df3a-2b0f-4c72-ad67-0708c3dbfa46,closedloop,msisdn,3853,msisdn,3536,5,USD,Test Payee Payment
-2,9f2d8f3e-1d4b-4dfd-a441-764ee0a7f102,closedloop,msisdn,3854,msisdn,3537,5,USD,Test Payee Payment
-3,345deafc-a280-4cf9-bdea-24ce04d62255,closedloop,msisdn,3855,msisdn,3538,5,USD,Test Payee Payment
-4,f7959697-29bd-42ed-bd87-f814c6ff693b,closedloop,msisdn,3856,msisdn,3539,5,USD,Test Payee Payment
-5,8b8c6cfd-4108-41e3-a326-4ed386657cb7,gsma,msisdn,3857,msisdn,3540,6,USD,Test Payee Payment
-6,b0e78317-541b-4602-80e0-f529124a87a5,gsma,msisdn,3858,msisdn,3541,7,USD,Test Payee Payment
-7,190a3682-6b97-4bb4-819a-7f29b9bc3513,gsma,msisdn,3859,msisdn,3542,8,USD,Test Payee Payment
\ No newline at end of file
+0,f0ef75d1-4386-4fac-ba8c-b11c1619281f,closedloop,msisdn,492,msisdn,456,10,USD,Test Payee Payment
+1,05839d34-40b3-45a5-a67f-bf86f4eba3c7,closedloop,msisdn,493,msisdn,457,5,USD,Test Payee Payment
+2,98ceca94-082f-4dad-a5f1-3e0c99b68452,closedloop,msisdn,494,msisdn,458,5,USD,Test Payee Payment
+3,30cf3cbd-d073-4dda-bce1-19d75d5043b8,closedloop,msisdn,495,msisdn,459,5,USD,Test Payee Payment
+4,cb33d092-678c-4b40-af41-0cf7737e219c,closedloop,msisdn,496,msisdn,460,5,USD,Test Payee Payment
+5,698bba3d-bd11-44ed-ab87-3fe3ba970dc6,gsma,msisdn,497,msisdn,461,6,USD,Test Payee Payment
+6,cad5863d-bf6d-4e4b-bd5a-9194357b7756,gsma,msisdn,498,msisdn,462,7,USD,Test Payee Payment
+7,1c486600-0414-40cb-a4a7-ea7200d8221a,gsma,msisdn,499,msisdn,463,8,USD,Test Payee Payment
\ No newline at end of file
diff --git a/src/test/java/resources/batch_demo_csv/batchTransactionGsmaClosedLoopMojaloop.csv b/src/test/java/resources/batch_demo_csv/batchTransactionGsmaClosedLoopMojaloop.csv
index bedc587e8..72b0af741 100644
--- a/src/test/java/resources/batch_demo_csv/batchTransactionGsmaClosedLoopMojaloop.csv
+++ b/src/test/java/resources/batch_demo_csv/batchTransactionGsmaClosedLoopMojaloop.csv
@@ -1,14 +1,14 @@
 id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
-0,3e340d67-ecfa-4cfd-a44a-fd8f8ddd009a,closedloop,msisdn,222,msisdn,205,10,USD,Test Payee Payment
-1,62d0e1db-df4b-4659-bf35-2bdeeaaf00fb,closedloop,msisdn,223,msisdn,206,5,USD,Test Payee Payment
-2,0620b8f1-c054-46ef-a23a-520848811241,closedloop,msisdn,224,msisdn,207,5,USD,Test Payee Payment
-3,fb56be3e-e84d-4b64-83de-711958a1f5dd,closedloop,msisdn,225,msisdn,208,5,USD,Test Payee Payment
-4,61b90e75-846f-40ff-a0c7-1da9606c320a,closedloop,msisdn,226,msisdn,209,5,USD,Test Payee Payment
-5,84c5dd3f-a5a3-430a-8bd1-6c7f53b32654,gsma,msisdn,227,msisdn,210,6,USD,Test Payee Payment
-6,99ca4c0a-ff6f-4db5-9a35-a7525ea28810,gsma,msisdn,228,msisdn,211,7,USD,Test Payee Payment
-7,2675ddd7-39ff-4be4-b2b2-0de587dc1a56,gsma,msisdn,229,msisdn,212,8,USD,Test Payee Payment
-8,2a1ff283-ac56-4572-a80f-aa3a57a26120,gsma,msisdn,230,msisdn,213,9,USD,Test Payee Payment
-9,ea300c47-4dc0-410e-92a4-d050e7685f35,gsma,msisdn,231,msisdn,214,10,USD,Test Payee Payment
-10,424d0cad-31ae-42f9-be2a-1d809d2a3aa8,mojaloop,msisdn,232,msisdn,215,3,USD,Test Payee Payment
-11,b0c9006d-71e7-4d20-86fc-ef7f874109e1,mojaloop,msisdn,233,msisdn,215,2,USD,Test Payee Payment
-12,074e6889-f91f-49cb-87a5-1823c59c929b,mojaloop,msisdn,234,msisdn,216,1,USD,Test Payee Payment
\ No newline at end of file
+0,7a326f82-5e6d-4df5-a768-d985a0be0256,closedloop,msisdn,508,msisdn,471,10,USD,Test Payee Payment
+1,d7cb1933-ffb5-4251-a614-91e7e5ec8866,closedloop,msisdn,509,msisdn,472,5,USD,Test Payee Payment
+2,78ceda7e-fcc0-4e0c-a02d-08c7aff1dc3c,closedloop,msisdn,510,msisdn,473,5,USD,Test Payee Payment
+3,51e1b029-707d-4939-a2ed-0f226516c998,closedloop,msisdn,511,msisdn,474,5,USD,Test Payee Payment
+4,68df2863-0223-411d-b0dc-5f6209563a65,closedloop,msisdn,512,msisdn,475,5,USD,Test Payee Payment
+5,66b25219-0b4a-41b9-b3b5-e373ab7aac53,gsma,msisdn,513,msisdn,476,6,USD,Test Payee Payment
+6,d7319db5-ca76-4f6e-adbe-17cbfab2e876,gsma,msisdn,514,msisdn,477,7,USD,Test Payee Payment
+7,71bdc8af-487e-4d0d-b9ce-3ff10e579f42,gsma,msisdn,515,msisdn,478,8,USD,Test Payee Payment
+8,823d2380-e22d-4fcf-9092-8be9652eccb7,gsma,msisdn,516,msisdn,479,9,USD,Test Payee Payment
+9,bc4e0d99-dfd3-4d25-a0b1-ce0d19383239,gsma,msisdn,517,msisdn,480,10,USD,Test Payee Payment
+10,b19a1491-5d6e-4145-888e-a2a58f4ff79e,mojaloop,msisdn,518,msisdn,481,3,USD,Test Payee Payment
+11,743f4283-b20f-4e0d-9c3b-c474b971c0b8,mojaloop,msisdn,519,msisdn,481,2,USD,Test Payee Payment
+12,d8b05513-01db-4fc9-bf57-1a52b7ceee9a,mojaloop,msisdn,520,msisdn,482,1,USD,Test Payee Payment
\ No newline at end of file
diff --git a/src/test/java/resources/bulkPayment.feature b/src/test/java/resources/bulkPayment.feature
index 05ba06d20..836f2b842 100644
--- a/src/test/java/resources/bulkPayment.feature
+++ b/src/test/java/resources/bulkPayment.feature
@@ -297,7 +297,7 @@ Feature: Test ability to make payment to individual with bank account
 
         #payer 4 creation
     Given I have Fineract-Platform-TenantId as "payerfsp2"
-    When I create and setup a "payer" with id "4" and account balance of 50 for all combine test cases
+    When I create and setup a "payer" with id "4" and account balance of 50
     Given I have tenant as "payerfsp"
     Then I call the balance api for payer "4" balance for all combine test cases
     #payee 4 creation

From 7702d1b325c629c6e6113fbb0fc805739450b18a Mon Sep 17 00:00:00 2001
From: Abhinav Mishra <abhinav@fynarfin.in>
Date: Fri, 19 Apr 2024 18:01:33 +0530
Subject: [PATCH 09/11] Added identifier

---
 src/test/java/resources/bulkPayment.feature | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/test/java/resources/bulkPayment.feature b/src/test/java/resources/bulkPayment.feature
index 836f2b842..2e689ecd6 100644
--- a/src/test/java/resources/bulkPayment.feature
+++ b/src/test/java/resources/bulkPayment.feature
@@ -1,7 +1,7 @@
 @gov @ext
 Feature: Test ability to make payment to individual with bank account
 
-  Scenario: Input CSV file using the batch transaction API and poll batch summary API till we get completed status
+  Scenario:BB-FSP 001 Input CSV file using the batch transaction API and poll batch summary API till we get completed status
     Given I have tenant as "paymentbb1"
     And I have the demo csv file "bulk_payment.csv"
     And I create a list of payee identifiers from csv file
@@ -25,7 +25,7 @@ Feature: Test ability to make payment to individual with bank account
     And Status of transaction is "COMPLETED"
     And I should have matching total txn count and successful txn count in response
 
-  Scenario: Bulk Transfer with ClosedLoop and Mojaloop
+  Scenario:BB-FSP 002 Bulk Transfer with ClosedLoop and Mojaloop
     Given I have tenant as "paymentbb1"
     And I have the demo csv file "bulk_payment_closedl_mock_mojaloop.csv"
     And I create a list of payee identifiers from csv file
@@ -49,7 +49,7 @@ Feature: Test ability to make payment to individual with bank account
     And Status of transaction is "COMPLETED"
     And My total txns 8 and successful txn count in response should Match
 
-  Scenario: Bulk Transfer with ClosedLoop and GSMA
+  Scenario:BB-FSP 003 Bulk Transfer with ClosedLoop and GSMA
     #payer 1 creation
     Given I have Fineract-Platform-TenantId as "payerfsp2"
     When I create and setup a "payer" with id "1" and account balance of 100 for combine test cases
@@ -161,7 +161,7 @@ Feature: Test ability to make payment to individual with bank account
     And My total txns 8 and successful txn count in response should Match
 
 
-  Scenario: Bulk Transfer with Closedloop and Real Mojaloop
+  Scenario:BB-FSP 004 Bulk Transfer with Closedloop and Real Mojaloop
       #payer 1 creation
     Given I have Fineract-Platform-TenantId as "payerfsp2"
     When I create and setup a "payer" with id "1" and account balance of 100 for combine test cases
@@ -257,7 +257,7 @@ Feature: Test ability to make payment to individual with bank account
     And My total txns 8 and successful txn count in response should Match
 
 
-  Scenario: Bulk Transfer with ClosedLoop, Real mojaloop and Real GSMA
+  Scenario:BB-FSP 005 Bulk Transfer with ClosedLoop, Real mojaloop and Real GSMA
     #payer 1 creation
     Given I have Fineract-Platform-TenantId as "payerfsp2"
     When I create and setup a "payer" with id "1" and account balance of 100 for all combine test cases

From a17e1c96b11916e80c0415d14af2ec88f9f2f770 Mon Sep 17 00:00:00 2001
From: Abhinav Mishra <abhinav@fynarfin.in>
Date: Mon, 22 Apr 2024 17:46:04 +0530
Subject: [PATCH 10/11] updated tenant

---
 ...ansactioClosedLoopMojaloopFundTransfer.csv | 16 ++++++------
 .../batch_demo_csv/batchTransaction.csv       |  6 ++---
 .../batchTransactionGsmaClosedLoop.csv        | 16 ++++++------
 ...batchTransactionGsmaClosedLoopMojaloop.csv | 26 +++++++++----------
 src/test/java/resources/bulkPayment.feature   |  6 ++---
 5 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/test/java/resources/batch_demo_csv/batchTransactioClosedLoopMojaloopFundTransfer.csv b/src/test/java/resources/batch_demo_csv/batchTransactioClosedLoopMojaloopFundTransfer.csv
index eba49b9b0..a230764bf 100644
--- a/src/test/java/resources/batch_demo_csv/batchTransactioClosedLoopMojaloopFundTransfer.csv
+++ b/src/test/java/resources/batch_demo_csv/batchTransactioClosedLoopMojaloopFundTransfer.csv
@@ -1,9 +1,9 @@
 id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
-0,26cd00a1-58e1-404c-98ae-8f6d29e9811d,closedloop,msisdn,500,msisdn,464,10,USD,Test Payee Payment
-1,1a0029c7-2d0a-476c-8fc4-57c87fa1aba6,closedloop,msisdn,501,msisdn,465,5,USD,Test Payee Payment
-2,e82f7481-e558-4c27-873d-a6613a52570f,closedloop,msisdn,502,msisdn,466,5,USD,Test Payee Payment
-3,d800302f-daeb-44a5-967a-1f743735903e,closedloop,msisdn,503,msisdn,467,5,USD,Test Payee Payment
-4,ca231223-336f-4dcb-93f0-79eed9329735,closedloop,msisdn,504,msisdn,468,5,USD,Test Payee Payment
-5,f9b77072-dc7c-432d-a523-847c20256d1d,mojaloop,msisdn,505,msisdn,469,3,USD,Test Payee Payment
-6,8317eff8-dd00-4054-9a9e-b2bee04d6462,mojaloop,msisdn,506,msisdn,469,2,USD,Test Payee Payment
-7,0f5d17fc-7184-42b5-bec8-67c51cacb0e5,mojaloop,msisdn,507,msisdn,470,1,USD,Test Payee Payment
\ No newline at end of file
+0,4676a8cd-a9bd-4ff8-8f7f-343e15e6b06b,closedloop,msisdn,1661,msisdn,1589,10,USD,Test Payee Payment
+1,c6543675-e573-4575-85fb-6e25f44a643b,closedloop,msisdn,1662,msisdn,1590,5,USD,Test Payee Payment
+2,14a359d4-d37f-4eda-a5e7-c7002ae699e0,closedloop,msisdn,1663,msisdn,1591,5,USD,Test Payee Payment
+3,36472026-28d2-4203-8f0f-8489ea04ae36,closedloop,msisdn,1664,msisdn,1592,5,USD,Test Payee Payment
+4,ef8c31b3-43d8-4318-b2fd-d9cbb2391aa6,closedloop,msisdn,1665,msisdn,1593,5,USD,Test Payee Payment
+5,7d8f65a5-f19e-4e23-93aa-c01100771f09,mojaloop,msisdn,1666,msisdn,1594,3,USD,Test Payee Payment
+6,801fe779-5950-41dd-8dd7-11b0e3171674,mojaloop,msisdn,1667,msisdn,1594,2,USD,Test Payee Payment
+7,a6c35b7c-432c-4cc0-8df4-0d53be2316c6,mojaloop,msisdn,1668,msisdn,1595,1,USD,Test Payee Payment
\ No newline at end of file
diff --git a/src/test/java/resources/batch_demo_csv/batchTransaction.csv b/src/test/java/resources/batch_demo_csv/batchTransaction.csv
index 74628adee..cd530f199 100644
--- a/src/test/java/resources/batch_demo_csv/batchTransaction.csv
+++ b/src/test/java/resources/batch_demo_csv/batchTransaction.csv
@@ -1,4 +1,4 @@
 id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
-0,0264c6af-76d4-4591-bc79-f0d47859fe2d,mojaloop,msisdn,117,msisdn,105,3,USD,Test Payee Payment
-1,d31dacb6-459f-4fc5-8c4d-891f41813fc3,mojaloop,msisdn,118,msisdn,105,2,USD,Test Payee Payment
-2,1910e3de-1fee-4d33-8ab3-888268937f0f,mojaloop,msisdn,119,msisdn,106,1,USD,Test Payee Payment
\ No newline at end of file
+0,b0105ec7-6dec-4965-bc49-b0dcaa52b210,mojaloop,msisdn,1650,msisdn,1579,3,USD,Test Payee Payment
+1,575fff97-28c8-4162-9dd2-2347fbc0b7d8,mojaloop,msisdn,1651,msisdn,1579,2,USD,Test Payee Payment
+2,ab9bd2bc-54ba-4f2e-af4c-dcd92c9e0abf,mojaloop,msisdn,1652,msisdn,1580,1,USD,Test Payee Payment
\ No newline at end of file
diff --git a/src/test/java/resources/batch_demo_csv/batchTransactionGsmaClosedLoop.csv b/src/test/java/resources/batch_demo_csv/batchTransactionGsmaClosedLoop.csv
index c19bd5cad..92b306bc4 100644
--- a/src/test/java/resources/batch_demo_csv/batchTransactionGsmaClosedLoop.csv
+++ b/src/test/java/resources/batch_demo_csv/batchTransactionGsmaClosedLoop.csv
@@ -1,9 +1,9 @@
 id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
-0,f0ef75d1-4386-4fac-ba8c-b11c1619281f,closedloop,msisdn,492,msisdn,456,10,USD,Test Payee Payment
-1,05839d34-40b3-45a5-a67f-bf86f4eba3c7,closedloop,msisdn,493,msisdn,457,5,USD,Test Payee Payment
-2,98ceca94-082f-4dad-a5f1-3e0c99b68452,closedloop,msisdn,494,msisdn,458,5,USD,Test Payee Payment
-3,30cf3cbd-d073-4dda-bce1-19d75d5043b8,closedloop,msisdn,495,msisdn,459,5,USD,Test Payee Payment
-4,cb33d092-678c-4b40-af41-0cf7737e219c,closedloop,msisdn,496,msisdn,460,5,USD,Test Payee Payment
-5,698bba3d-bd11-44ed-ab87-3fe3ba970dc6,gsma,msisdn,497,msisdn,461,6,USD,Test Payee Payment
-6,cad5863d-bf6d-4e4b-bd5a-9194357b7756,gsma,msisdn,498,msisdn,462,7,USD,Test Payee Payment
-7,1c486600-0414-40cb-a4a7-ea7200d8221a,gsma,msisdn,499,msisdn,463,8,USD,Test Payee Payment
\ No newline at end of file
+0,4f5b3af0-e9c4-4d0d-82e1-f7a306537a78,closedloop,msisdn,1653,msisdn,1581,10,USD,Test Payee Payment
+1,1f135114-f258-43ca-bde7-b1a1d35ef6b8,closedloop,msisdn,1654,msisdn,1582,5,USD,Test Payee Payment
+2,9504b7a3-bd56-4b3f-a5e3-62490f15946c,closedloop,msisdn,1655,msisdn,1583,5,USD,Test Payee Payment
+3,36633dc5-0ebf-438b-9e92-9454b9ec1b48,closedloop,msisdn,1656,msisdn,1584,5,USD,Test Payee Payment
+4,4f2378aa-b53a-4875-bf46-d64478282a5d,closedloop,msisdn,1657,msisdn,1585,5,USD,Test Payee Payment
+5,f0a69fcb-1007-4f00-b13c-5fa708c1d345,gsma,msisdn,1658,msisdn,1586,6,USD,Test Payee Payment
+6,5f21b775-7a6c-4ddf-b816-be7d9e614337,gsma,msisdn,1659,msisdn,1587,7,USD,Test Payee Payment
+7,de9aa5a7-a74e-49c4-9b5c-293ebbd48b65,gsma,msisdn,1660,msisdn,1588,8,USD,Test Payee Payment
\ No newline at end of file
diff --git a/src/test/java/resources/batch_demo_csv/batchTransactionGsmaClosedLoopMojaloop.csv b/src/test/java/resources/batch_demo_csv/batchTransactionGsmaClosedLoopMojaloop.csv
index 72b0af741..ba5c73d3e 100644
--- a/src/test/java/resources/batch_demo_csv/batchTransactionGsmaClosedLoopMojaloop.csv
+++ b/src/test/java/resources/batch_demo_csv/batchTransactionGsmaClosedLoopMojaloop.csv
@@ -1,14 +1,14 @@
 id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
-0,7a326f82-5e6d-4df5-a768-d985a0be0256,closedloop,msisdn,508,msisdn,471,10,USD,Test Payee Payment
-1,d7cb1933-ffb5-4251-a614-91e7e5ec8866,closedloop,msisdn,509,msisdn,472,5,USD,Test Payee Payment
-2,78ceda7e-fcc0-4e0c-a02d-08c7aff1dc3c,closedloop,msisdn,510,msisdn,473,5,USD,Test Payee Payment
-3,51e1b029-707d-4939-a2ed-0f226516c998,closedloop,msisdn,511,msisdn,474,5,USD,Test Payee Payment
-4,68df2863-0223-411d-b0dc-5f6209563a65,closedloop,msisdn,512,msisdn,475,5,USD,Test Payee Payment
-5,66b25219-0b4a-41b9-b3b5-e373ab7aac53,gsma,msisdn,513,msisdn,476,6,USD,Test Payee Payment
-6,d7319db5-ca76-4f6e-adbe-17cbfab2e876,gsma,msisdn,514,msisdn,477,7,USD,Test Payee Payment
-7,71bdc8af-487e-4d0d-b9ce-3ff10e579f42,gsma,msisdn,515,msisdn,478,8,USD,Test Payee Payment
-8,823d2380-e22d-4fcf-9092-8be9652eccb7,gsma,msisdn,516,msisdn,479,9,USD,Test Payee Payment
-9,bc4e0d99-dfd3-4d25-a0b1-ce0d19383239,gsma,msisdn,517,msisdn,480,10,USD,Test Payee Payment
-10,b19a1491-5d6e-4145-888e-a2a58f4ff79e,mojaloop,msisdn,518,msisdn,481,3,USD,Test Payee Payment
-11,743f4283-b20f-4e0d-9c3b-c474b971c0b8,mojaloop,msisdn,519,msisdn,481,2,USD,Test Payee Payment
-12,d8b05513-01db-4fc9-bf57-1a52b7ceee9a,mojaloop,msisdn,520,msisdn,482,1,USD,Test Payee Payment
\ No newline at end of file
+0,aa2640cc-7b46-4843-8cd6-ae11d7fc45b4,closedloop,msisdn,1669,msisdn,1596,10,USD,Test Payee Payment
+1,90a8eee0-8ca8-4b34-a83e-f9bc4a83eac9,closedloop,msisdn,1670,msisdn,1597,5,USD,Test Payee Payment
+2,d4f89e0d-0250-4287-9da8-85fcb564a43d,closedloop,msisdn,1671,msisdn,1598,5,USD,Test Payee Payment
+3,e2ecc8ef-4fd2-4be1-8e45-6b664f7bb475,closedloop,msisdn,1672,msisdn,1599,5,USD,Test Payee Payment
+4,763fe464-c2b0-490d-847b-07ad46cf61ce,closedloop,msisdn,1673,msisdn,1600,5,USD,Test Payee Payment
+5,d96b1832-01d8-420d-8e61-efb57780fbac,gsma,msisdn,1674,msisdn,1601,6,USD,Test Payee Payment
+6,74c7a361-5d45-4840-99df-2a2a95a48b35,gsma,msisdn,1675,msisdn,1602,7,USD,Test Payee Payment
+7,ba069ad5-7eea-4727-8d5a-3f0959146ceb,gsma,msisdn,1677,msisdn,1603,8,USD,Test Payee Payment
+8,04412577-4c38-4d7c-b280-b9672c694ea2,gsma,msisdn,1678,msisdn,1605,9,USD,Test Payee Payment
+9,89a6fc00-5af2-48a9-8187-1358d87941d6,gsma,msisdn,1679,msisdn,1606,10,USD,Test Payee Payment
+10,53014e2d-492b-4324-b04e-b03daa6f4fc4,mojaloop,msisdn,1680,msisdn,1607,3,USD,Test Payee Payment
+11,f262f423-ff62-4298-8942-fd56d71b64cf,mojaloop,msisdn,1681,msisdn,1607,2,USD,Test Payee Payment
+12,3d907874-507e-4319-8399-15629c07e999,mojaloop,msisdn,1682,msisdn,1608,1,USD,Test Payee Payment
\ No newline at end of file
diff --git a/src/test/java/resources/bulkPayment.feature b/src/test/java/resources/bulkPayment.feature
index 2e689ecd6..d4a543195 100644
--- a/src/test/java/resources/bulkPayment.feature
+++ b/src/test/java/resources/bulkPayment.feature
@@ -26,7 +26,7 @@ Feature: Test ability to make payment to individual with bank account
     And I should have matching total txn count and successful txn count in response
 
   Scenario:BB-FSP 002 Bulk Transfer with ClosedLoop and Mojaloop
-    Given I have tenant as "paymentbb1"
+    Given I have tenant as "paymentBB2"
     And I have the demo csv file "bulk_payment_closedl_mock_mojaloop.csv"
     And I create a list of payee identifiers from csv file
     When I can inject MockServer
@@ -42,8 +42,8 @@ Feature: Test ability to make payment to individual with bank account
     Then I should get non empty response
     And I am able to parse batch transactions response
     And I fetch batch ID from batch transaction API's response
-#    Then I will sleep for 10000 millisecond
-    Given I have tenant as "paymentbb1"
+    Then I will sleep for 10000 millisecond
+    Given I have tenant as "paymentBB2"
     When I call the batch summary API with expected status of 200 with total successfull 8 txns
     Then I am able to parse batch summary response
     And Status of transaction is "COMPLETED"

From 9ecd7e9e21f1d10cf37e1e14c44d948e381c3f87 Mon Sep 17 00:00:00 2001
From: Abhinav Mishra <abhinav@fynarfin.in>
Date: Mon, 22 Apr 2024 18:14:03 +0530
Subject: [PATCH 11/11] removed ext tag

---
 src/test/java/resources/bulkPayment.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/resources/bulkPayment.feature b/src/test/java/resources/bulkPayment.feature
index d4a543195..5782a4f3d 100644
--- a/src/test/java/resources/bulkPayment.feature
+++ b/src/test/java/resources/bulkPayment.feature
@@ -1,4 +1,4 @@
-@gov @ext
+@gov
 Feature: Test ability to make payment to individual with bank account
 
   Scenario:BB-FSP 001 Input CSV file using the batch transaction API and poll batch summary API till we get completed status