From 35eeecf7f5be8b7553cf164d1d4a6ade8feb9a6f Mon Sep 17 00:00:00 2001 From: cbrianbet Date: Mon, 18 Mar 2024 16:42:42 +0300 Subject: [PATCH 1/2] code clean up for typescript upgrade --- package-lock.json | 952 ++++++++++++++++-- package.json | 5 +- src/app.service.ts | 6 + ...ation-pending-surveys-by-county.handler.ts | 2 +- ...dult-plhiv-current-on-treatment.handler.ts | 2 +- ...-tx-curr-distribution-by-county.handler.ts | 3 +- ...tx-curr-distribution-by-partner.handler.ts | 4 +- .../handlers/get-ct-tx-curr.handler.ts | 4 +- ...load-cascade-active-art-clients.handler.ts | 2 +- ...ral-load-suppression-percentage.handler.ts | 2 +- .../get-vl-outcomes-by-sex.handler.ts | 2 +- ...y-year-and-suppression-category.handler.ts | 2 +- ...get-vl-outcomes-hvl-by-facility.handler.ts | 3 +- .../get-vl-outcomes-overall.handler.ts | 1 - ...all-gt-1000-copies-received-eac.handler.ts | 2 +- .../get-vl-overall-gt-1000-copies.handler.ts | 2 +- ...000-copies-second-line-regiment.handler.ts | 3 +- ...uppression-refered-less-intense.handler.ts | 3 +- ...ptake-received-follow-tests-all.handler.ts | 3 +- ...ll-uptake-received-follow-tests.handler.ts | 2 +- .../get-vl-suppression-by-age.handler.ts | 3 +- src/common/common.module.ts | 2 +- .../handlers/get-hts-partners.handler.ts | 2 +- src/hts/hts.module.ts | 2 +- .../queries/handlers/get-emr-info.handler.ts | 2 +- .../handlers/get-facility-info.handler.ts | 4 +- .../get-dwh-htspos-by-county.handler.ts | 2 +- .../get-dwh-htspos-by-facility.handler.ts | 2 +- .../get-dwh-htspos-by-gender.handler.ts | 2 +- .../get-dwh-htspos-by-partner.handler.ts | 4 +- .../handlers/get-dwh-htspos.handler.ts | 2 +- .../get-dwh-htstest-trends.handler.ts | 2 +- .../get-tx-curr-by-sex-dwh.handler.ts | 3 +- .../handlers/get-tx-curr-by-sex.handler.ts | 1 - .../handlers/get-tx-new-by-sex-dwh.handler.ts | 2 +- src/operational-his/operational-his.module.ts | 6 +- src/pmtct-rri/pmtct-rri.module.ts | 2 +- 37 files changed, 926 insertions(+), 122 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8fcd11e1..fbfc4cf8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,6 +28,7 @@ "fast-glob": "^3.2.2", "fs": "^0.0.1-security", "helmet": "^3.22.0", + "joi": "^17.12.2", "lodash": "^4.17.21", "moment": "^2.27.0", "mssql": "^10.0.2", @@ -40,7 +41,7 @@ }, "devDependencies": { "@nestjs/cli": "^7.0.0", - "@nestjs/schematics": "^7.0.0", + "@nestjs/schematics": "^10.1.1", "@nestjs/testing": "^10.3.3", "@types/express": "^4.17.3", "@types/jest": "25.1.4", @@ -60,7 +61,7 @@ "ts-loader": "^6.2.1", "ts-node": "^10.7.0", "tsconfig-paths": "^3.9.0", - "typescript": "^3.7.4" + "typescript": "^5.4.2" } }, "node_modules/@angular-devkit/core": { @@ -1025,9 +1026,9 @@ "deprecated": "Moved to 'npm install @sideway/formula'" }, "node_modules/@hapi/hoek": { - "version": "9.1.0", - "resolved": "https://registry.npmmirror.com/@hapi/hoek/-/hoek-9.1.0.tgz", - "integrity": "sha512-i9YbZPN3QgfighY/1X1Pu118VUz2Fmmhd6b2n0/O8YVgGGfw0FbUYoA97k7FkpGJ+pLCFEDLUmAPPV4D1kpeFw==" + "version": "9.3.0", + "resolved": "https://registry.npmmirror.com/@hapi/hoek/-/hoek-9.3.0.tgz", + "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==" }, "node_modules/@hapi/joi": { "version": "17.1.1", @@ -1049,9 +1050,9 @@ "deprecated": "Moved to 'npm install @sideway/pinpoint'" }, "node_modules/@hapi/topo": { - "version": "5.0.0", - "resolved": "https://registry.npmmirror.com/@hapi/topo/-/topo-5.0.0.tgz", - "integrity": "sha512-tFJlT47db0kMqVm3H4nQYgn6Pwg10GTZHb1pwmSiv1K4ks6drQOtfEF5ZnPjkvC+y4/bUPHK+bc87QvLcL+WMw==", + "version": "5.1.0", + "resolved": "https://registry.npmmirror.com/@hapi/topo/-/topo-5.1.0.tgz", + "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==", "dependencies": { "@hapi/hoek": "^9.0.0" } @@ -1556,6 +1557,100 @@ "npm": ">= 6.11.0" } }, + "node_modules/@nestjs/cli/node_modules/@nestjs/schematics": { + "version": "7.3.1", + "resolved": "https://registry.npmmirror.com/@nestjs/schematics/-/schematics-7.3.1.tgz", + "integrity": "sha512-eyBjJstAjecpdzRuBLiqnwomwXIAEV3+kPkpaphOieRUM6nBhjnXCCl3Qf8Dul2QUQK4NOVPd8FFxWtGP5XNlg==", + "dev": true, + "dependencies": { + "@angular-devkit/core": "11.2.4", + "@angular-devkit/schematics": "11.2.4", + "fs-extra": "9.1.0", + "jsonc-parser": "3.0.0", + "pluralize": "8.0.0" + }, + "peerDependencies": { + "typescript": "^3.4.5 || ^4.0.0" + } + }, + "node_modules/@nestjs/cli/node_modules/@nestjs/schematics/node_modules/@angular-devkit/core": { + "version": "11.2.4", + "resolved": "https://registry.npmmirror.com/@angular-devkit/core/-/core-11.2.4.tgz", + "integrity": "sha512-98mGDV4XtKWiQ/2D6yzvOHrnJovXchaAN9AjscAHd2an8Fkiq72d9m2wREpk+2J40NWTDB6J5iesTh3qbi8+CA==", + "dev": true, + "dependencies": { + "ajv": "6.12.6", + "fast-json-stable-stringify": "2.1.0", + "magic-string": "0.25.7", + "rxjs": "6.6.3", + "source-map": "0.7.3" + }, + "engines": { + "node": ">= 10.13.0", + "npm": "^6.11.0 || ^7.5.6", + "yarn": ">= 1.13.0" + } + }, + "node_modules/@nestjs/cli/node_modules/@nestjs/schematics/node_modules/@angular-devkit/schematics": { + "version": "11.2.4", + "resolved": "https://registry.npmmirror.com/@angular-devkit/schematics/-/schematics-11.2.4.tgz", + "integrity": "sha512-M9Ike1TYawOIHzenlZS1ufQbsS+Z11/doj5w/UrU0q2OEKc6U375t5qVGgKo3PLHHS8osb9aW9xYwBfVlKrryQ==", + "dev": true, + "dependencies": { + "@angular-devkit/core": "11.2.4", + "ora": "5.3.0", + "rxjs": "6.6.3" + }, + "engines": { + "node": ">= 10.13.0", + "npm": "^6.11.0 || ^7.5.6", + "yarn": ">= 1.13.0" + } + }, + "node_modules/@nestjs/cli/node_modules/@nestjs/schematics/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@nestjs/cli/node_modules/@nestjs/schematics/node_modules/ora": { + "version": "5.3.0", + "resolved": "https://registry.npmmirror.com/ora/-/ora-5.3.0.tgz", + "integrity": "sha512-zAKMgGXUim0Jyd6CXK9lraBnD3H5yPGBPPOkC23a2BG6hsm4Zu6OQSjQuEtV0BHDf4aKHcUFvJiGRrFuW3MG8g==", + "dev": true, + "dependencies": { + "bl": "^4.0.3", + "chalk": "^4.1.0", + "cli-cursor": "^3.1.0", + "cli-spinners": "^2.5.0", + "is-interactive": "^1.0.0", + "log-symbols": "^4.0.0", + "strip-ansi": "^6.0.0", + "wcwidth": "^1.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@nestjs/cli/node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmmirror.com/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, "node_modules/@nestjs/cli/node_modules/json5": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz", @@ -1568,6 +1663,30 @@ "json5": "lib/cli.js" } }, + "node_modules/@nestjs/cli/node_modules/rxjs": { + "version": "6.6.3", + "resolved": "https://registry.npmmirror.com/rxjs/-/rxjs-6.6.3.tgz", + "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==", + "dev": true, + "dependencies": { + "tslib": "^1.9.0" + }, + "engines": { + "npm": ">=2.0.0" + } + }, + "node_modules/@nestjs/cli/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/@nestjs/cli/node_modules/strip-bom": { "version": "3.0.0", "resolved": "https://registry.npmmirror.com/strip-bom/-/strip-bom-3.0.0.tgz", @@ -1589,6 +1708,12 @@ "strip-bom": "^3.0.0" } }, + "node_modules/@nestjs/cli/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmmirror.com/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, "node_modules/@nestjs/cli/node_modules/typescript": { "version": "4.0.5", "resolved": "https://registry.npmmirror.com/typescript/-/typescript-4.0.5.tgz", @@ -1729,18 +1854,238 @@ } }, "node_modules/@nestjs/schematics": { - "version": "7.2.1", - "resolved": "https://registry.npmmirror.com/@nestjs/schematics/-/schematics-7.2.1.tgz", - "integrity": "sha512-yTIwiclX65HYIeemJ/ih3SVlj3BhUHS5eeGy/6uFy1EiIujNadsgi/RZxFSwlCIDkSrGUykqoZdvzfdnsD1Itw==", + "version": "10.1.1", + "resolved": "https://registry.npmmirror.com/@nestjs/schematics/-/schematics-10.1.1.tgz", + "integrity": "sha512-o4lfCnEeIkfJhGBbLZxTuVWcGuqDCFwg5OrvpgRUBM7vI/vONvKKiB5riVNpO+JqXoH0I42NNeDb0m4V5RREig==", "dev": true, "dependencies": { - "@angular-devkit/core": "10.2.0", - "@angular-devkit/schematics": "10.2.0", - "fs-extra": "9.0.1", + "@angular-devkit/core": "17.1.2", + "@angular-devkit/schematics": "17.1.2", + "comment-json": "4.2.3", + "jsonc-parser": "3.2.1", "pluralize": "8.0.0" }, "peerDependencies": { - "typescript": "^3.4.5 || ^4.0.0" + "typescript": ">=4.8.2" + } + }, + "node_modules/@nestjs/schematics/node_modules/@angular-devkit/core": { + "version": "17.1.2", + "resolved": "https://registry.npmmirror.com/@angular-devkit/core/-/core-17.1.2.tgz", + "integrity": "sha512-ku+/W/HMCBacSWFppenr9y6Lx8mDuTuQvn1IkTyBLiJOpWnzgVbx9kHDeaDchGa1PwLlJUBBrv27t3qgJOIDPw==", + "dev": true, + "dependencies": { + "ajv": "8.12.0", + "ajv-formats": "2.1.1", + "jsonc-parser": "3.2.0", + "picomatch": "3.0.1", + "rxjs": "7.8.1", + "source-map": "0.7.4" + }, + "engines": { + "node": "^18.13.0 || >=20.9.0", + "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", + "yarn": ">= 1.13.0" + }, + "peerDependencies": { + "chokidar": "^3.5.2" + }, + "peerDependenciesMeta": { + "chokidar": { + "optional": true + } + } + }, + "node_modules/@nestjs/schematics/node_modules/@angular-devkit/core/node_modules/jsonc-parser": { + "version": "3.2.0", + "resolved": "https://registry.npmmirror.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz", + "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==", + "dev": true + }, + "node_modules/@nestjs/schematics/node_modules/@angular-devkit/schematics": { + "version": "17.1.2", + "resolved": "https://registry.npmmirror.com/@angular-devkit/schematics/-/schematics-17.1.2.tgz", + "integrity": "sha512-8S9RuM8olFN/gwN+mjbuF1CwHX61f0i59EGXz9tXLnKRUTjsRR+8vVMTAmX0dvVAT5fJTG/T69X+HX7FeumdqA==", + "dev": true, + "dependencies": { + "@angular-devkit/core": "17.1.2", + "jsonc-parser": "3.2.0", + "magic-string": "0.30.5", + "ora": "5.4.1", + "rxjs": "7.8.1" + }, + "engines": { + "node": "^18.13.0 || >=20.9.0", + "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", + "yarn": ">= 1.13.0" + } + }, + "node_modules/@nestjs/schematics/node_modules/@angular-devkit/schematics/node_modules/jsonc-parser": { + "version": "3.2.0", + "resolved": "https://registry.npmmirror.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz", + "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==", + "dev": true + }, + "node_modules/@nestjs/schematics/node_modules/ajv": { + "version": "8.12.0", + "resolved": "https://registry.npmmirror.com/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + } + }, + "node_modules/@nestjs/schematics/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@nestjs/schematics/node_modules/chokidar": { + "version": "3.6.0", + "resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "dev": true, + "optional": true, + "peer": true, + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/@nestjs/schematics/node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "peer": true, + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/@nestjs/schematics/node_modules/json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "dev": true + }, + "node_modules/@nestjs/schematics/node_modules/jsonc-parser": { + "version": "3.2.1", + "resolved": "https://registry.npmmirror.com/jsonc-parser/-/jsonc-parser-3.2.1.tgz", + "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==", + "dev": true + }, + "node_modules/@nestjs/schematics/node_modules/magic-string": { + "version": "0.30.5", + "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.30.5.tgz", + "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==", + "dev": true, + "dependencies": { + "@jridgewell/sourcemap-codec": "^1.4.15" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@nestjs/schematics/node_modules/ora": { + "version": "5.4.1", + "resolved": "https://registry.npmmirror.com/ora/-/ora-5.4.1.tgz", + "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==", + "dev": true, + "dependencies": { + "bl": "^4.1.0", + "chalk": "^4.1.0", + "cli-cursor": "^3.1.0", + "cli-spinners": "^2.5.0", + "is-interactive": "^1.0.0", + "is-unicode-supported": "^0.1.0", + "log-symbols": "^4.1.0", + "strip-ansi": "^6.0.0", + "wcwidth": "^1.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@nestjs/schematics/node_modules/picomatch": { + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/picomatch/-/picomatch-3.0.1.tgz", + "integrity": "sha512-I3EurrIQMlRc9IaAZnqRR044Phh2DXY+55o7uJ0V+hYZAcQYSuFWsc9q5PvyDHUSCe1Qxn/iBz+78s86zWnGag==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/@nestjs/schematics/node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, + "optional": true, + "peer": true, + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/@nestjs/schematics/node_modules/readdirp/node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmmirror.com/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "optional": true, + "peer": true, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/@nestjs/schematics/node_modules/source-map": { + "version": "0.7.4", + "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.7.4.tgz", + "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==", + "dev": true, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nestjs/schematics/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" } }, "node_modules/@nestjs/testing": { @@ -1913,6 +2258,24 @@ "yarn": ">= 1.13.0" } }, + "node_modules/@sideway/address": { + "version": "4.1.5", + "resolved": "https://registry.npmmirror.com/@sideway/address/-/address-4.1.5.tgz", + "integrity": "sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q==", + "dependencies": { + "@hapi/hoek": "^9.0.0" + } + }, + "node_modules/@sideway/formula": { + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/@sideway/formula/-/formula-3.0.1.tgz", + "integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==" + }, + "node_modules/@sideway/pinpoint": { + "version": "2.0.0", + "resolved": "https://registry.npmmirror.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz", + "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==" + }, "node_modules/@sinonjs/commons": { "version": "1.8.1", "resolved": "https://registry.npmmirror.com/@sinonjs/commons/-/commons-1.8.1.tgz", @@ -2738,6 +3101,41 @@ "uri-js": "^4.2.2" } }, + "node_modules/ajv-formats": { + "version": "2.1.1", + "resolved": "https://registry.npmmirror.com/ajv-formats/-/ajv-formats-2.1.1.tgz", + "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==", + "dev": true, + "dependencies": { + "ajv": "^8.0.0" + }, + "peerDependencies": { + "ajv": "^8.0.0" + }, + "peerDependenciesMeta": { + "ajv": { + "optional": true + } + } + }, + "node_modules/ajv-formats/node_modules/ajv": { + "version": "8.12.0", + "resolved": "https://registry.npmmirror.com/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + } + }, + "node_modules/ajv-formats/node_modules/json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "dev": true + }, "node_modules/ajv-keywords": { "version": "3.5.2", "resolved": "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz", @@ -2793,9 +3191,9 @@ "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==" }, "node_modules/anymatch": { - "version": "3.1.1", - "resolved": "https://registry.npmmirror.com/anymatch/-/anymatch-3.1.1.tgz", - "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", + "version": "3.1.3", + "resolved": "https://registry.npmmirror.com/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", "dev": true, "dependencies": { "normalize-path": "^3.0.0", @@ -2935,6 +3333,12 @@ "node": ">= 0.4" } }, + "node_modules/array-timsort": { + "version": "1.0.3", + "resolved": "https://registry.npmmirror.com/array-timsort/-/array-timsort-1.0.3.tgz", + "integrity": "sha512-/+3GRL7dDAGEfM6TseQk/U+mi18TU2Ms9I3UlLdUMhz2hbvGNTKdj9xniwXfUqgYhHxRx0+8UnKkvlNwVU+cWQ==", + "dev": true + }, "node_modules/array-unique": { "version": "0.3.2", "resolved": "https://registry.npmmirror.com/array-unique/-/array-unique-0.3.2.tgz", @@ -4126,6 +4530,22 @@ "node": ">= 6" } }, + "node_modules/comment-json": { + "version": "4.2.3", + "resolved": "https://registry.npmmirror.com/comment-json/-/comment-json-4.2.3.tgz", + "integrity": "sha512-SsxdiOf064DWoZLH799Ata6u7iV658A11PlWtZATDlXPpKGJnbJZ5Z24ybixAi+LUUqJ/GKowAejtC5GFUG7Tw==", + "dev": true, + "dependencies": { + "array-timsort": "^1.0.3", + "core-util-is": "^1.0.3", + "esprima": "^4.0.1", + "has-own-prop": "^2.0.0", + "repeat-string": "^1.6.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/component-emitter": { "version": "1.3.1", "resolved": "https://registry.npmmirror.com/component-emitter/-/component-emitter-1.3.1.tgz", @@ -6226,15 +6646,15 @@ "devOptional": true }, "node_modules/fs-extra": { - "version": "9.0.1", - "resolved": "https://registry.npmmirror.com/fs-extra/-/fs-extra-9.0.1.tgz", - "integrity": "sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==", + "version": "9.1.0", + "resolved": "https://registry.npmmirror.com/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", "dev": true, "dependencies": { "at-least-node": "^1.0.0", "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", - "universalify": "^1.0.0" + "universalify": "^2.0.0" }, "engines": { "node": ">=10" @@ -6578,6 +6998,15 @@ "node": ">=8" } }, + "node_modules/has-own-prop": { + "version": "2.0.0", + "resolved": "https://registry.npmmirror.com/has-own-prop/-/has-own-prop-2.0.0.tgz", + "integrity": "sha512-Pq0h+hvsVm6dDEa8x82GnLSYHOzNDt7f0ddFa3FqcQlgzEiptPqL+XrOJNavjOzSYiYWIrgeVYYgGlLmnxwilQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/has-property-descriptors": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", @@ -8202,6 +8631,18 @@ "node": ">= 8.3" } }, + "node_modules/joi": { + "version": "17.12.2", + "resolved": "https://registry.npmmirror.com/joi/-/joi-17.12.2.tgz", + "integrity": "sha512-RonXAIzCiHLc8ss3Ibuz45u28GOsWE1UpfDXLbN/9NKbL4tCJf8TWYVKsoYuuh+sAUt7fsSNpA+r2+TBA6Wjmw==", + "dependencies": { + "@hapi/hoek": "^9.3.0", + "@hapi/topo": "^5.1.0", + "@sideway/address": "^4.1.5", + "@sideway/formula": "^3.0.1", + "@sideway/pinpoint": "^2.0.0" + } + }, "node_modules/js-md4": { "version": "0.3.2", "resolved": "https://registry.npmmirror.com/js-md4/-/js-md4-0.3.2.tgz", @@ -8343,6 +8784,12 @@ "node": ">=6" } }, + "node_modules/jsonc-parser": { + "version": "3.0.0", + "resolved": "https://registry.npmmirror.com/jsonc-parser/-/jsonc-parser-3.0.0.tgz", + "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==", + "dev": true + }, "node_modules/jsonfile": { "version": "6.1.0", "resolved": "https://registry.npmmirror.com/jsonfile/-/jsonfile-6.1.0.tgz", @@ -8355,15 +8802,6 @@ "graceful-fs": "^4.1.6" } }, - "node_modules/jsonfile/node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmmirror.com/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, - "engines": { - "node": ">= 10.0.0" - } - }, "node_modules/jsonwebtoken": { "version": "9.0.2", "resolved": "https://registry.npmmirror.com/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz", @@ -10529,6 +10967,15 @@ "node": ">=0.10.0" } }, + "node_modules/require-from-string": { + "version": "2.0.2", + "resolved": "https://registry.npmmirror.com/require-from-string/-/require-from-string-2.0.2.tgz", + "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/require-main-filename": { "version": "2.0.0", "resolved": "https://registry.npmmirror.com/require-main-filename/-/require-main-filename-2.0.0.tgz", @@ -13369,16 +13816,16 @@ } }, "node_modules/typescript": { - "version": "3.9.10", - "resolved": "https://registry.npmmirror.com/typescript/-/typescript-3.9.10.tgz", - "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==", + "version": "5.4.2", + "resolved": "https://registry.npmmirror.com/typescript/-/typescript-5.4.2.tgz", + "integrity": "sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==", "devOptional": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" }, "engines": { - "node": ">=4.2.0" + "node": ">=14.17" } }, "node_modules/uid": { @@ -13459,9 +13906,9 @@ } }, "node_modules/universalify": { - "version": "1.0.0", - "resolved": "https://registry.npmmirror.com/universalify/-/universalify-1.0.0.tgz", - "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==", + "version": "2.0.1", + "resolved": "https://registry.npmmirror.com/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", "dev": true, "engines": { "node": ">= 10.0.0" @@ -15112,9 +15559,9 @@ "integrity": "sha512-V87P8fv7PI0LH7LiVi8Lkf3x+KCO7pQozXRssAHNXXL9L1K+uyu4XypLXwxqVDKgyQai6qj3/KteNlrqDx4W5A==" }, "@hapi/hoek": { - "version": "9.1.0", - "resolved": "https://registry.npmmirror.com/@hapi/hoek/-/hoek-9.1.0.tgz", - "integrity": "sha512-i9YbZPN3QgfighY/1X1Pu118VUz2Fmmhd6b2n0/O8YVgGGfw0FbUYoA97k7FkpGJ+pLCFEDLUmAPPV4D1kpeFw==" + "version": "9.3.0", + "resolved": "https://registry.npmmirror.com/@hapi/hoek/-/hoek-9.3.0.tgz", + "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==" }, "@hapi/joi": { "version": "17.1.1", @@ -15134,9 +15581,9 @@ "integrity": "sha512-vzXR5MY7n4XeIvLpfl3HtE3coZYO4raKXW766R6DZw/6aLqR26iuZ109K7a0NtF2Db0jxqh7xz2AxkUwpUFybw==" }, "@hapi/topo": { - "version": "5.0.0", - "resolved": "https://registry.npmmirror.com/@hapi/topo/-/topo-5.0.0.tgz", - "integrity": "sha512-tFJlT47db0kMqVm3H4nQYgn6Pwg10GTZHb1pwmSiv1K4ks6drQOtfEF5ZnPjkvC+y4/bUPHK+bc87QvLcL+WMw==", + "version": "5.1.0", + "resolved": "https://registry.npmmirror.com/@hapi/topo/-/topo-5.1.0.tgz", + "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==", "requires": { "@hapi/hoek": "^9.0.0" } @@ -15551,6 +15998,83 @@ "webpack-node-externals": "2.5.2" }, "dependencies": { + "@nestjs/schematics": { + "version": "7.3.1", + "resolved": "https://registry.npmmirror.com/@nestjs/schematics/-/schematics-7.3.1.tgz", + "integrity": "sha512-eyBjJstAjecpdzRuBLiqnwomwXIAEV3+kPkpaphOieRUM6nBhjnXCCl3Qf8Dul2QUQK4NOVPd8FFxWtGP5XNlg==", + "dev": true, + "requires": { + "@angular-devkit/core": "11.2.4", + "@angular-devkit/schematics": "11.2.4", + "fs-extra": "9.1.0", + "jsonc-parser": "3.0.0", + "pluralize": "8.0.0" + }, + "dependencies": { + "@angular-devkit/core": { + "version": "11.2.4", + "resolved": "https://registry.npmmirror.com/@angular-devkit/core/-/core-11.2.4.tgz", + "integrity": "sha512-98mGDV4XtKWiQ/2D6yzvOHrnJovXchaAN9AjscAHd2an8Fkiq72d9m2wREpk+2J40NWTDB6J5iesTh3qbi8+CA==", + "dev": true, + "requires": { + "ajv": "6.12.6", + "fast-json-stable-stringify": "2.1.0", + "magic-string": "0.25.7", + "rxjs": "6.6.3", + "source-map": "0.7.3" + } + }, + "@angular-devkit/schematics": { + "version": "11.2.4", + "resolved": "https://registry.npmmirror.com/@angular-devkit/schematics/-/schematics-11.2.4.tgz", + "integrity": "sha512-M9Ike1TYawOIHzenlZS1ufQbsS+Z11/doj5w/UrU0q2OEKc6U375t5qVGgKo3PLHHS8osb9aW9xYwBfVlKrryQ==", + "dev": true, + "requires": { + "@angular-devkit/core": "11.2.4", + "ora": "5.3.0", + "rxjs": "6.6.3" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "ora": { + "version": "5.3.0", + "resolved": "https://registry.npmmirror.com/ora/-/ora-5.3.0.tgz", + "integrity": "sha512-zAKMgGXUim0Jyd6CXK9lraBnD3H5yPGBPPOkC23a2BG6hsm4Zu6OQSjQuEtV0BHDf4aKHcUFvJiGRrFuW3MG8g==", + "dev": true, + "requires": { + "bl": "^4.0.3", + "chalk": "^4.1.0", + "cli-cursor": "^3.1.0", + "cli-spinners": "^2.5.0", + "is-interactive": "^1.0.0", + "log-symbols": "^4.0.0", + "strip-ansi": "^6.0.0", + "wcwidth": "^1.0.1" + } + } + } + }, + "ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmmirror.com/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, "json5": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz", @@ -15560,6 +16084,24 @@ "minimist": "^1.2.0" } }, + "rxjs": { + "version": "6.6.3", + "resolved": "https://registry.npmmirror.com/rxjs/-/rxjs-6.6.3.tgz", + "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + }, + "strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.1" + } + }, "strip-bom": { "version": "3.0.0", "resolved": "https://registry.npmmirror.com/strip-bom/-/strip-bom-3.0.0.tgz", @@ -15578,6 +16120,12 @@ "strip-bom": "^3.0.0" } }, + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmmirror.com/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, "typescript": { "version": "4.0.5", "resolved": "https://registry.npmmirror.com/typescript/-/typescript-4.0.5.tgz", @@ -15660,15 +16208,189 @@ } }, "@nestjs/schematics": { - "version": "7.2.1", - "resolved": "https://registry.npmmirror.com/@nestjs/schematics/-/schematics-7.2.1.tgz", - "integrity": "sha512-yTIwiclX65HYIeemJ/ih3SVlj3BhUHS5eeGy/6uFy1EiIujNadsgi/RZxFSwlCIDkSrGUykqoZdvzfdnsD1Itw==", + "version": "10.1.1", + "resolved": "https://registry.npmmirror.com/@nestjs/schematics/-/schematics-10.1.1.tgz", + "integrity": "sha512-o4lfCnEeIkfJhGBbLZxTuVWcGuqDCFwg5OrvpgRUBM7vI/vONvKKiB5riVNpO+JqXoH0I42NNeDb0m4V5RREig==", "dev": true, "requires": { - "@angular-devkit/core": "10.2.0", - "@angular-devkit/schematics": "10.2.0", - "fs-extra": "9.0.1", + "@angular-devkit/core": "17.1.2", + "@angular-devkit/schematics": "17.1.2", + "comment-json": "4.2.3", + "jsonc-parser": "3.2.1", "pluralize": "8.0.0" + }, + "dependencies": { + "@angular-devkit/core": { + "version": "17.1.2", + "resolved": "https://registry.npmmirror.com/@angular-devkit/core/-/core-17.1.2.tgz", + "integrity": "sha512-ku+/W/HMCBacSWFppenr9y6Lx8mDuTuQvn1IkTyBLiJOpWnzgVbx9kHDeaDchGa1PwLlJUBBrv27t3qgJOIDPw==", + "dev": true, + "requires": { + "ajv": "8.12.0", + "ajv-formats": "2.1.1", + "jsonc-parser": "3.2.0", + "picomatch": "3.0.1", + "rxjs": "7.8.1", + "source-map": "0.7.4" + }, + "dependencies": { + "jsonc-parser": { + "version": "3.2.0", + "resolved": "https://registry.npmmirror.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz", + "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==", + "dev": true + } + } + }, + "@angular-devkit/schematics": { + "version": "17.1.2", + "resolved": "https://registry.npmmirror.com/@angular-devkit/schematics/-/schematics-17.1.2.tgz", + "integrity": "sha512-8S9RuM8olFN/gwN+mjbuF1CwHX61f0i59EGXz9tXLnKRUTjsRR+8vVMTAmX0dvVAT5fJTG/T69X+HX7FeumdqA==", + "dev": true, + "requires": { + "@angular-devkit/core": "17.1.2", + "jsonc-parser": "3.2.0", + "magic-string": "0.30.5", + "ora": "5.4.1", + "rxjs": "7.8.1" + }, + "dependencies": { + "jsonc-parser": { + "version": "3.2.0", + "resolved": "https://registry.npmmirror.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz", + "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==", + "dev": true + } + } + }, + "ajv": { + "version": "8.12.0", + "resolved": "https://registry.npmmirror.com/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "chokidar": { + "version": "3.6.0", + "resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "dev": true, + "optional": true, + "peer": true, + "requires": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "fsevents": "~2.3.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + } + }, + "fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, + "optional": true, + "peer": true + }, + "json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "dev": true + }, + "jsonc-parser": { + "version": "3.2.1", + "resolved": "https://registry.npmmirror.com/jsonc-parser/-/jsonc-parser-3.2.1.tgz", + "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==", + "dev": true + }, + "magic-string": { + "version": "0.30.5", + "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.30.5.tgz", + "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==", + "dev": true, + "requires": { + "@jridgewell/sourcemap-codec": "^1.4.15" + } + }, + "ora": { + "version": "5.4.1", + "resolved": "https://registry.npmmirror.com/ora/-/ora-5.4.1.tgz", + "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==", + "dev": true, + "requires": { + "bl": "^4.1.0", + "chalk": "^4.1.0", + "cli-cursor": "^3.1.0", + "cli-spinners": "^2.5.0", + "is-interactive": "^1.0.0", + "is-unicode-supported": "^0.1.0", + "log-symbols": "^4.1.0", + "strip-ansi": "^6.0.0", + "wcwidth": "^1.0.1" + } + }, + "picomatch": { + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/picomatch/-/picomatch-3.0.1.tgz", + "integrity": "sha512-I3EurrIQMlRc9IaAZnqRR044Phh2DXY+55o7uJ0V+hYZAcQYSuFWsc9q5PvyDHUSCe1Qxn/iBz+78s86zWnGag==", + "dev": true + }, + "readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, + "optional": true, + "peer": true, + "requires": { + "picomatch": "^2.2.1" + }, + "dependencies": { + "picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmmirror.com/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "optional": true, + "peer": true + } + } + }, + "source-map": { + "version": "0.7.4", + "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.7.4.tgz", + "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==", + "dev": true + }, + "strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.1" + } + } } }, "@nestjs/testing": { @@ -15786,6 +16508,24 @@ "@angular-devkit/schematics": "10.2.0" } }, + "@sideway/address": { + "version": "4.1.5", + "resolved": "https://registry.npmmirror.com/@sideway/address/-/address-4.1.5.tgz", + "integrity": "sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q==", + "requires": { + "@hapi/hoek": "^9.0.0" + } + }, + "@sideway/formula": { + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/@sideway/formula/-/formula-3.0.1.tgz", + "integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==" + }, + "@sideway/pinpoint": { + "version": "2.0.0", + "resolved": "https://registry.npmmirror.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz", + "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==" + }, "@sinonjs/commons": { "version": "1.8.1", "resolved": "https://registry.npmmirror.com/@sinonjs/commons/-/commons-1.8.1.tgz", @@ -16538,6 +17278,35 @@ "uri-js": "^4.2.2" } }, + "ajv-formats": { + "version": "2.1.1", + "resolved": "https://registry.npmmirror.com/ajv-formats/-/ajv-formats-2.1.1.tgz", + "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==", + "dev": true, + "requires": { + "ajv": "^8.0.0" + }, + "dependencies": { + "ajv": { + "version": "8.12.0", + "resolved": "https://registry.npmmirror.com/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + } + }, + "json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "dev": true + } + } + }, "ajv-keywords": { "version": "3.5.2", "resolved": "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz", @@ -16581,9 +17350,9 @@ "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==" }, "anymatch": { - "version": "3.1.1", - "resolved": "https://registry.npmmirror.com/anymatch/-/anymatch-3.1.1.tgz", - "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", + "version": "3.1.3", + "resolved": "https://registry.npmmirror.com/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", "dev": true, "requires": { "normalize-path": "^3.0.0", @@ -16698,6 +17467,12 @@ "is-string": "^1.0.7" } }, + "array-timsort": { + "version": "1.0.3", + "resolved": "https://registry.npmmirror.com/array-timsort/-/array-timsort-1.0.3.tgz", + "integrity": "sha512-/+3GRL7dDAGEfM6TseQk/U+mi18TU2Ms9I3UlLdUMhz2hbvGNTKdj9xniwXfUqgYhHxRx0+8UnKkvlNwVU+cWQ==", + "dev": true + }, "array-unique": { "version": "0.3.2", "resolved": "https://registry.npmmirror.com/array-unique/-/array-unique-0.3.2.tgz", @@ -17656,6 +18431,19 @@ "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==", "dev": true }, + "comment-json": { + "version": "4.2.3", + "resolved": "https://registry.npmmirror.com/comment-json/-/comment-json-4.2.3.tgz", + "integrity": "sha512-SsxdiOf064DWoZLH799Ata6u7iV658A11PlWtZATDlXPpKGJnbJZ5Z24ybixAi+LUUqJ/GKowAejtC5GFUG7Tw==", + "dev": true, + "requires": { + "array-timsort": "^1.0.3", + "core-util-is": "^1.0.3", + "esprima": "^4.0.1", + "has-own-prop": "^2.0.0", + "repeat-string": "^1.6.1" + } + }, "component-emitter": { "version": "1.3.1", "resolved": "https://registry.npmmirror.com/component-emitter/-/component-emitter-1.3.1.tgz", @@ -19347,15 +20135,15 @@ "devOptional": true }, "fs-extra": { - "version": "9.0.1", - "resolved": "https://registry.npmmirror.com/fs-extra/-/fs-extra-9.0.1.tgz", - "integrity": "sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==", + "version": "9.1.0", + "resolved": "https://registry.npmmirror.com/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", "dev": true, "requires": { "at-least-node": "^1.0.0", "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", - "universalify": "^1.0.0" + "universalify": "^2.0.0" } }, "fs-minipass": { @@ -19626,6 +20414,12 @@ "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" }, + "has-own-prop": { + "version": "2.0.0", + "resolved": "https://registry.npmmirror.com/has-own-prop/-/has-own-prop-2.0.0.tgz", + "integrity": "sha512-Pq0h+hvsVm6dDEa8x82GnLSYHOzNDt7f0ddFa3FqcQlgzEiptPqL+XrOJNavjOzSYiYWIrgeVYYgGlLmnxwilQ==", + "dev": true + }, "has-property-descriptors": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", @@ -20909,6 +21703,18 @@ "supports-color": "^7.0.0" } }, + "joi": { + "version": "17.12.2", + "resolved": "https://registry.npmmirror.com/joi/-/joi-17.12.2.tgz", + "integrity": "sha512-RonXAIzCiHLc8ss3Ibuz45u28GOsWE1UpfDXLbN/9NKbL4tCJf8TWYVKsoYuuh+sAUt7fsSNpA+r2+TBA6Wjmw==", + "requires": { + "@hapi/hoek": "^9.3.0", + "@hapi/topo": "^5.1.0", + "@sideway/address": "^4.1.5", + "@sideway/formula": "^3.0.1", + "@sideway/pinpoint": "^2.0.0" + } + }, "js-md4": { "version": "0.3.2", "resolved": "https://registry.npmmirror.com/js-md4/-/js-md4-0.3.2.tgz", @@ -21024,6 +21830,12 @@ "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", "dev": true }, + "jsonc-parser": { + "version": "3.0.0", + "resolved": "https://registry.npmmirror.com/jsonc-parser/-/jsonc-parser-3.0.0.tgz", + "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==", + "dev": true + }, "jsonfile": { "version": "6.1.0", "resolved": "https://registry.npmmirror.com/jsonfile/-/jsonfile-6.1.0.tgz", @@ -21032,14 +21844,6 @@ "requires": { "graceful-fs": "^4.1.6", "universalify": "^2.0.0" - }, - "dependencies": { - "universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmmirror.com/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true - } } }, "jsonwebtoken": { @@ -22775,6 +23579,12 @@ "resolved": "https://registry.npmmirror.com/require-directory/-/require-directory-2.1.1.tgz", "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==" }, + "require-from-string": { + "version": "2.0.2", + "resolved": "https://registry.npmmirror.com/require-from-string/-/require-from-string-2.0.2.tgz", + "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", + "dev": true + }, "require-main-filename": { "version": "2.0.0", "resolved": "https://registry.npmmirror.com/require-main-filename/-/require-main-filename-2.0.0.tgz", @@ -24991,9 +25801,9 @@ } }, "typescript": { - "version": "3.9.10", - "resolved": "https://registry.npmmirror.com/typescript/-/typescript-3.9.10.tgz", - "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==", + "version": "5.4.2", + "resolved": "https://registry.npmmirror.com/typescript/-/typescript-5.4.2.tgz", + "integrity": "sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==", "devOptional": true }, "uid": { @@ -25064,9 +25874,9 @@ } }, "universalify": { - "version": "1.0.0", - "resolved": "https://registry.npmmirror.com/universalify/-/universalify-1.0.0.tgz", - "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==", + "version": "2.0.1", + "resolved": "https://registry.npmmirror.com/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", "dev": true }, "unpipe": { diff --git a/package.json b/package.json index 11cb22f3..15f450a6 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,7 @@ "fast-glob": "^3.2.2", "fs": "^0.0.1-security", "helmet": "^3.22.0", + "joi": "^17.12.2", "lodash": "^4.17.21", "moment": "^2.27.0", "mssql": "^10.0.2", @@ -53,7 +54,7 @@ }, "devDependencies": { "@nestjs/cli": "^7.0.0", - "@nestjs/schematics": "^7.0.0", + "@nestjs/schematics": "^10.1.1", "@nestjs/testing": "^10.3.3", "@types/express": "^4.17.3", "@types/jest": "25.1.4", @@ -73,7 +74,7 @@ "ts-loader": "^6.2.1", "ts-node": "^10.7.0", "tsconfig-paths": "^3.9.0", - "typescript": "^3.7.4" + "typescript": "^5.4.2" }, "jest": { "moduleFileExtensions": [ diff --git a/src/app.service.ts b/src/app.service.ts index 61b7a5b6..95c55881 100644 --- a/src/app.service.ts +++ b/src/app.service.ts @@ -1,8 +1,14 @@ import { Injectable } from '@nestjs/common'; +import { CacheService } from './cache/cache.service'; @Injectable() export class AppService { + // constructor(private readonly cacheService: CacheService) { + // } getHello(): string { return 'Hello World!'; } + // deleteCaches(): boolean { + // return this.cacheService.clearAll(); + // } } diff --git a/src/care-treatment/art-verification/queries/handlers/get-art-verification-pending-surveys-by-county.handler.ts b/src/care-treatment/art-verification/queries/handlers/get-art-verification-pending-surveys-by-county.handler.ts index 7762d79c..d2860714 100644 --- a/src/care-treatment/art-verification/queries/handlers/get-art-verification-pending-surveys-by-county.handler.ts +++ b/src/care-treatment/art-verification/queries/handlers/get-art-verification-pending-surveys-by-county.handler.ts @@ -29,7 +29,7 @@ export class GetArtVerificationPendingSurveysByCountyHandler coalesce(EMRs.SDP, Allsites.SDIP) As SDIP, coalesce(EMRs.[SDP Agency], Allsites.Agency) as Agency from HIS_Implementation.dbo.EMRandNonEMRSites as Allsites - left join HIS_Implementation.dbo.All_EMRSites EMRs on EMRs.MFL_Code=Allsites.MFLCode + left join ODS.dbo.All_EMRSites EMRs on EMRs.MFL_Code=Allsites.MFLCode ), --Pick Only the EMR Sites EMRSites as ( diff --git a/src/care-treatment/covid/queries/handlers/get-covid-adult-plhiv-current-on-treatment.handler.ts b/src/care-treatment/covid/queries/handlers/get-covid-adult-plhiv-current-on-treatment.handler.ts index 9f6e5051..578f9474 100644 --- a/src/care-treatment/covid/queries/handlers/get-covid-adult-plhiv-current-on-treatment.handler.ts +++ b/src/care-treatment/covid/queries/handlers/get-covid-adult-plhiv-current-on-treatment.handler.ts @@ -2,7 +2,7 @@ import { IQueryHandler, QueryHandler } from '@nestjs/cqrs'; import { GetCovidAdultPLHIVCurrentOnTreatmentQuery } from '../impl/get-covid-adult-plhiv-current-on-treatment.query'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { LinelistFACTART } from 'src/care-treatment/common/entities/linelist-fact-art.model'; +import { LinelistFACTART } from '../../../common/entities/linelist-fact-art.model'; @QueryHandler(GetCovidAdultPLHIVCurrentOnTreatmentQuery) export class GetCovidAdultPLHIVCurrentOnTreatmentHandler diff --git a/src/care-treatment/current-on-art/queries/handlers/get-ct-tx-curr-distribution-by-county.handler.ts b/src/care-treatment/current-on-art/queries/handlers/get-ct-tx-curr-distribution-by-county.handler.ts index 08bb1bf0..2b30cb3f 100644 --- a/src/care-treatment/current-on-art/queries/handlers/get-ct-tx-curr-distribution-by-county.handler.ts +++ b/src/care-treatment/current-on-art/queries/handlers/get-ct-tx-curr-distribution-by-county.handler.ts @@ -2,8 +2,7 @@ import { IQueryHandler, QueryHandler } from '@nestjs/cqrs'; import { GetCtTxCurrDistributionByCountyQuery } from '../impl/get-ct-tx-curr-distribution-by-county.query'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { FactTransNewCohort } from 'src/care-treatment/new-on-art/entities/fact-trans-new-cohort.model'; -import { AggregateTXCurr } from './../../entities/aggregate-txcurr.model'; +import { AggregateTXCurr } from '../../entities/aggregate-txcurr.model'; @QueryHandler(GetCtTxCurrDistributionByCountyQuery) export class GetCtTxCurrDistributionByCountyHandler diff --git a/src/care-treatment/current-on-art/queries/handlers/get-ct-tx-curr-distribution-by-partner.handler.ts b/src/care-treatment/current-on-art/queries/handlers/get-ct-tx-curr-distribution-by-partner.handler.ts index 86ac8094..be3e5cd9 100644 --- a/src/care-treatment/current-on-art/queries/handlers/get-ct-tx-curr-distribution-by-partner.handler.ts +++ b/src/care-treatment/current-on-art/queries/handlers/get-ct-tx-curr-distribution-by-partner.handler.ts @@ -3,9 +3,7 @@ import { GetCtTxCurrDistributionByPartnerQuery } from '../impl/get-ct-tx-curr-di import { InjectRepository } from '@nestjs/typeorm'; import { FactTransHmisStatsTxcurr } from '../../entities/fact-trans-hmis-stats-txcurr.model'; import { Repository } from 'typeorm'; -import { DimAgeGroups } from '../../../common/entities/dim-age-groups.model'; -import { FactTransNewCohort } from 'src/care-treatment/new-on-art/entities/fact-trans-new-cohort.model'; -import { AggregateTXCurr } from './../../entities/aggregate-txcurr.model'; +import { AggregateTXCurr } from '../../entities/aggregate-txcurr.model'; @QueryHandler(GetCtTxCurrDistributionByPartnerQuery) export class GetCtTxCurrDistributionByPartnerHandler diff --git a/src/care-treatment/current-on-art/queries/handlers/get-ct-tx-curr.handler.ts b/src/care-treatment/current-on-art/queries/handlers/get-ct-tx-curr.handler.ts index 297416d1..cbcde44d 100644 --- a/src/care-treatment/current-on-art/queries/handlers/get-ct-tx-curr.handler.ts +++ b/src/care-treatment/current-on-art/queries/handlers/get-ct-tx-curr.handler.ts @@ -2,9 +2,7 @@ import { IQueryHandler, QueryHandler } from '@nestjs/cqrs'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { GetCtTxCurrQuery } from '../impl/get-ct-tx-curr.query'; -import { FactTransHmisStatsTxcurr } from '../../entities/fact-trans-hmis-stats-txcurr.model'; -import { FactTransNewCohort } from '../../../new-on-art/entities/fact-trans-new-cohort.model'; -import { AggregateTXCurr } from './../../entities/aggregate-txcurr.model'; +import { AggregateTXCurr } from '../../entities/aggregate-txcurr.model'; @QueryHandler(GetCtTxCurrQuery) export class GetCtTxCurrHandler implements IQueryHandler { diff --git a/src/care-treatment/home/queries/handlers/get-ct-viral-load-cascade-active-art-clients.handler.ts b/src/care-treatment/home/queries/handlers/get-ct-viral-load-cascade-active-art-clients.handler.ts index 53441adf..6e8667bc 100644 --- a/src/care-treatment/home/queries/handlers/get-ct-viral-load-cascade-active-art-clients.handler.ts +++ b/src/care-treatment/home/queries/handlers/get-ct-viral-load-cascade-active-art-clients.handler.ts @@ -2,7 +2,7 @@ import { IQueryHandler, QueryHandler } from '@nestjs/cqrs'; import { GetCtViralLoadCascadeActiveArtClientsQuery } from '../impl/get-ct-viral-load-cascade-active-art-clients.query'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { LinelistFACTART } from 'src/care-treatment/common/entities/linelist-fact-art.model'; +import { LinelistFACTART } from '../../../common/entities/linelist-fact-art.model'; @QueryHandler(GetCtViralLoadCascadeActiveArtClientsQuery) export class GetCtViralLoadCascadeActiveArtClientsHandler implements IQueryHandler { diff --git a/src/care-treatment/home/queries/handlers/get-ct-viral-load-suppression-percentage.handler.ts b/src/care-treatment/home/queries/handlers/get-ct-viral-load-suppression-percentage.handler.ts index f00bf5c2..44ac6724 100644 --- a/src/care-treatment/home/queries/handlers/get-ct-viral-load-suppression-percentage.handler.ts +++ b/src/care-treatment/home/queries/handlers/get-ct-viral-load-suppression-percentage.handler.ts @@ -3,7 +3,7 @@ import { GetCtViralLoadSuppressionPercentageQuery } from '../impl/get-ct-viral-l import { InjectRepository } from '@nestjs/typeorm'; import { FactTransHmisStatsTxcurr } from '../../entities/fact-trans-hmis-stats-txcurr.model'; import { Repository } from 'typeorm'; -import { LinelistFACTART } from 'src/care-treatment/common/entities/linelist-fact-art.model'; +import { LinelistFACTART } from '../../../common/entities/linelist-fact-art.model'; @QueryHandler(GetCtViralLoadSuppressionPercentageQuery) export class GetCtViralLoadSuppressionPercentageHandler diff --git a/src/care-treatment/viral-load/queries/handlers/get-vl-outcomes-by-sex.handler.ts b/src/care-treatment/viral-load/queries/handlers/get-vl-outcomes-by-sex.handler.ts index 5f0307e5..1480f495 100644 --- a/src/care-treatment/viral-load/queries/handlers/get-vl-outcomes-by-sex.handler.ts +++ b/src/care-treatment/viral-load/queries/handlers/get-vl-outcomes-by-sex.handler.ts @@ -2,7 +2,7 @@ import { InjectRepository } from '@nestjs/typeorm'; import { IQueryHandler, QueryHandler } from '@nestjs/cqrs'; import { Repository } from 'typeorm'; import { GetVlOutcomesBySexQuery } from '../impl/get-vl-outcomes-by-sex.query'; -import { LinelistFACTART } from 'src/care-treatment/common/entities/linelist-fact-art.model'; +import { LinelistFACTART } from '../../../common/entities/linelist-fact-art.model'; @QueryHandler(GetVlOutcomesBySexQuery) export class GetVlOutcomesBySexHandler diff --git a/src/care-treatment/viral-load/queries/handlers/get-vl-outcomes-by-year-and-suppression-category.handler.ts b/src/care-treatment/viral-load/queries/handlers/get-vl-outcomes-by-year-and-suppression-category.handler.ts index 68cfa5ac..3e24f174 100644 --- a/src/care-treatment/viral-load/queries/handlers/get-vl-outcomes-by-year-and-suppression-category.handler.ts +++ b/src/care-treatment/viral-load/queries/handlers/get-vl-outcomes-by-year-and-suppression-category.handler.ts @@ -2,7 +2,7 @@ import { IQueryHandler, QueryHandler } from '@nestjs/cqrs'; import { GetVlOutcomesByYearAndSuppressionCategoryQuery } from '../impl/get-vl-outcomes-by-year-and-suppression-category.query'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { LinelistFACTART } from 'src/care-treatment/common/entities/linelist-fact-art.model'; +import { LinelistFACTART } from '../../../common/entities/linelist-fact-art.model'; @QueryHandler(GetVlOutcomesByYearAndSuppressionCategoryQuery) diff --git a/src/care-treatment/viral-load/queries/handlers/get-vl-outcomes-hvl-by-facility.handler.ts b/src/care-treatment/viral-load/queries/handlers/get-vl-outcomes-hvl-by-facility.handler.ts index 306f66e6..bbeecbf5 100644 --- a/src/care-treatment/viral-load/queries/handlers/get-vl-outcomes-hvl-by-facility.handler.ts +++ b/src/care-treatment/viral-load/queries/handlers/get-vl-outcomes-hvl-by-facility.handler.ts @@ -1,9 +1,8 @@ import { InjectRepository } from '@nestjs/typeorm'; import { IQueryHandler, QueryHandler } from '@nestjs/cqrs'; import { Repository } from 'typeorm'; -import { FactTransVLOutcome } from '../../entities/fact-trans-vl-outcome.model'; import { GetVlOutcomesHvlByFacilityQuery } from '../impl/get-vl-outcomes-hvl-by-facility.query'; -import { AggregateVLUptakeOutcome } from './../../entities/aggregate-vl-uptake-outcome.model'; +import { AggregateVLUptakeOutcome } from '../../entities/aggregate-vl-uptake-outcome.model'; @QueryHandler(GetVlOutcomesHvlByFacilityQuery) export class GetVlOutcomesHvlByFacilityHandler implements IQueryHandler { diff --git a/src/care-treatment/viral-load/queries/handlers/get-vl-outcomes-overall.handler.ts b/src/care-treatment/viral-load/queries/handlers/get-vl-outcomes-overall.handler.ts index 605dff48..c8a027b4 100644 --- a/src/care-treatment/viral-load/queries/handlers/get-vl-outcomes-overall.handler.ts +++ b/src/care-treatment/viral-load/queries/handlers/get-vl-outcomes-overall.handler.ts @@ -1,7 +1,6 @@ import { InjectRepository } from '@nestjs/typeorm'; import { IQueryHandler, QueryHandler } from '@nestjs/cqrs'; import { Repository } from 'typeorm'; -import { FactTransVLOutcome } from '../../entities/fact-trans-vl-outcome.model'; import { GetVlOutcomesOverallQuery } from '../impl/get-vl-outcomes-overall.query'; import { AggregateVLUptakeOutcome } from '../../entities/aggregate-vl-uptake-outcome.model'; diff --git a/src/care-treatment/viral-load/queries/handlers/get-vl-overall-gt-1000-copies-received-eac.handler.ts b/src/care-treatment/viral-load/queries/handlers/get-vl-overall-gt-1000-copies-received-eac.handler.ts index 87fbc551..4248e828 100644 --- a/src/care-treatment/viral-load/queries/handlers/get-vl-overall-gt-1000-copies-received-eac.handler.ts +++ b/src/care-treatment/viral-load/queries/handlers/get-vl-overall-gt-1000-copies-received-eac.handler.ts @@ -2,7 +2,7 @@ import { InjectRepository } from '@nestjs/typeorm'; import { IQueryHandler, QueryHandler } from '@nestjs/cqrs'; import { Repository } from 'typeorm'; import { GetVlOverallUptakeGt1000CopiesReceivedEacQuery } from '../impl/get-vl-overall-uptake-gt-1000-copies-received-eac.query'; -import { LinelistFACTART } from 'src/care-treatment/common/entities/linelist-fact-art.model'; +import { LinelistFACTART } from '../../../common/entities/linelist-fact-art.model'; @QueryHandler(GetVlOverallUptakeGt1000CopiesReceivedEacQuery) export class GetVlOverallGt1000CopiesReceivedEacHandler diff --git a/src/care-treatment/viral-load/queries/handlers/get-vl-overall-gt-1000-copies.handler.ts b/src/care-treatment/viral-load/queries/handlers/get-vl-overall-gt-1000-copies.handler.ts index d1537114..323ef20d 100644 --- a/src/care-treatment/viral-load/queries/handlers/get-vl-overall-gt-1000-copies.handler.ts +++ b/src/care-treatment/viral-load/queries/handlers/get-vl-overall-gt-1000-copies.handler.ts @@ -2,7 +2,7 @@ import { InjectRepository } from '@nestjs/typeorm'; import { IQueryHandler, QueryHandler } from '@nestjs/cqrs'; import { Repository } from 'typeorm'; import { GetVlOverallUptakeGt1000CopiesQuery } from '../impl/get-vl-overall-uptake-gt-1000-copies.query'; -import { LinelistFACTART } from './../../../common/entities/linelist-fact-art.model'; +import { LinelistFACTART } from '../../../common/entities/linelist-fact-art.model'; @QueryHandler(GetVlOverallUptakeGt1000CopiesQuery) export class GetVlOverallGt1000CopiesHandler diff --git a/src/care-treatment/viral-load/queries/handlers/get-vl-overall-number-with-follow-vl-tests-at-gt1000-copies-second-line-regiment.handler.ts b/src/care-treatment/viral-load/queries/handlers/get-vl-overall-number-with-follow-vl-tests-at-gt1000-copies-second-line-regiment.handler.ts index 960fe222..629e5784 100644 --- a/src/care-treatment/viral-load/queries/handlers/get-vl-overall-number-with-follow-vl-tests-at-gt1000-copies-second-line-regiment.handler.ts +++ b/src/care-treatment/viral-load/queries/handlers/get-vl-overall-number-with-follow-vl-tests-at-gt1000-copies-second-line-regiment.handler.ts @@ -1,11 +1,10 @@ import {InjectRepository} from '@nestjs/typeorm'; import {IQueryHandler, QueryHandler} from '@nestjs/cqrs'; import {Repository} from 'typeorm'; -import {FactTransNewCohort} from "../../../new-on-art/entities/fact-trans-new-cohort.model"; -import { LinelistFACTART } from 'src/care-treatment/common/entities/linelist-fact-art.model'; import { GetVlOverallNumberWithFollowTestsAtGt1000CopiesSecondlineRegimentQuery } from "../impl/get-vl-overall-number-with-follow-tests-at-gt1000-copies-secondline-regiment.query"; +import { LinelistFACTART } from '../../../common/entities/linelist-fact-art.model'; @QueryHandler(GetVlOverallNumberWithFollowTestsAtGt1000CopiesSecondlineRegimentQuery) export class GetVlOverallNumberWithFollowVlTestsAtGt1000CopiesSecondLineRegimentHandler implements IQueryHandler { diff --git a/src/care-treatment/viral-load/queries/handlers/get-vl-overall-uptake-and-suppression-refered-less-intense.handler.ts b/src/care-treatment/viral-load/queries/handlers/get-vl-overall-uptake-and-suppression-refered-less-intense.handler.ts index 851ba753..845c8bad 100644 --- a/src/care-treatment/viral-load/queries/handlers/get-vl-overall-uptake-and-suppression-refered-less-intense.handler.ts +++ b/src/care-treatment/viral-load/queries/handlers/get-vl-overall-uptake-and-suppression-refered-less-intense.handler.ts @@ -1,9 +1,8 @@ import { InjectRepository } from '@nestjs/typeorm'; import { IQueryHandler, QueryHandler } from '@nestjs/cqrs'; import { Repository } from 'typeorm'; -import { FactTransNewCohort } from '../../../new-on-art/entities/fact-trans-new-cohort.model'; import { GetVlOverallUptakeAndSuppressionReferredLessIntenseQuery } from '../impl/get-vl-overall-uptake-and-suppression-referred-less-intense.query'; -import { LinelistFACTART } from './../../../common/entities/linelist-fact-art.model'; +import { LinelistFACTART } from '../../../common/entities/linelist-fact-art.model'; @QueryHandler(GetVlOverallUptakeAndSuppressionReferredLessIntenseQuery) export class GetVlOverallUptakeAndSuppressionReferedLessIntenseHandler diff --git a/src/care-treatment/viral-load/queries/handlers/get-vl-overall-uptake-received-follow-tests-all.handler.ts b/src/care-treatment/viral-load/queries/handlers/get-vl-overall-uptake-received-follow-tests-all.handler.ts index d2d7a7e5..88353437 100644 --- a/src/care-treatment/viral-load/queries/handlers/get-vl-overall-uptake-received-follow-tests-all.handler.ts +++ b/src/care-treatment/viral-load/queries/handlers/get-vl-overall-uptake-received-follow-tests-all.handler.ts @@ -1,9 +1,8 @@ import {InjectRepository} from '@nestjs/typeorm'; import {IQueryHandler, QueryHandler} from '@nestjs/cqrs'; import {Repository} from 'typeorm'; -import {FactTransNewCohort} from "../../../new-on-art/entities/fact-trans-new-cohort.model"; import { GetVlOverallUptakeReceivedFollowTestsAllQuery} from "../impl/get-vl-overall-uptake-received-follow-tests-all.query"; -import { LinelistFACTART } from 'src/care-treatment/common/entities/linelist-fact-art.model'; +import { LinelistFACTART } from '../../../common/entities/linelist-fact-art.model'; @QueryHandler(GetVlOverallUptakeReceivedFollowTestsAllQuery) export class GetVlOverallUptakeReceivedFollowTestsAllHandler implements IQueryHandler { diff --git a/src/care-treatment/viral-load/queries/handlers/get-vl-overall-uptake-received-follow-tests.handler.ts b/src/care-treatment/viral-load/queries/handlers/get-vl-overall-uptake-received-follow-tests.handler.ts index c58ec969..973ed74e 100644 --- a/src/care-treatment/viral-load/queries/handlers/get-vl-overall-uptake-received-follow-tests.handler.ts +++ b/src/care-treatment/viral-load/queries/handlers/get-vl-overall-uptake-received-follow-tests.handler.ts @@ -3,7 +3,7 @@ import {IQueryHandler, QueryHandler} from '@nestjs/cqrs'; import {Repository} from 'typeorm'; import {FactTransNewCohort} from "../../../new-on-art/entities/fact-trans-new-cohort.model"; import {GetVlOverallUptakeReceivedFollowTestsQuery} from "../impl/get-vl-overall-uptake-received-follow-tests.query"; -import { LinelistFACTART } from './../../../common/entities/linelist-fact-art.model'; +import { LinelistFACTART } from '../../../common/entities/linelist-fact-art.model'; @QueryHandler(GetVlOverallUptakeReceivedFollowTestsQuery) export class GetVlOverallUptakeReceivedFollowTestsHandler implements IQueryHandler { diff --git a/src/care-treatment/viral-load/queries/handlers/get-vl-suppression-by-age.handler.ts b/src/care-treatment/viral-load/queries/handlers/get-vl-suppression-by-age.handler.ts index a74575fb..09b05eed 100644 --- a/src/care-treatment/viral-load/queries/handlers/get-vl-suppression-by-age.handler.ts +++ b/src/care-treatment/viral-load/queries/handlers/get-vl-suppression-by-age.handler.ts @@ -2,8 +2,7 @@ import { InjectRepository } from '@nestjs/typeorm'; import { IQueryHandler, QueryHandler } from '@nestjs/cqrs'; import { Repository } from 'typeorm'; import { GetVlSuppressionByAgeQuery } from '../impl/get-vl-suppression-by-age.query'; -import { AggregateVLUptakeOutcome } from './../../entities/aggregate-vl-uptake-outcome.model'; -import { LinelistFACTART } from 'src/care-treatment/common/entities/linelist-fact-art.model'; +import { LinelistFACTART } from '../../../common/entities/linelist-fact-art.model'; @QueryHandler(GetVlSuppressionByAgeQuery) export class GetVlSuppressionByAgeHandler diff --git a/src/common/common.module.ts b/src/common/common.module.ts index 8b6859b5..527992c4 100644 --- a/src/common/common.module.ts +++ b/src/common/common.module.ts @@ -9,7 +9,7 @@ import { GetPartnersHandler } from './queries/handlers/get-partners.handler'; import { GetAgenciesHandler } from './queries/handlers/get-agencies.handler'; import { GetSitesHandler } from './queries/handlers/get-sites.handler'; import { CommonController } from './common.controller'; -import { AllEmrSites } from 'src/care-treatment/common/entities/all-emr-sites.model'; +import { AllEmrSites } from '../care-treatment/common/entities/all-emr-sites.model'; @Module({ imports: [ diff --git a/src/hts/common/queries/handlers/get-hts-partners.handler.ts b/src/hts/common/queries/handlers/get-hts-partners.handler.ts index d720e026..dfd5f960 100644 --- a/src/hts/common/queries/handlers/get-hts-partners.handler.ts +++ b/src/hts/common/queries/handlers/get-hts-partners.handler.ts @@ -3,7 +3,7 @@ import { GetHtsPartnersQuery } from '../impl/get-hts-partners.query'; import { InjectRepository } from '@nestjs/typeorm'; import { FactHtsUptake } from '../../entities/fact-htsuptake.entity'; import { Repository } from 'typeorm'; -import { AllEmrSites } from 'src/care-treatment/common/entities/all-emr-sites.model'; +import { AllEmrSites } from '../../../../care-treatment/common/entities/all-emr-sites.model'; @QueryHandler(GetHtsPartnersQuery) export class GetHtsPartnersHandler diff --git a/src/hts/hts.module.ts b/src/hts/hts.module.ts index 879e8dd9..31c20f3e 100644 --- a/src/hts/hts.module.ts +++ b/src/hts/hts.module.ts @@ -22,7 +22,7 @@ import { AggregateHTSUptake } from './uptake/entities/aggregate-hts-uptake.model import { FactHTSClientTests } from './linkage/entities/fact-hts-client-tests.model'; import { FactHTSClientLinkages } from './linkage/entities/fact-hts-client-linkages.model'; import { FactHTSClientTracing } from './linkage/entities/fact-hts-client-tracing.model'; -import { AllEmrSites } from 'src/care-treatment/common/entities/all-emr-sites.model'; +import { AllEmrSites } from '../care-treatment/common/entities/all-emr-sites.model'; import { GetHtsCountiesHandler } from './common/queries/handlers/get-hts-counties.handler'; import { GetHtsSubCountiesHandler } from './common/queries/handlers/get-hts-sub-counties.handler'; diff --git a/src/manifests/queries/handlers/get-emr-info.handler.ts b/src/manifests/queries/handlers/get-emr-info.handler.ts index 5e0cc070..6b55ee7c 100644 --- a/src/manifests/queries/handlers/get-emr-info.handler.ts +++ b/src/manifests/queries/handlers/get-emr-info.handler.ts @@ -1,7 +1,7 @@ import { IQueryHandler, QueryHandler } from '@nestjs/cqrs'; import { InjectRepository } from '@nestjs/typeorm'; import { FactManifest } from '../../entities/fact-manifest.model'; -import { FacilityInfo } from 'src/manifests/entities/facility-info.entity'; +import { FacilityInfo } from '../../entities/facility-info.entity'; import { Repository } from 'typeorm'; import { GetEMRInfoQuery } from './../impl/get-emr-info.query'; diff --git a/src/manifests/queries/handlers/get-facility-info.handler.ts b/src/manifests/queries/handlers/get-facility-info.handler.ts index ac73e596..abda5f02 100644 --- a/src/manifests/queries/handlers/get-facility-info.handler.ts +++ b/src/manifests/queries/handlers/get-facility-info.handler.ts @@ -1,10 +1,10 @@ import { IQueryHandler, QueryHandler } from '@nestjs/cqrs'; import { InjectRepository } from '@nestjs/typeorm'; import { FactManifest } from '../../entities/fact-manifest.model'; -import { FacilityInfo } from 'src/manifests/entities/facility-info.entity'; +import { FacilityInfo } from '../../entities/facility-info.entity'; import { Repository } from 'typeorm'; import { GetFacilityInfoQuery } from '../impl/get-facility-info.query'; -import { EMRInfo } from 'src/manifests/entities/emr-info.entity'; +import { EMRInfo } from '../../entities/emr-info.entity'; @QueryHandler(GetFacilityInfoQuery) export class GetFacilityInfoHandler diff --git a/src/operational-his/khis/queries/handlers/get-dwh-htspos-by-county.handler.ts b/src/operational-his/khis/queries/handlers/get-dwh-htspos-by-county.handler.ts index d7bc8d9c..13f31b1e 100644 --- a/src/operational-his/khis/queries/handlers/get-dwh-htspos-by-county.handler.ts +++ b/src/operational-his/khis/queries/handlers/get-dwh-htspos-by-county.handler.ts @@ -2,7 +2,7 @@ import { IQueryHandler, QueryHandler } from '@nestjs/cqrs'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { GetDWHHTSPOSByCountyQuery } from '../impl/get-dwh-htspos-by-county.query'; -import { FactHTSClientTests } from 'src/hts/linkage/entities/fact-hts-client-tests.model'; +import { FactHTSClientTests } from '../../../../hts/linkage/entities/fact-hts-client-tests.model'; @QueryHandler(GetDWHHTSPOSByCountyQuery) export class GetDWHHTSPOSByCountyHandler diff --git a/src/operational-his/khis/queries/handlers/get-dwh-htspos-by-facility.handler.ts b/src/operational-his/khis/queries/handlers/get-dwh-htspos-by-facility.handler.ts index 9bd63d83..bcd1d88a 100644 --- a/src/operational-his/khis/queries/handlers/get-dwh-htspos-by-facility.handler.ts +++ b/src/operational-his/khis/queries/handlers/get-dwh-htspos-by-facility.handler.ts @@ -1,6 +1,6 @@ import { IQueryHandler, QueryHandler } from '@nestjs/cqrs'; import { InjectRepository } from '@nestjs/typeorm'; -import { FactHTSClientTests } from 'src/hts/linkage/entities/fact-hts-client-tests.model'; +import { FactHTSClientTests } from '../../../../hts/linkage/entities/fact-hts-client-tests.model'; import { Repository } from 'typeorm'; import { GetDWHHTSPOSByFacilityQuery } from '../impl/get-dwh-htspos-by-facility.query'; diff --git a/src/operational-his/khis/queries/handlers/get-dwh-htspos-by-gender.handler.ts b/src/operational-his/khis/queries/handlers/get-dwh-htspos-by-gender.handler.ts index fa383919..0baeeaee 100644 --- a/src/operational-his/khis/queries/handlers/get-dwh-htspos-by-gender.handler.ts +++ b/src/operational-his/khis/queries/handlers/get-dwh-htspos-by-gender.handler.ts @@ -1,7 +1,7 @@ import { IQueryHandler, QueryHandler } from '@nestjs/cqrs'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { FactHTSClientTests } from 'src/hts/linkage/entities/fact-hts-client-tests.model'; +import { FactHTSClientTests } from '../../../../hts/linkage/entities/fact-hts-client-tests.model'; import { GetDWHHTSPOSByGenderQuery } from '../impl/get-dwh-htspos-by-gender.query'; @QueryHandler(GetDWHHTSPOSByGenderQuery) diff --git a/src/operational-his/khis/queries/handlers/get-dwh-htspos-by-partner.handler.ts b/src/operational-his/khis/queries/handlers/get-dwh-htspos-by-partner.handler.ts index bb16f643..35e0abcb 100644 --- a/src/operational-his/khis/queries/handlers/get-dwh-htspos-by-partner.handler.ts +++ b/src/operational-his/khis/queries/handlers/get-dwh-htspos-by-partner.handler.ts @@ -1,8 +1,8 @@ import { IQueryHandler, QueryHandler } from '@nestjs/cqrs'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { GetDWHHTSPOSByPartnerQuery } from './../impl/get-dwh-htspos-by-partner.query'; -import { FactHTSClientTests } from 'src/hts/linkage/entities/fact-hts-client-tests.model'; +import { GetDWHHTSPOSByPartnerQuery } from '../impl/get-dwh-htspos-by-partner.query'; +import { FactHTSClientTests } from '../../../../hts/linkage/entities/fact-hts-client-tests.model'; @QueryHandler(GetDWHHTSPOSByPartnerQuery) export class GetDWHHTSPOSByPartnerHandler diff --git a/src/operational-his/khis/queries/handlers/get-dwh-htspos.handler.ts b/src/operational-his/khis/queries/handlers/get-dwh-htspos.handler.ts index 7f39492d..f0b6c742 100644 --- a/src/operational-his/khis/queries/handlers/get-dwh-htspos.handler.ts +++ b/src/operational-his/khis/queries/handlers/get-dwh-htspos.handler.ts @@ -2,7 +2,7 @@ import { IQueryHandler, QueryHandler } from '@nestjs/cqrs'; import { GetDWHHTSPOSPositiveQuery } from '../impl/get-dwh-htspos-positive.query'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { FactHTSClientTests } from 'src/hts/linkage/entities/fact-hts-client-tests.model'; +import { FactHTSClientTests } from '../../../../hts/linkage/entities/fact-hts-client-tests.model'; @QueryHandler(GetDWHHTSPOSPositiveQuery) export class GetDWHHTSPOSPositiveHandler diff --git a/src/operational-his/khis/queries/handlers/get-dwh-htstest-trends.handler.ts b/src/operational-his/khis/queries/handlers/get-dwh-htstest-trends.handler.ts index 9a0a84c0..59c99253 100644 --- a/src/operational-his/khis/queries/handlers/get-dwh-htstest-trends.handler.ts +++ b/src/operational-his/khis/queries/handlers/get-dwh-htstest-trends.handler.ts @@ -2,7 +2,7 @@ import { IQueryHandler, QueryHandler } from '@nestjs/cqrs'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { GetDWHHTSTestTrendsQuery } from '../impl/get-dwh-htstest-trends.query'; -import { FactHTSClientTests } from 'src/hts/linkage/entities/fact-hts-client-tests.model'; +import { FactHTSClientTests } from '../../../../hts/linkage/entities/fact-hts-client-tests.model'; @QueryHandler(GetDWHHTSTestTrendsQuery) export class GetDWHHTSTestTrendsHandler diff --git a/src/operational-his/khis/queries/handlers/get-tx-curr-by-sex-dwh.handler.ts b/src/operational-his/khis/queries/handlers/get-tx-curr-by-sex-dwh.handler.ts index 6c91422c..6f4277cb 100644 --- a/src/operational-his/khis/queries/handlers/get-tx-curr-by-sex-dwh.handler.ts +++ b/src/operational-his/khis/queries/handlers/get-tx-curr-by-sex-dwh.handler.ts @@ -1,9 +1,8 @@ import { IQueryHandler, QueryHandler } from '@nestjs/cqrs'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import {FactCtDhis2} from "../../entities/fact-ct-dhis2.model"; import {GetTxCurrBySexDwhQuery} from "../impl/get-tx-curr-by-sex-dwh.query"; -import { AggregateTXCurr } from 'src/care-treatment/current-on-art/entities/aggregate-txcurr.model'; +import { AggregateTXCurr } from '../../../../care-treatment/current-on-art/entities/aggregate-txcurr.model'; @QueryHandler(GetTxCurrBySexDwhQuery) export class GetTxCurrBySexDwhHandler implements IQueryHandler { diff --git a/src/operational-his/khis/queries/handlers/get-tx-curr-by-sex.handler.ts b/src/operational-his/khis/queries/handlers/get-tx-curr-by-sex.handler.ts index 83022a4b..dc326090 100644 --- a/src/operational-his/khis/queries/handlers/get-tx-curr-by-sex.handler.ts +++ b/src/operational-his/khis/queries/handlers/get-tx-curr-by-sex.handler.ts @@ -4,7 +4,6 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import {GetTxCurrBySexQuery} from "../impl/get-tx-curr-by-sex.query"; import { FactCtDhis2 } from '../../entities/fact-ct-dhis2.model'; -import {AllEmrSites} from "../../../../care-treatment/common/entities/all-emr-sites.model"; @QueryHandler(GetTxCurrBySexQuery) export class GetTxCurrBySexHandler implements IQueryHandler { diff --git a/src/operational-his/khis/queries/handlers/get-tx-new-by-sex-dwh.handler.ts b/src/operational-his/khis/queries/handlers/get-tx-new-by-sex-dwh.handler.ts index fa03a234..83778151 100644 --- a/src/operational-his/khis/queries/handlers/get-tx-new-by-sex-dwh.handler.ts +++ b/src/operational-his/khis/queries/handlers/get-tx-new-by-sex-dwh.handler.ts @@ -3,7 +3,7 @@ import {InjectRepository} from '@nestjs/typeorm'; import {Repository} from 'typeorm'; import {GetTxNewBySexDwhQuery} from "../impl/get-tx-new-by-sex-dwh.query"; -import { AggregateCohortRetention } from 'src/care-treatment/new-on-art/entities/aggregate-cohort-retention.model'; +import { AggregateCohortRetention } from '../../../../care-treatment/new-on-art/entities/aggregate-cohort-retention.model'; @QueryHandler(GetTxNewBySexDwhQuery) export class GetTxNewBySexDwhHandler implements IQueryHandler { diff --git a/src/operational-his/operational-his.module.ts b/src/operational-his/operational-his.module.ts index 72134bb1..c3baf65e 100644 --- a/src/operational-his/operational-his.module.ts +++ b/src/operational-his/operational-his.module.ts @@ -10,9 +10,9 @@ import {FactCtDhis2} from "./khis/entities/fact-ct-dhis2.model"; import {FactTransHmisStatsTxcurr} from "../care-treatment/current-on-art/entities/fact-trans-hmis-stats-txcurr.model"; import {FactTransNewlyStarted} from "../care-treatment/new-on-art/entities/fact-trans-newly-started.model"; import {FactHtsDhis2} from "./khis/entities/fact-hts-dhis2.model"; -import { AggregateTXCurr } from 'src/care-treatment/current-on-art/entities/aggregate-txcurr.model'; -import { AggregateCohortRetention } from 'src/care-treatment/new-on-art/entities/aggregate-cohort-retention.model'; -import { FactHTSClientTests } from 'src/hts/linkage/entities/fact-hts-client-tests.model'; +import { AggregateTXCurr } from '../care-treatment/current-on-art/entities/aggregate-txcurr.model'; +import { AggregateCohortRetention } from '../care-treatment/new-on-art/entities/aggregate-cohort-retention.model'; +import { FactHTSClientTests } from '../hts/linkage/entities/fact-hts-client-tests.model'; import { LinelistTicketExport } from './help-desk/entities/linelist-ticket-export.model'; diff --git a/src/pmtct-rri/pmtct-rri.module.ts b/src/pmtct-rri/pmtct-rri.module.ts index 4b50dcbd..cfaa784c 100644 --- a/src/pmtct-rri/pmtct-rri.module.ts +++ b/src/pmtct-rri/pmtct-rri.module.ts @@ -5,7 +5,7 @@ import {TypeOrmModule} from '@nestjs/typeorm'; import {PmtctRRIController} from './pmtct-rri.controller'; -import { AggregateTXCurr } from 'src/care-treatment/current-on-art/entities/aggregate-txcurr.model'; +import { AggregateTXCurr } from '../care-treatment/current-on-art/entities/aggregate-txcurr.model'; import { MissedTestingFirstANC } from './missed-anc/entities/missed-testing-first-anc.model'; import { MissedMaternalHaart } from './missed-haart/entities/missed-maternal-haart.model'; import { MissedEIDTesting } from './missed-eid/entities/missed-eid-testing.model'; From 0a1bed30e085e16dc8981366fe7b9c3d914f16fd Mon Sep 17 00:00:00 2001 From: cbrianbet Date: Mon, 18 Mar 2024 16:43:39 +0300 Subject: [PATCH 2/2] added service to clear cache --- src/cache/cache.controller.ts | 17 +++++++++++++++++ src/cache/cache.service.ts | 14 ++++++++++++++ src/cache/caches.module.ts | 14 ++++++++++++++ 3 files changed, 45 insertions(+) create mode 100644 src/cache/cache.controller.ts create mode 100644 src/cache/cache.service.ts create mode 100644 src/cache/caches.module.ts diff --git a/src/cache/cache.controller.ts b/src/cache/cache.controller.ts new file mode 100644 index 00000000..6555ce4f --- /dev/null +++ b/src/cache/cache.controller.ts @@ -0,0 +1,17 @@ +import { Controller, Get, Inject } from '@nestjs/common'; +import { CacheService } from './cache.service'; + +@Controller('cache') +export class CacheController { + constructor( + @Inject(CacheService) private readonly cacheService: CacheService + ) { } + + @Get('invalidate-cache') + invalidateAllCaches(): { success: boolean } { + // Clear all caches + this.cacheService.clearAll(); + + return { success: true }; + } +} diff --git a/src/cache/cache.service.ts b/src/cache/cache.service.ts new file mode 100644 index 00000000..3663effe --- /dev/null +++ b/src/cache/cache.service.ts @@ -0,0 +1,14 @@ +import { Injectable } from '@nestjs/common'; +import { Cache } from 'cache-manager'; + +@Injectable() +export class CacheService { + constructor( + private readonly cacheManager: Cache + ) {} + + clearAll(): boolean { + this.cacheManager.reset(); + return true; + } +} diff --git a/src/cache/caches.module.ts b/src/cache/caches.module.ts new file mode 100644 index 00000000..2fea7802 --- /dev/null +++ b/src/cache/caches.module.ts @@ -0,0 +1,14 @@ +import { Module } from '@nestjs/common'; +import { CacheService } from './cache.service'; +import { CacheController } from './cache.controller'; + +@Module({ + providers: [ + CacheService, + ], + exports: [CacheService], +}) + +export class CachesModule { + +}