Align CSV export

Author: okorach-sonar

cli/audit.py

@@ -100,8 +100,8 @@ def write_csv(queue: Queue[list[problem.Problem]], fd: TextIO, settings: types.C
         problems = __filter_problems(problems, settings)
         for p in problems:
             json_data = p.to_json(with_url)
-            data = [] if not server_id else [server_id]
-            data += [json_data[k] for k in ("problem", "type", "severity", "message") if k in json_data]
+            data = [server_id] if server_id else []
+            data += [json_data[k] for k in ("problem", "type", "severity", "message", "url") if k in json_data]
             csvwriter.writerow(data)
         queue.task_done()
     queue.task_done()

sonar/audit/problem.py

@@ -91,14 +91,13 @@ def __dump_csv(problems: list[Problem], file: str, server_id: Optional[str] = No
     with utilities.open_file(file, "w") as fd:
         csvwriter = csv.writer(fd, delimiter=separator)
         header = ["Server Id"] if server_id else []
-        header += ["Audit Check", "Category", "Severity", "Message"]
+        header += ["Problem", "Category", "Severity", "Message"]
         header += ["URL"] if with_url else []
         csvwriter.writerow(header)
         for p in problems:
-            data = []
-            if server_id is not None:
-                data = [server_id]
-            data += list(p.to_json(with_url).values())
+            json_data = p.to_json(with_url)
+            data = [server_id] if server_id else []
+            data += [json_data[k] for k in ("problem", "type", "severity", "message", "url") if k in json_data]
             csvwriter.writerow(data)