From 4de6ab18a2985507d078bd412b31fdd287752fad Mon Sep 17 00:00:00 2001
From: Marko Kohtala <marko.kohtala@okoko.fi>
Date: Mon, 15 Sep 2025 09:48:28 +0300
Subject: [PATCH] fix: Use default_batch_size for enhanced_search_issues
 (#2366)

It asked always in batches of 100 items ignoring the configured
default_batch_size. This caused timeouts with 500 status on some
searches.
---
 jira/client.py | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/jira/client.py b/jira/client.py
index b23aff2de..fb40ff05e 100644
--- a/jira/client.py
+++ b/jira/client.py
@@ -918,7 +918,7 @@ def _fetch_pages_searchToken(
         item_type: type[ResourceType],
         items_key: str | None,
         request_path: str,
-        maxResults: int = 50,
+        maxResults: int | Literal[False] = 50,
         params: dict[str, Any] | None = None,
         base: str = JIRA_BASE_URL,
         use_post: bool = False,
@@ -929,7 +929,7 @@ def _fetch_pages_searchToken(
             item_type (Type[Resource]): Type of single item. Returns a `ResultList` of such items.
             items_key (Optional[str]): Path to the items in JSON returned from the server.
             request_path (str): Path in the request URL.
-            maxResults (int): Maximum number of items to return per page. (Default: 50)
+            maxResults (int): Maximum number of items to return. If maxResults evaluates as False, it will try to get all items in batches. (Default:50)
             params (Dict[str, Any]): Parameters to be sent with the request.
             base (str): Base URL for the requests.
             use_post (bool): Whether to use POST instead of GET.
@@ -937,11 +937,10 @@ def _fetch_pages_searchToken(
         Returns:
             ResultList: List of fetched items.
         """
-        DEFAULT_BATCH = 100  # Max batch size per request
         fetch_all = maxResults in (0, False)  # If False/0, fetch everything
 
         page_params = (params or {}).copy()  # Ensure params isn't modified
-        page_params["maxResults"] = DEFAULT_BATCH if fetch_all else maxResults
+        page_params["maxResults"] = self._get_batch_size(item_type) if fetch_all else maxResults
 
         # Use caller-provided nextPageToken if present
         nextPageToken: str | None = page_params.get("nextPageToken")
@@ -2177,7 +2176,7 @@ def createmeta_fieldtypes(
         projectIdOrKey: str | int,
         issueTypeId: str | int,
         startAt: int = 0,
-        maxResults: int = 50,
+        maxResults: int | Literal[False] = 50,
     ) -> dict[str, Any]:
         """Get the field metadata for a given project and issue type, required to create issues.
 
@@ -3091,7 +3090,7 @@ def project_issue_types(
         self,
         project: str,
         startAt: int = 0,
-        maxResults: int = 50,
+        maxResults: int | Literal[False] = 50,
     ) -> ResultList[IssueType]:
         """Get a list of issue type Resources available in a given project from the server.
 
@@ -3121,7 +3120,7 @@ def project_issue_fields(
         project: str,
         issue_type: str,
         startAt: int = 0,
-        maxResults: int = 50,
+        maxResults: int | Literal[False] = 50,
     ) -> ResultList[Field]:
         """Get a list of field type Resources available for a project and issue type from the server.
 
@@ -3557,7 +3556,7 @@ def search_issues(
         self,
         jql_str: str,
         startAt: int = 0,
-        maxResults: int = 50,
+        maxResults: int | Literal[False] = 50,
         validate_query: bool = True,
         fields: str | list[str] | None = "*all",
         expand: str | None = None,
@@ -3572,7 +3571,7 @@ def search_issues(
         self,
         jql_str: str,
         startAt: int = 0,
-        maxResults: int = 50,
+        maxResults: int | Literal[False] = 50,
         validate_query: bool = True,
         fields: str | list[str] | None = "*all",
         expand: str | None = None,
@@ -3586,7 +3585,7 @@ def search_issues(
         self,
         jql_str: str,
         startAt: int = 0,
-        maxResults: int = 50,
+        maxResults: int | Literal[False] = 50,
         validate_query: bool = True,
         fields: str | list[str] | None = "*all",
         expand: str | None = None,
@@ -3693,7 +3692,7 @@ def enhanced_search_issues(
         self,
         jql_str: str,
         nextPageToken: str | None = None,
-        maxResults: int = 50,
+        maxResults: int | Literal[False] = 50,
         fields: str | list[str] | None = "*all",
         expand: str | None = None,
         reconcileIssues: list[int] | None = None,