Remove outdated BillingController implementation, resolve conflicting bean definitions across modules, and retain the updated BillingController for consistency with frontend API logic.

dc-backend.yaml

@@ -12,7 +12,7 @@ services:
       context: .
       dockerfile: backend/infrastructure/gateway/Dockerfile
       args:
-        GRADLE_VERSION: "${DOCKER_GRADLE_VERSION:-9.3.1}"
+        GRADLE_VERSION: "${DOCKER_GRADLE_VERSION:-9.4.1}"
         JAVA_VERSION: "${DOCKER_JAVA_VERSION:-25}"
         VERSION: "${DOCKER_VERSION:-1.0.0-SNAPSHOT}"
         BUILD_DATE: "${DOCKER_BUILD_DATE}"
@@ -29,7 +29,7 @@ services:
       DEBUG: "${GATEWAY_DEBUG:-true}"
 
       # --- KEYCLOAK ---
-      SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: "${KC_ISSUER_URI:-http://localhost:8180/realms/meldestelle}"
+      SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: "${KC_ISSUER_URI:-http://keycloak:8080/realms/meldestelle}"
       SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: "${KC_JWK_SET_URI:-http://keycloak:8080/realms/meldestelle/protocol/openid-connect/certs}"
 
       # --- CONSUL ---
@@ -75,7 +75,7 @@ services:
       valkey:
         condition: "service_healthy"
       zipkin:
-        condition: "service_started"
+        condition: "service_healthy"
 
     healthcheck:
       test: [ "CMD", "wget", "--spider", "-q", "http://localhost:8081/actuator/health/readiness" ]
@@ -99,7 +99,7 @@ services:
       context: .
       dockerfile: backend/services/ping/Dockerfile
       args:
-        GRADLE_VERSION: "${DOCKER_GRADLE_VERSION:-9.3.1}"
+        GRADLE_VERSION: "${DOCKER_GRADLE_VERSION:-9.4.1}"
         JAVA_VERSION: "${DOCKER_JAVA_VERSION:-25}"
         VERSION: "${DOCKER_VERSION:-1.0.0-SNAPSHOT}"
         BUILD_DATE: "${DOCKER_BUILD_DATE}"
@@ -116,7 +116,7 @@ services:
       SERVER_PORT: "${PING_SERVER_PORT:-8082}"
 
       # --- KEYCLOAK ---
-      SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: "${KC_ISSUER_URI:-http://localhost:8180/realms/meldestelle}"
+      SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: "${KC_ISSUER_URI:-http://keycloak:8080/realms/meldestelle}"
       SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: "${KC_JWK_SET_URI:-http://keycloak:8080/realms/meldestelle/protocol/openid-connect/certs}"
 
       # --- CONSUL ---
@@ -150,7 +150,7 @@ services:
       valkey:
         condition: "service_healthy"
       zipkin:
-        condition: "service_started"
+        condition: "service_healthy"
 
     healthcheck:
       test: [ "CMD", "wget", "--spider", "-q", "http://localhost:8082/actuator/health/readiness" ]
@@ -174,7 +174,7 @@ services:
       context: .
       dockerfile: backend/services/masterdata/Dockerfile
       args:
-        GRADLE_VERSION: "${DOCKER_GRADLE_VERSION:-9.3.1}"
+        GRADLE_VERSION: "${DOCKER_GRADLE_VERSION:-9.4.1}"
         JAVA_VERSION: "${DOCKER_JAVA_VERSION:-25}"
         VERSION: "${DOCKER_VERSION:-1.0.0-SNAPSHOT}"
         BUILD_DATE: "${DOCKER_BUILD_DATE}"
@@ -191,7 +191,7 @@ services:
       SERVER_PORT: "${MASTERDATA_SERVER_PORT:-8086}"
 
       # --- KEYCLOAK ---
-      SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: "${KC_ISSUER_URI:-http://localhost:8180/realms/meldestelle}"
+      SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: "${KC_ISSUER_URI:-http://keycloak:8080/realms/meldestelle}"
       SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: "${KC_JWK_SET_URI:-http://keycloak:8080/realms/meldestelle/protocol/openid-connect/certs}"
 
       # --- CONSUL ---
@@ -225,7 +225,7 @@ services:
       valkey:
         condition: "service_healthy"
       zipkin:
-        condition: "service_started"
+        condition: "service_healthy"
 
     healthcheck:
       test: [ "CMD", "wget", "--spider", "-q", "http://localhost:8086/actuator/health/readiness" ]
@@ -249,7 +249,7 @@ services:
       context: .
       dockerfile: backend/services/events/Dockerfile
       args:
-        GRADLE_VERSION: "${DOCKER_GRADLE_VERSION:-9.3.1}"
+        GRADLE_VERSION: "${DOCKER_GRADLE_VERSION:-9.4.1}"
         JAVA_VERSION: "${DOCKER_JAVA_VERSION:-25}"
         VERSION: "${DOCKER_VERSION:-1.0.0-SNAPSHOT}"
         BUILD_DATE: "${DOCKER_BUILD_DATE}"
