@mojaloop/central-ledger 17.7.8 → 17.8.0-orb.1

package/seeds/participant.js

@@ -28,6 +28,7 @@ const Config = require('../src/lib/config')
 
 const participant = [
   {
+    participantId: Config.HUB_ID,
     name: Config.HUB_NAME,
     description: 'Hub Operator',
     createdBy: 'seeds'
@@ -36,7 +37,7 @@ const participant = [
 
 exports.seed = async function (knex) {
   try {
-    return await knex('participant').insert(participant).onConflict('name').ignore()
+    return await knex('participant').insert(participant).onConflict('id').merge()
   } catch (err) {
     console.log(`Uploading seeds for participant has failed with the following error: ${err}`)
     return -1000

package/seeds/transferParticipantRoleType.js

@@ -20,6 +20,7 @@
 
  * Georgi Georgiev <georgi.georgiev@modusbox.com>
  * Shashikant Hirugade <shashikant.hirugade@modusbox.com>
+ * Vijay Kumar Guthi <vijaya.guthi@infitx.com>
  --------------
  ******/
 
@@ -45,6 +46,14 @@ const transferParticipantRoleTypes = [
   {
     name: 'DFSP_POSITION',
     description: 'Indicates the position account'
+  },
+  {
+    name: 'INITIATING_FSP',
+    description: 'Identifier for the FSP who is requesting a currency conversion'
+  },
+  {
+    name: 'COUNTER_PARTY_FSP',
+    description: 'Identifier for the FXP who is performing the currency conversion'
   }
 ]
 

package/seeds/transferState.js

@@ -41,6 +41,11 @@ const transferStates = [
     enumeration: 'RESERVED',
     description: 'The switch has reserved the transfer, and has been assigned to a settlement window.'
   },
+  {
+    transferStateId: 'RECEIVED_FULFIL_DEPENDENT',
+    enumeration: 'RESERVED',
+    description: 'The switch has reserved the fxTransfer fulfilment.'
+  },
   {
     transferStateId: 'COMMITTED',
     enumeration: 'COMMITTED',
@@ -95,6 +100,11 @@ const transferStates = [
     transferStateId: 'SETTLED',
     enumeration: 'SETTLED',
     description: 'The switch has settled the transfer.'
+  },
+  {
+    transferStateId: 'RESERVED_FORWARDED',
+    enumeration: 'RESERVED',
+    description: 'The switch has forwarded the transfer to a proxy participant'
   }
 ]
 

package/src/api/interface/swagger.json

@@ -66,6 +66,25 @@
         "tags": [
           "participants"
         ],
+        "parameters": [
+          {
+            "type": ["string", "boolean", "integer", "null"],
+            "enum": [
+              false,
+              "0",
+              "false",
+              "",
+              true,
+              "1",
+              "true",
+              null
+            ],
+            "description": "Filter by if participant is a proxy",
+            "name": "isProxy",
+            "in": "query",
+            "required": false
+          }
+        ],
         "responses": {
           "default": {
             "schema": {
@@ -375,9 +394,6 @@
             "description": "Name of the participant",
             "minLength": 2,
             "maxLength": 30,
-            "x-format": {
-              "alphanum": true
-            },
             "name": "name",
             "in": "path",
             "required": true
@@ -404,9 +420,6 @@
             "description": "Name of the participant",
             "minLength": 2,
             "maxLength": 30,
-            "x-format": {
-              "alphanum": true
-            },
             "name": "name",
             "in": "path",
             "required": true
@@ -442,9 +455,6 @@
             "description": "Name of the participant",
             "minLength": 2,
             "maxLength": 30,
-            "x-format": {
-              "alphanum": true
-            },
             "name": "name",
             "in": "path",
             "required": true
@@ -663,9 +673,6 @@
             "description": "Name of the participant",
             "minLength": 2,
             "maxLength": 30,
-            "x-format": {
-              "alphanum": true
-            },
             "name": "name",
             "in": "path",
             "required": true
@@ -701,9 +708,6 @@
             "description": "Name of the participant",
             "minLength": 2,
             "maxLength": 30,
-            "x-format": {
-              "alphanum": true
-            },
             "name": "name",
             "in": "path",
             "required": true
@@ -917,9 +921,6 @@
             "description": "Name of the participant",
             "minLength": 2,
             "maxLength": 30,
-            "x-format": {
-              "alphanum": true
-            },
             "name": "name",
             "in": "path",
             "required": true
@@ -979,9 +980,6 @@
             "description": "Name of the participant",
             "minLength": 2,
             "maxLength": 30,
-            "x-format": {
-              "alphanum": true
-            },
             "name": "name",
             "in": "path",
             "required": true
@@ -1017,9 +1015,6 @@
             "description": "Name of the participant",
             "minLength": 2,
             "maxLength": 30,
-            "x-format": {
-              "alphanum": true
-            },
             "name": "name",
             "in": "path",
             "required": true
@@ -1062,9 +1057,6 @@
             "description": "Name of the participant",
             "minLength": 2,
             "maxLength": 30,
-            "x-format": {
-              "alphanum": true
-            },
             "name": "name",
             "in": "path",
             "required": true
@@ -1109,9 +1101,6 @@
             "description": "Name of the participant",
             "minLength": 2,
             "maxLength": 30,
-            "x-format": {
-              "alphanum": true
-            },
             "name": "name",
             "in": "path",
             "required": true
@@ -1326,6 +1315,10 @@
           "description": "Currency code",
           "$ref" : "#/definitions/Currency"
 
+        },
+        "isProxy": {
+          "type": "boolean",
+          "description": "Is the participant a proxy"
         }
       },
       "required": [

package/src/api/participants/handler.js

@@ -38,7 +38,7 @@ const LocalEnum = {
   disabled: 'disabled'
 }
 
-const entityItem = ({ name, createdDate, isActive, currencyList }, ledgerAccountIds) => {
+const entityItem = ({ name, createdDate, isActive, currencyList, isProxy }, ledgerAccountIds) => {
   const link = UrlParser.toParticipantUri(name)
   const accounts = currencyList.map((currentValue) => {
     return {
@@ -58,7 +58,8 @@ const entityItem = ({ name, createdDate, isActive, currencyList }, ledgerAccount
     links: {
       self: link
     },
-    accounts
+    accounts,
+    isProxy
   }
 }
 
@@ -160,6 +161,9 @@ const getAll = async function (request) {
   const results = await ParticipantService.getAll()
   const ledgerAccountTypes = await Enums.getEnums('ledgerAccountType')
   const ledgerAccountIds = Util.transpose(ledgerAccountTypes)
+  if (request.query.isProxy) {
+    return results.map(record => entityItem(record, ledgerAccountIds)).filter(record => record.isProxy)
+  }
   return results.map(record => entityItem(record, ledgerAccountIds))
 }
 

package/src/api/participants/routes.js

@@ -29,7 +29,7 @@ const Joi = require('joi')
 const currencyList = require('../../../seeds/currency.js').currencyList
 
 const tags = ['api', 'participants']
-const nameValidator = Joi.string().alphanum().min(2).max(30).required().description('Name of the participant')
+const nameValidator = Joi.string().min(2).max(30).required().description('Name of the participant')
 const currencyValidator = Joi.string().valid(...currencyList).description('Currency code')
 
 module.exports = [
@@ -49,7 +49,7 @@ module.exports = [
       tags,
       validate: {
         params: Joi.object({
-          name: Joi.string().required().description('Participant name')
+          name: nameValidator
         })
       }
     }
@@ -68,7 +68,8 @@ module.exports = [
         payload: Joi.object({
           name: nameValidator,
           // password: passwordValidator,
-          currency: currencyValidator // ,
+          currency: currencyValidator,
+          isProxy: Joi.boolean().falsy(0, '0', '').truthy(1, '1').allow(true, false, 0, 1, '0', '1', null)
           // emailAddress: Joi.string().email().required()
         })
       }
@@ -89,7 +90,7 @@ module.exports = [
           isActive: Joi.boolean().required().description('Participant isActive boolean')
         }),
         params: Joi.object({
-          name: Joi.string().required().description('Participant name')
+          name: nameValidator
         })
       }
     }
@@ -239,7 +240,7 @@ module.exports = [
           type: Joi.string().required().description('Account type') // Needs a validator here
         }),
         params: Joi.object({
-          name: Joi.string().required().description('Participant name') // nameValidator
+          name: nameValidator // nameValidator
         })
       }
     }
@@ -306,7 +307,7 @@ module.exports = [
       description: 'Record Funds In or Out of participant account',
       validate: {
         payload: Joi.object({
-          transferId: Joi.string().guid().required(),
+          transferId: Joi.string().pattern(/^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-7][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]}$|^[0-9A-HJKMNP-TV-Z]{26}$6})$/).required(),
           externalReference: Joi.string().required(),
           action: Joi.string().required().valid('recordFundsIn', 'recordFundsOutPrepareReserve').label('action is missing or not supported'),
           reason: Joi.string().required(),
@@ -344,7 +345,7 @@ module.exports = [
         params: Joi.object({
           name: nameValidator,
           id: Joi.number().integer().positive(),
-          transferId: Joi.string().guid().required()
+          transferId: Joi.string().pattern(/^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-7][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]}$|^[0-9A-HJKMNP-TV-Z]{26}$6})$/).required()
         })
       }
     }

package/src/api/root/handler.js

@@ -30,13 +30,23 @@ const { defaultHealthHandler } = require('@mojaloop/central-services-health')
 const packageJson = require('../../../package.json')
 const {
   getSubServiceHealthDatastore,
-  getSubServiceHealthBroker
+  getSubServiceHealthBroker,
+  getSubServiceHealthProxyCache
 } = require('../../lib/healthCheck/subServiceHealth')
+const Config = require('../../lib/config')
 
-const healthCheck = new HealthCheck(packageJson, [
-  getSubServiceHealthDatastore,
-  getSubServiceHealthBroker
-])
+const subServiceChecks = Config.PROXY_CACHE_CONFIG?.enabled
+  ? [
+      getSubServiceHealthDatastore,
+      getSubServiceHealthBroker,
+      getSubServiceHealthProxyCache
+    ]
+  : [
+      getSubServiceHealthDatastore,
+      getSubServiceHealthBroker
+    ]
+
+const healthCheck = new HealthCheck(packageJson, subServiceChecks)
 
 /**
  * @function getHealth