Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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 || id.equals("1")) {
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);
Expand Down Expand Up @@ -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 || id.equals("1")) {
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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 || id == 1) {
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 {

Expand Down Expand Up @@ -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 || 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 || id.equals("1")) {
scenarioScopeState.initialBalForPayeeForBatch = new int[14];
}
scenarioScopeState.initialBalForPayeeForBatch[Integer.parseInt(id)] = amount;
assertThat(scenarioScopeState.initialBalForPayeeForBatch[Integer.parseInt(id)]).isNotNull();
}
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
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
4 changes: 4 additions & 0 deletions src/test/java/resources/batch_demo_csv/batchTransaction.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
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
Original file line number Diff line number Diff line change
@@ -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
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
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
Loading