@@ -266,7 +266,7 @@ services:
       SERVER_PORT: "${EVENTS_SERVER_PORT:-8085}"
 
       # --- KEYCLOAK ---
-      SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: "${KC_ISSUER_URI:-http://localhost:8180/realms/meldestelle}"
+      SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: "${KC_ISSUER_URI:-http://keycloak:8080/realms/meldestelle}"
       SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: "${KC_JWK_SET_URI:-http://keycloak:8080/realms/meldestelle/protocol/openid-connect/certs}"
 
       # --- CONSUL ---
@@ -300,7 +300,7 @@ services:
       valkey:
         condition: "service_healthy"
       zipkin:
-        condition: "service_started"
+        condition: "service_healthy"
 
     healthcheck:
       test: [ "CMD", "wget", "--spider", "-q", "http://localhost:8085/actuator/health/readiness" ]
@@ -324,7 +324,7 @@ services:
       context: .
       dockerfile: backend/services/zns-import/Dockerfile
       args:
-        GRADLE_VERSION: "${DOCKER_GRADLE_VERSION:-9.3.1}"
+        GRADLE_VERSION: "${DOCKER_GRADLE_VERSION:-9.4.1}"
         JAVA_VERSION: "${DOCKER_JAVA_VERSION:-25}"
         VERSION: "${DOCKER_VERSION:-1.0.0-SNAPSHOT}"
         BUILD_DATE: "${DOCKER_BUILD_DATE}"
@@ -341,7 +341,7 @@ services:
       SERVER_PORT: "${ZNS_IMPORT_SERVER_PORT:-8095}"
 
       # --- KEYCLOAK ---
-      SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: "${KC_ISSUER_URI:-http://localhost:8180/realms/meldestelle}"
+      SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: "${KC_ISSUER_URI:-http://keycloak:8080/realms/meldestelle}"
       SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: "${KC_JWK_SET_URI:-http://keycloak:8080/realms/meldestelle/protocol/openid-connect/certs}"
 
       # --- CONSUL ---
@@ -375,7 +375,7 @@ services:
       valkey:
         condition: "service_healthy"
       zipkin:
-        condition: "service_started"
+        condition: "service_healthy"
 
     healthcheck:
       test: [ "CMD", "wget", "--spider", "-q", "http://localhost:8095/actuator/health/readiness" ]
@@ -399,7 +399,7 @@ services:
       context: .
       dockerfile: backend/services/results/results-service/Dockerfile
       args:
-        GRADLE_VERSION: "${DOCKER_GRADLE_VERSION:-9.3.1}"
+        GRADLE_VERSION: "${DOCKER_GRADLE_VERSION:-9.4.1}"
         JAVA_VERSION: "${DOCKER_JAVA_VERSION:-25}"
         VERSION: "${DOCKER_VERSION:-1.0.0-SNAPSHOT}"
         BUILD_DATE: "${DOCKER_BUILD_DATE}"
@@ -416,7 +416,7 @@ services:
       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_ISSUER_URI: "${KC_ISSUER_URI:-http://keycloak:8080/realms/meldestelle}"
       SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: "${KC_JWK_SET_URI:-http://keycloak:8080/realms/meldestelle/protocol/openid-connect/certs}"
 
       # --- CONSUL ---
@@ -450,7 +450,7 @@ services:
       valkey:
         condition: "service_healthy"
       zipkin:
-        condition: "service_started"
+        condition: "service_healthy"
 
     healthcheck:
       test: [ "CMD", "wget", "--spider", "-q", "http://localhost:8088/actuator/health/readiness" ]
@@ -474,7 +474,7 @@ services:
       context: .
       dockerfile: backend/services/billing/billing-service/Dockerfile
       args:
-        GRADLE_VERSION: "${DOCKER_GRADLE_VERSION:-9.3.1}"
+        GRADLE_VERSION: "${DOCKER_GRADLE_VERSION:-9.4.1}"
         JAVA_VERSION: "${DOCKER_JAVA_VERSION:-25}"
         VERSION: "${DOCKER_VERSION:-1.0.0-SNAPSHOT}"
         BUILD_DATE: "${DOCKER_BUILD_DATE}"
@@ -491,7 +491,7 @@ services:
       SERVER_PORT: "${BILLING_SERVER_PORT:-8087}"
 
       # --- KEYCLOAK ---
-      SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: "${KC_ISSUER_URI:-http://localhost:8180/realms/meldestelle}"
+      SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: "${KC_ISSUER_URI:-http://keycloak:8080/realms/meldestelle}"
       SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: "${KC_JWK_SET_URI:-http://keycloak:8080/realms/meldestelle/protocol/openid-connect/certs}"
 
       # --- CONSUL ---
@@ -522,7 +522,7 @@ services:
       valkey:
         condition: "service_healthy"
       zipkin:
