Ensure session is closed

genotype_api/api/app.py

@@ -7,8 +7,9 @@
 from fastapi.responses import JSONResponse
 from fastapi.middleware.cors import CORSMiddleware
 
+from genotype_api.api.middleware import DBSessionMiddleware
 from genotype_api.config import security_settings, settings
-from genotype_api.database.database import create_all_tables, initialise_database, close_session
+from genotype_api.database.database import create_all_tables, initialise_database
 from genotype_api.api.endpoints import samples, snps, users, plates, analyses
 from sqlalchemy.exc import NoResultFound
 
@@ -19,6 +20,7 @@
 )
 app.add_middleware(
     CORSMiddleware,
+    DBSessionMiddleware,
     allow_origins=["*"],
     allow_credentials=True,
     allow_methods=["*"],

genotype_api/api/middleware.py

@@ -0,0 +1,11 @@
+from fastapi import Request
+from genotype_api.database.database import close_session
+
+
+class DBSessionMiddleware:
+    async def __call__(self, request: Request, call_next):
+        try:
+            response = await call_next(request)
+        finally:
+            close_session()
+        return response