Remove promises

.eslintrc

@@ -18,6 +18,7 @@
     "semi": ["off"],
     "@typescript-eslint/semi": ["error", "always"],
     "quotes": ["error", "single", { "avoidEscape": true }],
-
+    "@typescript-eslint/no-explicit-any": ["off"],
+    "@typescript-eslint/no-unused-vars": ["warn", { "argsIgnorePattern": "^_" }]
   }
 }

.github/workflows/ci-workflow.yml

@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        node-version: [14]
+        node-version: [18]
 
     steps:
     - uses: actions/checkout@v1

.mocharc.json

@@ -0,0 +1,7 @@
+{
+  "timeout" : 20000,
+  "extension": ["ts"],
+  "spec": "test/**/*.test.ts",
+  "require": "ts-node/register",
+  "file" : ["test/setup.ts"]
+}

env.json

@@ -1,7 +1,7 @@
 {
   "MONGO_URL": {
     "type": "string",
-    "default": "mongodb://127.0.0.1:27017",
+    "default": "mongodb://rems-user:pass@127.0.0.1:27017",
     "required": true
   },
   "MONGO_DB_NAME": {

package.json

@@ -14,7 +14,7 @@
   "scripts": {
     "develop": "node dist/scripts/develop.js",
     "start": "ts-node-dev --inspect=8091 src/scripts/serve.ts",
-    "test": "mocha --timeout 20000 -r ts-node/register test/*.test.ts",
+    "test": "mocha",
     "lint": "eslint \"**/*.{js,ts}\"",
     "lint:fix": "eslint \"**/*.{js,ts}\" --quiet --fix",
     "prettier": "prettier --check \"**/*.{js,ts}\"",
@@ -27,12 +27,14 @@
   "dependencies": {
     "@projecttacoma/node-fhir-server-core": "^2.2.8",
     "@types/fhir": "^0.0.35",
+    "@types/glob": "^8.1.0",
     "axios": "^1.2.1",
     "body-parser": "^1.19.0",
     "conventional-changelog-cli": "^2.0.34",
     "cors": "^2.8.5",
     "express": "^4.17.1",
     "fhirpath": "^3.2.0",
+    "glob": "^10.2.1",
     "lodash": "^4.17.19",
     "moment": "^2.24.0",
     "moment-timezone": "^0.5.40",
@@ -62,6 +64,7 @@
     "@typescript-eslint/parser": "^5.45.0",
     "axios-mock-adapter": "^1.21.2",
     "chai": "^4.3.7",
+    "chai-http": "^4.3.0",
     "eslint": "^8.28.0",
     "eslint-config-prettier": "^6.15.0",
     "eslint-plugin-prettier": "^4.2.1",

src/fhir/questionnaireUtilities.ts

@@ -10,8 +10,6 @@ import {
   QuestionnaireItem,
   ValueSet
 } from 'fhir/r4';
-import constants from '../constants';
-import { Globals } from '../globals';
 import { FhirUtilities } from './utilities';
 import container from '../lib/winston';
 import config from '../config';
@@ -143,16 +141,7 @@ export class QuestionnaireUtilities {
               if (!valueSet) {
                 valueSet = await this.fetchValueSetFromVSAC(valueSetUrl);
                 if (valueSet) {
-                  await FhirUtilities.store(
-                    valueSet,
-                    ValueSetModel,
-                    function () {
-                      return;
-                    },
-                    function () {
-                      return;
-                    }
-                  );
+                  await FhirUtilities.store(valueSet, ValueSetModel);
                 } else {
                   this.logger.warn(`Library Processor >> Failed to find ValueSet: ${valueSetUrl}`);
                 }
@@ -172,60 +161,17 @@ export class QuestionnaireUtilities {
     }
     return returnValue;
   }
-  static async findQuestionnaire(id: string): Promise<Questionnaire | undefined> {
-    return new Promise((resolve, reject) => {
-      QuestionnaireModel.findOne(
-        { id: id.toString() },
-        (err: any, questionnaire: Questionnaire) => {
-          if (err) {
-            return reject(err);
-          }
-          if (questionnaire) {
-            resolve(new QuestionnaireModel(questionnaire));
-          }
-          resolve(undefined);
-        }
-      );
-    });
+  static async findQuestionnaire(id: string): Promise<Questionnaire | null | undefined> {
+    return await QuestionnaireModel.findOne({ id: id.toString() });
   }
-  static async findLibraryByUrl(url: string): Promise<Library | undefined> {
-    return new Promise((resolve, reject) => {
-      LibraryModel.findOne({ url: url.toString() }, (err: any, library: Library) => {
-        if (err) {
-          return reject(err);
-        }
-        if (library) {
-          resolve(new LibraryModel(library));
-        }
-        resolve(undefined);
-      });
-    });
+  static async findLibraryByUrl(url: string): Promise<Library | null | undefined> {
+    return await LibraryModel.findOne({ url: url.toString() });
   }
-  static async findLibraryById(id: string): Promise<Library | undefined> {
-    return new Promise((resolve, reject) => {
-      LibraryModel.findOne({ id: id.toString() }, (err: any, library: Library) => {
-        if (err) {
-          return reject(err);
-        }
-        if (library) {
-          resolve(new LibraryModel(library));
-        }
-        resolve(undefined);
-      });
-    });
+  static async findLibraryById(id: string): Promise<Library | null | undefined> {
+    return await LibraryModel.findOne({ id: id.toString() });
   }
-  static async findValueSetByUrl(url: string): Promise<ValueSet | undefined> {
-    return new Promise((resolve, reject) => {
-      ValueSetModel.findOne({ url: url.toString() }, (err: any, valueset: ValueSet) => {
-        if (err) {
-          return reject(err);
-        }
-        if (valueset) {
-          resolve(new ValueSetModel(valueset));
-        }
-        resolve(undefined);
-      });
-    });
+  static async findValueSetByUrl(url: string): Promise<ValueSet | null | undefined> {
+    return await ValueSetModel.findOne({ url: url.toString() });
   }
   static async processSubQuestionnaires(questionnaire: Questionnaire) {
     const extensions = questionnaire.extension || [];