From b930e0933c0d6c120ff3fd78a9ce95843991792b Mon Sep 17 00:00:00 2001 From: Anover000 Date: Tue, 10 Oct 2023 18:54:06 +0530 Subject: [PATCH 01/13] add annotation to Feature file to make it part of CI tests --- src/test/java/resources/channelCollection.feature | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/resources/channelCollection.feature b/src/test/java/resources/channelCollection.feature index dd351f136..3a1ccc46b 100644 --- a/src/test/java/resources/channelCollection.feature +++ b/src/test/java/resources/channelCollection.feature @@ -1,3 +1,4 @@ +@gov Feature: Channel Collection API test From 7bfcb19785a6de0b29a1832061038e985abf928c Mon Sep 17 00:00:00 2001 From: "jit-ci[bot]" <91912817+jit-ci[bot]@users.noreply.github.com> Date: Fri, 24 May 2024 22:50:41 +0000 Subject: [PATCH 02/13] Sync with plan From 3ded316b289227d2d8ea2cece1b6c34186e7aff6 Mon Sep 17 00:00:00 2001 From: "jit-ci[bot]" <91912817+jit-ci[bot]@users.noreply.github.com> Date: Thu, 30 May 2024 05:31:09 +0000 Subject: [PATCH 03/13] Sync with plan From 6afa5107251c2ce1ae9788b1196871da2f3b08d4 Mon Sep 17 00:00:00 2001 From: "jit-ci[bot]" <91912817+jit-ci[bot]@users.noreply.github.com> Date: Thu, 30 May 2024 05:40:35 +0000 Subject: [PATCH 04/13] Sync with plan From b55ca0af427cb25a638d2d3ea9e712372874ec25 Mon Sep 17 00:00:00 2001 From: "jit-ci[bot]" <91912817+jit-ci[bot]@users.noreply.github.com> Date: Thu, 30 May 2024 05:43:10 +0000 Subject: [PATCH 05/13] Sync with plan From b2710f0753c8e32b4ae29dca4563e37a15923ca8 Mon Sep 17 00:00:00 2001 From: "jit-ci[bot]" <91912817+jit-ci[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2024 15:11:12 +0000 Subject: [PATCH 06/13] Sync with plan From 9889bf56fda0449c63c0b3d24309e13027cbd09d Mon Sep 17 00:00:00 2001 From: "jit-ci[bot]" <91912817+jit-ci[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2024 15:43:16 +0000 Subject: [PATCH 07/13] Sync with plan From 5772a5f079d5e32eb4fafceb1bd95bd970a8e202 Mon Sep 17 00:00:00 2001 From: "jit-ci[bot]" <91912817+jit-ci[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2024 16:10:45 +0000 Subject: [PATCH 08/13] Sync with plan From c59075dc4acee71569cc7d1f2405ae24ece119db Mon Sep 17 00:00:00 2001 From: "jit-ci[bot]" <91912817+jit-ci[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 14:06:59 +0000 Subject: [PATCH 09/13] Sync with plan From e510b9387e183e2eecb093a048af6a1e455d9de8 Mon Sep 17 00:00:00 2001 From: "jit-ci[bot]" <91912817+jit-ci[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2024 14:49:52 +0000 Subject: [PATCH 10/13] Sync with plan From 5d208bd6adca1fa056f4df40bbcb0fccbfc10120 Mon Sep 17 00:00:00 2001 From: Anover000 Date: Sun, 7 Jul 2024 23:33:03 +0530 Subject: [PATCH 11/13] Enable testing for Multi Payee Tenant support for PayerFundTransfer. --- .../config/MojaloopConfig.java | 6 +++++ .../config/PayerFundTransferConfig.java | 6 +++++ src/main/resources/application.yaml | 4 +++ .../cucumber/stepdef/MojaloopStepDef.java | 23 +++++++++++----- .../stepdef/PayerFundTransferStepDef.java | 27 +++++++++++++------ src/test/java/resources/mojaloop.feature | 6 +++-- 6 files changed, 56 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/mifos/integrationtest/config/MojaloopConfig.java b/src/main/java/org/mifos/integrationtest/config/MojaloopConfig.java index 129912a84..af90dab99 100644 --- a/src/main/java/org/mifos/integrationtest/config/MojaloopConfig.java +++ b/src/main/java/org/mifos/integrationtest/config/MojaloopConfig.java @@ -45,6 +45,12 @@ public class MojaloopConfig { @Value("${mojaloop.fspid.payee}") public String payeeFspId; + @Value("${mojaloop.fspid.payee2}") + public String payeeFspId2; + + @Value("${mojaloop.fspid.payee3}") + public String payeeFspId3; + @Value("${ml-connector.host}") public String mlConnectorHost; diff --git a/src/main/java/org/mifos/integrationtest/config/PayerFundTransferConfig.java b/src/main/java/org/mifos/integrationtest/config/PayerFundTransferConfig.java index 353670ce6..2f473239b 100644 --- a/src/main/java/org/mifos/integrationtest/config/PayerFundTransferConfig.java +++ b/src/main/java/org/mifos/integrationtest/config/PayerFundTransferConfig.java @@ -12,6 +12,12 @@ public class PayerFundTransferConfig { @Value("${payerFundTransfer.tenant.payee}") 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}") diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index cb7987fb7..fa04ca7e1 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -187,11 +187,15 @@ payerFundTransfer: tenant: payer: "wakanda" payee: "jupiter" + payee2: "pluto" + payee3: "venus" mojaloop: fspid: payer: "payerfsp" payee: "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 diff --git a/src/test/java/org/mifos/integrationtest/cucumber/stepdef/MojaloopStepDef.java b/src/test/java/org/mifos/integrationtest/cucumber/stepdef/MojaloopStepDef.java index 32dbf07d6..00fb70c7e 100644 --- a/src/test/java/org/mifos/integrationtest/cucumber/stepdef/MojaloopStepDef.java +++ b/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(); 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 3da9ae9f7..a8cb6e3c9 100644 --- a/src/test/java/org/mifos/integrationtest/cucumber/stepdef/PayerFundTransferStepDef.java +++ b/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("payeeDfspId", fundTransferDef.payeeTenant); // requestSpec.header("Platform-TenantId", transferConfig.payerTenant); String requestBody = TransferHelper diff --git a/src/test/java/resources/mojaloop.feature b/src/test/java/resources/mojaloop.feature index 3cae45cf8..449c530a3 100644 --- a/src/test/java/resources/mojaloop.feature +++ b/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" +# payee/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 +# payee/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 From f9ef53a477d4ad08bf5ddc54db2629abf06eb09f Mon Sep 17 00:00:00 2001 From: Anover000 Date: Mon, 8 Jul 2024 13:37:22 +0530 Subject: [PATCH 12/13] Update transfer header value. --- .../cucumber/stepdef/PayerFundTransferStepDef.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a8cb6e3c9..9926590ae 100644 --- a/src/test/java/org/mifos/integrationtest/cucumber/stepdef/PayerFundTransferStepDef.java +++ b/src/test/java/org/mifos/integrationtest/cucumber/stepdef/PayerFundTransferStepDef.java @@ -406,7 +406,7 @@ public void payerFundTransfer(String amount) throws JSONException { RequestSpecification requestSpec = Utils.getDefaultSpec(transferConfig.payerTenant); requestSpec.header(Utils.X_CORRELATIONID, UUID.randomUUID()); - requestSpec.header("payeeDfspId", fundTransferDef.payeeTenant); + requestSpec.header("X-PayeeDFSP-ID", fundTransferDef.payeeTenant); // requestSpec.header("Platform-TenantId", transferConfig.payerTenant); String requestBody = TransferHelper From d38b43afbbba87af2fefd484beebd48a4c633bf5 Mon Sep 17 00:00:00 2001 From: Abhinav Mishra Date: Tue, 9 Jul 2024 18:20:31 +0530 Subject: [PATCH 13/13] Made payee generic --- .../java/org/mifos/integrationtest/config/MojaloopConfig.java | 2 +- .../mifos/integrationtest/config/PayerFundTransferConfig.java | 2 +- src/main/resources/application.yaml | 4 ++-- src/test/java/resources/mojaloop.feature | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/mifos/integrationtest/config/MojaloopConfig.java b/src/main/java/org/mifos/integrationtest/config/MojaloopConfig.java index af90dab99..61dd4b77a 100644 --- a/src/main/java/org/mifos/integrationtest/config/MojaloopConfig.java +++ b/src/main/java/org/mifos/integrationtest/config/MojaloopConfig.java @@ -42,7 +42,7 @@ 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}") diff --git a/src/main/java/org/mifos/integrationtest/config/PayerFundTransferConfig.java b/src/main/java/org/mifos/integrationtest/config/PayerFundTransferConfig.java index 2f473239b..f8965c5de 100644 --- a/src/main/java/org/mifos/integrationtest/config/PayerFundTransferConfig.java +++ b/src/main/java/org/mifos/integrationtest/config/PayerFundTransferConfig.java @@ -9,7 +9,7 @@ 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}") diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index fa04ca7e1..07386015a 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -186,14 +186,14 @@ 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 diff --git a/src/test/java/resources/mojaloop.feature b/src/test/java/resources/mojaloop.feature index 449c530a3..c1f90e6cf 100644 --- a/src/test/java/resources/mojaloop.feature +++ b/src/test/java/resources/mojaloop.feature @@ -67,7 +67,7 @@ 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" -# payee/payee2/payee3 +# 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" @@ -78,7 +78,7 @@ Feature: Mojaloop test Then I call the deposit account endpoint with command "deposit" for amount 10 for "payee" Then I add "payer" to als -# payee/payee2/payee3 +# 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