bug: 304 response to request with if-none-metch header field must contain cache-control, expires, etag header fields (#44)

a-luna · web-flow · commit b6ff77f660f5 · 2021-06-29T04:21:55.000-07:00
Fixes #39
diff --git a/src/fastapi_redis_cache/cache.py b/src/fastapi_redis_cache/cache.py
@@ -46,14 +46,24 @@ async def inner_wrapper(*args, **kwargs):
             key = redis_cache.get_cache_key(func, *args, **kwargs)
             ttl, in_cache = redis_cache.check_cache(key)
             if in_cache:
+                redis_cache.set_response_headers(response, True, deserialize_json(in_cache), ttl)
                 if redis_cache.requested_resource_not_modified(request, in_cache):
                     response.status_code = int(HTTPStatus.NOT_MODIFIED)
-                    return response
-                cached_data = deserialize_json(in_cache)
-                redis_cache.set_response_headers(response, cache_hit=True, response_data=cached_data, ttl=ttl)
-                if create_response_directly:
-                    return Response(content=in_cache, media_type="application/json", headers=response.headers)
-                return cached_data
+                    return (
+                        Response(
+                            content=None,
+                            status_code=response.status_code,
+                            media_type="application/json",
+                            headers=response.headers,
+                        )
+                        if create_response_directly
+                        else response
+                    )
+                return (
+                    Response(content=in_cache, media_type="application/json", headers=response.headers)
+                    if create_response_directly
+                    else deserialize_json(in_cache)
+                )
             response_data = await get_api_response_async(func, *args, **kwargs)
             ttl = calculate_ttl(expire)
             cached = redis_cache.add_to_cache(key, response_data, ttl)
diff --git a/tests/test_cache.py b/tests/test_cache.py
@@ -113,8 +113,18 @@ def test_if_none_match():
     invalid_etag = "W/-5480454928453453778"
     response = client.get("/cache_never_expire", headers={"if-none-match": f"{etag}, {invalid_etag}"})
     assert response.status_code == 304
+    assert not response.content
+    assert "x-fastapi-cache" in response.headers and response.headers["x-fastapi-cache"] == "Hit"
+    assert "cache-control" in response.headers
+    assert "expires" in response.headers
+    assert "etag" in response.headers
     response = client.get("/cache_never_expire", headers={"if-none-match": "*"})
     assert response.status_code == 304
+    assert not response.content
+    assert "x-fastapi-cache" in response.headers and response.headers["x-fastapi-cache"] == "Hit"
+    assert "cache-control" in response.headers
+    assert "expires" in response.headers
+    assert "etag" in response.headers
     response = client.get("/cache_never_expire", headers={"if-none-match": invalid_etag})
     assert response.status_code == 200
     assert response.json() == {"success": True, "message": "this data can be cached indefinitely"}
