diff --git a/package-lock.json b/package-lock.json index ec4e7438..52aa00ad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "quoting-service", - "version": "7.3.1", + "version": "7.3.2", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -24,29 +24,27 @@ "js-tokens": "^4.0.0" } }, - "@babel/polyfill": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.4.4.tgz", - "integrity": "sha512-WlthFLfhQQhh+A2Gn5NSFl0Huxz36x86Jn+E9OW7ibK8edKPq+KLy4apM1yDpQ8kJOVi1OVjpP4vSDLdrI04dg==", - "requires": { - "core-js": "^2.6.5", - "regenerator-runtime": "^0.13.2" - } - }, "@hapi/address": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.0.0.tgz", "integrity": "sha512-mV6T0IYqb0xL1UALPFplXYQmR0twnXG0M6jUswpquqT2sD12BOiCiLy3EvMp/Fy7s3DZElC4/aPjEjo2jeZpvw==" }, "@hapi/good": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/@hapi/good/-/good-8.2.0.tgz", - "integrity": "sha512-/teb7vubMlWup+Eg/VLdJ6blhWNkU8JUhEbpAP6XTycWbtYwBoXLv3CBFre0jSBZQ7gElKhEzZXYBpr1ET/5JA==", + "version": "8.2.1", + "resolved": "https://registry.npmjs.org/@hapi/good/-/good-8.2.1.tgz", + "integrity": "sha512-/DO3d9BMgW/6fleOjqgP381Z4DMASbKutgI+OzIiVxOjw8SCOiRKsY94X3R3e0HQOXCbFF6hoXz6IoQGpQXjfQ==", "requires": { - "@hapi/hoek": "6.x.x", + "@hapi/hoek": "8.x.x", "@hapi/joi": "15.x.x", "@hapi/oppsy": "2.x.x", "pumpify": "1.x.x" + }, + "dependencies": { + "@hapi/hoek": { + "version": "8.2.1", + "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.2.1.tgz", + "integrity": "sha512-JPiBy+oSmsq3St7XlipfN5pNA6bDJ1kpa73PrK/zR29CVClDVqy04AanM/M/qx5bSF+I61DdCfAvRrujau+zRg==" + } } }, "@hapi/hoek": { @@ -65,11 +63,18 @@ } }, "@hapi/oppsy": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/@hapi/oppsy/-/oppsy-2.1.1.tgz", - "integrity": "sha512-Pi07rU7p8Zz1TdjhNu8iUlNTp1d22geW2UkA766zkrzbhgycsqPtRfnco2t3aXSqm54dgkZAK3I0fJ42q5dRVA==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@hapi/oppsy/-/oppsy-2.1.2.tgz", + "integrity": "sha512-V/KNuFemyA//sowFFpeMRY4zE6szuy8vh6v2vWDPDhZFowOIwB7kqdFvmnBogk+aHHR+iKgKCU/SuUiv/xZyzg==", "requires": { - "@hapi/hoek": "6.x.x" + "@hapi/hoek": "8.x.x" + }, + "dependencies": { + "@hapi/hoek": { + "version": "8.2.1", + "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.2.1.tgz", + "integrity": "sha512-JPiBy+oSmsq3St7XlipfN5pNA6bDJ1kpa73PrK/zR29CVClDVqy04AanM/M/qx5bSF+I61DdCfAvRrujau+zRg==" + } } }, "@hapi/topo": { @@ -164,11 +169,6 @@ "integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==", "dev": true }, - "@types/bluebird": { - "version": "3.5.26", - "resolved": "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.26.tgz", - "integrity": "sha512-aj2mrBLn5ky0GmAg6IPXrQjnN0iB/ulozuJ+oZdrHRAzRbXjGmu4UXsNCjFvPbSaaPZmniocdOzsM392qLOlmQ==" - }, "abbrev": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", @@ -595,9 +595,9 @@ } }, "bluebird": { - "version": "3.5.4", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz", - "integrity": "sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw==" + "version": "3.5.5", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz", + "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==" }, "brace-expansion": { "version": "1.1.11", @@ -794,9 +794,9 @@ } }, "colorette": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.0.7.tgz", - "integrity": "sha512-KeK4klsvAgdODAjFPm6QLzvStizJqlxMBtVo4KQMCgk5tt/tf9rAzxmxLHNRynJg3tJjkKGKbHx3j4HLox27Lw==" + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.0.8.tgz", + "integrity": "sha512-X6Ck90ReaF+EfKdVGB7vdIQ3dr651BbIrBwY5YBKg13fjH+940sTtp7/Pkx33C6ntYfQcRumOs/aUQhaRPpbTQ==" }, "colornames": { "version": "1.1.1", @@ -882,9 +882,9 @@ } }, "curriable": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/curriable/-/curriable-1.2.5.tgz", - "integrity": "sha512-hQwrkCn8DNiCw5CG8OS0td2wfpCDtxo1dmrVYxCDWUBHQPkpAvN9RqBVbmC64oSQaBqPQD2SOCXcTWH1zXe2mA==" + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/curriable/-/curriable-1.3.0.tgz", + "integrity": "sha512-7kfjDPRSF+pguU0TlfSFBMCd8XlmF29ZAiXcq/zaN4LhZvWdvV0Y72AvaWFqInXZG9Yg1kA1UMkpE9lFBKMpQA==" }, "curry2": { "version": "1.0.3", @@ -1518,9 +1518,9 @@ "integrity": "sha512-q8BZ89jjc+mz08rSxROs8VsrBBcn1SIw1kq9NjolL509tkABRk9io01RAjSaEv1Xb2uFLt8VtRiZbGp5H8iDtg==" }, "fast-stringify": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/fast-stringify/-/fast-stringify-1.1.1.tgz", - "integrity": "sha512-2oYQip2IKpGNOvVNhv5w6r3pI9BRSgoKZNsBnKCDXlc7envYhT2kYSejz11UZHVstGVCrUb6TWeENa4H1W5hwg==" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/fast-stringify/-/fast-stringify-1.1.2.tgz", + "integrity": "sha512-SfslXjiH8km0WnRiuPfpUKwlZjW5I878qsOm+2x8x3TgqmElOOLh1rgJFb+PolNdNRK3r8urEefqx0wt7vx1dA==" }, "fecha": { "version": "2.3.3", @@ -1728,9 +1728,9 @@ "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=" }, "getopts": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/getopts/-/getopts-2.2.3.tgz", - "integrity": "sha512-viEcb8TpgeG05+Nqo5EzZ8QR0hxdyrYDp6ZSTZqe2M/h53Bk036NmqG38Vhf5RGirC/Of9Xql+v66B2gp256SQ==" + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/getopts/-/getopts-2.2.4.tgz", + "integrity": "sha512-Rz7DGyomZjrenu9Jx4qmzdlvJgvrEFHXHvjK0FcZtcTC1U5FmES7OdZHUwMuSnEE6QvBvwse1JODKj7TgbSEjQ==" }, "getpass": { "version": "0.1.7", @@ -2785,9 +2785,9 @@ "integrity": "sha1-I+L60QiTKyVQUOPxpwUAwrSqMMc=" }, "json-rules-engine": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/json-rules-engine/-/json-rules-engine-3.0.1.tgz", - "integrity": "sha512-6Sfxonwl3UjMUWkX+WbXJGmS6utzBYlwvfQl+JcTRdHVCr2oog1SiIxKY3tHu9o6/DmNx/kJXyd7BdTLeY17hw==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/json-rules-engine/-/json-rules-engine-3.1.0.tgz", + "integrity": "sha512-QbJcCbHjOuPSUuw2a0EHzrH6HEcus0syA1c9C28GhXe5vVbE3Ml0fAP8W0meg8VCGIiqrPmYDNgE428Xvp6R9Q==", "requires": { "clone": "^2.1.2", "events": "^3.0.0", @@ -2887,27 +2887,25 @@ "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" }, "knex": { - "version": "0.16.5", - "resolved": "https://registry.npmjs.org/knex/-/knex-0.16.5.tgz", - "integrity": "sha512-1RVxMU8zGOBqgmXlAvs8vohg9MD14iiRZZPe0IeQXd554n4xxPmoMkbH4hlFeqfM6eOdFE3AVqVSncL3YuocqA==", - "requires": { - "@babel/polyfill": "^7.4.3", - "@types/bluebird": "^3.5.26", - "bluebird": "^3.5.4", - "colorette": "1.0.7", + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/knex/-/knex-0.19.1.tgz", + "integrity": "sha512-Y25eu5xMv8h/2/98YQqGMPzzo0AYs/HluST6BR8vkGfRyhme0A51jyCde4y4QInJo2GokrUzrXqlKDqqERg+nQ==", + "requires": { + "bluebird": "^3.5.5", + "colorette": "1.0.8", "commander": "^2.20.0", "debug": "4.1.1", - "getopts": "2.2.3", - "inherits": "~2.0.3", + "getopts": "2.2.4", + "inherits": "~2.0.4", "interpret": "^1.2.0", "liftoff": "3.1.0", - "lodash": "^4.17.11", + "lodash": "^4.17.15", "mkdirp": "^0.5.1", "pg-connection-string": "2.0.0", - "tarn": "^1.1.5", - "tildify": "1.2.0", + "tarn": "^2.0.0", + "tildify": "2.0.0", "uuid": "^3.3.2", - "v8flags": "^3.1.2" + "v8flags": "^3.1.3" }, "dependencies": { "debug": { @@ -2917,6 +2915,11 @@ "requires": { "ms": "^2.1.1" } + }, + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" } } }, @@ -3460,11 +3463,6 @@ "wordwrap": "~1.0.0" } }, - "os-homedir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" - }, "os-tmpdir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", @@ -3586,25 +3584,14 @@ "dev": true }, "proxyquire": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/proxyquire/-/proxyquire-2.1.0.tgz", - "integrity": "sha512-kptdFArCfGRtQFv3Qwjr10lwbEV0TBJYvfqzhwucyfEXqVgmnAkyEw/S3FYzR5HI9i5QOq4rcqQjZ6AlknlCDQ==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/proxyquire/-/proxyquire-2.1.3.tgz", + "integrity": "sha512-BQWfCqYM+QINd+yawJz23tbBM40VIGXOdDw3X344KcclI/gtBbdWF6SlQ4nK/bYhF9d27KYug9WzljHC6B9Ysg==", "dev": true, "requires": { "fill-keys": "^1.0.2", - "module-not-found-error": "^1.0.0", - "resolve": "~1.8.1" - }, - "dependencies": { - "resolve": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz", - "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==", - "dev": true, - "requires": { - "path-parse": "^1.0.5" - } - } + "module-not-found-error": "^1.0.1", + "resolve": "^1.11.1" } }, "psl": { @@ -3622,11 +3609,11 @@ } }, "pumpify": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.3.6.tgz", - "integrity": "sha512-BurGAcvezsINL5US9T9wGHHcLNrG6MCp//ECtxron3vcR+Rfx5Anqq7HbZXNJvFQli8FGVsWCAvywEJFV5Hx/Q==", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz", + "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==", "requires": { - "duplexify": "^3.5.3", + "duplexify": "^3.6.0", "inherits": "^2.0.3", "pump": "^2.0.0" } @@ -3701,11 +3688,6 @@ "resolve": "^1.1.6" } }, - "regenerator-runtime": { - "version": "0.13.2", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz", - "integrity": "sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==" - }, "regex-not": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", @@ -3786,9 +3768,9 @@ } }, "resolve": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.1.tgz", - "integrity": "sha512-KuIe4mf++td/eFb6wkaPbMDnP6kObCaEtIDuHOUED6MNUo4K670KZUHuuvYPZDxNF0WVLw49n06M2m2dXphEzA==", + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz", + "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==", "requires": { "path-parse": "^1.0.6" } @@ -4410,9 +4392,9 @@ } }, "tap-xunit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/tap-xunit/-/tap-xunit-2.3.0.tgz", - "integrity": "sha512-YVsURNvn1wfVUWb5wjansxhfbfeo2hOBTUbVgZoaMO8lyZzpiSi9IiZTZ7JG56m6A49LeWjfJIx/SnAre41V/A==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/tap-xunit/-/tap-xunit-2.4.1.tgz", + "integrity": "sha512-qcZStDtjjYjMKAo7QNiCtOW256g3tuSyCSe5kNJniG1Q2oeOExJq4vm8CwboHZURpkXAHvtqMl4TVL7mcbMVVA==", "dev": true, "requires": { "duplexer": "~0.1.1", @@ -4424,24 +4406,35 @@ } }, "tape": { - "version": "4.10.1", - "resolved": "https://registry.npmjs.org/tape/-/tape-4.10.1.tgz", - "integrity": "sha512-G0DywYV1jQeY3axeYnXUOt6ktnxS9OPJh97FGR3nrua8lhWi1zPflLxcAHavZ7Jf3qUfY7cxcVIVFa4mY2IY1w==", + "version": "4.10.2", + "resolved": "https://registry.npmjs.org/tape/-/tape-4.10.2.tgz", + "integrity": "sha512-mgl23h7W2yuk3N85FOYrin2OvThTYWdwbk6XQ1pr2PMJieyW2FM/4Bu/+kD/wecb3aZ0Enm+Syinyq467OPq2w==", "dev": true, "requires": { "deep-equal": "~1.0.1", "defined": "~1.0.0", "for-each": "~0.3.3", "function-bind": "~1.1.1", - "glob": "~7.1.3", + "glob": "~7.1.4", "has": "~1.0.3", "inherits": "~2.0.3", "minimist": "~1.2.0", "object-inspect": "~1.6.0", - "resolve": "~1.10.0", + "resolve": "~1.10.1", "resumer": "~0.0.0", "string.prototype.trim": "~1.1.2", "through": "~2.3.8" + }, + "dependencies": { + "resolve": { + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.1.tgz", + "integrity": "sha512-KuIe4mf++td/eFb6wkaPbMDnP6kObCaEtIDuHOUED6MNUo4K670KZUHuuvYPZDxNF0WVLw49n06M2m2dXphEzA==", + "dev": true, + "requires": { + "path-parse": "^1.0.6" + } + } } }, "tapes": { @@ -4470,9 +4463,9 @@ } }, "tarn": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/tarn/-/tarn-1.1.5.tgz", - "integrity": "sha512-PMtJ3HCLAZeedWjJPgGnCvcphbCOMbtZpjKgLq3qM5Qq9aQud+XHrL0WlrlgnTyS8U+jrjGbEXprFcQrxPy52g==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/tarn/-/tarn-2.0.0.tgz", + "integrity": "sha512-7rNMCZd3s9bhQh47ksAQd92ADFcJUjjbyOvyFjNLwTPpGieFHMC84S+LOzw0fx1uh6hnDz/19r8CPMnIjJlMMA==" }, "text-hex": { "version": "1.0.0", @@ -4502,12 +4495,9 @@ } }, "tildify": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz", - "integrity": "sha1-3OwD9V3Km3qj5bBPIYF+tW5jWIo=", - "requires": { - "os-homedir": "^1.0.0" - } + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/tildify/-/tildify-2.0.0.tgz", + "integrity": "sha512-Cc+OraorugtXNfs50hU9KS369rFXCfgGLpfCfvlc+Ud5u6VWmUQsOAa9HbTvheQdYnrdJqqv1e5oIqXppMYnSw==" }, "tmp": { "version": "0.0.33", @@ -4852,9 +4842,9 @@ } }, "xtend": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", - "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", + "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", "dev": true }, "yargs-parser": { diff --git a/package.json b/package.json index d29ba0f7..553bf0e1 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "quoting-service", "description": "Quoting Service hosted by a scheme", "license": "Apache-2.0", - "version": "7.3.1", + "version": "7.3.2", "author": "Modusbox", "contributors": [ "James Bush ", @@ -19,7 +19,7 @@ "registry": "https://registry.npmjs.org" }, "dependencies": { - "@hapi/good": "8.2.0", + "@hapi/good": "8.2.1", "@mojaloop/central-services-error-handling": "7.3.0", "axios": "0.19.0", "blipp": "4.0.0", @@ -27,8 +27,8 @@ "good-squeeze": "5.1.0", "hapi": "18.1.0", "hapi-openapi": "1.2.2", - "json-rules-engine": "3.0.1", - "knex": "0.16.5", + "json-rules-engine": "3.1.0", + "knex": "0.19.1", "memory-cache": "0.2.0", "mysql": "2.17.1", "node-fetch": "2.6.0", @@ -38,11 +38,11 @@ "eslint": "5.16.0", "istanbul": "1.1.0-alpha.1", "npm-audit-resolver": "1.5.0", - "proxyquire": "2.1.0", + "proxyquire": "2.1.3", "sinon": "7.3.2", "swagmock": "1.0.0", - "tap-xunit": "2.3.0", - "tape": "4.10.1", + "tap-xunit": "2.4.1", + "tape": "4.10.2", "tapes": "4.1.0" }, "scripts": { diff --git a/src/data/cachedDatabase.js b/src/data/cachedDatabase.js index be6a0ed0..c0c96cf8 100644 --- a/src/data/cachedDatabase.js +++ b/src/data/cachedDatabase.js @@ -79,9 +79,10 @@ class CachedDatabase extends Database { return this.getCacheValue('getPartyIdentifierType', [partyIdentifierType]) } - async getParticipant (participantName) { - return this.getCacheValue('getParticipant', [participantName]) - } + // This has been commented out as the participant data should not be cached. This is mainly due to the scenario when the participant is made inactive vs active. Ref: https://github.com/mojaloop/project/issues/933 + // async getParticipant (participantName) { + // return this.getCacheValue('getParticipant', [participantName]) + // } async getTransferParticipantRoleType (name) { return this.getCacheValue('getTransferParticipantRoleType', [name])