Skip to content

Commit 93c91a9

Browse files
MaximZemskovgonchik
authored andcommitted
Fix few get requests in ServiceDesk API falls if advanced_mode is on (#425)
1 parent b6533ab commit 93c91a9

File tree

1 file changed

+18
-5
lines changed

1 file changed

+18
-5
lines changed

atlassian/service_desk.py

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,10 @@ def get_customer_request(self, issue_id_or_key):
6666

6767
def get_my_customer_requests(self):
6868
""" Returning requests where you are the assignee """
69-
70-
return (self.get('rest/servicedeskapi/request') or {}).get('values')
69+
response = self.get('rest/servicedeskapi/request')
70+
if self.advanced_mode:
71+
return response
72+
return (response or {}).get('values')
7173

7274
def create_customer_request(self, service_desk_id, request_type_id,
7375
values_dict, raise_on_behalf_of=None,
@@ -105,6 +107,8 @@ def get_customer_request_status(self, issue_id_or_key):
105107
:return: Status name
106108
"""
107109
request = self.get('rest/servicedeskapi/request/{}/status'.format(issue_id_or_key))
110+
if self.advanced_mode:
111+
return request
108112
if request:
109113
if request.get('values', []):
110114
return request.get('values', [])[0].get('status', {})
@@ -148,7 +152,10 @@ def get_request_participants(self, issue_id_or_key, start=0, limit=50):
148152
if limit is not None:
149153
params['limit'] = int(limit)
150154

151-
return (self.get(url, params=params) or {}).get('values')
155+
response = self.get(url, params=params)
156+
if self.advanced_mode:
157+
return response
158+
return (response or {}).get('values')
152159

153160
def add_request_participants(self, issue_id_or_key, users_list):
154161
"""
@@ -454,7 +461,10 @@ def get_sla(self, issue_id_or_key, start=0, limit=50):
454461
if limit is not None:
455462
params['limit'] = int(limit)
456463

457-
return (self.get(url, params=params) or {}).get('values')
464+
response = self.get(url, params=params)
465+
if self.advanced_mode:
466+
return response
467+
return (response or {}).get('values')
458468

459469
def get_sla_by_id(self, issue_id_or_key, sla_id):
460470
"""
@@ -486,7 +496,10 @@ def get_approvals(self, issue_id_or_key, start=0, limit=50):
486496
if limit is not None:
487497
params['limit'] = int(limit)
488498

489-
return (self.get(url, headers=self.experimental_headers, params=params) or {}).get('values')
499+
response = self.get(url, headers=self.experimental_headers, params=params)
500+
if self.advanced_mode:
501+
return response
502+
return (response or {}).get('values')
490503

491504
def get_approval_by_id(self, issue_id_or_key, approval_id):
492505
"""

0 commit comments

Comments
 (0)