Add results-service microservice with API gateway integration, implement Ergebnis repository and edit dialog, update BewerbViewModel for Ergebniserfassung, and enhance Turnier UI with result management features.

This commit is contained in:
2026-04-12 16:37:10 +02:00
parent eb06c85013
commit 9c520d1b71
14 changed files with 453 additions and 27 deletions
+76
View File
@@ -62,6 +62,7 @@ services:
MASTERDATA_SERVICE_URL: "http://masterdata-service:8086"
EVENTS_SERVICE_URL: "http://events-service:8085"
ZNS_IMPORT_SERVICE_URL: "http://zns-import-service:8095"
RESULTS_SERVICE_URL: "http://results-service:8088"
depends_on:
postgres:
@@ -390,6 +391,81 @@ services:
volumes:
- ./config/app/base-application.yaml:/workspace/config/application.yml:Z
# --- MICROSERVICE: Results Service ---
results-service:
image: "${DOCKER_REGISTRY:-git.mo-code.at/mo-code}/results-service:${DOCKER_TAG:-latest}"
build:
context: .
dockerfile: backend/services/results/results-service/Dockerfile
args:
GRADLE_VERSION: "${DOCKER_GRADLE_VERSION:-9.3.1}"
JAVA_VERSION: "${DOCKER_JAVA_VERSION:-25}"
VERSION: "${DOCKER_VERSION:-1.0.0-SNAPSHOT}"
BUILD_DATE: "${DOCKER_BUILD_DATE}"
labels:
- "org.opencontainers.image.created=${DOCKER_BUILD_DATE}"
container_name: "${PROJECT_NAME:-meldestelle}-results-service"
restart: unless-stopped
ports:
- "${RESULTS_PORT:-8088:8088}"
- "${RESULTS_DEBUG_PORT:-5010:5010}"
environment:
SPRING_PROFILES_ACTIVE: "${RESULTS_SPRING_PROFILES_ACTIVE:-docker}"
DEBUG: "${RESULTS_DEBUG:-true}"
SERVER_PORT: "${RESULTS_SERVER_PORT:-8088}"
# --- KEYCLOAK ---
SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: "${KC_ISSUER_URI:-http://localhost:8180/realms/meldestelle}"
SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: "${KC_JWK_SET_URI:-http://keycloak:8080/realms/meldestelle/protocol/openid-connect/certs}"
# --- CONSUL ---
SPRING_CLOUD_CONSUL_HOST: "${CONSUL_HOST:-consul}"
SPRING_CLOUD_CONSUL_PORT: "${CONSUL_HTTP_PORT:-8500}"
SPRING_CLOUD_CONSUL_DISCOVERY_SERVICE_NAME: "${RESULTS_SERVICE_NAME:-results-service}"
SPRING_CLOUD_CONSUL_DISCOVERY_PREFER_IP_ADDRESS: "${RESULTS_CONSUL_PREFER_IP:-true}"
# - DATENBANK VERBINDUNG -
SPRING_DATASOURCE_URL: "${POSTGRES_DB_URL:-jdbc:postgresql://postgres:5432/pg-meldestelle-db}"
SPRING_DATASOURCE_USERNAME: "${POSTGRES_USER:-pg-user}"
SPRING_DATASOURCE_PASSWORD: "${POSTGRES_PASSWORD:-pg-password}"
# --- VALKEY (formerly Redis) ---
SPRING_DATA_VALKEY_HOST: "${VALKEY_SERVER_HOSTNAME:-valkey}"
SPRING_DATA_VALKEY_PORT: "${VALKEY_SERVER_PORT:-6379}"
SPRING_DATA_VALKEY_PASSWORD: "${VALKEY_PASSWORD:-}"
SPRING_DATA_VALKEY_CONNECT_TIMEOUT: "${VALKEY_SERVER_CONNECT_TIMEOUT:-5s}"
# --- ZIPKIN ---
MANAGEMENT_ZIPKIN_TRACING_ENDPOINT: "${ZIPKIN_ENDPOINT:-http://zipkin:9411/api/v2/spans}"
MANAGEMENT_TRACING_SAMPLING_PROBABILITY: "${ZIPKIN_SAMPLING_PROBABILITY:-1.0}"
depends_on:
postgres:
condition: "service_healthy"
keycloak:
condition: "service_healthy"
consul:
condition: "service_healthy"
valkey:
condition: "service_healthy"
zipkin:
condition: "service_started"
healthcheck:
test: [ "CMD", "wget", "--spider", "-q", "http://localhost:8088/actuator/health/readiness" ]
interval: 15s
timeout: 5s
retries: 5
start_period: 40s
networks:
meldestelle-network:
aliases:
- "results-service"
profiles: [ "backend", "all" ]
volumes:
- ./config/app/base-application.yaml:/workspace/config/application.yml:Z
networks:
meldestelle-network:
driver: bridge