Merge pull request #351 from it-at-m/226-verbesserung-nutzbarkeit-eai…

…-service

226 verbesserung nutzbarkeit eai service

stack/.env

@@ -27,4 +27,8 @@ WLS_BRIEFWAHL_SERVICE_KEYCLOAK_URL=http://kubernetes.docker.internal:8100/auth/r
 
 WLS_WAHLVORBEREITUNG_SERVICE_PROFILE=local,db-oracle,dummy.nobezirkid.check
 WLS_WAHLVORBEREITUNG_SERVICE_DB_URL=jdbc:oracle:thin:@//wls-db-oracle:1521/XEPDB1
-WLS_WAHLVORBEREITUNG_SERVICE_KEYCLOAK_URL=http://kubernetes.docker.internal:8100/auth/realms/${SSO_REALM}/protocol/openid-connect
+WLS_WAHLVORBEREITUNG_SERVICE_KEYCLOAK_URL=http://kubernetes.docker.internal:8100/auth/realms/${SSO_REALM}/protocol/openid-connect
+
+WLS_EAI_SERVICE_PROFILE=local,db-oracle,db-dummydata
+WLS_EAI_SERVICE_DB_URL=jdbc:oracle:thin:@//wls-db-oracle:1521/XEPDB1
+WLS_EAI_SERVICE_KEYCLOAK_URL=http://kubernetes.docker.internal:8100/auth/realms/${SSO_REALM}/protocol/openid-connect

stack/docker-compose.yml

@@ -78,6 +78,25 @@ services:
       - services
       - keycloak
 
+  wls-eai-service:
+    container_name: wls-eai-service
+    image: ghcr.io/it-at-m/wahllokalsystem-wls-eai-service:latest
+    depends_on:
+      - wls-db-oracle
+    env_file:
+      - .env
+    environment:
+      - SPRING_PROFILES_ACTIVE=${WLS_EAI_SERVICE_PROFILE}
+      - SPRING_DATASOURCE_URL=${WLS_EAI_SERVICE_DB_URL}
+      - SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK-SET-URI=${WLS_EAI_SERVICE_KEYCLOAK_URL}/certs
+      - SECURITY_OAUTH2_RESOURCE_USER-INFO-URI=${WLS_EAI_SERVICE_KEYCLOAK_URL}/userinfo
+      - SERVER_PORT=8080
+    ports:
+      - 8300:8080
+    networks:
+      - services
+      - keycloak
+
   ## Keycloak
   wls-keycloak:
     container_name: wls-keycloak

wls-eai-service/runLocal.bat

@@ -1 +1 @@
-mvn clean spring-boot:run -Dspring-boot.run.jvmArguments="-Dspring.profiles.active=local"
+mvn clean spring-boot:run -Dspring-boot.run.jvmArguments="-Dspring.profiles.active=local,db-dummydata"

wls-eai-service/runLocal.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-mvn clean spring-boot:run -Dspring-boot.run.jvmArguments="-Dspring.profiles.active=local"
+mvn clean spring-boot:run -Dspring-boot.run.jvmArguments="-Dspring.profiles.active=local,db-dummydata"

wls-eai-service/runLocalNoSecurity.bat

@@ -1 +1 @@
-mvn clean spring-boot:run -Dspring-boot.run.jvmArguments="-Dspring.profiles.active=local,no-security"
+mvn clean spring-boot:run -Dspring-boot.run.jvmArguments="-Dspring.profiles.active=local,no-security,db-dummydata"

wls-eai-service/runLocalNoSecurity.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-mvn clean spring-boot:run -Dspring-boot.run.jvmArguments="-Dspring.profiles.active=local,no-security"
+mvn clean spring-boot:run -Dspring-boot.run.jvmArguments="-Dspring.profiles.active=local,no-security,db-dummydata"

wls-eai-service/src/main/resources/application-local.yml

@@ -1,2 +1,2 @@
 server:
-  port: 39146
+  port: 39149

wls-eai-service/src/main/resources/application.yml

@@ -4,7 +4,7 @@ spring:
   profiles:
     group:
       local:
-        - db-oracle
+        - db-h2
   flyway:
     locations:
       - classpath:db/migrations/{vendor}

wls-eai-service/src/test/resources/httpRequests/http-client.env.json

@@ -4,7 +4,7 @@
     "SSO_URL": "http://kubernetes.docker.internal:8100"
   },
   "nonDocker": {
-    "WLS_EAI_SERVICE_URL": "http://localhost:39146",
+    "WLS_EAI_SERVICE_URL": "http://localhost:39149",
     "SSO_URL": "http://kubernetes.docker.internal:8100"
   }
 }