Changed models to test relationships

Author: reinhud

src/.env.example

@@ -4,11 +4,12 @@
 """
 from fastapi import APIRouter
 
-from app.api.routes import user
+from app.api.routes import children, parents
 
 
 router = APIRouter()
 
-router.include_router(user.router, prefix="/user", tags=["User Endpoints"])
+router.include_router(children.router, prefix="/children", tags=["Children Endpoints"])
+router.include_router(parents.router, prefix="/parents", tags=["Parents Endpoints"])
 
 

src/Generator

@@ -1,7 +1,18 @@
 """App configuration functions and access to settings"""
+import os
+
+import alembic
+from alembic.config import Config
 from fastapi import FastAPI
+from loguru import logger
+from pydantic import PostgresDsn
+from sqlalchemy import create_engine
+from sqlalchemy.orm import Session
+from sqlalchemy_utils import database_exists, create_database
+import warnings
 
 from app.core.app_settings import AppSettings
+from app.db.models.base import Base
 
 
 def get_app_settings() -> AppSettings:
@@ -16,5 +27,3 @@ def add_middleware(app: FastAPI) -> None:
     pass
 
 
-
-

src/fastapi_server/app/api/routes/router.py

@@ -1,17 +1,40 @@
 """Connection to the Postgres database."""
+from loguru import logger
+from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.ext.asyncio import AsyncEngine, create_async_engine
 
 from app.core.config import get_app_settings
+from app.db.models.base import Base
 
 
 def get_async_engine() -> AsyncEngine:
     """Return async database engine."""
-    async_engine: AsyncEngine = create_async_engine(
-        get_app_settings().database_url,
-        echo=True,  # see sql querries executed
-        future=True,
-    )
+    try:
+        async_engine: AsyncEngine = create_async_engine(
+            get_app_settings().database_url,
+            echo=True,  # see sql querries executed
+            future=True,
+        )
+    except SQLAlchemyError as e:
+        logger.warning("Unable to establish db engine, database might not exist yet")
+        logger.warning(e)
 
     return async_engine
 
 
+async def initialize_database() -> None:
+    """Create table in metadata if they don't exist yet.
+    
+    This uses a sync connection because the 'create_all' doesn't
+    feature async yet.
+    """
+    async_engine = get_async_engine()
+    async with async_engine.begin() as async_conn:
+        logger.info("Trying to create new tables")
+
+        await async_conn.run_sync(Base.metadata.create_all)
+
+
+
+
+

src/fastapi_server/app/api/routes/user.py

@@ -8,7 +8,7 @@
 Base = declarative_base()
 
 @declarative_mixin
-class BaseSaModel:
+class BaseDBModel:
     """Class defining common db model components."""
     # autoinc pk key
     id = Column(Integer, primary_key=True, autoincrement=True)

src/fastapi_server/app/core/config.py

@@ -21,6 +21,7 @@
 
 from app.api.routes.router import router as api_router
 from app.core.config import add_middleware, get_app_settings
+from app.db.db_session import initialize_database
 
 def get_app() -> FastAPI:
     """Instanciating and setting up FastAPI application"""
@@ -34,6 +35,11 @@ def get_app() -> FastAPI:
 
     app.include_router(api_router, prefix=settings.api_prefix)
 
+    @app.on_event("startup")
+    async def startup_event() -> None:
+        logger.warning("Startup Event starting")
+        await initialize_database()
+
     return app
 
 

src/fastapi_server/app/db/db_session.py

@@ -5,6 +5,7 @@
 import sys
 
 from alembic import context
+from loguru import logger
 from sqlalchemy import engine_from_config
 from sqlalchemy.ext.asyncio import AsyncEngine
 from sqlalchemy.pool import NullPool
@@ -13,6 +14,7 @@
 sys.path.append(str(pathlib.Path(__file__).resolve().parents[1]))
 from app.core.config import get_app_settings
 from app.db.models.base import Base
+from app.db.models.metadata import metadata_family
 
 
 settings = get_app_settings()
@@ -23,8 +25,8 @@
 
 # Interpret the config file for Python logging.
 # This line sets up loggers basically.
-if config.config_file_name is not None:
-    fileConfig(config.config_file_name)
+# if config.config_file_name is not None:
+#    fileConfig(config.config_file_name)
 
 # add your model's MetaData object here
 # for 'autogenerate' support
@@ -76,7 +78,7 @@ async def run_migrations_online():
 
     """
     # varies between live and test migrations
-    DATABASE_URL = f"{settings.database_url}_test" if os.environ.get("Testing") else settings.database_url
+    DATABASE_URL = f"{settings.database_url}_test" if os.environ.get("TESTING") else settings.database_url
 
     connectable = context.config.attributes.get("connection", None)
     config.set_main_option("sqlalchemy.url", DATABASE_URL)
@@ -86,7 +88,7 @@ async def run_migrations_online():
                 context.config.get_section(context.config.config_ini_section),
                 prefix="sqlalchemy.",
                 poolclass=NullPool,
-                future=True
+                # future=True
             )
         )
 
@@ -97,6 +99,8 @@ async def run_migrations_online():
 
 
 if context.is_offline_mode():
+    logger.info("Running migrations offline.")
     run_migrations_offline()
 else:
+    logger.info("Running migrations online.")
     asyncio.run(run_migrations_online())