Merge pull request #1191 from dm3-org/develop

Release 1.7.0
dm3-org · Sep 30, 2024 · 98edfa9 · 98edfa9
2 parents bc71fd5 + a22fd95
commit 98edfa9
Show file tree

Hide file tree

Showing 155 changed files with 4,165 additions and 1,512 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -133,13 +133,15 @@ jobs:
                   rsync -avz -e 'ssh -i ./ssh-key' ./.env app@${{ vars.HOST_DOMAIN }}:/home/app/dm3
                   rsync -avz -e 'ssh -i ./ssh-key' ./dm3-*.tar app@${{ vars.HOST_DOMAIN }}:/home/app/dm3 
                   rsync -avz -e 'ssh -i ./ssh-key' ./nginx.conf app@${{ vars.HOST_DOMAIN }}:/home/app/dm3
-                  rsync -avz -e 'ssh -i ./ssh-key' ./docker/docker-compose.yml app@${{ vars.HOST_DOMAIN }}:/home/app/dm3
             - name: Stop docker on server
               run: |
                   ssh -i ./ssh-key app@${{ vars.HOST_DOMAIN }} "\
                   cd dm3 && docker compose down"
                   ssh -i ./ssh-key root@${{ vars.HOST_DOMAIN }} "\
                   systemctl restart docker.service"
+            - name: Send docker compose to server
+              run: |
+                  rsync -avz -e 'ssh -i ./ssh-key' ./docker/docker-compose.yml app@${{ vars.HOST_DOMAIN }}:/home/app/dm3
             - name: Load docker images
               run: |
                   ssh -i ./ssh-key app@${{ vars.HOST_DOMAIN }} "\

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -25,7 +25,6 @@ services:
             - db
             - dm3-storage
         environment:
-            REDIS_URL: redis://db:6379
             SIGNING_PUBLIC_KEY: ${SIGNING_PUBLIC_KEY}
             SIGNING_PRIVATE_KEY: ${SIGNING_PRIVATE_KEY}
             ENCRYPTION_PUBLIC_KEY: ${ENCRYPTION_PUBLIC_KEY}
@@ -36,12 +35,6 @@ services:
             LOG_LEVEL: 'debug'
             DATABASE_URL: ${DATABASE_URL}
 
-    db:
-        image: redis
-        restart: always
-        volumes:
-            - ${PERSISTENCE_DIRECTORY}/db/redis:/data
-
     dm3-storage:
         image: postgres:13
         restart: always

diff --git a/packages/backend/docker-compose.test.yml b/packages/backend/docker-compose.test.yml
@@ -2,12 +2,6 @@ version: '3.6'
 
 # The containers that compose the project
 services:
-    db:
-        image: redis
-        restart: always
-        container_name: redis-backend
-        ports:
-            - '6380:6379' # map to host port 6380
     postgres:
         image: postgres:13
         restart: always

diff --git a/packages/backend/docker-compose.yml b/packages/backend/docker-compose.yml
@@ -2,12 +2,6 @@ version: '3.6'
 
 # The containers that compose the project
 services:
-    db:
-        image: redis
-        restart: always
-        container_name: redis
-        ports:
-            - '6380:6379' # map to host port 6380
     dm3-storage:
         image: postgres:13
         restart: always

diff --git a/packages/backend/manual_data_migration/insertWithinDocker.sh b/packages/backend/manual_data_migration/insertWithinDocker.sh
diff --git a/packages/backend/manual_data_migration/notes.md b/packages/backend/manual_data_migration/notes.md
diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dm3-org/dm3-backend",
   "license": "BSD-2-Clause",
-  "version": "1.6.1",
+  "version": "1.7.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "dependencies": {
@@ -13,17 +13,15 @@
     "@dm3-org/dm3-lib-shared": "workspace:^",
     "@dm3-org/dm3-lib-storage": "workspace:^",
     "@dm3-org/dm3-lib-test-helper": "workspace:^",
-    "@prisma/client": "4.16.2",
+    "@prisma/client": "^5.19.1",
     "axios": "^0.27.2",
     "body-parser": "^1.20.1",
     "cors": "^2.8.5",
     "dotenv": "^16.0.1",
     "ethers": "5.7.2",
     "express": "^4.18.1",
     "prisma": "^5.10.1",
-    "redis": "^4.1.0",
     "web-push": "^3.6.7",
-    "winston": "^3.8.1",
     "yaml": "^2.1.3"
   },
   "scripts": {
@@ -33,7 +31,7 @@
     "start": "yarn prisma-init && node  ./dist/index.js",
     "start-inspect": "node --inspect=0.0.0.0:9229  ./dist/index.js",
     "test": "yarn run before:tests && DATABASE_URL='postgresql://prisma:prisma@localhost:5433/tests?schema=public' yarn jest --coverage --runInBand --transformIgnorePatterns 'node_modules/(?!(dm3-lib-\\w*)/)'",
-    "build": "yarn prisma generate && yarn tsc && cp ./config.yml ./dist/config.yml | true",
+    "build": "yarn prisma generate && yarn tsc | true",
     "build:schema": "sh ./schemas.sh",
     "createDeliveryServiceProfile": "node --no-warnings ./cli.js",
     "before:tests": "docker compose -f docker-compose.test.yml up -d && DATABASE_URL='postgresql://prisma:prisma@localhost:5433/tests?schema=public' yarn prisma-init"
@@ -45,14 +43,14 @@
     "@types/cors": "^2.8.17",
     "@types/express": "^4.17.13",
     "@types/node": "^20.3.1",
-    "@types/redis": "^4.0.11",
     "@types/supertest": "^2.0.12",
     "babel-cli": "^6.26.0",
     "babel-jest": "^29.2.2",
     "babel-preset-env": "^1.7.0",
     "jest": "^29.2.2",
     "jest-mock-extended": "2.0.4",
     "prettier": "^2.6.2",
+    "prisma": "^5.19.1",
     "superagent": "^8.0.3",
     "supertest": "^6.3.1",
     "ts-json-schema-generator": "^0.98.0",

diff --git a/packages/backend/src/config/getDeliveryServiceProperties.test.ts b/packages/backend/src/config/getDeliveryServiceProperties.test.ts