Merge branch 'main' into eddie/callsign_upgrade

Author: Syzygicality

gs/backend/config/config.py

@@ -22,12 +22,27 @@ def __init__(self) -> None:
 
 backend_config = BackendConfiguration()
 
-# TODO: Make these throw an exception if they are None
-GS_DATABASE_USER = environ.get("GS_DATABASE_USER")
-GS_DATABASE_PASSWORD = environ.get("GS_DATABASE_PASSWORD")
-GS_DATABASE_LOCATION = environ.get("GS_DATABASE_LOCATION")
-GS_DATABASE_PORT = environ.get("GS_DATABASE_PORT")
-GS_DATABASE_NAME = environ.get("GS_DATABASE_NAME")
+
+def getenv(config: str) -> str:
+    """
+    Validates whether or not database env values exist in .env. If not, throws a value error.
+
+    :param config: Variable in .env
+    :type config: str
+    :return: Value of variable in .env
+    :rtype: str
+    """
+    value = environ.get(config)
+    if not value:
+        raise ValueError(f"{config} is missing from .env.")
+    return value
+
+
+GS_DATABASE_USER = getenv("GS_DATABASE_USER")
+GS_DATABASE_PASSWORD = getenv("GS_DATABASE_PASSWORD")
+GS_DATABASE_LOCATION = getenv("GS_DATABASE_LOCATION")
+GS_DATABASE_PORT = getenv("GS_DATABASE_PORT")
+GS_DATABASE_NAME = getenv("GS_DATABASE_NAME")
 
 DATABASE_CONNECTION_STRING: Final[
     str

migrations/env.py

@@ -6,6 +6,8 @@
 from sqlalchemy import engine_from_config, pool
 from sqlmodel import SQLModel
 
+from gs.backend.data.tables import aro_user_tables, main_tables, transactional_tables  # noqa: F401
+
 load_dotenv()
 
 SQLALCHEMY_DATABASE_URL = os.getenv("SQLALCHEMY_DATABASE_URL")
@@ -55,6 +57,7 @@ def run_migrations_offline() -> None:
         target_metadata=target_metadata,
         literal_binds=True,
         dialect_opts={"paramstyle": "named"},
+        include_schemas=True,
     )
 
     with context.begin_transaction():
@@ -76,7 +79,11 @@ def run_migrations_online() -> None:
     )
 
     with connectable.connect() as connection:
-        context.configure(connection=connection, target_metadata=target_metadata)
+        context.configure(
+            connection=connection,
+            target_metadata=target_metadata,
+            include_schemas=True,
+        )
 
         with context.begin_transaction():
             context.run_migrations()