From 91cc8e24b674414546b16cf0c8ba6ea2e3a7c0eb Mon Sep 17 00:00:00 2001
From: Xevion <xevion@xevion.dev>
Date: Fri, 1 Nov 2024 02:40:39 -0500
Subject: [PATCH] Remove deprecated startup/shutdown events into proper
 applicaiton Lifespan definition

---
 backend/linkpulse/__main__.py | 14 ++++++++++----
 backend/linkpulse/app.py      | 29 ++++++++++++-----------------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/backend/linkpulse/__main__.py b/backend/linkpulse/__main__.py
index be66362..ebb0155 100644
--- a/backend/linkpulse/__main__.py
+++ b/backend/linkpulse/__main__.py
@@ -13,22 +13,28 @@ def main(*args):
         asyncio.run(serve(app, config))
     elif args[0] == "migrate":
         from linkpulse.migrate import main
+
         main(*args[1:])
     elif args[0] == "repl":
-        import linkpulse 
-        lp = linkpulse
+        import linkpulse
+
+        # import most useful objects, models, and functions
+        lp = linkpulse  # alias
         from linkpulse.app import app, db
         from linkpulse.models import BaseModel, IPAddress
+
+        # start REPL
         from bpython import embed
         embed(locals())
     else:
         print("Invalid command: {}".format(args[0]))
 
+
 if __name__ == "__main__":
     if len(sys.argv) == 1:
         main("serve")
     else:
         # Check that args after aren't all whitespace
-        remaining_args = ' '.join(sys.argv[1:]).strip()
+        remaining_args = " ".join(sys.argv[1:]).strip()
         if len(remaining_args) > 0:
-            main(*sys.argv[1:])
\ No newline at end of file
+            main(*sys.argv[1:])
diff --git a/backend/linkpulse/app.py b/backend/linkpulse/app.py
index a15d6c2..23ddffb 100644
--- a/backend/linkpulse/app.py
+++ b/backend/linkpulse/app.py
@@ -23,8 +23,9 @@ load_dotenv(dotenv_path=".env")
 
 from linkpulse import models, responses  # type: ignore
 
+# global variables
 is_development = os.getenv("ENVIRONMENT") == "development"
-db: PostgresqlDatabase = models.BaseModel._meta.database
+db: PostgresqlDatabase = models.BaseModel._meta.database  # type: ignore
 
 
 def flush_ips():
@@ -65,10 +66,6 @@ scheduler.add_job(flush_ips, IntervalTrigger(seconds=5))
 
 @asynccontextmanager
 async def lifespan(_: FastAPI) -> AsyncIterator[None]:
-    FastAPICache.init(
-        backend=InMemoryBackend(), prefix="fastapi-cache", cache_status_header="X-Cache"
-    )
-
     if is_development:
         # 42 is the answer to everything
         random.seed(42)
@@ -77,6 +74,13 @@ async def lifespan(_: FastAPI) -> AsyncIterator[None]:
             ".".join(str(random.randint(0, 255)) for _ in range(4)) for _ in range(50)
         ]
 
+    # Connect to database, ensure specific tables exist
+    db.connect()
+    db.create_tables([models.IPAddress])
+    FastAPICache.init(
+        backend=InMemoryBackend(), prefix="fastapi-cache", cache_status_header="X-Cache"
+    )
+
     app.state.buffered_updates = defaultdict(IPCounter)
 
     scheduler.start()
@@ -86,6 +90,9 @@ async def lifespan(_: FastAPI) -> AsyncIterator[None]:
     scheduler.shutdown()
     flush_ips()
 
+    if not db.is_closed():
+        db.close()
+
 
 @dataclass
 class IPCounter:
@@ -114,18 +121,6 @@ if is_development:
     )
 
 
-@app.on_event("startup")
-def startup():
-    db.connect()
-    db.create_tables([models.IPAddress])
-
-
-@app.on_event("shutdown")
-def shutdown():
-    if not db.is_closed():
-        db.close()
-
-
 @app.get("/health")
 async def health():
     return "OK"