client.py: remove the same code and added into one

Author: marcin-wozniak-wttech

jira/client.py

@@ -315,7 +315,10 @@ class JiraCookieAuth(AuthBase):
     """
 
     def __init__(
-        self, session: ResilientSession, session_api_url: str, auth: tuple[str, str]
+        self,
+        session: ResilientSession,
+        session_api_url: str,
+        auth: tuple[str, str],
     ):
         """Cookie Based Authentication.
 
@@ -888,7 +891,10 @@ def json_params() -> dict[str, Any]:
                     page_params["maxResults"] = page_size
 
                     resource = self._get_json(
-                        request_path, params=page_params, base=base, use_post=use_post
+                        request_path,
+                        params=page_params,
+                        base=base,
+                        use_post=use_post,
                     )
                     if resource:
                         next_items_page = self._get_items_from_page(
@@ -901,12 +907,20 @@ def json_params() -> dict[str, Any]:
                         break
 
             return ResultList(
-                items, start_at_from_response, max_results_from_response, total, is_last
+                items,
+                start_at_from_response,
+                max_results_from_response,
+                total,
+                is_last,
             )
         else:  # TODO: unreachable
             # it seems that search_users can return a list() containing a single user!
             return ResultList(
-                [item_type(self._options, self._session, resource)], 0, 1, 1, True
+                [item_type(self._options, self._session, resource)],
+                0,
+                1,
+                1,
+                True,
             )
 
     def _get_items_from_page(
@@ -1424,7 +1438,11 @@ def dashboard_item_property(
         return dashboard_item_property
 
     def set_dashboard_item_property(
-        self, dashboard_id: str, item_id: str, property_key: str, value: dict[str, Any]
+        self,
+        dashboard_id: str,
+        item_id: str,
+        property_key: str,
+        value: dict[str, Any],
     ) -> DashboardItemProperty:
         """Set a dashboard item property.
 
@@ -1629,7 +1647,9 @@ def update_filter(
 
         url = self._get_url(f"filter/{filter_id}")
         r = self._session.put(
-            url, headers={"content-type": "application/json"}, data=json.dumps(data)
+            url,
+            headers={"content-type": "application/json"},
+            data=json.dumps(data),
         )
 
         raw_filter_json = json.loads(r.text)
@@ -1689,12 +1709,14 @@ def group_members(self, group: str) -> OrderedDict:
         Args:
             group (str): Name of the group.
         """
+        users = {}
+
         if self._version < (6, 0, 0):
             raise NotImplementedError(
                 "Group members is not implemented in Jira before version 6.0, upgrade the instance, if possible."
             )
 
-        if self._version < (10, 0, 0):
+        elif self._version < (10, 0, 0):
             params = {"groupname": group, "expand": "users"}
             r = self._get_json("group", params=params)
             size = r["users"]["size"]
@@ -1711,31 +1733,7 @@ def group_members(self, group: str) -> OrderedDict:
                 end_index = r2["users"]["end-index"]
                 size = r["users"]["size"]
 
-            result = {}
-            for user in r["users"]["items"]:
-                # 'id' is likely available only in older JIRA Server,
-                # it's not available on newer JIRA Server.
-                # 'name' is not available in JIRA Cloud.
-                hasId = user.get("id") is not None and user.get("id") != ""
-                hasName = user.get("name") is not None and user.get("name") != ""
-                result[
-                    (
-                        user["id"]
-                        if hasId
-                        else user.get("name")
-                        if hasName
-                        else user.get("accountId")
-                    )
-                ] = {
-                    "name": user.get("name"),
-                    "id": user.get("id"),
-                    "accountId": user.get("accountId"),
-                    "fullname": user.get("displayName"),
-                    "email": user.get("emailAddress", "hidden"),
-                    "active": user.get("active"),
-                    "timezone": user.get("timezone"),
-                }
-            return OrderedDict(sorted(result.items(), key=lambda t: t[0]))
+            users = r["users"]["items"]
 
         else:
             params = {"groupname": group}
@@ -1755,31 +1753,33 @@ def group_members(self, group: str) -> OrderedDict:
                     r["values"].append(user)
                 end_index += r2["maxResults"]
 
-            result = {}
-            for user in r["values"]:
-                # 'id' is likely available only in older JIRA Server,
-                # it's not available on newer JIRA Server.
-                # 'name' is not available in JIRA Cloud.
-                hasId = user.get("id") is not None and user.get("id") != ""
-                hasName = user.get("name") is not None and user.get("name") != ""
-                result[
-                    (
-                        user["id"]
-                        if hasId
-                        else user.get("name")
-                        if hasName
-                        else user.get("accountId")
-                    )
-                ] = {
-                    "name": user.get("name"),
-                    "id": user.get("id"),
-                    "accountId": user.get("accountId"),
-                    "fullname": user.get("displayName"),
-                    "email": user.get("emailAddress", "hidden"),
-                    "active": user.get("active"),
-                    "timezone": user.get("timezone"),
-                }
-            return OrderedDict(sorted(result.items(), key=lambda t: t[0]))
+            users = r["values"]
+
+        result = {}
+        for user in users:
+            # 'id' is likely available only in older JIRA Server,
+            # it's not available on newer JIRA Server.
+            # 'name' is not available in JIRA Cloud.
+            hasId = user.get("id") is not None and user.get("id") != ""
+            hasName = user.get("name") is not None and user.get("name") != ""
+            result[
+                (
+                    user["id"]
+                    if hasId
+                    else user.get("name")
+                    if hasName
+                    else user.get("accountId")
+                )
+            ] = {
+                "name": user.get("name"),
+                "id": user.get("id"),
+                "accountId": user.get("accountId"),
+                "fullname": user.get("displayName"),
+                "email": user.get("emailAddress", "hidden"),
+                "active": user.get("active"),
+                "timezone": user.get("timezone"),
+            }
+        return OrderedDict(sorted(result.items(), key=lambda t: t[0]))
 
     def add_group(self, groupname: str) -> bool:
         """Create a new group in Jira.
@@ -1905,7 +1905,10 @@ def create_issue(
         raw_issue_json = json_loads(r)
         if "key" not in raw_issue_json:
             raise JIRAError(
-                status_code=r.status_code, response=r, url=url, text=json.dumps(data)
+                status_code=r.status_code,
+                response=r,
+                url=url,
+                text=json.dumps(data),
             )
         if prefetch:
             return self.issue(raw_issue_json["key"])
@@ -2483,7 +2486,10 @@ def add_remote_link(
 
         data: dict[str, Any] = {}
         if isinstance(destination, Issue) and destination.raw:
-            data["object"] = {"title": str(destination), "url": destination.permalink()}
+            data["object"] = {
+                "title": str(destination),
+                "url": destination.permalink(),
+            }
             for x in applicationlinks:
                 if x["application"]["displayUrl"] == destination._options["server"]:
                     data["globalId"] = "appId={}&issueId={}".format(
@@ -4222,7 +4228,11 @@ def _create_oauth_session(self, oauth: dict[str, Any]):
             FALLBACK_SHA = DEFAULT_SHA
             _logging.debug("Fallback SHA 'SIGNATURE_RSA_SHA1' could not be imported.")
 
-        for sha_type in (oauth.get("signature_method"), DEFAULT_SHA, FALLBACK_SHA):
+        for sha_type in (
+            oauth.get("signature_method"),
+            DEFAULT_SHA,
+            FALLBACK_SHA,
+        ):
             if sha_type is None:
                 continue
             oauth_instance = OAuth1(
@@ -4342,7 +4352,11 @@ def _get_internal_url(self, path: str, base: str = JIRA_BASE_URL) -> str:
         """
         options = self._options.copy()
         options.update(
-            {"path": path, "rest_api_version": "latest", "rest_path": "internal"}
+            {
+                "path": path,
+                "rest_api_version": "latest",
+                "rest_path": "internal",
+            }
         )
         return base.format(**options)
 
@@ -4496,7 +4510,7 @@ def rename_user(self, old_user: str, new_user: str):
             self._session.put(url, params=params, data=json.dumps(payload))
         else:
             raise NotImplementedError(
-                "Support for renaming users in Jira " "< 6.0.0 has been removed."
+                "Support for renaming users in Jira < 6.0.0 has been removed."
             )
 
     def delete_user(self, username: str) -> bool:
@@ -4625,7 +4639,10 @@ def reindex(self, force: bool = False, background: bool = True) -> bool:
             r = self._session.post(
                 url,
                 headers=self._options["headers"],
-                params={"indexingStrategy": indexingStrategy, "reindex": "Re-Index"},
+                params={
+                    "indexingStrategy": indexingStrategy,
+                    "reindex": "Re-Index",
+                },
             )
             if r.text.find("All issues are being re-indexed") != -1:
                 return True
@@ -5574,7 +5591,10 @@ def add_issues_to_sprint(self, sprint_id: int, issue_keys: list[str]) -> Respons
         return self._session.post(url, data=json.dumps(payload))
 
     def add_issues_to_epic(
-        self, epic_id: str, issue_keys: str | list[str], ignore_epics: bool = None
+        self,
+        epic_id: str,
+        issue_keys: str | list[str],
+        ignore_epics: bool = None,
     ) -> Response:
         """Add the issues in ``issue_keys`` to the ``epic_id``.