Merge pull request #1239 from GSA/notify-admin-1218

Adjust data format for download all users

app/user/rest.py

@@ -629,7 +629,17 @@ def get_all_users():
 @user_blueprint.route("/report-all-users", methods=["GET"])
 def report_all_users():
     users = dao_report_users()
-    return jsonify(data=users.serialize()), 200
+    download_users = []
+    for user in users:
+        new_user = {
+            "name": user[0],
+            "email_address": user[1],
+            "mobile_number": user[2],
+            "service": user[3],
+        }
+        download_users.append(new_user)
+
+    return jsonify(data=download_users, status=200, mime_type="application/json"), 200
 
 
 @user_blueprint.route("/<uuid:user_id>/organizations-and-services", methods=["GET"])

tests/app/user/test_rest.py

@@ -1125,3 +1125,26 @@ def test_complete_login_after_webauthn_authentication_attempt_raises_400_if_sche
         _data={"successful": "True"},
         _expected_status=400,
     )
+
+
+def test_report_all_users(admin_request, mocker):
+    mocker.patch(
+        "app.user.rest.dao_report_users",
+        return_value=[("name", "email", "phone", "service")],
+    )
+    response = admin_request.get(
+        "user.report_all_users",
+        _expected_status=200,
+    )
+    assert response == {
+        "data": [
+            {
+                "name": "name",
+                "email_address": "email",
+                "mobile_number": "phone",
+                "service": "service",
+            }
+        ],
+        "mime_type": "application/json",
+        "status": 200,
+    }