Merge pull request #60 from rubenvitt/develop

dev-release

.github/workflows/test-and-cover.yml

@@ -5,8 +5,13 @@ on:
     branches:
       - main
       - release
-  pull_request:
+  pull_requests:
     branches:
+      - develop
+  merge_group:
+    types:
+      - checks_requested
+
 
 jobs:
   frontend-build:

.husky/_/post-checkout

@@ -0,0 +1,3 @@
+#!/bin/sh
+command -v git-lfs >/dev/null 2>&1 || { echo >&2 "\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting the 'post-checkout' file in the hooks directory (set by 'core.hookspath'; usually '.git/hooks').\n"; exit 2; }
+git lfs post-checkout "$@"

.husky/_/post-commit

@@ -0,0 +1,3 @@
+#!/bin/sh
+command -v git-lfs >/dev/null 2>&1 || { echo >&2 "\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting the 'post-commit' file in the hooks directory (set by 'core.hookspath'; usually '.git/hooks').\n"; exit 2; }
+git lfs post-commit "$@"

.husky/_/post-merge

@@ -0,0 +1,3 @@
+#!/bin/sh
+command -v git-lfs >/dev/null 2>&1 || { echo >&2 "\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting the 'post-merge' file in the hooks directory (set by 'core.hookspath'; usually '.git/hooks').\n"; exit 2; }
+git lfs post-merge "$@"

.husky/_/pre-push

@@ -0,0 +1,3 @@
+#!/bin/sh
+command -v git-lfs >/dev/null 2>&1 || { echo >&2 "\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting the 'pre-push' file in the hooks directory (set by 'core.hookspath'; usually '.git/hooks').\n"; exit 2; }
+git lfs pre-push "$@"

.tool-versions

@@ -0,0 +1,2 @@
+nodejs 23.0.0
+rust 1.82.0

backend/backend.iml

@@ -5,10 +5,7 @@
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/coverage" />
-      <excludeFolder url="file://$MODULE_DIR$/dist" />
-    </content>
+    <content url="file://$MODULE_DIR$" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>

backend/fahrzeuge.json

@@ -0,0 +1,52 @@
+[
+  {
+    "funkrufname": "40-10-1",
+    "fahrzeugTyp": "KdoW",
+    "kapazitaet": 1
+  },
+  {
+    "funkrufname": "40-12-1",
+    "fahrzeugTyp": "FüKW",
+    "kapazitaet": 4
+  },
+  {
+    "funkrufname": "40-15-1",
+    "fahrzeugTyp": "AufklSt Luft",
+    "kapazitaet": 2
+  },
+  {
+    "funkrufname": "40-83-1",
+    "fahrzeugTyp": "RTW",
+    "kapazitaet": 2
+  },
+  {
+    "funkrufname": "40-83-2",
+    "fahrzeugTyp": "RTW",
+    "kapazitaet": 2
+  },
+  {
+    "funkrufname": "40-83-3",
+    "fahrzeugTyp": "RTW",
+    "kapazitaet": 2
+  },
+  {
+    "funkrufname": "40-83-4",
+    "fahrzeugTyp": "RTW",
+    "kapazitaet": 2
+  },
+  {
+    "funkrufname": "40-83-5",
+    "fahrzeugTyp": "RTW",
+    "kapazitaet": 2
+  },
+  {
+    "funkrufname": "40-83-6",
+    "fahrzeugTyp": "RTW",
+    "kapazitaet": 2
+  },
+  {
+    "funkrufname": "40-66-1",
+    "fahrzeugTyp": "Wechsellader",
+    "kapazitaet": 0
+  }
+]

backend/package.json

@@ -24,47 +24,45 @@
     "test:e2e": "jest --config ./test/jest-e2e.json"
   },
   "dependencies": {
-    "@nestjs/common": "^10.4.4",
-    "@nestjs/config": "^3.2.3",
-    "@nestjs/core": "^10.4.4",
+    "@nestjs/common": "^10.4.6",
+    "@nestjs/config": "^3.3.0",
+    "@nestjs/core": "^10.4.6",
     "@nestjs/mapped-types": "^2.0.5",
-    "@nestjs/platform-express": "^10.4.4",
+    "@nestjs/platform-express": "^10.4.6",
     "@nestjs/schedule": "^4.1.1",
     "@nestjs/swagger": "^7.4.2",
     "@paralleldrive/cuid2": "^2.2.2",
-    "@pdfme/common": "^5.1.1",
-    "@pdfme/generator": "^5.1.1",
-    "@pdfme/schemas": "^5.1.1",
-    "@prisma/client": "5.20.0",
-    "class-transformer": "^0.5.1",
+    "@pdfme/common": "^5.1.5",
+    "@pdfme/generator": "^5.1.5",
+    "@prisma/client": "5.21.1",
+    "ajv": "^8.17.1",
     "class-validator": "^0.14.1",
     "date-fns": "^4.1.0",
     "joi": "^17.13.3",
-    "pg": "^8.13.0",
-    "prisma": "^5.20.0",
+    "pg": "^8.13.1",
+    "prisma": "^5.21.1",
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.1"
   },
   "devDependencies": {
     "@jest/types": "^29.6.3",
     "@nestjs/cli": "^10.4.5",
-    "@nestjs/schematics": "^10.1.4",
-    "@nestjs/testing": "^10.4.4",
+    "@nestjs/schematics": "^10.2.2",
+    "@nestjs/testing": "^10.4.6",
     "@types/express": "^5.0.0",
-    "@types/jest": "^29.5.13",
-    "@types/node": "^22.7.5",
+    "@types/jest": "^29.5.14",
+    "@types/node": "^22.7.9",
     "@types/supertest": "^6.0.2",
-    "@typescript-eslint/eslint-plugin": "^8.8.1",
-    "@typescript-eslint/parser": "^8.8.1",
+    "@typescript-eslint/eslint-plugin": "^8.11.0",
+    "@typescript-eslint/parser": "^8.11.0",
     "esbuild": "^0.24.0",
-    "eslint": "^9.12.0",
+    "eslint": "^9.13.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.2.1",
     "jest": "^29.7.0",
     "nexe": "4.0.0-rc.6",
     "pkg": "^5.8.1",
     "prettier": "^3.3.3",
-    "source-map-support": "^0.5.21",
     "supertest": "^7.0.0",
     "ts-jest": "^29.2.5",
     "ts-loader": "^9.5.1",
@@ -93,5 +91,5 @@
     "coverageDirectory": "../coverage",
     "testEnvironment": "node"
   },
-  "packageManager": "[email protected].1+sha512.e5a7e52a4183a02d5931057f7a0dbff9d5e9ce3161e33fa68ae392125b79282a8a8a470a51dfc8a0ed86221442eb2fb57019b0990ed24fab519bf0e1bc5ccfc4"
+  "packageManager": "[email protected].2"
 }