brynq-sdk-jira 3.0.0__tar.gz → 3.0.2__tar.gz

{brynq_sdk_jira-3.0.0 → brynq_sdk_jira-3.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: brynq_sdk_jira
-Version: 3.0.0
+Version: 3.0.2
 Summary: JIRA wrapper from BrynQ
 Home-page: UNKNOWN
 Author: BrynQ

{brynq_sdk_jira-3.0.0 → brynq_sdk_jira-3.0.2}/brynq_sdk_jira/jira.py

@@ -26,42 +26,60 @@ class Jira(BrynQ):
         :param expand_fields: an optional list of fields to expand
         :return: dataframe with issues
         """
-        total_response = []
-        got_all_results = False
-        no_of_loops = 0
-        while not got_all_results:
-            query = {
-                'startAt': f'{100 * no_of_loops}',
-                'maxResults': '100',
-                'fields': ["summary", "issuetype", "timetracking", "timespent", "description", "assignee", "project"],
-                'fieldsByKeys': 'false'
+        if jira_filter_id is not None:
+            raise ValueError("Jira filter id is no longer supported, use jql_filter instead")
+
+        # Use new JQL search endpoint
+        url = f"{self.base_url}rest/api/3/search/jql"
+
+        all_issues = []
+        next_page_token = None
+
+        while True:
+            payload = {
+                "maxResults": 100,
+                "fields": ["summary", "issuetype", "timetracking", "timespent", "description", "assignee", "project"]
             }
+
+            if jql_filter:
+                payload["jql"] = jql_filter
+
+            if get_extra_fields:
+                payload["fields"].extend(get_extra_fields)
+
+            if expand_fields:
+                # Convert list to comma-delimited string
+                payload["expand"] = ",".join(expand_fields)
+
+            if next_page_token:
+                payload["nextPageToken"] = next_page_token
+
             if self.debug:
-                print(query)
-            if jql_filter is not None:
-                query['jql'] = jql_filter
-            if get_extra_fields is not None:
-                query['fields'] += get_extra_fields
-            if expand_fields is not None:
-                query['expand'] = expand_fields
-            if jira_filter_id is not None:
-                url = f"{self.base_url}rest/api/3/search/jira/filter/{jira_filter_id}"
-            else:
-                url = f"{self.base_url}rest/api/3/search"
-            response = requests.post(url=url, headers=self.headers, data=json.dumps(query), timeout=self.timeout)
+                print(f"Payload: {payload}")
+
+            response = requests.post(
+                url=url,
+                headers=self.headers,
+                data=json.dumps(payload),
+                timeout=self.timeout
+            )
+
             if response.status_code == 200:
                 response_json = response.json()
-                no_of_loops += 1
-                got_all_results = False if len(response_json['issues']) == 100 else True
-                total_response += response_json['issues']
+                all_issues.extend(response_json.get("issues", []))
+
+                # Check for next page
+                if "nextPageToken" in response_json:
+                    next_page_token = response_json["nextPageToken"]
+                else:
+                    break
             else:
                 raise ConnectionError(f"Error getting issues from Jira with message: {response.status_code, response.text}")
 
         if self.debug:
-            print(f"Received {len(total_response)} issues from Jira")
-
-        df = pd.json_normalize(total_response)
+            print(f"Received {len(all_issues)} issues from Jira")
 
+        df = pd.json_normalize(all_issues)
         return df
 
     def get_projects(self) -> pd.DataFrame:
@@ -143,4 +161,4 @@ class Jira(BrynQ):
                 print(f"Received {len(all_users)} jira users from Jira")
 
         df = pd.json_normalize(all_users)
-        return df
+        return df

{brynq_sdk_jira-3.0.0 → brynq_sdk_jira-3.0.2}/brynq_sdk_jira/tempo.py

@@ -9,7 +9,7 @@ class Tempo(BrynQ):
     def __init__(self, system_type: Optional[Literal['source', 'target']] = None, debug=False):
         super().__init__()
         self.debug = debug
-        credentials = self.interfaces.credentials.get(system="tempo-timesheets", system_type=system_type)
+        credentials = self.interfaces.credentials.get(system="jira", system_type=system_type)
         credentials = credentials.get('data')
         self.headers = {
             "Authorization": f"Bearer {credentials['api_token']}",

{brynq_sdk_jira-3.0.0 → brynq_sdk_jira-3.0.2}/brynq_sdk_jira.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: brynq-sdk-jira
-Version: 3.0.0
+Version: 3.0.2
 Summary: JIRA wrapper from BrynQ
 Home-page: UNKNOWN
 Author: BrynQ

{brynq_sdk_jira-3.0.0 → brynq_sdk_jira-3.0.2}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_namespace_packages
 
 setup(
     name='brynq_sdk_jira',
-    version='3.0.0',
+    version='3.0.2',
     description='JIRA wrapper from BrynQ',
     long_description='JIRA wrapper from BrynQ',
     author='BrynQ',
@@ -15,4 +15,4 @@ setup(
         'requests>=2,<=3'
     ],
     zip_safe=False,
-)
+)