Merge pull request #690 from atlassian/DCA1312-Fix-jsm-prepare-data-script

DCA-1312: fix jsm prepare data script

Author: opopovss

app/util/api/jsm_clients.py

@@ -81,7 +81,8 @@ def create_request(self, service_desk_id: int, request_type_id: int,
 
     def get_request(self, issue_id_or_key: str, auth: tuple = None):
         api_url = self.host + f"/rest/servicedeskapi/request/{issue_id_or_key}"
-        return self.get(api_url, f"Could not get customer request for id/key {issue_id_or_key}", auth=auth)
+        response = self.get(api_url, f"Could not get customer request for id/key {issue_id_or_key}", auth=auth)
+        return response.json()
 
     def get_requests(self, start_at: int = 0, max_results: int = 100, auth: tuple = None, status: str = None):
         """

app/util/data_preparation/jsm_prepare_data.py

@@ -382,7 +382,7 @@ def __get_custom_issues(jira_api, jsm_api, custom_jql):
         )
     for issue in issues:
         expanded_issue = jsm_api.get_request(issue_id_or_key=issue['key'])
-        issue['service_desk_id'] = expanded_issue[0]['serviceDeskId']
+        issue['service_desk_id'] = expanded_issue['serviceDeskId']
     if not issues:
         print(f"There are no issues found using JQL {custom_jql}")
     return issues