rollback mw active session before closing

Author: ahdamin

genotype_api/api/middleware.py

@@ -1,6 +1,7 @@
 from fastapi import Request
 from starlette.middleware.base import BaseHTTPMiddleware
-from genotype_api.database.database import close_session
+
+from genotype_api.database.database import close_session, get_session
 
 
 class DBSessionMiddleware(BaseHTTPMiddleware):
@@ -10,6 +11,11 @@ def __init__(self, app):
     async def dispatch(self, request: Request, call_next):
         try:
             response = await call_next(request)
+        except Exception as e:
+            raise e
         finally:
+            session = get_session()
+            if session.is_active:
+                session.rollback()
             close_session()
         return response

genotype_api/database/database.py

@@ -61,10 +61,6 @@ def get_tables() -> list[str]:
     return inspector.get_table_names()
 
 
-def close_session() -> None:
+def close_session():
     """Close the global database session of the genotype api."""
-    if SESSION:
-        session = SESSION()
-        if session.is_active:
-            session.rollback()
-        SESSION.remove()
+    SESSION.remove()