Merge branch 'develop' into feature/add-simple-mentor-logic

.github/PULL_REQUEST_TEMPLATE.md

@@ -5,6 +5,9 @@
 ### Description
 <!-- Provide a brief summary of the changes. -->
 
+### Testing Instructions
+<!-- Explain how to test the changes made in this PR. -->
+
 ### Screenshots (if applicable)
 <!-- Attach screenshots here. -->
 

.github/workflows/application-server-qa.yml

@@ -0,0 +1,28 @@
+name: Application-Server QA
+
+on:
+    pull_request:
+        paths:
+            - "server/application-server/**"
+            - "!server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/**"
+    push:
+        paths:
+            - "server/application-server/**"
+            - "!server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/**"
+        branches: [develop]
+
+jobs:
+    quality:
+        name: Code Quality Checks
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout repository
+              uses: actions/checkout@v4
+            - name: Set up Node.js
+              uses: actions/setup-node@v4
+              with:
+                  node-version: "22"
+            - name: Install dependencies
+              run: npm ci
+            - name: Run Prettier
+              run: npm run prettier:java:check

.github/workflows/generate-application-server-client.yml

@@ -37,6 +37,12 @@ jobs:
           distribution: 'temurin'
           java-version: '21'
 
+      - name: Set up directories
+        working-directory: server/application-server
+        run: |
+          mkdir -p ./keycloak-data
+          chmod -R 755 ./keycloak-data
+
       - name: Install dependencies
         run: npm install
 

.vscode/settings.json

@@ -1,18 +1,24 @@
 {
 	"java.compile.nullAnalysis.mode": "automatic",
 	"java.configuration.updateBuildConfiguration": "interactive",
+	"java.completion.importOrder": ["#"],
+	"[java]": {
+		"editor.defaultFormatter": "esbenp.prettier-vscode"
+	},
 	"tailwindCSS.experimental.classRegex": [
-		"cva\\(([^)]*)\\)", "[\"'`]([^\"'`]*).*?[\"'`]",
-		"cn\\(([^)]*)\\)", "[\"'`]([^\"'`]*).*?[\"'`]"
+		"cva\\(([^)]*)\\)",
+		"[\"'`]([^\"'`]*).*?[\"'`]",
+		"cn\\(([^)]*)\\)",
+		"[\"'`]([^\"'`]*).*?[\"'`]"
 	],
 	"editor.codeActionsOnSave": {
 		"source.fixAll": "explicit"
 	},
 	"[python]": {
-    "editor.defaultFormatter": "ms-python.autopep8"
-  },
-  "python.testing.pytestArgs": ["."],
-  "python.testing.pytestEnabled": true,
+		"editor.defaultFormatter": "ms-python.autopep8"
+	},
+	"python.testing.pytestArgs": ["."],
+	"python.testing.pytestEnabled": true,
 	"python.terminal.activateEnvironment": true,
 	"python.terminal.activateEnvInCurrentTerminal": true,
 	"python.defaultInterpreterPath": "${workspaceFolder}/.venv/bin/python"

compose.yaml

@@ -14,6 +14,12 @@ services:
       - postgres
     networks:
       - app-network
+    healthcheck:
+      test: "wget -qO- http://localhost:8080/actuator/health || exit 1"
+      interval: 30s
+      timeout: 10s
+      retries: 5
+      start_period: 30s
 
   postgres:
     image: 'postgres:16'
@@ -28,7 +34,12 @@ services:
         aliases:
           - postgres
     volumes:
-      - 'postgresql-data:/var/lib/postgresql/data'
+      - postgresql-data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
 
 networks:
   app-network: