#32 - Remove codex references in settings

- remove prefix from db env variables
medizininformatik-initiative · Aug 14, 2024 · 145ba84 · 145ba84
1 parent ec751b8
commit 145ba84
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/.github/integration-test/docker-compose.yml b/.github/integration-test/docker-compose.yml
@@ -18,10 +18,11 @@ services:
       QUERYRESULT_EXPIRY_MINUTES: 5
       ELASTIC_SEARCH_ENABLED: "false"
       # ---- db config
-      FEASIBILITY_DATABASE_HOST: "feasibility-gui-backend-db"
-      FEASIBILITY_DATABASE_PORT: 5432
-      FEASIBILITY_DATABASE_USER: "guidbuser"
-      FEASIBILITY_DATABASE_PASSWORD: "guidbpw"
+      DATABASE_HOST: "feasibility-gui-backend-db"
+      DATABASE_PORT: 5432
+      DATABASE_USER: "guidbuser"
+      DATABASE_PASSWORD: "guidbpw"
+      DATABASE_DBNAME: "feasibility_ui"
       # ---- auth
       KEYCLOAK_ENABLED: "true"
       KEYCLOAK_ALLOWED_ROLE: "FeasibilityUser"

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -19,10 +19,11 @@ services:
       ONTOLOGY_ORDER: ${FEASIBILITY_BACKEND_ONTOLOGY_ORDER:-"Diagnose, Prozedur, Person, Laboruntersuchung, Medikamentenverabreichung, Bioprobe, Einwilligung"}
       MAX_SAVED_QUERIES_PER_USER: ${FEASIBILITY_BACKEND_MAX_SAVED_QUERIES_PER_USER:-100}
       # ---- db config
-      FEASIBILITY_DATABASE_HOST: ${FEASIBILITY_BACKEND_DATASOURCE_HOST:-feasibility-gui-backend-db}
-      FEASIBILITY_DATABASE_PORT: ${FEASIBILITY_BACKEND_DATASOURCE_PORT:-5432}
-      FEASIBILITY_DATABASE_USER: ${FEASIBILITY_BACKEND_DATASOURCE_USERNAME:-guidbuser}
-      FEASIBILITY_DATABASE_PASSWORD: ${FEASIBILITY_BACKEND_DATASOURCE_PASSWORD:-guidbpw}
+      DATABASE_HOST: ${FEASIBILITY_BACKEND_DATABASE_HOST:-feasibility-gui-backend-db}
+      DATABASE_PORT: ${FEASIBILITY_BACKEND_DATABASE_PORT:-5432}
+      DATABASE_USER: ${FEASIBILITY_BACKEND_DATABASE_USERNAME:-guidbuser}
+      DATABASE_PASSWORD: ${FEASIBILITY_BACKEND_DATABASE_PASSWORD:-guidbpw}
+      DATABASE_DBNAME: ${FEASIBILITY_BACKEND_DATABASE_DBNAME:-feasibility_ui}
       # ---- ontology
       ONTOLOGY_FILES_FOLDER_UI: ${FEASIBILITY_BACKEND_ONTOLOGY_FILES_FOLDER:-/opt/mii-feasibility-backend/ontology}
       ONTOLOGY_DB_MIGRATION_FOLDER: ${FEASIBILITY_BACKEND_ONTOLOGY_DB_MIGRATION_FOLDER:-/opt/mii-feasibility-backend/ontology/migration}

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -4,9 +4,9 @@ spring:
   application:
     name: mii-feasibility-gui-backend
   datasource:
-    url: jdbc:postgresql://${FEASIBILITY_DATABASE_HOST:localhost}:${FEASIBILITY_DATABASE_PORT:5432}/${FEASIBILITY_DATABASE_DBNAME:feasibility_ui}
-    username: ${FEASIBILITY_DATABASE_USER:guidbuser}
-    password: ${FEASIBILITY_DATABASE_PASSWORD:guidbpw}
+    url: jdbc:postgresql://${DATABASE_HOST:localhost}:${DATABASE_PORT:5432}/${DATABASE_DBNAME:feasibility_ui}
+    username: ${DATABASE_USER:guidbuser}
+    password: ${DATABASE_PASSWORD:guidbpw}
     driverClassName: org.postgresql.Driver
   jpa:
     database-platform: org.hibernate.dialect.PostgreSQLDialect