change 'user_engine' to a 'WriteSession' instead, so the master db connection is used for writes only

Author: melange396

src/server/_db.py

@@ -10,14 +10,14 @@
 
 
 engine: Engine = create_engine(SQLALCHEMY_DATABASE_URI, **SQLALCHEMY_ENGINE_OPTIONS)
+metadata = MetaData(bind=engine)
+Session = sessionmaker(bind=engine)
 
 if SQLALCHEMY_DATABASE_URI_PRIMARY:
-    user_engine: Engine = create_engine(SQLALCHEMY_DATABASE_URI_PRIMARY, **SQLALCHEMY_ENGINE_OPTIONS)
+    write_engine: Engine = create_engine(SQLALCHEMY_DATABASE_URI_PRIMARY, **SQLALCHEMY_ENGINE_OPTIONS)
+    write_metadata = MetaData(bind=write_engine)
+    WriteSession = sessionmaker(bind=write_engine)
 else:
-    user_engine: Engine = engine
-
-metadata = MetaData(bind=user_engine)
-
-Session = sessionmaker(bind=user_engine)
-
-
+    write_engine: Engine = engine
+    write_metadata = metadata
+    WriteSession = Session

src/server/admin/models.py

@@ -3,7 +3,7 @@
 from sqlalchemy.orm import relationship
 from copy import deepcopy
 
-from .._db import Session
+from .._db import Session, WriteSession
 from delphi.epidata.common.logger import get_structured_logger
 
 from typing import Set, Optional, List
@@ -89,7 +89,7 @@ def find_user(*, # asterisk forces explicit naming of all arguments when calling
     @staticmethod
     def create_user(api_key: str, email: str, user_roles: Optional[Set[str]] = None) -> "User":
         get_structured_logger("api_user_models").info("creating user", api_key=api_key)
-        with Session() as session:
+        with WriteSession() as session:
             new_user = User(api_key=api_key, email=email)
             # TODO: we may need to populate 'created' field/column here, if the default
             #   specified above gets bound to the time of when that line of python was evaluated.
@@ -107,7 +107,7 @@ def update_user(
         roles: Optional[Set[str]]
     ) -> "User":
         get_structured_logger("api_user_models").info("updating user", user_id=user.id, new_api_key=api_key)
-        with Session() as session:
+        with WriteSession() as session:
             user = User.find_user(user_id=user.id)
             if user:
                 update_stmt = (
@@ -123,7 +123,7 @@ def update_user(
     @staticmethod
     def delete_user(user_id: int) -> None:
         get_structured_logger("api_user_models").info("deleting user", user_id=user_id)
-        with Session() as session:
+        with WriteSession() as session:
             session.execute(delete(User).where(User.id == user_id))
             session.commit()
 
@@ -136,7 +136,7 @@ class UserRole(Base):
     @staticmethod
     def create_role(name: str) -> None:
         get_structured_logger("api_user_models").info("creating user role", role=name)
-        with Session() as session:
+        with WriteSession() as session:
             session.execute(
                 f"""
             INSERT INTO user_role (name)