From bdc71f1218066898a9d0dac71dbf50890b9dd20c Mon Sep 17 00:00:00 2001
From: Raphael Paul Laude <raphlaude@gmail.com>
Date: Sat, 20 Jul 2024 19:38:43 -0400
Subject: [PATCH 1/3] just do it the old way

---
 backend/app/core/config.py | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/backend/app/core/config.py b/backend/app/core/config.py
index 12c11669..6912b178 100644
--- a/backend/app/core/config.py
+++ b/backend/app/core/config.py
@@ -52,30 +52,18 @@ def server_host(self) -> str:
     # Postgres
 
     POSTGRES_SCHEME: str
-    POSTGRES_SERVER: str | None
-    POSTGRES_PORT: int | None = 5432
-    POSTGRES_USER: str | None
-    POSTGRES_PASSWORD: str | None
-    POSTGRES_DB: str = ""
-    DATABASE_URL: str | None = None
+    POSTGRES_SERVER: str
+    POSTGRES_PORT: int = 5432
+    POSTGRES_USER: str
+    POSTGRES_PASSWORD: str
+    POSTGRES_DB: str
+    DATABASE_URL: str
 
     @computed_field  # type: ignore[misc]
     @property
     def SQLALCHEMY_DATABASE_URI(self) -> PostgresDsn:
         if self.DATABASE_URL:
-            db_uri = MultiHostUrl(self.DATABASE_URL)
-            (host,) = db_uri.hosts()
-
-            self.POSTGRES_SCHEME = db_uri.scheme
-            self.POSTGRES_PORT = host["port"]
-            self.POSTGRES_USER = host["username"]
-            self.POSTGRES_PASSWORD = host["password"]
-            self.POSTGRES_SERVER = host["host"]
-
-            if db_uri.path:
-                self.POSTGRES_DB = db_uri.path.lstrip("/")
-
-            return db_uri
+            return MultiHostUrl(self.DATABASE_URL)
 
         return MultiHostUrl.build(
             scheme=self.POSTGRES_SCHEME,

From e81a097da20af0bb3570de2b3a1c6919ef3ff542 Mon Sep 17 00:00:00 2001
From: Raphael Paul Laude <raphlaude@gmail.com>
Date: Sat, 20 Jul 2024 19:40:14 -0400
Subject: [PATCH 2/3] update dockerignore

---
 backend/.dockerignore | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/backend/.dockerignore b/backend/.dockerignore
index 0501d092..a0ac2975 100644
--- a/backend/.dockerignore
+++ b/backend/.dockerignore
@@ -1 +1,16 @@
 fly.toml
+.venv/
+.pytest_cache/
+__pycache__/
+*.pyc
+.env
+.ruff_cache/
+scratch/
+.git
+*.whl
+*.deb
+*.rpm
+*.tar.gz
+*.zip
+.pyenv/
+*pyvenv*

From b8cd0179086a997f39927f43ced8c7b2e49645b1 Mon Sep 17 00:00:00 2001
From: Raphael Paul Laude <raphlaude@gmail.com>
Date: Sat, 20 Jul 2024 19:46:38 -0400
Subject: [PATCH 3/3] add db url

---
 .github/workflows/test-backend.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index e300c9ef..825a0426 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -54,6 +54,7 @@ jobs:
           PROJECT_NAME: Districtr v2 backend
           BACKEND_CORS_ORIGINS: "http://localhost,http://localhost:5173"
           SECRET_KEY: mysupersecretkey
+          DATABASE_URL: postgresql+psycopg://postgres:postgres@postgres:5432/postgres
           POSTGRES_SCHEME: postgresql+psycopg
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres