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

package/migrations/950106_unique_settlement_model_ledger_account_currency.js

@@ -0,0 +1,38 @@
+/*****
+ 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
+ - Georgi Georgiev <georgi.georgiev@modusbox.com>
+ --------------
+ ******/
+
+'use strict'
+
+exports.up = function (knex) {
+  return knex.schema.table('settlementModel', (t) => {
+    t.unique(['currencyId', 'ledgerAccountTypeId'])
+  })
+}
+
+exports.down = function (knex) {
+  return knex.schema.table('settlementModel', (t) => {
+    t.dropUnique(['currencyId', 'ledgerAccountTypeId'])
+  })
+}

package/migrations/950107_settlementWindowContent_foreign_settlementModel.js

@@ -0,0 +1,60 @@
+/*****
+ 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
+ - Valentin Genev <valentin.genev@modusbox.com>
+ --------------
+ ******/
+
+ 'use strict'
+
+ exports.up = async (knex) => {
+   return await knex.schema.hasTable('settlementWindowContent').then(async function (exists) {
+     if (exists) {
+       await knex.schema.hasColumn('settlementWindowContent', 'settlementModelId')
+         .then(async (columnExists) => {
+           if (!columnExists) {
+             return knex.schema.alterTable('settlementWindowContent', (t) => {
+               t.integer('SettlementModelId').unsigned().defaultTo(null)
+               t.foreign('SettlementModelId').references('SettlementModelId').inTable('settlementModel')
+             })
+           }
+         })
+     }
+   })
+ }
+ 
+ exports.down = async function (knex) {
+   return await knex.schema.hasTable('settlementWindowContent').then(async function (exists) {
+     if (exists) {
+       await knex.schema.hasColumn('settlementWindowContent', 'settlementModelId')
+         .then(async (columnExists) => {
+           if (columnExists) {
+             return knex.schema
+               .alterTable('settlementWindowContent', (t) => {
+                 t.dropForeign('SettlementModelId')
+                 t.dropColumn('SettlementModelId')
+               })
+           }
+         })
+     }
+   })
+ }
+ 

package/package.json

