Feature/724Db Object Exposed By src/lib

- src/models/index.js to src/lib/db.js

.istanbul.yml

@@ -2,7 +2,7 @@ instrumentation:
   include-all-sources: true
   excludes: [
     '**/test/**,
-    src/models/index.js'
+    src/lib/db.js'
   ]
 check:
   global:

package.json

@@ -1,7 +1,7 @@
 {
     "name": "central-settlement",
     "description": "Central settlements hosted by a scheme to record and make settlements",
-    "version": "5.5.0",
+    "version": "6.1.0",
     "license": "Apache-2.0",
     "private": true,
     "author": "ModusBox",

src/models/index.js → src/lib/db.js

@@ -19,10 +19,6 @@
  - Name Surname <name.surname@gatesfoundation.com>
 
  * Georgi Georgiev <georgi.georgiev@modusbox.com>
- * Valentin Genev <valentin.genev@modusbox.com>
- * Deon Botha <deon.botha@modusbox.com>
- * Rajiv Mothilal <rajiv.mothilal@modusbox.com>
- * Miguel de Barros <miguel.debarros@modusbox.com>
 
  --------------
  ******/

src/models/lib/enums.js

@@ -26,7 +26,7 @@
 
 'use strict'
 
-const Db = require('../index')
+const Db = require('../../lib/db')
 
 module.exports = {
   headers: {

src/models/settlement/facade.js

@@ -27,7 +27,7 @@
 'use strict'
 
 const Boom = require('boom')
-const Db = require('../index')
+const Db = require('../../lib/db')
 const Uuid = require('uuid4')
 const Crypto = require('crypto')
 const Config = require('../../lib/config')

src/models/settlement/participantCurrency.js

@@ -26,7 +26,7 @@
 
 'use strict'
 
-const Db = require('../index')
+const Db = require('../../lib/db')
 
 const checkParticipantAccountExists = async ({ participantId, accountId }, enums = {}) => {
   try {

src/models/settlement/settlement.js

@@ -26,7 +26,7 @@
 
 'use strict'
 
-const Db = require('../index')
+const Db = require('../../lib/db')
 
 const create = async (settlement) => {
   try {

src/models/settlement/settlementParticipantCurrency.js

@@ -26,7 +26,7 @@
 
 'use strict'
 
-const Db = require('../index')
+const Db = require('../../lib/db')
 
 const getAccountInSettlement = async ({ settlementId, accountId }) => {
   try {

src/models/settlement/settlementStateChange.js

@@ -24,7 +24,7 @@
 
 'use strict'
 
-const Db = require('../index')
+const Db = require('../../lib/db')
 
 const getBySettlementId = async (id) => {
   try {

src/models/settlement/settlementTransferParticipant.js

@@ -28,7 +28,7 @@
 
 'use strict'
 
-const Db = require('../index')
+const Db = require('../../lib/db')
 
 module.exports = {
   getBySettlementId: async function ({ settlementId }) {

src/models/settlementWindow/facade.js

@@ -26,7 +26,7 @@
 
 'use strict'
 
-const Db = require('../index')
+const Db = require('../../lib/db')
 
 const Facade = {
   getById: async function ({ settlementWindowId }) {

src/models/settlementWindow/settlementWindowStateChange.js

@@ -26,7 +26,7 @@
 
 'use strict'
 
-const Db = require('../index')
+const Db = require('../../lib/db')
 
 const create = async ({ settlementWindowId, state, reason }, enums = {}) => {
   try {

src/setup.js

@@ -31,7 +31,7 @@
 const Hapi = require('hapi')
 const HapiOpenAPI = require('hapi-openapi')
 const Path = require('path')
-const Db = require('./models')
+const Db = require('./lib/db')
 const Enums = require('./models/lib/enums')
 const Config = require('./lib/config')
 

test/integration/helpers/models.js

@@ -23,7 +23,7 @@
  ******/
 
 'use strict'
-const Db = require('../../../src/models')
+const Db = require('../../../src/lib/db')
 
 module.exports = {
   getTransferParticipantsByTransferId: async function (transferId) {

test/integration/settlementTransfer.test.js

@@ -29,7 +29,7 @@ const Logger = require('@mojaloop/central-services-shared').Logger
 const PrepareTransferData = require('./helpers/transferData')
 const Models = require('./helpers/models')
 const Config = require('../../src/lib/config')
-const Db = require('../../src/models')
+const Db = require('../../src/lib/db')
 const SettlementWindowService = require('../../src/domain/settlementWindow')
 const SettlementService = require('../../src/domain/settlement')
 const Enums = require('../../src/models/lib/enums')

test/unit/handlers/settlementWindows.test.js

@@ -29,7 +29,7 @@ const InitServer = require('./../../../src/setup').initialize
 const Enums = require('./../../../src/models/lib/enums')
 const Logger = require('@mojaloop/central-services-shared').Logger
 const settlementWindows = require('./../../../src/domain/settlementWindow')
-const Db = require('./../../../src/models')
+const Db = require('./../../../src/lib/db')
 /**
  * Test for /settlementWindows
  */

test/unit/handlers/settlementWindows/{id}.test.js

@@ -29,7 +29,7 @@ const InitServer = require('./../../../../src/setup').initialize
 const Enums = require('./../../../../src/models/lib/enums')
 const Logger = require('@mojaloop/central-services-shared').Logger
 const settlementWindows = require('./../../../../src/domain/settlementWindow')
-const Db = require('./../../../../src/models')
+const Db = require('./../../../../src/lib/db')
 
 /**
  * Test for /settlementWindows

test/unit/handlers/settlements.test.js

@@ -29,7 +29,7 @@ const InitServer = require('./../../../src/setup').initialize
 const Enums = require('./../../../src/models/lib/enums')
 const Logger = require('@mojaloop/central-services-shared').Logger
 const settlement = require('./../../../src/domain/settlement')
-const Db = require('./../../../src/models')
+const Db = require('./../../../src/lib/db')
 /**
  * Test for /settlementWindows
  */

test/unit/handlers/settlements/{id}.test.js

@@ -29,7 +29,7 @@ const InitServer = require('./../../../../src/setup').initialize
 const Enums = require('./../../../../src/models/lib/enums')
 const Logger = require('@mojaloop/central-services-shared').Logger
 const settlement = require('./../../../../src/domain/settlement')
-const Db = require('./../../../../src/models')
+const Db = require('./../../../../src/lib/db')
 /**
  * Test for /settlementWindows
  */

test/unit/handlers/settlements/{settlementId}/participants/{participantId}.test.js

@@ -36,7 +36,7 @@ const InitServer = require('./../../../../../../src/setup').initialize
 const Enums = require('./../../../../../../src/models/lib/enums')
 const Logger = require('@mojaloop/central-services-shared').Logger
 const settlement = require('./../../../../../../src/domain/settlement')
-const Db = require('./../../../../../../src/models')
+const Db = require('./../../../../../../src/lib/db')
 
 Test('/settlements/{settlementId}/participants/{participantId}', async (settlementTest) => {
   let server

test/unit/handlers/settlements/{settlementId}/participants/{participantId}/accounts/{accountId}.test.js

@@ -32,7 +32,7 @@ const InitServer = require('./../../../../../../../../src/setup').initialize
 const Enums = require('./../../../../../../../../src/models/lib/enums')
 const Logger = require('@mojaloop/central-services-shared').Logger
 const settlement = require('./../../../../../../../../src/domain/settlement')
-const Db = require('./../../../../../../../../src/models')
+const Db = require('./../../../../../../../../src/lib/db')
 
 Test('/settlements/{settlementId}/participants/{participantId}/account/{accountId}', async (settlementTest) => {
   let server

test/unit/models/index.test.js

@@ -25,7 +25,7 @@
 
 const Test = require('tapes')(require('tape'))
 const Logger = require('@mojaloop/central-services-shared').Logger
-const Db = require('../../../src/models')
+const Db = require('../../../src/lib/db')
 
 Test('Central Services Database', (test) => {
   try {

test/unit/models/lib/enums.test.js

@@ -28,7 +28,7 @@ const Test = require('tapes')(require('tape'))
 const Sinon = require('sinon')
 const Logger = require('@mojaloop/central-services-shared').Logger
 const Enums = require('../../../../src/models/lib/enums')
-const Db = require('../../../../src/models')
+const Db = require('../../../../src/lib/db')
 
 Test('Enums', async (enumsTest) => {
   let sandbox

test/unit/models/settlement/facade.test.js

@@ -27,7 +27,7 @@
 
 const Test = require('tapes')(require('tape'))
 const Sinon = require('sinon')
-const Db = require('../../../../src/models')
+const Db = require('../../../../src/lib/db')
 const Logger = require('@mojaloop/central-services-shared').Logger
 const SettlementFacade = require('../../../../src/models/settlement/facade')
 const ParticipantFacade = require('@mojaloop/central-ledger/src/models/participant/facade')

test/unit/models/settlement/participantCurrency.test.js

@@ -28,7 +28,7 @@ const Test = require('tapes')(require('tape'))
 const Sinon = require('sinon')
 const Logger = require('@mojaloop/central-services-shared').Logger
 const ParticipantCurrencyModel = require('../../../../src/models/settlement/participantCurrency')
-const Db = require('../../../../src/models')
+const Db = require('../../../../src/lib/db')
 
 Test('ParticipantCurrencyModel', async (participantCurrencyModelTest) => {
   let sandbox

test/unit/models/settlement/settlement.test.js

@@ -28,7 +28,7 @@ const Test = require('tapes')(require('tape'))
 const Sinon = require('sinon')
 const Logger = require('@mojaloop/central-services-shared').Logger
 const SettlementModel = require('../../../../src/models/settlement/settlement')
-const Db = require('../../../../src/models')
+const Db = require('../../../../src/lib/db')
 
 Test('SettlementModel', async (settlementModelTest) => {
   let sandbox

test/unit/models/settlement/settlementParticipantCurrency.test.js

@@ -29,7 +29,7 @@ const Test = require('tapes')(require('tape'))
 const Sinon = require('sinon')
 const Logger = require('@mojaloop/central-services-shared').Logger
 const SettlementParticipantCurrencyModel = require('../../../../src/models/settlement/settlementParticipantCurrency')
-const Db = require('../../../../src/models')
+const Db = require('../../../../src/lib/db')
 
 Test('SettlementParticipantCurrencyModel', async (settlementParticipantCurrencyModelTest) => {
   let sandbox

test/unit/models/settlement/settlementStateChange.test.js

@@ -28,7 +28,7 @@ const Test = require('tapes')(require('tape'))
 const Sinon = require('sinon')
 const Logger = require('@mojaloop/central-services-shared').Logger
 const SettlementStateChangeModel = require('../../../../src/models/settlement/settlementStateChange.js')
-const Db = require('../../../../src/models')
+const Db = require('../../../../src/lib/db')
 
 Test('SettlementStateChangeModel', async (SettlementStateChangeModelTest) => {
   let sandbox

test/unit/models/settlement/settlementTransferParticipant.test.js

@@ -28,7 +28,7 @@ const Test = require('tapes')(require('tape'))
 const Sinon = require('sinon')
 const Logger = require('@mojaloop/central-services-shared').Logger
 const SettlementTransferParticipantModel = require('../../../../src/models/settlement/settlementTransferParticipant')
-const Db = require('../../../../src/models')
+const Db = require('../../../../src/lib/db')
 
 Test('SettlementTransferParticipantModel', async (settlementTransferParticipantModelTest) => {
   let sandbox

test/unit/models/settlementWindow/facade.test.js

@@ -27,7 +27,7 @@
 
 const Test = require('tapes')(require('tape'))
 const Sinon = require('sinon')
-const Db = require('../../../../src/models')
+const Db = require('../../../../src/lib/db')
 const Logger = require('@mojaloop/central-services-shared').Logger
 const SettlementWindowFacade = require('../../../../src/models/settlementWindow/facade')
 

test/unit/models/settlementWindow/settlementWindowStateChange.test.js

@@ -28,7 +28,7 @@ const Test = require('tapes')(require('tape'))
 const Sinon = require('sinon')
 const Logger = require('@mojaloop/central-services-shared').Logger
 const SettlementWindowStateChangeModel = require('../../../../src/models/settlementWindow/settlementWindowStateChange')
-const Db = require('../../../../src/models')
+const Db = require('../../../../src/lib/db')
 
 Test('SettlementModel', async (settlementWindowStateChangeModelTest) => {
   let sandbox

test/unit/setup.test.js

@@ -80,7 +80,7 @@ Test('Server Setup', async setupTest => {
         'hapi': HapiStub,
         'hapi-openapi': HapiOpenAPIStub,
         'path': PathStub,
-        './models': DbStub,
+        './lib/db': DbStub,
         './models/lib/enums': EnumsStub,
         './lib/config': ConfigStub,
         'catbox-memory': EngineStub