brynq-sdk-jira 3.0.1__tar.gz → 3.0.3__tar.gz

{brynq_sdk_jira-3.0.1 → brynq_sdk_jira-3.0.3}/PKG-INFO

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

{brynq_sdk_jira-3.0.1 → brynq_sdk_jira-3.0.3}/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.1 → brynq_sdk_jira-3.0.3}/brynq_sdk_jira/tempo.py

@@ -55,6 +55,82 @@ class Tempo(BrynQ):
 
         return total_response
 
+    def get_tempo_timesheet_approvals(self, from_date: str, to_date: str, team_id: int = 19) -> json:
+        """
+        This function retrieves approved timesheet approvals for a given team in Tempo
+        over the specified date range.
+
+        :param from_date: string <yyyy-MM-dd> - retrieve results starting with this date
+        :param to_date: string <yyyy-MM-dd> - retrieve results up to and including this date
+        :param team_id: int (default 19) - Tempo team ID whose approvals are retrieved
+        :return: json response with results
+        """
+        total_response = []
+        got_all_results = False
+        no_of_loops = 0
+
+        parameters = {
+            "from": from_date,
+            "to": to_date,
+        }
+
+        while not got_all_results:
+            loop_parameters = parameters | {"limit": 50, "offset": 50 * no_of_loops}
+            url = f"https://api.tempo.io/4/timesheet-approvals/team/{team_id}"
+            response = requests.get(
+                url,
+                headers=self.headers,
+                params=loop_parameters,
+                timeout=self.timeout
+            )
+
+            if response.status_code == 200:
+                response_json = response.json()
+                no_of_loops += 1
+                got_all_results = False if int(response_json['metadata']['count']) == 50 else True
+                total_response += response_json['results']
+            else:
+                raise ConnectionError(
+                    f"Error getting timesheet approvals from Tempo: {response.status_code, response.text}"
+                )
+
+        if self.debug:
+            print(f"Received {len(total_response)} timesheet approvals from Tempo")
+
+        return total_response
+
+    def call_api(self, url: str, limit: int = 50) -> list[dict]:
+        """
+        Calls the Tempo API and retrieves all paginated results for a given endpoint.
+
+        Args:
+            url (str): The API endpoint URL to call.
+            limit (int): Max results to fetch per request (default 50).
+
+        Returns:
+            list[dict]: A list of all results across all pages.
+        """
+        all_results = []
+        offset = 0
+        while True:
+            querystring = {"limit": str(limit), "offset": str(offset)}
+            response = requests.get(url, headers=self.headers, params=querystring)
+            response.raise_for_status()
+            data = response.json()
+
+            # append results
+            results = data.get("results", [])
+            all_results.extend(results)
+
+            # pagination check
+            count = data.get("metadata", {}).get("count", 0)
+            if count < limit:
+                break
+
+            offset += limit
+
+        return all_results
+
     def get_tempo_teams(self, team_members: List[str] = None, name: str = None) -> json:
         """
         Fetches teams from the Tempo API in smaller batches to prevent long URLs if team_members is specified,

{brynq_sdk_jira-3.0.1 → brynq_sdk_jira-3.0.3}/brynq_sdk_jira.egg-info/PKG-INFO

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

{brynq_sdk_jira-3.0.1 → brynq_sdk_jira-3.0.3}/setup.py

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