@@ -1,135 +1,153 @@
 {
   "name": "@mojaloop/central-ledger",
-  "version": "9.2.2",
+  "version": "15.1.3-snapshot.2",
   "description": "Central ledger hosted by a scheme to record and settle transfers",
   "license": "Apache-2.0",
   "author": "ModusBox",
   "contributors": [
     "Georgi Georgiev <georgi.georgiev@modusbox.com>",
+    "Georgi Logodazhki <georgi.logodazhki@modusbox.com>",
     "Henk Kodde <henkkodde@modusbox.com>",
+    "Kevin Leyow <kevin.leyow@modusbox.com>",
+    "Lazola Lucas <lazola.lucas@modusbox.com>",
     "Lewis Daly <lewisd@crosslaketech.com>",
     "Miguel de Barros <miguel.debarros@modusbox.com>",
+    "Paweł Marzec <pawel.marzec@modusbox.com>",
     "Rajiv Mothilal <rajiv.mothilal@modusbox.com>",
+    "Sam Kummary <sam@modusbox.com>",
+    "Shashikant Hirugade <shashikant.hirugade@modusbox.com>",
     "Steven Oderayi <steven.oderayi@modusbox.com>",
-    "Lazola Lucas <lazola.lucas@modusbox.com>"
+    "Valentin Genev <valentin.genev@modusbox.com>"
   ],
   "repository": {
     "type": "git",
     "url": "git@github.com:mojaloop/central-ledger.git"
   },
-  "config": {
-    "knex": "--knexfile ./config/knexfile.js",
-    "images": {
-      "api": "central-ledger",
-      "admin": "central-ledger-admin"
-    }
-  },
-  "standard": {
-    "ignore": [
-      "/migrations/**"
-    ]
+  "engines": {
+    "node": "=16.x"
   },
   "pre-commit": [
-    "standard",
+    "lint",
     "dep:check",
     "test"
   ],
   "scripts": {
-    "start": "run-p start:api",
+    "start": "npm run start:api",
     "start:api": "node src/api/index.js",
-    "watch:api": "nodemon src/api/index.js",
+    "watch:api": "npx nodemon src/api/index.js",
     "start:handlers": "node src/handlers/index.js",
     "dev": "npm run docker:stop && docker-compose -f docker-compose.yml -f docker-compose.dev.yml up --build -d",
-    "test": "npm run test:unit | faucet",
-    "standard": "standard",
-    "test:unit": "tape 'test/unit/**/*.test.js'",
-    "test:int": "tape 'test/integration/**/*.test.js'",
-    "test:all": "run-s test test:integration test:functional test:spec",
-    "test:xunit": "tape 'test/unit/**/*.test.js' | tap-xunit",
-    "test:coverage": "nyc --reporter=lcov --reporter=text-summary tapes -- 'test/unit/**/**.test.js'",
+    "lint": "npx standard",
+    "lint:fix": "npx standard --fix",
+    "test": "npm run test:unit",
+    "test:unit": "npx tape 'test/unit/**/*.test.js' | tap-spec",
+    "test:xunit": "npx tape 'test/unit/**/**.test.js' | tap-xunit > ./test/results/xunit.xml",
+    "test:coverage": "npx nyc --reporter=lcov --reporter=text-summary tapes -- 'test/unit/**/**.test.js'",
     "test:coverage-check": "npm run test:coverage && nyc check-coverage",
-    "test:integration": "sh ./test/integration-runner.sh ./test/integration-runner.env",
-    "db:psql": "docker run -it --net centralledger_back --rm postgres:9.4 sh -c 'exec psql -h postgres -p \"$POSTGRES_PORT_5432_TCP_PORT\" -U central_ledger -d postgres'",
-    "migrate": "run-s migrate:latest seed:run",
-    "migrate:latest": "knex $npm_package_config_knex migrate:latest",
-    "migrate:create": "knex migrate:make $npm_package_config_knex",
-    "migrate:rollback": "knex migrate:rollback $npm_package_config_knex",
-    "migrate:current": "knex migrate:currentVersion $npm_package_config_knex",
-    "seed:run": "knex seed:run $npm_package_config_knex",
-    "docker:build": "run-s docker:build:test docker:build:api docker:build:admin",
+    "test:int": "npm run migrate && npx tape 'test/integration/**/*.test.js' | tap-spec",
+    "migrate": "npm run migrate:latest && npm run seed:run",
+    "migrate:latest": "npx knex $npm_package_config_knex migrate:latest",
+    "migrate:create": "npx knex migrate:make $npm_package_config_knex",
+    "migrate:rollback": "npx knex migrate:rollback $npm_package_config_knex",
+    "migrate:current": "npx knex migrate:currentVersion $npm_package_config_knex",
+    "seed:run": "npx knex seed:run $npm_package_config_knex",
+    "docker:build": "npm run docker:build:test && npm run docker:build:api",
     "docker:build:test": "docker build --no-cache -f test.Dockerfile -t $npm_package_config_images_api:test .",
-    "docker:build:api": "docker build --no-cache -f api.Dockerfile -t $npm_package_config_images_api:latest .",
-    "docker:build:admin": "docker build --no-cache -f admin.Dockerfile -t $npm_package_config_images_admin:latest .",
+    "docker:build:api": "docker build --no-cache -f Dockerfile -t $npm_package_config_images_api:latest .",
     "docker:up": "docker-compose -f docker-compose.yml up",
+    "docker:up:backend": "docker-compose up -d ml-api-adapter mysql mockserver kafka kowl temp_curl",
+    "docker:script:populateTestData": "sh ./test/util/scripts/populateTestData.sh",
     "docker:stop": "docker-compose -f docker-compose.yml stop",
     "docker:rm": "docker-compose -f docker-compose.yml rm -f -v",
     "docker:down": "docker-compose -f docker-compose.yml down -v",
     "docker:clean": "docker-compose -f docker-compose.yml down --rmi local",
-    "generate-docs": "node_modules/.bin/jsdoc -c jsdoc.json",
-    "audit:resolve": "SHELL=sh resolve-audit",
-    "audit:check": "SHELL=sh check-audit",
+    "generate-docs": "npx jsdoc -c jsdoc.json",
+    "audit:resolve": "npx resolve-audit --production",
+    "audit:check": "npx check-audit --production",
     "dep:check": "npx ncu -e 2",
-    "dep:update": "npx ncu -u"
+    "dep:update": "npx ncu -u",
+    "release": "npx standard-version --no-verify --releaseCommitMessageFormat 'chore(release): {{currentTag}} [skip ci]'",
+    "snapshot": "npx standard-version --no-verify --skip.changelog --prerelease snapshot --releaseCommitMessageFormat 'chore(snapshot): {{currentTag}}'",
+    "wait-4-docker": "node ./scripts/_wait4_all.js"
   },
   "dependencies": {
-    "@hapi/good": "9.0.0",
-    "@hapi/hapi": "19.1.1",
-    "@hapi/inert": "6.0.1",
-    "@hapi/joi": "17.1.0",
-    "@hapi/vision": "6.0.0",
-    "@mojaloop/central-object-store": "9.1.0-snapshot",
-    "@mojaloop/central-services-database": "9.2.0",
-    "@mojaloop/central-services-error-handling": "9.1.0",
-    "@mojaloop/central-services-health": "9.2.0",
-    "@mojaloop/central-services-logger": "9.1.0",
-    "@mojaloop/central-services-metrics": "9.1.0",
-    "@mojaloop/central-services-shared": "9.2.0",
-    "@mojaloop/central-services-stream": "9.2.0",
-    "@mojaloop/event-sdk": "9.2.0",
-    "@mojaloop/forensic-logging-client": "8.3.0",
-    "@mojaloop/ml-number": "8.2.0",
-    "@now-ims/hapi-now-auth": "2.0.1",
-    "awaitify-stream": "1.0.2",
+    "@hapi/good": "9.0.1",
+    "@hapi/hapi": "20.2.2",
+    "@hapi/inert": "6.0.5",
+    "@hapi/joi": "17.1.1",
+    "@hapi/vision": "6.1.0",
+    "@mojaloop/central-services-database": "10.7.0",
+    "@mojaloop/central-services-error-handling": "12.0.3",
+    "@mojaloop/central-services-health": "14.0.1",
+    "@mojaloop/central-services-logger": "11.0.1",
+    "@mojaloop/central-services-metrics": "12.0.5",
+    "@mojaloop/central-services-shared": "17.0.2",
+    "@mojaloop/central-services-stream": "11.0.0",
+    "@mojaloop/event-sdk": "11.0.2",
+    "@mojaloop/ml-number": "11.2.1",
+    "@mojaloop/object-store-lib": "12.0.0",
+    "@now-ims/hapi-now-auth": "2.1.0",
+    "ajv": "8.11.0",
+    "ajv-keywords": "5.1.0",
     "base64url": "3.0.1",
-    "blipp": "4.0.1",
+    "blipp": "4.0.2",
     "catbox-memory": "4.0.1",
-    "commander": "4.1.1",
-    "cron": "1.8.2",
-    "decimal.js": "10.2.0",
+    "commander": "9.3.0",
+    "cron": "2.0.0",
+    "decimal.js": "10.3.1",
     "docdash": "1.2.0",
+    "event-stream": "4.0.1",
     "five-bells-condition": "5.0.1",
-    "glob": "7.1.6",
+    "glob": "8.0.3",
     "hapi-auth-basic": "5.0.0",
-    "hapi-auth-bearer-token": "6.2.1",
-    "hapi-swagger": "12.1.1",
-    "knex": "0.20.10",
-    "lodash": "4.17.15",
-    "moment": "2.24.0",
-    "mongoose": "5.9.2",
-    "npm-run-all": "4.1.5",
+    "hapi-auth-bearer-token": "8.0.0",
+    "hapi-swagger": "14.5.5",
+    "ilp-packet": "2.2.0",
+    "knex": "2.1.0",
+    "lodash": "4.17.21",
+    "moment": "2.29.4",
     "rc": "1.2.8",
-    "require-glob": "3.2.0",
-    "uuid4": "1.1.4"
+    "require-glob": "^4.1.0",
+    "uuid4": "2.0.2"
   },
   "optionalDependencies": {
     "mysql": "2.18.1"
   },
   "devDependencies": {
-    "async-retry": "1.3.1",
-    "faucet": "0.0.1",
+    "async-retry": "1.3.3",
     "get-port": "5.1.1",
-    "jsdoc": "3.6.3",
-    "jsonpath": "1.0.2",
-    "nodemon": "2.0.2",
-    "npm-audit-resolver": "2.2.0",
-    "npm-check-updates": "4.0.2",
-    "nyc": "15.0.0",
+    "jsdoc": "3.6.10",
+    "jsonpath": "1.1.1",
+    "nodemon": "2.0.19",
+    "npm-audit-resolver": "3.0.0-7",
+    "npm-check-updates": "15.2.6",
+    "nyc": "15.1.0",
     "pre-commit": "1.2.2",
     "proxyquire": "2.1.3",
-    "sinon": "9.0.0",
-    "standard": "14.3.1",
+    "replace": "^1.2.1",
+    "sinon": "14.0.0",
+    "standard": "17.0.0",
+    "standard-version": "^9.5.0",
+    "tap-spec": "^5.0.0",
     "tap-xunit": "2.4.1",
-    "tape": "4.13.0",
+    "tape": "4.13.2",
     "tapes": "4.1.0"
+  },
+  "config": {
+    "knex": "--knexfile ./config/knexfile.js",
+    "images": {
+      "api": "central-ledger",
+      "admin": "central-ledger-admin"
+    }
+  },
+  "standard": {
+    "ignore": [
+      "/migrations/**"
+    ]
+  },
+  "standard-version": {
+    "scripts": {
+      "postchangelog": "replace '\\[mojaloop/#(\\d+)\\]\\(https://github.com/mojaloop/(.*)/issues/(\\d+)\\)' '[mojaloop/#$1](https://github.com/mojaloop/project/issues/$1)' CHANGELOG.md"
+    }
   }
 }

package/scripts/_wait4_all.js

@@ -0,0 +1,146 @@
+#!/usr/bin/env node
+
+const { execSync } = require('child_process')
+
+/**
+ * @file _wait4_all.js
+ * @description Waits for all docker-compose services to be running and healthy
+ */
+
+// Define the docker-compose containers you want to monitor here
+const expectedContainers = [
+  'cl_mysql',
+  'cl_kafka'
+  // ## NOTE: These are not needed for Integration Tests
+  // 'cl_central-ledger',
+  // 'cl_ml-api-adapter',
+  // 'cl_simulator',
+  // 'mockserver',
+  // 'cl_objstore' //,
+  // 'kowl'
+]
+
+let retries = 40
+const waitTimeMs = 60000
+
+async function main () {
+  const waitingMap = {}
+  // serviceName => status, where status is healthy, unhealthy or starting
+  expectedContainers.forEach(serviceName => {
+    waitingMap[serviceName] = 'starting'
+  })
+
+  try {
+    let allHealthy = await areAllServicesHealthy(waitingMap, waitTimeMs)
+
+    while (!allHealthy && retries > 0) {
+      await sleep(waitTimeMs)
+      allHealthy = await areAllServicesHealthy(waitingMap, waitTimeMs)
+
+      if (retries === 0) {
+        throw new Error(`Out of retries waiting for service health.\nStill waiting for: ${getServicesForStatus(waitingMap, 'starting')}`)
+      }
+
+      console.log('Still waiting for service health. Retries', retries)
+      console.log(`${getServicesForStatus(waitingMap, 'healthy').length} services are healthy. Expected: ${expectedContainers.length}`)
+      console.log('Waiting for', getServicesForStatus(waitingMap, 'starting'))
+
+      retries--
+    }
+
+    console.log('All services are healthy. Time to get to work!')
+    process.exit(0)
+  } catch (error) {
+    console.error(`_wait4_all: ${error}`)
+    process.exit(1)
+  }
+}
+
+/**
+ * @function areAllServicesHealthy
+ * @description Get Update the service status, and sleep for `waitTimeMs` if the services aren't healthy
+ * @param {*} waitingMap
+ * @returns boolean
+ */
+async function areAllServicesHealthy (waitingMap) {
+  await updateServiceStatus(waitingMap)
+
+  if (isSystemHealthy(waitingMap)) {
+    return true
+  }
+
+  if (isSystemFailing(waitingMap)) {
+    throw new Error(`One or more services went to unhealthy: \n\t${getServicesForStatus(waitingMap, 'unhealthy')}\n`)
+  }
+
+  return false
+}
+
+/**
+ * @function updateServiceStatus
+ * @description Go through all of the waiting services, and check their status
+ * @param {*} waitingMap
+ * @returns void
+ */
+async function updateServiceStatus (waitingMap) {
+  const startingServices = getServicesForStatus(waitingMap, 'starting')
+
+  Promise.all(startingServices.map(async serviceName => {
+    // TODO: This info may be useful in future!
+    // const currentStatus = waitingMap[serviceName]
+    const progress = await getProgress(serviceName)
+    waitingMap[serviceName] = progress
+  }))
+}
+
+/**
+ * @function getProgress
+ * @description Invokes the `docker inspect` command for the given container
+ * @param {string} containerName
+ * @returns {'healthy' | 'unhealthy' | 'starting'}
+ */
+function getProgress (containerName) {
+  const command = `docker inspect --format='{{json .State.Health.Status}}' ${containerName}`
+  return execSync(command).toString().replace(/['"]+|[\n]+/g, '')
+}
+
+/**
+ * @function isSystemHealthy
+ * @param {*} waitingMap
+ * @returns {boolean}
+ */
+function isSystemHealthy (waitingMap) {
+  return getServicesForStatus(waitingMap, 'healthy').length === expectedContainers.length
+}
+
+/**
+ * @function isSystemFailing
+ * @param {*} waitingMap
+ * @returns {boolean}
+ */
+function isSystemFailing (waitingMap) {
+  return getServicesForStatus(waitingMap, 'unhealthy').length > 0
+}
+
+/**
+ * @function getServicesForStatus
+ * @param {*} waitingMap
+ * @param {'healthy' | 'unhealthy' | 'starting'} status
+ * @returns {Array<string>}
+ */
+function getServicesForStatus (waitingMap, status) {
+  return Object
+    .keys(waitingMap)
+    .filter(k => waitingMap[k] === status)
+}
+
+/**
+ * @function sleep
+ * @param {*} timeMs - how long to sleep for
+ */
+async function sleep (timeMs) {
+  console.log(`Sleeping for ${timeMs} ms`)
+  return new Promise((resolve, reject) => setTimeout(() => resolve(), timeMs))
+}
+
+main()

package/seeds/amountType.js

@@ -25,6 +25,7 @@ Contributors
  - Name Surname <name.surname@gatesfoundation.com>
 
  * Georgi Georgiev <georgi.georgiev@modusbox.com>
+ * Shashikant Hirugade <shashikant.hirugade@modusbox.com>
  --------------
  ******/
 
@@ -44,12 +45,9 @@ const amountType = [
 
 exports.seed = async function (knex) {
   try {
-    return await knex('amountType').insert(amountType)
+    return await knex('amountType').insert(amountType).onConflict('name').ignore()
   } catch (err) {
-    if (err.code === 'ER_DUP_ENTRY') return -1001
-    else {
-      console.log(`Uploading seeds for amountType has failed with the following error: ${err}`)
-      return -1000
-    }
+    console.log(`Uploading seeds for amountType has failed with the following error: ${err}`)
+    return -1000
   }
 }

package/seeds/balanceOfPayments.js

@@ -25,6 +25,7 @@ Contributors
  - Name Surname <name.surname@gatesfoundation.com>
 
  * Georgi Georgiev <georgi.georgiev@modusbox.com>
+ * Shashikant Hirugade <shashikant.hirugade@modusbox.com>
  --------------
  ******/
 
@@ -510,12 +511,9 @@ const balanceOfPayments = [
 
 exports.seed = async function (knex) {
   try {
-    return await knex('balanceOfPayments').insert(balanceOfPayments)
+    return await knex('balanceOfPayments').insert(balanceOfPayments).onConflict('name').ignore()
   } catch (err) {
-    if (err.code === 'ER_DUP_ENTRY') return -1001
-    else {
-      console.log(`Uploading seeds for balanceOfPayments has failed with the following error: ${err}`)
-      return -1000
-    }
+    console.log(`Uploading seeds for balanceOfPayments has failed with the following error: ${err}`)
+    return -1000
   }
 }

package/seeds/bulkProcessingState.js

@@ -19,6 +19,7 @@
  - Name Surname <name.surname@gatesfoundation.com>
 
  * Georgi Georgiev <georgi.georgiev@modusbox.com>
+ * Shashikant Hirugade <shashikant.hirugade@modusbox.com>
  --------------
  ******/
 
@@ -69,12 +70,9 @@ const bulkProcessingStates = [
 
 exports.seed = async function (knex) {
   try {
-    return await knex('bulkProcessingState').insert(bulkProcessingStates)
+    return await knex('bulkProcessingState').insert(bulkProcessingStates).onConflict('name').ignore()
   } catch (err) {
-    if (err.code === 'ER_DUP_ENTRY') return -1001
-    else {
-      console.log(`Uploading seeds for bulkProcessingState has failed with the following error: ${err}`)
-      return -1000
-    }
+    console.log(`Uploading seeds for bulkProcessingState has failed with the following error: ${err}`)
+    return -1000
   }
 }

package/seeds/bulkTransferState.js

@@ -19,6 +19,7 @@
  - Name Surname <name.surname@gatesfoundation.com>
 
  * Georgi Georgiev <georgi.georgiev@modusbox.com>
+ * Shashikant Hirugade <shashikant.hirugade@modusbox.com>
  --------------
  ******/
 
@@ -84,12 +85,9 @@ const bulkTransferStates = [
 
 exports.seed = async function (knex) {
   try {
-    return await knex('bulkTransferState').insert(bulkTransferStates)
+    return await knex('bulkTransferState').insert(bulkTransferStates).onConflict('bulkTransferStateId').ignore()
   } catch (err) {
-    if (err.code === 'ER_DUP_ENTRY') return -1001
-    else {
-      console.log(`Uploading seeds for bulkTransferState has failed with the following error: ${err}`)
-      return -1000
-    }
+    console.log(`Uploading seeds for bulkTransferState has failed with the following error: ${err}`)
+    return -1000
   }
 }

package/seeds/currency.js

@@ -19,6 +19,7 @@
  - Name Surname <name.surname@gatesfoundation.com>
 
  * Georgi Georgiev <georgi.georgiev@modusbox.com>
+ * Shashikant Hirugade <shashikant.hirugade@modusbox.com>
  --------------
  ******/
 
@@ -224,13 +225,10 @@ const currencyList = currencies.map(currentValue => {
 
 const seed = async function (knex) {
   try {
-    return await knex('currency').insert(currencies)
+    return await knex('currency').insert(currencies).onConflict('currencyId').ignore()
   } catch (err) {
-    if (err.code === 'ER_DUP_ENTRY') return -1001
-    else {
-      console.log(`Uploading seeds for currency has failed with the following error: ${err}`)
-      return -1000
-    }
+    console.log(`Uploading seeds for currency has failed with the following error: ${err}`)
+    return -1000
   }
 }