[PHEE-701] Made Mojaloop Tc Generic for payee

src/main/java/org/mifos/integrationtest/config/MojaloopConfig.java

@@ -42,9 +42,15 @@ public class MojaloopConfig {
     @Value("${mojaloop.fspid.payer}")
     public String payerFspId;
 
-    @Value("${mojaloop.fspid.payee}")
+    @Value("${mojaloop.fspid.payee1}")
     public String payeeFspId;
 
+    @Value("${mojaloop.fspid.payee2}")
+    public String payeeFspId2;
+
+    @Value("${mojaloop.fspid.payee3}")
+    public String payeeFspId3;
+
     @Value("${ml-connector.host}")
     public String mlConnectorHost;
 

src/main/java/org/mifos/integrationtest/config/PayerFundTransferConfig.java

@@ -9,9 +9,15 @@ public class PayerFundTransferConfig {
     @Value("${payerFundTransfer.tenant.payer}")
     public String payerTenant;
 
-    @Value("${payerFundTransfer.tenant.payee}")
+    @Value("${payerFundTransfer.tenant.payee1}")
     public String payeeTenant;
 
+    @Value("${payerFundTransfer.tenant.payee2}")
+    public String payeeTenant2;
+
+    @Value("${payerFundTransfer.tenant.payee3}")
+    public String payeeTenant3;
+
     @Value("${savings.base-url}")
     public String clientBaseUrl;
     @Value("${savings.endpoints.client-endpoint}")

src/main/resources/application.yaml

@@ -186,12 +186,16 @@ config:
 payerFundTransfer:
   tenant:
     payer: "wakanda"
-    payee: "jupiter"
+    payee1: "jupiter"
+    payee2: "pluto"
+    payee3: "venus"
 
 mojaloop:
   fspid:
     payer: "payerfsp"
-    payee: "payeefsp"
+    payee1: "payeefsp"
+    payee2: "payeefsp2"
+    payee3: "payeefsp3"
   contactpoint: http://account-lookup-service.sandbox.fynarfin.io
   central-ledger-contactpoint: http://central-ledger.sandbox.fynarfin.io
   account-lookup-admin-contactpoint: http://account-lookup-service-admin.sandbox.fynarfin.io

src/test/java/org/mifos/integrationtest/cucumber/stepdef/MojaloopStepDef.java

@@ -29,12 +29,23 @@ public void addUsersToALS(String client) throws JsonProcessingException {
 
         String clientIdentifierId;
         String fspId;
-        if (client.equals("payer")) {
-            clientIdentifierId = scenarioScopeState.payerIdentifier;
-            fspId = mojaloopConfig.payerFspId;
-        } else {
-            clientIdentifierId = scenarioScopeState.payeeIdentifier;
-            fspId = mojaloopConfig.payeeFspId;
+        switch (client) {
+            case "payer" -> {
+                clientIdentifierId = scenarioScopeState.payerIdentifier;
+                fspId = mojaloopConfig.payerFspId;
+            }
+            case "payee2" -> {
+                clientIdentifierId = scenarioScopeState.payeeIdentifier;
+                fspId = mojaloopConfig.payeeFspId2;
+            }
+            case "payee3" -> {
+                clientIdentifierId = scenarioScopeState.payeeIdentifier;
+                fspId = mojaloopConfig.payeeFspId3;
+            }
+            default -> {
+                clientIdentifierId = scenarioScopeState.payeeIdentifier;
+                fspId = mojaloopConfig.payeeFspId;
+            }
         }
 
         RequestSpecification requestSpec = Utils.getDefaultSpec();

src/test/java/org/mifos/integrationtest/cucumber/stepdef/PayerFundTransferStepDef.java

@@ -66,15 +66,25 @@ public class PayerFundTransferStepDef extends BaseStepDef {
     public void setTenantForPayer(String client) {
         String tenant;
         logger.info(client);
-        if (client.equals("payer")) {
-            tenant = transferConfig.payerTenant;
-            fundTransferDef.setPayerTenant(tenant);
-            scenarioScopeState.tenant = tenant;
-        } else {
-            tenant = transferConfig.payeeTenant;
-            fundTransferDef.setPayeeTenant(tenant);
-            scenarioScopeState.tenant = tenant;
+        switch (client) {
+            case "payer" -> {
+                tenant = transferConfig.payerTenant;
+                fundTransferDef.setPayerTenant(tenant);
+            }
+            case "payee2" -> {
+                tenant = transferConfig.payeeTenant2;
+                fundTransferDef.setPayeeTenant(tenant);
+            }
+            case "payee3" -> {
+                tenant = transferConfig.payeeTenant3;
+                fundTransferDef.setPayeeTenant(tenant);
+            }
+            default -> {
+                tenant = transferConfig.payeeTenant;
+                fundTransferDef.setPayeeTenant(tenant);
+            }
         }
+        scenarioScopeState.tenant = tenant;
         assertThat(tenant).isNotEmpty();
         fundTransferDef.setTenant(tenant);
         logger.info(tenant);
@@ -396,6 +406,7 @@ public void payerFundTransfer(String amount) throws JSONException {
 
         RequestSpecification requestSpec = Utils.getDefaultSpec(transferConfig.payerTenant);
         requestSpec.header(Utils.X_CORRELATIONID, UUID.randomUUID());
+        requestSpec.header("X-PayeeDFSP-ID", fundTransferDef.payeeTenant);
         // requestSpec.header("Platform-TenantId", transferConfig.payerTenant);
 
         String requestBody = TransferHelper

src/test/java/resources/channelCollection.feature

@@ -1,3 +1,4 @@
+@gov
 Feature: Channel Collection API test
 
 

src/test/java/resources/mojaloop.feature

@@ -67,7 +67,8 @@ Feature: Mojaloop test
     When I activate the account with command "activate" for "payer"
     Then I call the deposit account endpoint with command "deposit" for amount 12 for "payer"
 
-    Given I have Fineract-Platform-TenantId for "payee"
+#    payee1/payee2/payee3
+    Given I have Fineract-Platform-TenantId for "payee3"
     When I call the create client endpoint for "payee"
     Then I call the create savings product endpoint for "payee"
     When I call the create savings account endpoint for "payee"
@@ -77,7 +78,8 @@ Feature: Mojaloop test
     Then I call the deposit account endpoint with command "deposit" for amount 10 for "payee"
 
     Then I add "payer" to als
-    Then I add "payee" to als
+#    payee1/payee2/payee3
+    Then I add "payee3" to als
 
     Then I call the payer fund transfer api to transfer amount "1" from payer to payee
     Then I should get transaction id in response