Use common fields conversion

Author: okorach-sonar

sonar/qualitygates.py

@@ -38,6 +38,7 @@
 
 from sonar.audit.rules import get_rule, RuleId
 from sonar.audit.problem import Problem
+from sonar.util import common_json_helper
 
 
 __MAX_ISSUES_SHOULD_BE_ZERO = "Any numeric threshold on number of issues should be 0 or should be removed from QG conditions"
@@ -565,4 +566,5 @@ def search_by_name(endpoint: pf.Platform, name: str) -> dict[str, QualityGate]:
 
 def convert_qgs_json(old_json: dict[str, Any]) -> dict[str, Any]:
     """Converts the sonar-config quality gates old JSON report format to the new one"""
+    old_json = common_json_helper.convert_common_fields(old_json, with_permissions=False)
     return util.dict_to_list(old_json, "name")

sonar/util/platform_helper.py

@@ -22,6 +22,7 @@
 from typing import Any
 from sonar import settings
 from sonar import utilities as util
+from sonar.util import common_json_helper
 
 _PERM_TPL_IMPORTABLE_PROPERTIES = ("name", "description", "pattern", "defaultFor", "permissions")
 
@@ -47,8 +48,7 @@ def convert_basics_json(old_json: dict[str, Any]) -> dict[str, Any]:
 
 
 def convert_template_json(json_data: dict[str, Any], full: bool = False) -> dict[str, Any]:
-    if "permissions" in json_data:
-        json_data["permissions"] = util.perms_to_list(json_data["permissions"])
+    json_data = common_json_helper.convert_common_fields(json_data)
     return util.remove_nones(util.filter_export(json_data, _PERM_TPL_IMPORTABLE_PROPERTIES, full))
 
 
@@ -63,8 +63,9 @@ def convert_global_settings_json(old_json: dict[str, Any], full: bool = False) -
         new_json[settings.LANGUAGES_SETTINGS][k] = util.sort_list_by_key(util.dict_to_list(v, "key"), "key")
     new_json[settings.LANGUAGES_SETTINGS] = util.dict_to_list(dict(sorted(new_json[settings.LANGUAGES_SETTINGS].items())), "language", "settings")
     new_json[settings.DEVOPS_INTEGRATION] = util.dict_to_list(dict(sorted(old_json[settings.DEVOPS_INTEGRATION].items())), "key")
-    new_json["permissions"] = util.perms_to_list(old_json["permissions"])
     for k, v in new_json["permissionTemplates"].items():
         new_json["permissionTemplates"][k] = convert_template_json(new_json["permissionTemplates"][k], full)
     new_json["permissionTemplates"] = util.dict_to_list(new_json["permissionTemplates"], "key")
-    return new_json
+    new_json = common_json_helper.convert_common_fields(new_json)
+
+    return util.order_dict(new_json, [*settings.CATEGORIES, "permissions", "permissionTemplates"])