Merge pull request #31 from wednesday-solutions/fix/cache_middleware_fix

Minor fix in cache_middleware plus optional option added for sentry_dsn

app/config/base.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from pydantic import BaseSettings
 
 
@@ -25,7 +27,7 @@ class Config:
 class Settings(BaseSettings):
     SECRET_KEY: str
     REDIS_URL: str
-    SENTRY_DSN: str
+    SENTRY_DSN: str | None
     SLACK_WEBHOOK_URL: str
     ALLOWED_HOSTS: list = ["*"]
     CACHE_MAX_AGE: int = 60

app/middlewares/cache_middleware.py

@@ -41,12 +41,13 @@ async def dispatch(self, request: Request, call_next) -> Response:
         if request_type != "GET":
             return await call_next(request)
 
-        stored_cache = await retrieve_cache(key)
+        stored_cache, expire = await retrieve_cache(key)
         res = stored_cache and cache_control != "no-cache"
 
         if res:
-            headers = {"Cache-Control": f"max-age:{stored_cache[1]}"}
-            return StreamingResponse(iter([stored_cache[0]]), media_type="application/json", headers=headers)
+            headers = {"Cache-Control": f"max-age:{expire}"}
+            return StreamingResponse(iter([stored_cache]), media_type="application/json", headers=headers)
+
         response: Response = await call_next(request)
         response_body = [chunk async for chunk in response.body_iterator]
         response.body_iterator = iterate_in_threadpool(iter(response_body))