@mojaloop/central-ledger 9.2.2 → 15.1.3-snapshot.2

package/src/api/ledgerAccountTypes/handler.js

@@ -0,0 +1,55 @@
+/*****
+ License
+ --------------
+ Copyright © 2017 Bill & Melinda Gates Foundation
+ The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+ Contributors
+ --------------
+ This is the official list of the Mojaloop project contributors for this file.
+ Names of the original copyright holders (individuals or organizations)
+ should be listed with a '*' in the first column. People who have
+ contributed from an organization can be listed under the organization
+ that actually holds the copyright for their contributions (see the
+ Gates Foundation organization for an example). Those individuals should have
+ their names indented and be marked with a '-'. Email address can be added
+ optionally within square brackets <email>.
+ * Gates Foundation
+ - Name Surname <name.surname@gatesfoundation.com>
+
+ * ModusBox
+ - Claudio Viola <claudio.viola@modusbox.com>
+ --------------
+ ******/
+'use strict'
+
+const LedgerAccountTypesService = require('../../domain/ledgerAccountTypes')
+const ErrorHandler = require('@mojaloop/central-services-error-handling')
+const Logger = require('@mojaloop/central-services-logger')
+
+const getAll = async function () {
+  return LedgerAccountTypesService.getAll()
+}
+async function create (request, h) {
+  try {
+    const ledgerAccountTypeExist = await LedgerAccountTypesService.getByName(request.payload.name)
+    if (ledgerAccountTypeExist) {
+      throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.CLIENT_ERROR, 'This Ledger Account Type already exists')
+    } else {
+      const body = request.payload
+      await LedgerAccountTypesService.create(body.name, body.description, body.isActive, body.isSettleable)
+      return h.response().code(201)
+    }
+  } catch (err) {
+    Logger.isErrorEnabled && Logger.error(err)
+    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+  }
+}
+
+module.exports = {
+  create,
+  // getByName,
+  getAll
+  // update
+}

package/src/api/ledgerAccountTypes/routes.js

@@ -0,0 +1,63 @@
+/*****
+ License
+ --------------
+ Copyright © 2017 Bill & Melinda Gates Foundation
+ The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+ Contributors
+ --------------
+ This is the official list of the Mojaloop project contributors for this file.
+ Names of the original copyright holders (individuals or organizations)
+ should be listed with a '*' in the first column. People who have
+ contributed from an organization can be listed under the organization
+ that actually holds the copyright for their contributions (see the
+ Gates Foundation organization for an example). Those individuals should have
+ their names indented and be marked with a '-'. Email address can be added
+ optionally within square brackets <email>.
+ * Gates Foundation
+ - Name Surname <name.surname@gatesfoundation.com>
+
+ * ModusBox
+ - Claudio Viola <claudio.viola@modusbox.com>
+ --------------
+ ******/
+'use strict'
+
+const Handler = require('./handler')
+const Joi = require('@hapi/joi')
+const tags = ['api', 'ledgerAccountTypes']
+
+module.exports = [
+  {
+    method: 'GET',
+    path: '/ledgerAccountTypes',
+    handler: Handler.getAll,
+    options: {
+      tags,
+      description: 'Get all ledger Account types'
+
+    }
+  },
+  {
+    method: 'POST',
+    path: '/ledgerAccountTypes',
+    handler: Handler.create,
+    options: {
+      tags,
+      description: 'Create a new ledger account type',
+      payload: {
+        allow: ['application/json'],
+        failAction: 'error'
+      },
+      validate: {
+        payload: Joi.object({
+          name: Joi.string().min(2).max(30).pattern(/^\w+$/).required().description('Name of the ledger account type'),
+          description: Joi.string().required().description('The description of the ledger account type'),
+          isActive: Joi.boolean().required().description('Determines whether this ledger account type is active or not'),
+          isSettleable: Joi.boolean().required().description('Determines whether this ledger account type is settleable or not')
+        })
+      }
+    }
+  }
+]

