Merge pull request #119 from communitiesuk/FPASF-143-fix-download-report

FPASF-143: fix download report

app/main/routes.py

@@ -113,11 +113,12 @@ def download():
         content_type, file_content = process_api_response(query_params)
 
         current_app.logger.info(
-            "Request for download by {user_id=} with {query_params=}",
+            "Request for download by {user_id} with {query_params}",
             extra={
                 "user_id": g.account_id,
                 "email": g.user.email,
                 "query_params": query_params,
+                "request_type": "download",
             },
         )
         return send_file(

scripts/extract_download_logs.py

@@ -106,8 +106,8 @@ def main(args):
         logGroupName=f"/copilot/post-award-{ENVIRONMENT}-data-frontend",
         queryString="""fields @timestamp, @message
     | sort @timestamp asc
-    | limit 1000
-    | filter request_type = 'download'""",
+    | limit 10000
+    | filter message LIKE /Request for download./ OR request_type = 'download'""",
         startTime=int(datetime.datetime.timestamp(start_time)),
         endTime=int(datetime.datetime.timestamp(end_time)),
     )["queryId"]

tests/test_logging.py

@@ -0,0 +1,11 @@
+import pytest
+
+
+@pytest.mark.usefixtures("mock_get_response_xlsx")
+def test_download_logging(flask_test_client, caplog):
+    flask_test_client.post("/download", data={"file_format": "xlsx"})
+    log_line = [record for record in caplog.records if hasattr(record, "request_type")]
+    assert len(log_line) == 1
+    assert log_line[0].request_type == "download"
+    assert log_line[0].user_id == "test-user"
+    assert log_line[0].query_params == {"file_format": "xlsx"}