From b5b29291043c4d8350260187988efe7c30fdea3d Mon Sep 17 00:00:00 2001
From: Patrick Arminio <patrick.arminio@gmail.com>
Date: Tue, 30 Jul 2024 19:46:41 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20Reuse=20database=20url=20from=20?=
 =?UTF-8?q?config=20in=20alembic=20setup=20(#1229)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/app/alembic/env.py | 8 ++------
 backend/app/core/config.py | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/backend/app/alembic/env.py b/backend/app/alembic/env.py
index 926f119..7f29c04 100755
--- a/backend/app/alembic/env.py
+++ b/backend/app/alembic/env.py
@@ -19,6 +19,7 @@ fileConfig(config.config_file_name)
 # target_metadata = None
 
 from app.models import SQLModel  # noqa
+from app.core.config import settings # noqa
 
 target_metadata = SQLModel.metadata
 
@@ -29,12 +30,7 @@ target_metadata = SQLModel.metadata
 
 
 def get_url():
-    user = os.getenv("POSTGRES_USER", "postgres")
-    password = os.getenv("POSTGRES_PASSWORD", "")
-    server = os.getenv("POSTGRES_SERVER", "db")
-    port = os.getenv("POSTGRES_PORT", "5432")
-    db = os.getenv("POSTGRES_DB", "app")
-    return f"postgresql+psycopg://{user}:{password}@{server}:{port}/{db}"
+    return str(settings.SQLALCHEMY_DATABASE_URI)
 
 
 def run_migrations_offline():
diff --git a/backend/app/core/config.py b/backend/app/core/config.py
index 41de80f..68cf702 100644
--- a/backend/app/core/config.py
+++ b/backend/app/core/config.py
@@ -51,7 +51,7 @@ class Settings(BaseSettings):
     POSTGRES_SERVER: str
     POSTGRES_PORT: int = 5432
     POSTGRES_USER: str
-    POSTGRES_PASSWORD: str
+    POSTGRES_PASSWORD: str = ""
     POSTGRES_DB: str = ""
 
     @computed_field  # type: ignore[misc]