Skip to content

Use new Jira Cloud jql search API #2

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
rkraats wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use new Jira Cloud jql search API #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion api/cloud/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class JiraCloudApi(Consumer):

@headers({"Accept": "application/json", "Content-Type": "application/json"})
@json
@post("{}{}".format(jira_endpoint, "search"))
@post("{}{}/jql".format(jira_endpoint, "search"))
def search_for_issues_using_jql(self, body: Body):
"""Search issues through jql"""

Expand Down
15 changes: 8 additions & 7 deletions utilities/cloud_functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,27 @@

def get_cloud_issue_folders(project_key, folder_issue_type_id):
start_at = 0
total = 1
folder_issue_type_name = cloud_jira_helper.get_issue_type_name(folder_issue_type_id)
request_body = {"jql": f'issuetype = "{folder_issue_type_name}" and project = {project_key}',
"maxResults": MAX_RESULTS, "fields": ["summary"], "startAt": start_at}
"maxResults": MAX_RESULTS, "fields": ["summary"], "nextPageToken": None}
cloud_issue_folders = []
while len(cloud_issue_folders) != total:
while True:
response = cloud_jira_helper.search_for_issues_using_jql(request_body)
cloud_issues = response.json()
if response.status_code == 200:
total = cloud_issues["total"]
start_at += MAX_RESULTS
request_body["startAt"] = start_at
cloud_issue_folders += [{"issue_key": issue["key"], "summary": issue["fields"]["summary"]}
for issue in cloud_issues["issues"]]
message = f"Folder issues retrieved from {cloud_issues['startAt']} to {len(cloud_issue_folders)}" \
message = f"Folder issues retrieved from {start_at} to {len(cloud_issue_folders)}" \
f" in Jira Cloud instance"
write_logging_server_response(response, message)
if cloud_issues["isLast"]:
break
request_body["nextPageToken"] = cloud_issues["nextPageToken"]
start_at += MAX_RESULTS
else:
message = "Could not retrieve the folder issues in Jira cloud instance"
write_logging_server_response(response, message, True)
break

return cloud_issue_folders

Expand Down
12 changes: 7 additions & 5 deletions utilities/cloud_verifications.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def verify_all_data_center_tree_issues_in_cloud_instance(tree_items_list):
for tree_item in tree_issues_list]

request_body = {"jql": f"issueKey in {tree_items_key_list}", "maxResults": MAX_RESULTS, "fields": ["summary",
"issuetype"], "startAt": start_at}
"issuetype"], "nextPageToken": None}

not_found_issues = []

Expand All @@ -84,14 +84,16 @@ def verify_all_data_center_tree_issues_in_cloud_instance(tree_items_list):

if response.status_code == 200:
tried_to_retrieve = min(
len(issue_keys_and_summary_expected) - request_body["startAt"], MAX_RESULTS)
start_at += MAX_RESULTS
request_body["startAt"] = start_at
len(issue_keys_and_summary_expected) - start_at, MAX_RESULTS)
issue_keys_and_summary_response += [{"issue_key": issue["key"], "summary": issue["fields"]["summary"]}
for issue in cloud_issues["issues"]]
issues_retrieved = len(cloud_issues["issues"])
message = f"Successfully retrieved {issues_retrieved} issues out of {tried_to_retrieve} requested starting with issue {(cloud_issues['startAt'] + 1)}"
message = f"Successfully retrieved {issues_retrieved} issues out of {tried_to_retrieve} requested starting with issue {(start_at + 1)}"
write_logging_server_response(response, message)
if cloud_issues["isLast"]:
break
request_body["nextPageToken"] = cloud_issues["nextPageToken"]
start_at += MAX_RESULTS
else:
# Try to get the response error message
message = try_extend_error_message_with_response_object(
Expand Down