Merge pull request #127 from mekanix/tests

Switch to lifespan

freenit/api/router.py

@@ -1,21 +1,6 @@
 from fastapi import FastAPI
 
-from ..config import getConfig
 from ..decorators import FreenitAPI
 
 api = FastAPI()
 route = FreenitAPI(api)
-
-
-@api.on_event("startup")
-async def startup():
-    config = getConfig()
-    if not config.database.is_connected:
-        await config.database.connect()
-
-
-@api.on_event("shutdown")
-async def shutdown():
-    config = getConfig()
-    if config.database.is_connected:
-        await config.database.disconnect()

freenit/app.py

@@ -1,23 +1,21 @@
+from contextlib import asynccontextmanager
 from fastapi import FastAPI
 
 import freenit.config
 
 from .api import api
 
 config = freenit.config.getConfig()
-app = FastAPI()
 
 
-@app.on_event("startup")
-async def startup() -> None:
-    if not config.database.is_connected:
-        await config.database.connect()
-
-
-@app.on_event("shutdown")
-async def shutdown() -> None:
+@asynccontextmanager
+async def lifespan(app: FastAPI):
     if config.database.is_connected:
         await config.database.disconnect()
+    yield
+    if not config.database.is_connected:
+        await config.database.connect()
 
 
+app = FastAPI(lifespan=lifespan)
 app.mount(config.api_root, api)

freenit/version.py

@@ -1 +1 @@
-version = "0.2.30"
+version = "0.2.31"