-        condition: "service_started"
+        condition: "service_healthy"
 
     healthcheck:
       test: [ "CMD", "wget", "--spider", "-q", "http://localhost:8087/actuator/health/readiness" ]
@@ -539,6 +539,79 @@ services:
     volumes:
       - ./config/app/base-application.yaml:/workspace/config/application.yml:Z
 
+  # --- MICROSERVICE: Scheduling Service ---
+#  scheduling-service:
+#    image: "${DOCKER_REGISTRY:-git.mo-code.at/mo-code}/scheduling-service:${DOCKER_TAG:-latest}"
+#    build:
+#      context: .
+#      dockerfile: backend/services/scheduling/scheduling-service/Dockerfile
+#      args:
+#        GRADLE_VERSION: "${DOCKER_GRADLE_VERSION:-9.4.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}-scheduling-service"
+#    restart: unless-stopped
+#    ports:
+#      - "${SCHEDULING_PORT:-8084:8084}"
+#      - "${SCHEDULING_DEBUG_PORT:-5013:5013}"
+#    environment:
+#      SPRING_PROFILES_ACTIVE: "${SCHEDULING_SPRING_PROFILES_ACTIVE:-docker}"
+#      DEBUG: "${SCHEDULING_DEBUG:-true}"
+#      SERVER_PORT: "${SCHEDULING_SERVER_PORT:-8084}"
+#      SPRING_APPLICATION_NAME: "${SCHEDULING_SERVICE_NAME:-scheduling-service}"
+#
+#      # --- KEYCLOAK ---
+#      SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: "${KC_ISSUER_URI:-http://keycloak:8080/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: "${SCHEDULING_SERVICE_NAME:-scheduling-service}"
+#      SPRING_CLOUD_CONSUL_DISCOVERY_PREFER_IP_ADDRESS: "${SCHEDULING_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 ---
+#      SPRING_DATA_VALKEY_HOST: "${VALKEY_SERVER_HOSTNAME:-valkey}"
+#      SPRING_DATA_VALKEY_PORT: "${VALKEY_SERVER_PORT:-6379}"
+#
+#      # --- ZIPKIN ---
+#      MANAGEMENT_ZIPKIN_TRACING_ENDPOINT: "${ZIPKIN_ENDPOINT:-http://zipkin:9411/api/v2/spans}"
+#
+#    depends_on:
+#      postgres:
+#        condition: "service_healthy"
+#      keycloak:
+#        condition: "service_healthy"
+#      consul:
+#        condition: "service_healthy"
+#      valkey:
+#        condition: "service_healthy"
+#      zipkin:
+#        condition: "service_healthy"
+#
+#    healthcheck:
+#      test: [ "CMD", "curl", "-f", "http://localhost:8084/actuator/health" ]
+#      interval: 15s
+#      timeout: 5s
+#      retries: 5
+#      start_period: 40s
+#
+#    networks:
+#      meldestelle-network:
+#        aliases:
+#          - "scheduling-service"
+#    profiles: [ "backend", "all" ]
+#    volumes:
+#      - ./config/app/base-application.yaml:/workspace/config/application.yml:Z
+
   # --- MICROSERVICE: Series Service ---
   series-service:
     image: "${DOCKER_REGISTRY:-git.mo-code.at/mo-code}/series-service:${DOCKER_TAG:-latest}"
@@ -546,7 +619,7 @@ services:
       context: .
       dockerfile: backend/services/series/series-service/Dockerfile
       args:
-        GRADLE_VERSION: "${DOCKER_GRADLE_VERSION:-9.3.1}"
+        GRADLE_VERSION: "${DOCKER_GRADLE_VERSION:-9.4.1}"
         JAVA_VERSION: "${DOCKER_JAVA_VERSION:-25}"
         VERSION: "${DOCKER_VERSION:-1.0.0-SNAPSHOT}"
         BUILD_DATE: "${DOCKER_BUILD_DATE}"
@@ -561,9 +634,10 @@ services:
       SPRING_PROFILES_ACTIVE: "${SERIES_SPRING_PROFILES_ACTIVE:-docker}"
       DEBUG: "${SERIES_DEBUG:-true}"
       SERVER_PORT: "${SERIES_SERVER_PORT:-8089}"
+      SPRING_APPLICATION_NAME: "series-service"
 
       # --- KEYCLOAK ---
-      SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: "${KC_ISSUER_URI:-http://localhost:8180/realms/meldestelle}"
+      SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: "${KC_ISSUER_URI:-http://keycloak:8080/realms/meldestelle}"
       SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: "${KC_JWK_SET_URI:-http://keycloak:8080/realms/meldestelle/protocol/openid-connect/certs}"
 
       # --- DATASOURCE ---
@@ -580,7 +654,13 @@ services:
       postgres:
         condition: service_healthy
       consul:
-        condition: service_started
+        condition: service_healthy
+      keycloak:
+        condition: service_healthy
+      valkey:
+        condition: service_healthy
+      zipkin:
+        condition: service_healthy
     networks:
       meldestelle-network:
         aliases: