REMS-366: Fixing caching tests

.eslintrc

@@ -5,14 +5,16 @@
     "plugin:@typescript-eslint/recommended"
   ],
   "plugins": [
-    "@typescript-eslint"
+    "@typescript-eslint",
+    "prettier"
   ],
   "parser": "@typescript-eslint/parser",
   "parserOptions": {
     "ecmaVersion": 2018,
     "sourceType": "module"
   },
   "rules": {
+    "prettier/prettier": ["error"],
     "semi": ["off"],
     "@typescript-eslint/semi": ["error", "always"],
     "quotes": ["error", "single", { "avoidEscape": true }],

.github/workflows/ci-workflow.yml

@@ -34,21 +34,3 @@ jobs:
     - run: npm test
       env:
         CI: true
-  test_mac_os:
-    name: Test on node ${{ matrix.node-version }} and ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [macos-latest]
-        node-version: [16]
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
-    - run: npm install
-    - run: npm test
-      env:
-        CI: true

docker-compose-dev.yml

@@ -102,7 +102,7 @@ services:
       - "8091:8091"
     environment:
       VSAC_API_KEY: ${VSAC_API_KEY}
-      MONGO_HOSTNAME: mongodb://rems-user:pass@pims_remsadmin_mongo:27017
+      MONGO_URL: mongodb://rems-user:pass@pims_remsadmin_mongo:27017
     volumes:
       - rems_dev_rems-sync:/REMS:nocopy #  nocopy is important
       - rems_dev_rems-nodeModules:/REMS/node_modules
@@ -118,7 +118,7 @@ services:
       - "5051:5051"
     environment:
       REMS_ADMIN_BASE: http://rems-administrator:8090
-      MONGO_HOSTNAME: mongodb://pims_remsadmin_mongo:27017/pims
+      MONGO_URL: mongodb://pims_remsadmin_mongo:27017/pims
     volumes:
       - rems_dev_pims-sync:/home/node/app/pims:nocopy
       - rems_dev_pims-nodeModules:/home/node/app/pims/node_modules

docker-compose-m1.yml

@@ -56,7 +56,7 @@ services:
       - "9015:9015" # Bind port 3000 of host to 3000 of container
     environment:
       VSAC_API_KEY: ${VSAC_API_KEY}
-      MONGO_HOSTNAME: mongodb://rems-user:pass@pims_remsadmin_mongo:27017
+      MONGO_URL: mongodb://rems-user:pass@pims_remsadmin_mongo:27017
 
   pims_remsadmin_mongo:
     image: mongo

docker-compose.yml

@@ -57,7 +57,7 @@ services:
       - "9015:9015" # Bind port 3000 of host to 3000 of container
     environment:
       VSAC_API_KEY: ${VSAC_API_KEY}
-      MONGO_HOSTNAME: mongodb://rems-user:pass@pims_remsadmin_mongo:27017
+      MONGO_URL: mongodb://rems-user:pass@pims_remsadmin_mongo:27017
 
   pims_remsadmin_mongo:
     image: mongo

env.json

@@ -1,7 +1,7 @@
 {
-  "MONGO_HOSTNAME": {
+  "MONGO_URL": {
     "type": "string",
-    "default": "mongodb://rems-user:pass@127.0.0.1:27017",
+    "default": "mongodb://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": "jest --maxWorkers=4 --coverage --detectOpenHandles",
+    "test": "mocha --timeout 20000 -r ts-node/register test/*.test.ts",
     "lint": "eslint \"**/*.{js,ts}\"",
     "lint:fix": "eslint \"**/*.{js,ts}\" --quiet --fix",
     "prettier": "prettier --check \"**/*.{js,ts}\"",
@@ -24,37 +24,9 @@
     "type": "git",
     "url": "git+ssh://git@bitbucket.org/asymmetrik/carejourney-cds.git"
   },
-  "jest": {
-    "moduleNameMapper": {
-      "axios": "axios/dist/node/axios.cjs"
-    },
-    "preset": "@shelf/jest-mongodb",
-    "testEnvironment": "node",
-    "transform": {
-      "^.+\\.ts?$": "ts-jest"
-    },
-    "transformIgnorePatterns": [
-      "<rootDir>/node_modules/"
-    ],
-    "testPathIgnorePatterns": [
-      "<rootDir>/src/config/env/test.js"
-    ],
-    "verbose": true,
-    "collectCoverage": true,
-    "coverageReporters": [
-      "text",
-      "lcov",
-      "json"
-    ],
-    "coveragePathIgnorePatterns": [
-      "<rootDir>/node_modules",
-      "<rootDir>/src/profiles"
-    ]
-  },
   "dependencies": {
     "@projecttacoma/node-fhir-server-core": "^2.2.8",
     "@types/fhir": "^0.0.35",
-    "@types/mongoose": "^5.11.97",
     "axios": "^1.2.1",
     "body-parser": "^1.19.0",
     "conventional-changelog-cli": "^2.0.34",
@@ -65,7 +37,7 @@
     "moment": "^2.24.0",
     "moment-timezone": "^0.5.40",
     "mongodb": "^4.12.1",
-    "mongoose": "^6.9.2",
+    "mongoose": "^7.0.3",
     "morgan": "^1.9.1",
     "uid": "^2.0.1",
     "uuid": "^9.0.0",
@@ -74,26 +46,32 @@
     "winston-daily-rotate-file": "^4.2.1"
   },
   "devDependencies": {
-    "@shelf/jest-mongodb": "^4.1.6",
+    "@types/chai": "^4.3.4",
     "@types/cors": "^2.8.12",
     "@types/express": "^4.17.14",
-    "@types/jest": "^27.5.2",
     "@types/lodash": "^4.14.188",
+    "@types/mocha": "^10.0.1",
+    "@types/mongodb-memory-server": "2.3.0",
+    "@types/mongoose": "^5.11.97",
     "@types/morgan": "^1.9.3",
     "@types/node": "^18.11.9",
     "@types/nodemon": "^1.19.2",
+    "@types/sinon": "10.0.13",
     "@types/uuid": "^9.0.0",
     "@typescript-eslint/eslint-plugin": "^5.45.0",
     "@typescript-eslint/parser": "^5.45.0",
     "axios-mock-adapter": "^1.21.2",
+    "chai": "^4.3.7",
     "eslint": "^8.28.0",
-    "eslint-config-prettier": "^6.10.1",
-    "jest": "^27.4.5",
-    "jest-extended": "^1.2.0",
+    "eslint-config-prettier": "^6.15.0",
+    "eslint-plugin-prettier": "^4.2.1",
     "json-diff": "^0.9.0",
+    "mocha": "^10.2.0",
+    "mongodb-memory-server": "^8.12.1",
     "nock": "^13.2.9",
     "nodemon": "^2.0.20",
     "prettier": "^2.0.5",
+    "sinon": "^15.0.3",
     "ts-jest": "^27.1.2",
     "ts-node": "^10.9.1",
     "ts-node-dev": "^2.0.0",

src/config.ts

@@ -28,7 +28,7 @@ export default {
   database: {
     selected: 'mongo',
     mongoConfig: {
-      location: env.MONGO_HOSTNAME,
+      location: env.MONGO_URL,
       db_name: env.MONGO_DB_NAME,
       options: {
         //auto_reconnect: true,