package/src/api/metrics/handler.js

@@ -27,6 +27,6 @@
 
 const Metrics = require('@mojaloop/central-services-metrics')
 
-exports.metrics = function (request, h) {
-  return h.response(Metrics.getMetricsForPrometheus()).code(200)
+exports.metrics = async (request, h) => {
+  return h.response(await Metrics.getMetricsForPrometheus()).code(200)
 }

package/src/api/metrics/routes.js

@@ -35,7 +35,7 @@ module.exports = [
     path: '/metrics',
     handler: Handler.metrics,
     config: {
-      tags: tags,
+      tags,
       description: 'Prometheus metrics endpoint',
       id: 'metrics'
     }

package/src/api/participants/handler.js

@@ -28,10 +28,10 @@ const ParticipantService = require('../../domain/participant')
 const UrlParser = require('../../lib/urlParser')
 const Config = require('../../lib/config')
 const Util = require('@mojaloop/central-services-shared').Util
-const Sidecar = require('../../lib/sidecar')
 const Logger = require('@mojaloop/central-services-logger')
 const ErrorHandler = require('@mojaloop/central-services-error-handling')
-const Cache = require('../../lib/cache')
+const Enums = require('../../lib/enumCached')
+const SettlementService = require('../../domain/settlement')
 
 const LocalEnum = {
   activated: 'activated',
@@ -70,17 +70,9 @@ const handleMissingRecord = (entity) => {
 }
 
 const create = async function (request, h) {
-  Sidecar.logRequest(request)
   try {
-    const ledgerAccountTypes = await Cache.getEnums('ledgerAccountType')
-    const hubReconciliationAccountExists = await ParticipantService.hubAccountExists(request.payload.currency, ledgerAccountTypes.HUB_RECONCILIATION)
-    if (!hubReconciliationAccountExists) {
-      throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ADD_PARTY_INFO_ERROR, 'Hub reconciliation account for the specified currency does not exist')
-    }
-    const hubMlnsAccountExists = await ParticipantService.hubAccountExists(request.payload.currency, ledgerAccountTypes.HUB_MULTILATERAL_SETTLEMENT)
-    if (!hubMlnsAccountExists) {
-      throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ADD_PARTY_INFO_ERROR, 'Hub multilateral net settlement account for the specified currency does not exist')
-    }
+    const ledgerAccountTypes = await Enums.getEnums('ledgerAccountType')
+    await ParticipantService.validateHubAccounts(request.payload.currency)
     let participant = await ParticipantService.getByName(request.payload.name)
     if (participant) {
       const currencyExists = participant.currencyList.find(currency => {
@@ -94,17 +86,32 @@ const create = async function (request, h) {
       participant = await ParticipantService.getById(participantId)
     }
     const ledgerAccountIds = Util.transpose(ledgerAccountTypes)
-    const participantCurrencyId1 = await ParticipantService.createParticipantCurrency(participant.participantId, request.payload.currency, ledgerAccountTypes.POSITION, false)
-    const participantCurrencyId2 = await ParticipantService.createParticipantCurrency(participant.participantId, request.payload.currency, ledgerAccountTypes.SETTLEMENT, false)
-    participant.currencyList = [await ParticipantService.getParticipantCurrencyById(participantCurrencyId1), await ParticipantService.getParticipantCurrencyById(participantCurrencyId2)]
+    const allSettlementModels = await SettlementService.getAll()
+    let settlementModels = allSettlementModels.filter(model => model.currencyId === request.payload.currency)
+    if (settlementModels.length === 0) {
+      settlementModels = allSettlementModels.filter(model => model.currencyId === null) // Default settlement model
+      if (settlementModels.length === 0) {
+        throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.GENERIC_SETTLEMENT_ERROR, 'Unable to find a matching or default, Settlement Model')
+      }
+    }
+    for (const settlementModel of settlementModels) {
+      const [participantCurrencyId1, participantCurrencyId2] = await Promise.all([
+        ParticipantService.createParticipantCurrency(participant.participantId, request.payload.currency, settlementModel.ledgerAccountTypeId, false),
+        ParticipantService.createParticipantCurrency(participant.participantId, request.payload.currency, settlementModel.settlementAccountTypeId, false)])
+      if (Array.isArray(participant.currencyList)) {
+        participant.currencyList = participant.currencyList.concat([await ParticipantService.getParticipantCurrencyById(participantCurrencyId1), await ParticipantService.getParticipantCurrencyById(participantCurrencyId2)])
+      } else {
+        participant.currencyList = await Promise.all([ParticipantService.getParticipantCurrencyById(participantCurrencyId1), ParticipantService.getParticipantCurrencyById(participantCurrencyId2)])
+      }
+    }
     return h.response(entityItem(participant, ledgerAccountIds)).code(201)
   } catch (err) {
+    Logger.isErrorEnabled && Logger.error(err)
     throw ErrorHandler.Factory.reformatFSPIOPError(err)
   }
 }
 
 const createHubAccount = async function (request, h) {
-  Sidecar.logRequest(request)
   try {
     // start - To Do move to domain
     const participant = await ParticipantService.getByName(request.params.name)
@@ -140,17 +147,18 @@ const createHubAccount = async function (request, h) {
       throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ADD_PARTY_INFO_ERROR, 'Participant was not found.')
     }
     // end here : move to domain
-    const ledgerAccountTypes = await Cache.getEnums('ledgerAccountType')
+    const ledgerAccountTypes = await Enums.getEnums('ledgerAccountType')
     const ledgerAccountIds = Util.transpose(ledgerAccountTypes)
     return h.response(entityItem(participant, ledgerAccountIds)).code(201)
   } catch (err) {
+    Logger.isErrorEnabled && Logger.error(err)
     throw ErrorHandler.Factory.reformatFSPIOPError(err)
   }
 }
 
 const getAll = async function (request) {
   const results = await ParticipantService.getAll()
-  const ledgerAccountTypes = await Cache.getEnums('ledgerAccountType')
+  const ledgerAccountTypes = await Enums.getEnums('ledgerAccountType')
   const ledgerAccountIds = Util.transpose(ledgerAccountTypes)
   return results.map(record => entityItem(record, ledgerAccountIds))
 }
@@ -158,40 +166,39 @@ const getAll = async function (request) {
 const getByName = async function (request) {
   const entity = await ParticipantService.getByName(request.params.name)
   handleMissingRecord(entity)
-  const ledgerAccountTypes = await Cache.getEnums('ledgerAccountType')
+  const ledgerAccountTypes = await Enums.getEnums('ledgerAccountType')
   const ledgerAccountIds = Util.transpose(ledgerAccountTypes)
   return entityItem(entity, ledgerAccountIds)
 }
 
 const update = async function (request) {
-  Sidecar.logRequest(request)
   try {
     const updatedEntity = await ParticipantService.update(request.params.name, request.payload)
     if (request.payload.isActive !== undefined) {
       const isActiveText = request.payload.isActive ? LocalEnum.activated : LocalEnum.disabled
       const changeLog = JSON.stringify(Object.assign({}, request.params, { isActive: request.payload.isActive }))
-      Logger.info(`Participant has been ${isActiveText} :: ${changeLog}`)
+      Logger.isInfoEnabled && Logger.info(`Participant has been ${isActiveText} :: ${changeLog}`)
     }
-    const ledgerAccountTypes = await Cache.getEnums('ledgerAccountType')
+    const ledgerAccountTypes = await Enums.getEnums('ledgerAccountType')
     const ledgerAccountIds = Util.transpose(ledgerAccountTypes)
     return entityItem(updatedEntity, ledgerAccountIds)
   } catch (err) {
+    Logger.isErrorEnabled && Logger.error(err)
     throw ErrorHandler.Factory.reformatFSPIOPError(err)
   }
 }
 
 const addEndpoint = async function (request, h) {
-  Sidecar.logRequest(request)
   try {
     await ParticipantService.addEndpoint(request.params.name, request.payload)
     return h.response().code(201)
   } catch (err) {
+    Logger.isErrorEnabled && Logger.error(err)
     throw ErrorHandler.Factory.reformatFSPIOPError(err)
   }
 }
 
 const getEndpoint = async function (request) {
-  Sidecar.logRequest(request)
   try {
     if (request.query.type) {
       const result = await ParticipantService.getEndpoint(request.params.name, request.query.type)
@@ -217,22 +224,22 @@ const getEndpoint = async function (request) {
       return endpoints
     }
   } catch (err) {
+    Logger.isErrorEnabled && Logger.error(err)
     throw ErrorHandler.Factory.reformatFSPIOPError(err)
   }
 }
 
 const addLimitAndInitialPosition = async function (request, h) {
-  Sidecar.logRequest(request)
   try {
     await ParticipantService.addLimitAndInitialPosition(request.params.name, request.payload)
     return h.response().code(201)
   } catch (err) {
+    Logger.isErrorEnabled && Logger.error(err)
     throw ErrorHandler.Factory.reformatFSPIOPError(err)
   }
 }
 
 const getLimits = async function (request) {
-  Sidecar.logRequest(request)
   try {
     const result = await ParticipantService.getLimits(request.params.name, request.query)
     const limits = []
@@ -250,12 +257,12 @@ const getLimits = async function (request) {
     }
     return limits
   } catch (err) {
+    Logger.isErrorEnabled && Logger.error(err)
     throw ErrorHandler.Factory.reformatFSPIOPError(err)
   }
 }
 
 const getLimitsForAllParticipants = async function (request) {
-  Sidecar.logRequest(request)
   try {
     const result = await ParticipantService.getLimitsForAllParticipants(request.query)
     const limits = []
@@ -274,12 +281,12 @@ const getLimitsForAllParticipants = async function (request) {
     }
     return limits
   } catch (err) {
+    Logger.isErrorEnabled && Logger.error(err)
     throw ErrorHandler.Factory.reformatFSPIOPError(err)
   }
 }
 
 const adjustLimits = async function (request, h) {
-  Sidecar.logRequest(request)
   try {
     const result = await ParticipantService.adjustLimits(request.params.name, request.payload)
     const { participantLimit } = result
@@ -294,53 +301,54 @@ const adjustLimits = async function (request, h) {
     }
     return h.response(updatedLimit).code(200)
   } catch (err) {
+    Logger.isErrorEnabled && Logger.error(err)
     throw ErrorHandler.Factory.reformatFSPIOPError(err)
   }
 }
 
 const getPositions = async function (request) {
-  Sidecar.logRequest(request)
   try {
     return await ParticipantService.getPositions(request.params.name, request.query)
   } catch (err) {
+    Logger.isErrorEnabled && Logger.error(err)
     throw ErrorHandler.Factory.reformatFSPIOPError(err)
   }
 }
 
 const getAccounts = async function (request) {
-  Sidecar.logRequest(request)
   try {
     return await ParticipantService.getAccounts(request.params.name, request.query)
   } catch (err) {
+    Logger.isErrorEnabled && Logger.error(err)
     throw ErrorHandler.Factory.reformatFSPIOPError(err)
   }
 }
 
 const updateAccount = async function (request, h) {
-  Sidecar.logRequest(request)
   try {
     const enums = {
-      ledgerAccountType: await Cache.getEnums('ledgerAccountType')
+      ledgerAccountType: await Enums.getEnums('ledgerAccountType')
     }
     await ParticipantService.updateAccount(request.payload, request.params, enums)
     if (request.payload.isActive !== undefined) {
       const isActiveText = request.payload.isActive ? LocalEnum.activated : LocalEnum.disabled
       const changeLog = JSON.stringify(Object.assign({}, request.params, { isActive: request.payload.isActive }))
-      Logger.info(`Participant account has been ${isActiveText} :: ${changeLog}`)
+      Logger.isInfoEnabled && Logger.info(`Participant account has been ${isActiveText} :: ${changeLog}`)
     }
     return h.response().code(200)
   } catch (err) {
+    Logger.isErrorEnabled && Logger.error(err)
     throw ErrorHandler.Factory.reformatFSPIOPError(err)
   }
 }
 
 const recordFunds = async function (request, h) {
-  Sidecar.logRequest(request)
   try {
-    const enums = await Cache.getEnums('all')
+    const enums = await Enums.getEnums('all')
     await ParticipantService.recordFundsInOut(request.payload, request.params, enums)
     return h.response().code(202)
   } catch (err) {
+    Logger.isErrorEnabled && Logger.error(err)
     throw ErrorHandler.Factory.reformatFSPIOPError(err)
   }
 }

package/src/api/participants/routes.js

@@ -25,7 +25,7 @@
 'use strict'
 
 const Handler = require('./handler')
-const Joi = require('@hapi/joi')
+const Joi = require('joi')
 const currencyList = require('../../../seeds/currency.js').currencyList
 
 const tags = ['api', 'participants']
@@ -100,7 +100,7 @@ module.exports = [
     handler: Handler.addEndpoint,
     options: {
       id: 'participants_endpoints_add',
-      tags: tags,
+      tags,
       description: 'Add/Update participant endpoints',
       payload: {
         allow: ['application/json'],
@@ -123,7 +123,7 @@ module.exports = [
     handler: Handler.getEndpoint,
     options: {
       id: 'participants_endpoints_get',
-      tags: tags,
+      tags,
       description: 'View participant endpoints',
       validate: {
         params: Joi.object({
@@ -138,7 +138,7 @@ module.exports = [
     handler: Handler.addLimitAndInitialPosition,
     options: {
       id: 'participants_limits_pos_add',
-      tags: tags,
+      tags,
       description: 'Add initial participant limits and position',
       payload: {
         allow: ['application/json'],
@@ -165,7 +165,7 @@ module.exports = [
     handler: Handler.getLimits,
     options: {
       id: 'participants_limits_get',
-      tags: tags,
+      tags,
       description: 'View participant limits',
       validate: {
         params: Joi.object({
@@ -184,7 +184,7 @@ module.exports = [
     handler: Handler.getLimitsForAllParticipants,
     options: {
       id: 'participants_limits_get_all',
-      tags: tags,
+      tags,
       description: 'View limits for all participants',
       validate: {
         query: Joi.object({
@@ -200,7 +200,7 @@ module.exports = [
     handler: Handler.adjustLimits,
     options: {
       id: 'participants_limits_adjust',
-      tags: tags,
+      tags,
       description: 'Adjust participant limits',
       payload: {
         allow: ['application/json'],
@@ -227,7 +227,7 @@ module.exports = [
     handler: Handler.createHubAccount,
     options: {
       id: 'hub_accounts_create',
-      tags: tags,
+      tags,
       description: 'Create hub accounts',
       payload: {
         allow: ['application/json'],
@@ -250,7 +250,7 @@ module.exports = [
     handler: Handler.getPositions,
     options: {
       id: 'participants_positions_get',
-      tags: tags,
+      tags,
       description: 'View participant positions',
       validate: {
         params: Joi.object({
@@ -268,7 +268,7 @@ module.exports = [
     handler: Handler.getAccounts,
     options: {
       id: 'participants_accounts_get',
-      tags: tags,
+      tags,
       description: 'View participant accounts and balances',
       validate: {
         params: Joi.object({
@@ -283,7 +283,7 @@ module.exports = [
     handler: Handler.updateAccount,
     options: {
       id: 'participants_accounts_update',
-      tags: tags,
+      tags,
       description: 'Update participant accounts',
       validate: {
         payload: Joi.object({
@@ -302,7 +302,7 @@ module.exports = [
     handler: Handler.recordFunds,
     options: {
       id: 'post_participants_accounts_funds',
-      tags: tags,
+      tags,
       description: 'Record Funds In or Out of participant account',
       validate: {
         payload: Joi.object({
@@ -334,7 +334,7 @@ module.exports = [
     handler: Handler.recordFunds,
     options: {
       id: 'put_participants_accounts_funds',
-      tags: tags,
+      tags,
       description: 'Record Funds In or Out of participant account',
       validate: {
         payload: Joi.object({

package/src/api/root/routes.js

@@ -29,7 +29,7 @@
  ******/
 'use strict'
 const Handler = require('./handler')
-const Cache = require('../../lib/cache')
+const Enums = require('../../lib/enumCached')
 
 const tags = ['api', 'root']
 
@@ -46,7 +46,7 @@ module.exports = [
     method: 'GET',
     path: '/enums',
     handler: async function (request, h) {
-      const enums = await Cache.getEnums('all')
+      const enums = await Enums.getEnums('all')
       return h.response(enums).code(200)
     },
     options: {

package/src/api/settlementModels/handler.js

@@ -26,9 +26,8 @@
 'use strict'
 
 const SettlementService = require('../../domain/settlement')
-const Sidecar = require('../../lib/sidecar')
 const ErrorHandler = require('@mojaloop/central-services-error-handling')
-const Cache = require('../../lib/cache')
+const Enums = require('../../lib/enumCached')
 const Util = require('@mojaloop/central-services-shared').Util
 const Enum = require('@mojaloop/central-services-shared').Enum.Settlements
 const Logger = require('@mojaloop/central-services-logger')
@@ -58,7 +57,7 @@ const handleMissingRecord = (entity) => {
 const getByName = async function (request) {
   const entity = await SettlementService.getByName(request.params.name)
   handleMissingRecord(entity)
-  const ledgerAccountTypes = await Cache.getEnums('ledgerAccountType')
+  const ledgerAccountTypes = await Enums.getEnums('ledgerAccountType')
   const ledgerAccountIds = Util.transpose(ledgerAccountTypes)
   const settlementGranularityIds = Util.transpose(Enum.SettlementGranularity)
   const settlementInterchangeIds = Util.transpose(Enum.SettlementInterchange)
@@ -68,7 +67,7 @@ const getByName = async function (request) {
 }
 const getAll = async function () {
   const results = await SettlementService.getAll()
-  const ledgerAccountTypes = await Cache.getEnums('ledgerAccountType')
+  const ledgerAccountTypes = await Enums.getEnums('ledgerAccountType')
   const ledgerAccountIds = Util.transpose(ledgerAccountTypes)
   const settlementGranularityIds = Util.transpose(Enum.SettlementGranularity)
   const settlementInterchangeIds = Util.transpose(Enum.SettlementInterchange)
@@ -77,46 +76,30 @@ const getAll = async function () {
 }
 
 const update = async function (request) {
-  Sidecar.logRequest(request)
   try {
     const updatedEntity = await SettlementService.update(request.params.name, request.payload)
     if (request.payload.isActive !== undefined) {
       const isActiveText = request.payload.isActive ? Enum.isActiveText.activated : Enum.isActiveText.disabled
       const changeLog = JSON.stringify(Object.assign({}, request.params, { isActive: request.payload.isActive }))
-      Logger.info(`Settlement Model has been ${isActiveText} :: ${changeLog}`)
+      Logger.isInfoEnabled && Logger.info(`Settlement Model has been ${isActiveText} :: ${changeLog}`)
     }
-    const ledgerAccountTypes = await Cache.getEnums('ledgerAccountType')
+    const ledgerAccountTypes = await Enums.getEnums('ledgerAccountType')
     const ledgerAccountIds = Util.transpose(ledgerAccountTypes)
     const settlementGranularityIds = Util.transpose(Enum.SettlementGranularity)
     const settlementInterchangeIds = Util.transpose(Enum.SettlementInterchange)
     const settlementDelayIds = Util.transpose(Enum.SettlementDelay)
     return entityItem(updatedEntity, ledgerAccountIds, settlementGranularityIds, settlementInterchangeIds, settlementDelayIds)
   } catch (err) {
+    Logger.isErrorEnabled && Logger.error(err)
     throw ErrorHandler.Factory.reformatFSPIOPError(err)
   }
 }
 const create = async function (request, h) {
-  Sidecar.logRequest(request)
   try {
-    const settlementGranularity = Enum.SettlementGranularity[request.payload.settlementGranularity]
-    const settlementInterchange = Enum.SettlementInterchange[request.payload.settlementInterchange]
-    const settlementDelay = Enum.SettlementDelay[request.payload.settlementDelay]
-    const { isValid, reasons } = Util.Settlement.validateSettlementModel(settlementDelay, settlementGranularity, settlementInterchange)
-    if (!isValid) {
-      throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.CLIENT_ERROR, reasons.join('. '))
-    }
-    const ledgerAccountType = await SettlementService.getLedgerAccountTypeName(request.payload.ledgerAccountType)
-    if (!ledgerAccountType) {
-      throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ADD_PARTY_INFO_ERROR, 'Ledger account type was not found')
-    }
-    const settlementModelExist = await SettlementService.getByName(request.payload.name)
-    if (settlementModelExist) {
-      throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.CLIENT_ERROR, 'This Settlement Model already exists')
-    } else {
-      await SettlementService.createSettlementModel(request.payload.name, true, settlementGranularity, settlementInterchange, settlementDelay, request.payload.currency, request.payload.requireLiquidityCheck, ledgerAccountType.ledgerAccountTypeId, request.payload.autoPositionReset)
-      return h.response().code(201)
-    }
+    await SettlementService.createSettlementModel(request.payload)
+    return h.response().code(201)
   } catch (err) {
+    Logger.isErrorEnabled && Logger.error(err)
     throw ErrorHandler.Factory.reformatFSPIOPError(err)
   }
 }

package/src/api/settlementModels/routes.js

@@ -26,12 +26,11 @@
 'use strict'
 
 const Handler = require('./handler')
-const Joi = require('@hapi/joi')
+const Joi = require('joi')
 const currencyList = require('../../../seeds/currency.js').currencyList
 const settlementGranularityList = require('../../../seeds/settlementGranularity.js').settlementGranularityList
 const settlementInterchangeList = require('../../../seeds/settlementInterchange.js').settlementInterchangeList
 const settlementDelayList = require('../../../seeds/settlementDelay.js').settlementDelayList
-const ledgerAccountList = require('../../../seeds/ledgerAccountType.js').ledgerAccountList
 const tags = ['api', 'settlement']
 
 module.exports = [
@@ -74,8 +73,9 @@ module.exports = [
           settlementDelay: Joi.string().required().valid(...settlementDelayList).description('Delay type for the settlement model IMMEDIATE or DEFERRED'),
           currency: Joi.string().valid(...currencyList).description('Currency code'),
           requireLiquidityCheck: Joi.boolean().required().description('Liquidity Check boolean'),
-          ledgerAccountType: Joi.string().required().valid(...ledgerAccountList).description('Account type for the settlement model POSITION, SETTLEMENT or INTERCHANGE_FEE'),
-          autoPositionReset: Joi.boolean().required().description('Automatic position reset setting, which determines whether to execute the settlement transfer or not')
+          ledgerAccountType: Joi.string().required().description('Account type for the settlement model'),
+          autoPositionReset: Joi.boolean().required().description('Automatic position reset setting, which determines whether to execute the settlement transfer or not'),
+          settlementAccountType: Joi.string().valid('SETTLEMENT', 'INTERCHANGE_FEE_SETTLEMENT').required().description('Settlement account linked to the ledger account')
         })
       }
     }