Merge branch 'staging' into fix/get-branch-error-on-push

Author: TurkerKoc

client/package.json

@@ -34,8 +34,8 @@
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "@analogjs/vite-plugin-angular": "^1.14.0",
-    "@analogjs/vitest-angular": "^1.14.0",
+    "@analogjs/vite-plugin-angular": "^1.14.1",
+    "@analogjs/vitest-angular": "^1.14.1",
     "@angular-devkit/build-angular": "^19.2.1",
     "@angular-eslint/builder": "^19.0.0",
     "@angular-eslint/eslint-plugin": "^19.0.0",
@@ -69,6 +69,6 @@
     "typescript": "5.8.2",
     "vite": "^6.0.0",
     "vite-tsconfig-paths": "^5.1.4",
-    "vitest": "^3.0.8"
+    "vitest": "3.0.9"
   }
-}
+}

client/vite.config.mts

@@ -8,6 +8,7 @@ import tsconfigPaths from "vite-tsconfig-paths";
 export default defineConfig(({ mode }) => ({
   plugins: [angular(), tsconfigPaths()],
   test: {
+    pool: 'forks',
     globals: true,
     setupFiles: ['src/test-setup.ts'],
     environment: 'jsdom',

client/yarn.lock

@@ -15,15 +15,15 @@
     "@jridgewell/gen-mapping" "^0.3.5"
     "@jridgewell/trace-mapping" "^0.3.24"
 
-"@analogjs/vite-plugin-angular@^1.14.0":
+"@analogjs/vite-plugin-angular@^1.14.1":
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/@analogjs/vite-plugin-angular/-/vite-plugin-angular-1.14.1.tgz#888c39a1a6ae21978b1a59ac10d9f37f922f27bf"
   integrity sha512-nCoRQpLu5t8DtBoN+lNbWAJ3p6X4TnKJZQqOh0ZmcADeHf07vEOq6HiGcEi461SedKawQVAu9SZmRTsNeDfz6A==
   dependencies:
     ts-morph "^21.0.0"
     vfile "^6.0.3"
 
-"@analogjs/vitest-angular@^1.14.0":
+"@analogjs/vitest-angular@^1.14.1":
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/@analogjs/vitest-angular/-/vitest-angular-1.14.1.tgz#35e966842ced1f6851f3f9b4fb0933112ac69d6b"
   integrity sha512-NriyAS81Ikqf936OoXNfrpdVqFY4Q5LsUFlHusaFwhtzU2Sl/AXBO35eoqbJlYCgGDDn92RGEHQm0nYLGGXGmg==
@@ -8620,7 +8620,7 @@ vite@6.2.0:
   optionalDependencies:
     fsevents "~2.3.3"
 
-vitest@^3.0.8:
+vitest@3.0.9:
   version "3.0.9"
   resolved "https://registry.yarnpkg.com/vitest/-/vitest-3.0.9.tgz#8cf607d27dcaa12b9f21111f001a4e3e92511ba5"
   integrity sha512-BbcFDqNyBlfSpATmTtXOAOj71RNKDDvjBM/uPfnxxVGrG+FSH2RQIwgeEngTaTkuU/h0ScFvf+tRcKfYXzBybQ==

server/application-server/src/main/java/de/tum/cit/aet/helios/branch/BranchRepository.java

@@ -6,7 +6,7 @@
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface BranchRepository extends JpaRepository<Branch, Long> {
+public interface BranchRepository extends JpaRepository<Branch, BranchId> {
   Optional<Branch> findByName(String name);
 
   Optional<Branch> findByNameAndRepositoryRepositoryId(String name, Long repositoryId);