Update CSV export (#2452)

ethyca · Feb 1, 2023 · 8d9aeb2 · 8d9aeb2
1 parent 32065f3
commit 8d9aeb2
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -51,6 +51,7 @@ The types of changes are:
 * Display the request type instead of the policy name on the request table [#2382](https://github.com/ethyca/fides/pull/2382)
 * Make denial reasons required [#2400](https://github.com/ethyca/fides/pull/2400)
 * Display the policy key on the request details page [#2395](https://github.com/ethyca/fides/pull/2395)
+* Updated CSV export [#2452](https://github.com/ethyca/fides/pull/2452)
 * Privacy Request approval now uses a modal [#2443](https://github.com/ethyca/fides/pull/2443)
 
 ### Developer Experience

diff --git a/src/fides/api/ops/api/v1/endpoints/privacy_request_endpoints.py b/src/fides/api/ops/api/v1/endpoints/privacy_request_endpoints.py
@@ -254,13 +254,14 @@ def privacy_request_csv_download(
 
     csv_file.writerow(
         [
-            "Time received",
-            "Subject identity",
-            "Policy key",
-            "Request status",
-            "Reviewer",
-            "Time approved/denied",
-            "Denial reason",
+            "Status",
+            "Request Type",
+            "Subject Identity",
+            "Time Received",
+            "Reviewed By",
+            "Request ID",
+            "Time Approved/Denied",
+            "Denial Reason",
         ]
     )
     privacy_request_ids: List[str] = [r.id for r in privacy_request_query]
@@ -278,17 +279,20 @@ def privacy_request_csv_download(
             if pr.status == PrivacyRequestStatus.denied and pr.id in denial_audit_logs
             else None
         )
+
         csv_file.writerow(
             [
-                pr.created_at,
-                pr.get_persisted_identity().dict(),
-                pr.policy.key if pr.policy else None,
                 pr.status.value if pr.status else None,
+                pr.policy.rules[0].action_type if len(pr.policy.rules) > 0 else None,
+                pr.get_persisted_identity().dict(),
+                pr.created_at,
                 pr.reviewed_by,
+                pr.id,
                 pr.reviewed_at,
                 denial_reason,
             ]
         )
+
     f.seek(0)
     response = StreamingResponse(f, media_type="text/csv")
     response.headers[

diff --git a/tests/ops/api/v1/endpoints/test_privacy_request_endpoints.py b/tests/ops/api/v1/endpoints/test_privacy_request_endpoints.py
@@ -1280,17 +1280,18 @@ def test_get_privacy_requests_csv_format(
         csv_file = csv.DictReader(file, delimiter=",")
 
         first_row = next(csv_file)
-        assert parse(first_row["Time received"], ignoretz=True) == created_at
-        assert ast.literal_eval(first_row["Subject identity"]) == {
+        assert parse(first_row["Time Received"], ignoretz=True) == created_at
+        assert ast.literal_eval(first_row["Subject Identity"]) == {
             "email": TEST_EMAIL,
             "phone_number": TEST_PHONE,
             "ga_client_id": None,
         }
-        assert first_row["Policy key"] == "example_access_request_policy"
-        assert first_row["Request status"] == "approved"
-        assert first_row["Reviewer"] == user.id
-        assert parse(first_row["Time approved/denied"], ignoretz=True) == reviewed_at
-        assert first_row["Denial reason"] == ""
+        assert first_row["Request Type"] == "access"
+        assert first_row["Status"] == "approved"
+        assert first_row["Reviewed By"] == user.id
+        assert parse(first_row["Time Approved/Denied"], ignoretz=True) == reviewed_at
+        assert first_row["Denial Reason"] == ""
+        assert first_row["Request ID"] == privacy_request.id
 
         privacy_request.delete(db)