Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Changed group_members to be compatiable with newest Jira LTS #1944

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
123 changes: 84 additions & 39 deletions jira/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -1694,47 +1694,92 @@ def group_members(self, group: str) -> OrderedDict:
"Group members is not implemented in Jira before version 6.0, upgrade the instance, if possible."
)

params = {"groupname": group, "expand": "users"}
r = self._get_json("group", params=params)
size = r["users"]["size"]
end_index = r["users"]["end-index"]

while end_index < size - 1:
params = {
"groupname": group,
"expand": f"users[{end_index + 1}:{end_index + 50}]",
}
r2 = self._get_json("group", params=params)
for user in r2["users"]["items"]:
r["users"]["items"].append(user)
end_index = r2["users"]["end-index"]
if self._version < (10, 0, 0):
params = {"groupname": group, "expand": "users"}
r = self._get_json("group", params=params)
size = r["users"]["size"]
end_index = r["users"]["end-index"]

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]))
while end_index < size - 1:
params = {
"groupname": group,
"expand": f"users[{end_index + 1}:{end_index + 50}]",
}
r2 = self._get_json("group", params=params)
for user in r2["users"]["items"]:
r["users"]["items"].append(user)
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]))

else:
params = {"groupname": group}
group_member_api_endpoint = "group/member"
r = self._get_json(group_member_api_endpoint, params=params)
end_index = r["maxResults"]
isLast = r["isLast"]

while isLast is False:
params = {
"groupname": group,
"startAt": f"{end_index}",
}
r2 = self._get_json(group_member_api_endpoint, params=params)
isLast = r2["isLast"]
for user in r2["values"]:
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]))

def add_group(self, groupname: str) -> bool:
"""Create a new group in Jira.
Expand Down
Loading