Main branch exported first in apps export

Author: okorach-sonar

sonar/applications.py

@@ -606,18 +606,16 @@ def convert_app_json(old_app_json: dict[str, Any]) -> dict[str, Any]:
     new_json = common_json_helper.convert_common_fields(old_app_json.copy())
     if "branches" not in new_json:
         return new_json
-    log.info("CONVERT %s", util.json_dump(new_json["branches"]))
     for br, data in new_json["branches"].items():
-        log.info("CONVERT PROJS %s", util.json_dump(new_json["branches"][br].get("projects", {})))
         if "projects" not in data:
             continue
+        new_json["branches"][br] = util.order_dict(data, ["name", "isMain", "projects"])
         new_json["branches"][br]["projects"] = util.dict_to_list(new_json["branches"][br]["projects"], "key", "branch")
         for proj_data in new_json["branches"][br]["projects"]:
             if proj_data.get("branch", None) in ("__default__", c.DEFAULT_BRANCH):
                 proj_data.pop("branch")
-    new_json["branches"] = util.dict_to_list(new_json["branches"], "name")
-    log.info("RETURN %s", util.json_dump(new_json))
-    return new_json
+    new_json["branches"] = util.sort_list_by_key(util.dict_to_list(new_json["branches"], "name"), "name", "isMain")
+    return util.order_dict(new_json, ["key", "name", "visibility", "tags", "branches", "permissions"])
 
 
 def convert_apps_json(old_json: dict[str, Any]) -> dict[str, Any]: