Merge branch 'main' of https://github.com/Promptly-Technologies-LLC/fastapi-jinja2-postgres-webapp

Author: chriscarrollsmith

docs/static/schema.png

@@ -28,6 +28,7 @@ mypy = "^1.11.2"
 jupyter = "^1.1.1"
 notebook = "^7.2.2"
 pytest = "^8.3.3"
+sqlalchemy-schemadisplay = "^2.0"
 
 [build-system]
 requires = ["poetry-core"]

migrations/set_up_db.py

@@ -1,8 +1,11 @@
 import pytest
+from dotenv import load_dotenv
 from sqlmodel import create_engine, Session, delete
-from utils.db import get_connection_url, set_up_db, tear_down_db
+from fastapi.testclient import TestClient
+from utils.db import get_connection_url, set_up_db, tear_down_db, get_session
 from utils.models import User, PasswordResetToken
-from dotenv import load_dotenv
+from utils.auth import get_password_hash
+from main import app
 
 load_dotenv()
 
@@ -49,3 +52,36 @@ def clean_db(session: Session):
     session.exec(delete(User))  # type: ignore
 
     session.commit()
+
+
+# Test client fixture
+@pytest.fixture()
+def client(session: Session):
+    """
+    Provides a TestClient instance with the session fixture.
+    Overrides the get_session dependency to use the test session.
+    """
+    def get_session_override():
+        return session
+
+    app.dependency_overrides[get_session] = get_session_override
+    client = TestClient(app)
+    yield client
+    app.dependency_overrides.clear()
+
+
+# Test user fixture
+@pytest.fixture()
+def test_user(session: Session):
+    """
+    Creates a test user in the database.
+    """
+    user = User(
+        name="Test User",
+        email="[email protected]",
+        hashed_password=get_password_hash("Test123!@#")
+    )
+    session.add(user)
+    session.commit()
+    session.refresh(user)
+    return user

poetry.lock

@@ -9,7 +9,6 @@
 
 from main import app
 from utils.models import User, PasswordResetToken
-from utils.db import get_session
 from utils.auth import (
     create_access_token,
     create_refresh_token,
@@ -23,39 +22,6 @@
 # --- Fixture setup ---
 
 
-# Test client fixture
-@pytest.fixture(name="client")
-def client_fixture(session: Session):
-    """
-    Provides a TestClient instance with the session fixture.
-    Overrides the get_session dependency to use the test session.
-    """
-    def get_session_override():
-        return session
-
-    app.dependency_overrides[get_session] = get_session_override
-    client = TestClient(app)
-    yield client
-    app.dependency_overrides.clear()
-
-
-# Test user fixture
-@pytest.fixture(name="test_user")
-def test_user_fixture(session: Session):
-    """
-    Creates a test user in the database.
-    """
-    user = User(
-        name="Test User",
-        email="[email protected]",
-        hashed_password=get_password_hash("Test123!@#")
-    )
-    session.add(user)
-    session.commit()
-    session.refresh(user)
-    return user
-
-
 # Mock email response fixture
 @pytest.fixture
 def mock_email_response():