Merge pull request #13 from Marvell-Consulting/SW-138-column-labelling

SW-138 Update backend for sources and dimensions

.eslintrc

@@ -24,7 +24,7 @@
     "no-process-env": 0,
     "no-inline-comments": 0,
     "line-comment-position": 0,
-    "no-warning-comments": 1
+    "no-warning-comments": 0
   },
   "globals": {
     "NodeJS": true

docker-compose.yml

@@ -7,8 +7,8 @@ services:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
       POSTGRES_DB: statswales-backend
-    volumes:
-      - .docker/postgres/data:/var/lib/postgresql/data
+    #    volumes:
+#      - .docker/postgres/data:/var/lib/postgresql/data
 
   db-test:
     image: postgres:latest

jest.config.ts

@@ -8,7 +8,15 @@ const config: Config = {
   coverageDirectory: './coverage',
   collectCoverage: true,
   coverageReporters: ['cobertura', 'lcov', 'html', 'text'],
-  coveragePathIgnorePatterns: ['/node_modules/', '/test/', '/src/controllers/datalake.ts'],
+  coveragePathIgnorePatterns: [
+    '/node_modules',
+    '/test/',
+    '/src/migrations',
+    '/src/controllers/auth.ts',
+    '/src/controllers/datalake.ts',
+    '/src/controllers/blob-storage.ts',
+    'src/middleware/passport-auth.ts'
+  ],
   setupFiles: ['<rootDir>/test/helpers/jest-setup.ts'],
   maxWorkers: 1 // TODO: temporary solution to test parallelism issue
 };

package.json

@@ -12,11 +12,13 @@
     "lint:ci": "eslint . --ext .ts",
     "lint:fix": "eslint . --ext .ts --fix",
     "build": "npm-run-all clean tsc copy-assets",
-    "pretest": "docker compose up -d db-test",
+    "pretest-docker": "docker compose up -d db-test",
+    "pretest-podman": "podman compose up -d db-test",
     "test": "NODE_ENV=test jest --coverage",
     "test:ci": "NODE_ENV=test jest --ci --coverage --config=jest.config.ts",
     "check": "npm-run-all prettier:fix lint:fix test build",
     "predev": "docker compose up -d db-dev redis",
+    "pretest": "docker compose up -d db-test",
     "dev:check": "npm-run-all check dev",
     "dev": "NODE_ENV=dev nodemon --watch src -e ts,ejs --exec npm run start",
     "start": "npm run build && node dist/server.js | pino-colada",
@@ -75,6 +77,7 @@
     "@azure/storage-file-datalake": "^12.16.0",
     "connect-redis": "^7.1.1",
     "cookie-parser": "^1.4.6",
+    "body-parser": "^1.20.2",
     "csv": "^6.3.8",
     "dotenv": "^16.4.4",
     "express": ">=4.19.2",