Feature/improvements in mobile simulator page (#110)

* Added settlement model selection box to hub console * Added currency selection in payer app * Some changes * Added configurable transfer expiration for payer mobile sim * Bumped up the version and postponed audits
mojaloop · Jul 20, 2021 · da44096 · da44096
1 parent ac87b52
commit da44096
Show file tree

Hide file tree

Showing 14 changed files with 300 additions and 55 deletions.
diff --git a/audit-resolve.json b/audit-resolve.json
@@ -30114,7 +30114,7 @@
     },
     "1763|socket.io-client>socket.io-parser": {
       "decision": "postpone",
-      "madeAt": 1626696276268
+      "madeAt": 1626796239617
     }
   },
   "rules": {},

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ml-testing-toolkit-ui",
-  "version": "13.0.2",
+  "version": "13.1.0",
   "description": "Mojaloop Testing Toolkit Web User Interface",
   "main": "index.js",
   "repository": {

diff --git a/src/services/demos/MobileSimulator/mojaloopNotifications.js b/src/services/demos/MobileSimulator/mojaloopNotifications.js
@@ -84,6 +84,17 @@ class NotificationService {
     })
   }
 
+  notifyPayerGetAccounts = (progress) => {
+    // Monitoring Logs
+    this.notificationEventFunction({
+      category: 'payer',
+      type: 'accountsUpdate',
+      data: {
+        accounts: progress.response.body
+      }
+    })
+  }
+
   notifyPayeeMonitorLog = (log) => {
     // Monitoring Logs
     this.notificationEventFunction({
@@ -135,6 +146,26 @@ class NotificationService {
 
   }
 
+  notifyGetHubConsoleInitValues = (progress) => {
+    if (progress.status === 'FINISHED') {
+      this.notificationEventFunction({
+        category: 'hubConsole',
+        type: 'getHubConsoleInitValuesFinished',
+        data: {
+          result: progress
+        }
+      })
+    } else if (progress.status === 'TERMINATED') {
+      this.notificationEventFunction({
+        category: 'hubConsole',
+        type: 'getHubConsoleInitValuesTerminated',
+        data: {
+          result: progress
+        }
+      })
+    }
+  }
+
   notifyDFSPValues = (progress) => {
     if (progress.status === 'FINISHED') {
       this.notificationEventFunction({
@@ -180,6 +211,17 @@ class NotificationService {
     }
   }
 
+  notifyGetSettlementModels = (progress) => {
+    if (progress.response.status === 200) {
+      this.notificationEventFunction({
+        category: 'hubConsole',
+        type: 'settlementModelsUpdate',
+        data: {
+          settlementModels: progress.response.body
+        }
+      })
+    }
+  }
   notifyGetSettlements = (progress) => {
     if (progress.status === 'FINISHED') {
       this.notificationEventFunction({
@@ -242,7 +284,7 @@ class NotificationService {
 
   handleNotificationLog = (log) => {
     // console.log(log)
-
+    
     // Handle the outbound progress events
     if ( log.internalLogType === 'outboundProgress' ) {
       if (log.status === 'FINISHED' || log.status === 'TERMINATED') {
@@ -253,6 +295,9 @@ class NotificationService {
           case 'GET_DFSP_VALUES':
             this.notifyDFSPValues(log)
             break
+          case 'GET_HUBCONSOLE_INIT_VALUES':
+            this.notifyGetHubConsoleInitValues(log)
+            break
           case 'GET_SETTLEMENTS':
             this.notifyGetSettlements(log)
             break
@@ -261,6 +306,7 @@ class NotificationService {
             break
         }
       } else {
+        // By test case name
         switch (log.testCaseName) {
           case 'PAYER_FSP_PROVISIONING':
           case 'PAYEE_FSP_PROVISIONING':
@@ -278,7 +324,19 @@ class NotificationService {
           case 'GET_PARTICIPANTS':
             this.notifyGetParticipants(log)
             break
+          case 'GET_SETTLEMENT_MODELS':
+            this.notifyGetSettlementModels(log)
+            break
+          case 'GET_PAYER_ACCOUNTS':
+            this.notifyPayerGetAccounts(log)
+            break
         }      
+        // By request name
+        switch (log.requestSent.description) {
+          case 'GET_PAYER_ACCOUNTS':
+            this.notifyPayerGetAccounts(log)
+            break
+        }
       }
       return null
     }
@@ -612,7 +670,8 @@ class NotificationService {
         category: 'payee',
         type: 'payeePutQuotes',
         data: {
-          resource: log.resource
+          resource: log.resource,
+          requestBody: log.additionalData.request.body
         }
       })
     }
@@ -630,7 +689,7 @@ class NotificationService {
         type: 'payeePutQuotesResponse',
         data: {
           resource: log.resource,
-          responseStatus: log.additionalData.response.status + ' ' + log.additionalData.response.statusText
+          responseStatus: log.additionalData.response && (log.additionalData.response.status + ' ' + log.additionalData.response.statusText)
         }
       })
     }

diff --git a/src/services/demos/MobileSimulator/mojaloopOutbound.js b/src/services/demos/MobileSimulator/mojaloopOutbound.js
@@ -24,13 +24,17 @@
 import axios from 'axios'
 import { getConfig, getServerConfig } from '../../../utils/getConfig'
 import { TraceHeaderUtils } from '@mojaloop/ml-testing-toolkit-shared-lib'
+import _ from 'lodash';
 
 class OutboundService {
 
   apiBaseUrl = ''
   inputValues = {}
   sessionId = '123'
   userConfig = {}
+  customParams = {
+    payerFspTransferExpirationOffset: 60 * 1000
+  }
 
   constructor (sessionId = '123') {
     const { apiBaseUrl } = getConfig()
@@ -68,6 +72,14 @@ class OutboundService {
     }
   }
 
+  setCustomParams = (newConfig) => {
+    _.merge(this.customParams, newConfig)
+  }
+
+  getCustomParams = () => {
+    return this.customParams
+  }
+
   async getParties (idNumber) {
     const traceId = this.getTraceId()
     const template = require('./template_getParties.json')
@@ -81,12 +93,13 @@ class OutboundService {
     // return null
     return resp
   }
-  async postQuotes (amount) {
+  async postQuotes (amount, currency) {
     const traceId = this.getTraceId()
     const template = require('./template_postQuotes.json')
     template.inputValues = this.inputValues
     // Replace corresponding values in inputValues
     template.inputValues.amount = amount + ''
+    template.inputValues.currency = currency + ''
     const resp = await axios.post(this.apiBaseUrl + "/api/outbound/template/" + traceId, template , { headers: { 'Content-Type': 'application/json' } })
     // if(typeof response.data === 'object') {
     //   return response.data
@@ -104,6 +117,7 @@ class OutboundService {
     template.inputValues.quotesCallbackExpiration = expiration + ''
     template.inputValues.quotesCallbackIlpPacket = ilpPacket + ''
     template.inputValues.quotesCallbackCondition = condition + ''
+    template.inputValues.expirationOffset = this.customParams.payerFspTransferExpirationOffset
     const resp = await axios.post(this.apiBaseUrl + "/api/outbound/template/" + traceId, template , { headers: { 'Content-Type': 'application/json' } })
     // if(typeof response.data === 'object') {
     //   return response.data
@@ -118,6 +132,15 @@ class OutboundService {
     const resp = await axios.post(this.apiBaseUrl + "/api/outbound/template/" + traceId, template , { headers: { 'Content-Type': 'application/json' } })
     return resp
   }
+
+  async getHubConsoleInitValues () {
+    const traceId = this.getTraceId()
+    const template = require('./template_getHubConsoleInitValues.json')
+    template.inputValues = this.inputValues
+    const resp = await axios.post(this.apiBaseUrl + "/api/outbound/template/" + traceId, template , { headers: { 'Content-Type': 'application/json' } })
+    return resp
+  }
+
   async getDFSPValues () {
     const traceId = this.getTraceId()
     const template = require('./template_getDFSPValues')
@@ -134,10 +157,12 @@ class OutboundService {
     return resp
   }
 
-  async executeSettlement () {
+  async executeSettlement (settlementModel) {
     const traceId = this.getTraceId()
     const template = require('./template_executeSettlement')
     template.inputValues = this.inputValues
+    // Replace corresponding values in inputValues
+    template.inputValues.settlementModel = settlementModel + ''
     const resp = await axios.post(this.apiBaseUrl + "/api/outbound/template/" + traceId, template , { headers: { 'Content-Type': 'application/json' } })
     return resp
   }

diff --git a/src/services/demos/MobileSimulator/template_executeSettlement.json b/src/services/demos/MobileSimulator/template_executeSettlement.json
@@ -203,7 +203,7 @@
           },
           "scriptingEngine": "javascript",
           "body": {
-            "settlementModel": "DEFERREDNET",
+            "settlementModel": "{$inputs.settlementModel}",
             "reason": "TESTING",
             "settlementWindows": [
               {

diff --git a/src/services/demos/MobileSimulator/template_getHubConsoleInitValues.json b/src/services/demos/MobileSimulator/template_getHubConsoleInitValues.json
@@ -0,0 +1,30 @@
+{
+  "name": "GET_HUBCONSOLE_INIT_VALUES",
+  "test_cases": [
+    {
+      "id": 1,
+      "name": "GET_SETTLEMENT_MODELS",
+      "requests": [
+        {
+          "id": 9,
+          "description": "test",
+          "apiVersion": {
+            "minorVersion": 0,
+            "majorVersion": 1,
+            "type": "central_admin"
+          },
+          "operationPath": "/settlementModels",
+          "path": "/settlementModels",
+          "method": "get",
+          "url": "{$inputs.HOST_CENTRAL_LEDGER}",
+          "headers": {
+            "FSPIOP-Source": "{$inputs.fromFspId}"
+          },
+          "params": {
+            "id": ""
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/src/services/demos/MobileSimulator/template_getParties.json b/src/services/demos/MobileSimulator/template_getParties.json
@@ -99,6 +99,22 @@
               ]
             }
           }
+        },
+        {
+          "id": 4,
+          "description": "GET_PAYER_ACCOUNTS",
+          "apiVersion": {
+            "minorVersion": 0,
+            "majorVersion": 1,
+            "type": "central_admin"
+          },
+          "operationPath": "/participants/{name}/accounts",
+          "path": "/participants/{$inputs.mobileSimPayerFsp}/accounts",
+          "method": "get",
+          "params": {
+            "name": "{$inputs.mobileSimPayerFsp}"
+          },
+          "url": "{$inputs.HOST_CENTRAL_LEDGER}"
         }
       ]
     }

diff --git a/src/services/demos/MobileSimulator/template_postTransfers.json b/src/services/demos/MobileSimulator/template_postTransfers.json
@@ -30,14 +30,27 @@
               "amount": "{$inputs.amount}",
               "currency": "{$inputs.currency}"
             },
-            "expiration": "{$inputs.quotesCallbackExpiration}",
+            "expiration": "{$requestVariables.transferExpiration}",
             "ilpPacket": "{$inputs.quotesCallbackIlpPacket}",
             "condition": "{$inputs.quotesCallbackCondition}"
           },
           "tests": {
             "assertions": []
           },
-          "url": "{$inputs.HOST_ML_API_ADAPTER}"
+          "url": "{$inputs.HOST_ML_API_ADAPTER}",
+          "scriptingEngine": "javascript",
+          "scripts": {
+            "preRequest": {
+              "exec": [
+                "let expirationOffset = 60 * 1000",
+                "if (environment.expirationOffset) {",
+                "  expirationOffset = environment.expirationOffset",
+                "}",
+                "requestVariables.transferExpiration = new Date(new Date().getTime() + expirationOffset).toISOString()",
+                ""
+              ]
+            }
+          }
         }
       ]
     }