fix(mojaloop/2886): fix bulk-quotes and bulk-transfers functionality (#…

…344) fix(mojaloop/2886): fix bulk-quotes and bulk-transfers functionality (#344) * fix: added bulk-quotes to inbound api definition * chore: updated TTK version, updated TTK config files and changed ttk port * fix: bulk quotes callback redis publish channel * fix: fixed bulk quotes and bulk transfers response in outbound api * chore: updated mojaloop sim api in ttk
mojaloop · Aug 24, 2022 · 85f308b · 85f308b
1 parent bd177e2
commit 85f308b
Show file tree

Hide file tree

Showing 38 changed files with 8,990 additions and 7,863 deletions.
diff --git a/audit-ci.jsonc b/audit-ci.jsonc
@@ -11,6 +11,7 @@
         "GHSA-mjxr-4v3x-q3m4",
         "GHSA-rjqq-98f6-6j3r",
         "GHSA-3cvr-822r-rqcc",
-        "GHSA-p9pc-299p-vxgp"
+        "GHSA-p9pc-299p-vxgp",
+        "GHSA-8qr4-xgw6-wmr3"
     ]
 }
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -30,14 +30,14 @@ services:
   ml-testing-toolkit:
     networks:
         - mojaloop-net
-    image: mojaloop/ml-testing-toolkit:v11.7.11
+    image: mojaloop/ml-testing-toolkit:v15.0.0
     container_name: ml-testing-toolkit
     volumes:
-      - "./docker/ml-testing-toolkit/spec_files:/opt/mojaloop-testing-toolkit/spec_files"
-      - "./docker/ml-testing-toolkit/secrets:/opt/mojaloop-testing-toolkit/secrets"
+      - "./docker/ml-testing-toolkit/spec_files:/opt/app/spec_files"
+      - "./docker/ml-testing-toolkit/secrets:/opt/app/secrets"
 
     ports:
-      - "5000:5000"
+      - "4040:4040"
       - "5050:5050"
     environment:
       - AUTH_ENABLED=FALSE
@@ -54,15 +54,15 @@ services:
   #
   # for local development we want to have ttk-ui
   #
-  # mojaloop-testing-toolkit-ui:
-  #   image: mojaloop/ml-testing-toolkit-ui:v11.8.4
-  #   ports:
-  #     - "6060:6060"
-  #   networks:
-  #     - mojaloop-net
-  #   environment:
-  #     - API_BASE_URL=http://localhost:5050
-  #     - AUTH_ENABLED=FALSE
-  #   command:
-  #     - sh
-  #     - /usr/share/nginx/start.sh
+  mojaloop-testing-toolkit-ui:
+    image: mojaloop/ml-testing-toolkit-ui:v15.0.0
+    ports:
+      - "6060:6060"
+    networks:
+      - mojaloop-net
+    environment:
+      - API_BASE_URL=http://localhost:5050
+      - AUTH_ENABLED=FALSE
+    command:
+      - sh
+      - /usr/share/nginx/start.sh
diff --git a/docker/ml-testing-toolkit/sample-tests/test_outbound_p2p_and_bulk.json b/docker/ml-testing-toolkit/sample-tests/test_outbound_p2p_and_bulk.json
@@ -0,0 +1,125 @@
+{
+  "name": "multi",
+  "test_cases": [
+    {
+      "id": 3,
+      "name": "outbound-post-bulk-quotes",
+      "requests": [
+        {
+          "id": 1,
+          "description": "Post BulkQuotes",
+          "apiVersion": {
+            "minorVersion": 0,
+            "majorVersion": 1,
+            "type": "scheme_adapter_outbound",
+            "prefix": "/sdk-out",
+            "hostnames": [],
+            "specFile": "spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/api_spec.yaml",
+            "callbackMapFile": "spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/callback_map.json",
+            "responseMapFile": "spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/response_map.json",
+            "jsfRefFile": "spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/mockRef.json",
+            "triggerTemplatesFolder": "spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/trigger_templates"
+          },
+          "operationPath": "/bulkQuotes",
+          "path": "/bulkQuotes",
+          "method": "post",
+          "url": "http://172.17.0.1:4001",
+          "body": {
+            "homeTransactionId": "7c5eaec1-5db2-4aca-92dd-0b68071becaa",
+            "bulkQuoteId": "7106d650-fb27-4a2a-9b70-c9731fc058aa",
+            "from": {
+              "idType": "MSISDN",
+              "idValue": "123456789",
+              "type": "CONSUMER",
+              "displayName": "PayerFirst PayerLast",
+              "firstName": "PayerFirst",
+              "middleName": "Something",
+              "lastName": "PayerLast",
+              "fspId": "ttkpm4mlreceiver"
+            },
+            "individualQuotes": [
+              {
+                "quoteId": "5fdba48f-0388-4a56-94e9-57f1bc4d78fc",
+                "to": {
+                  "type": "CONSUMER",
+                  "idType": "MSISDN",
+                  "idValue": "48500002222",
+                  "fspId": "ttkpm4mlreceiver"
+                },
+                "amountType": "SEND",
+                "currency": "USD",
+                "amount": "10",
+                "transactionType": "TRANSFER",
+                "note": "test"
+              }
+            ]
+          }
+        },
+        {
+          "id": 2,
+          "description": "bulkTransfers",
+          "apiVersion": {
+            "minorVersion": 0,
+            "majorVersion": 1,
+            "type": "scheme_adapter_outbound",
+            "prefix": "/sdk-out",
+            "hostnames": [],
+            "specFile": "spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/api_spec.yaml",
+            "callbackMapFile": "spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/callback_map.json",
+            "responseMapFile": "spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/response_map.json",
+            "jsfRefFile": "spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/mockRef.json",
+            "triggerTemplatesFolder": "spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/trigger_templates"
+          },
+          "operationPath": "/bulkTransfers",
+          "path": "/bulkTransfers",
+          "method": "post",
+          "url": "http://172.17.0.1:4001",
+          "body": {
+            "homeTransactionId": "{$prev.1.request.body.homeTransactionId}",
+            "bulkTransferId": "{$function.generic.generateUUID}",
+            "bulkQuoteId": "7106d650-fb27-4a2a-9b70-c9731fc058aa",
+            "from": {
+              "idType": "MSISDN",
+              "idValue": "123456789",
+              "type": "CONSUMER",
+              "displayName": "PayerFirst PayerLast",
+              "firstName": "PayerFirst",
+              "middleName": "Something",
+              "lastName": "PayerLast",
+              "fspId": "ttkpm4mlreceiver"
+            },
+            "individualTransfers": [
+              {
+                "transferId": "{$function.generic.generateUUID}",
+                "to": {
+                  "type": "CONSUMER",
+                  "idType": "MSISDN",
+                  "idValue": "48500002222",
+                  "fspId": "ttkpm4mlreceiver"
+                },
+                "amountType": "SEND",
+                "currency": "USD",
+                "amount": "10",
+                "transactionType": "TRANSFER",
+                "note": "string",
+                "ilpPacket": "{$prev.1.response.body.individualQuoteResults[0].ilpPacket}",
+                "condition": "{$prev.1.response.body.individualQuoteResults[0].condition}"
+              }
+            ],
+            "extensions": {
+              "extension": [
+                {
+                  "key": "string",
+                  "value": "string"
+                }
+              ]
+            }
+          }
+        }
+      ],
+      "fileInfo": {
+        "path": "test_sdk1.json"
+      }
+    }
+  ]
+}