keeping the context of the last request builder as the pagination scheme could get changed in between the pagination calls

Author: sufyankhanrao

apimatic_core/pagination/paginated_data.py

@@ -15,17 +15,15 @@ def last_response(self):
         """
         Returns the most recent HTTP response received during pagination.
         """
-        return self._http_call_context.response
+        return self._http_call_context.response if self._last_request_builder is not None else None
 
     @property
     def request_builder(self):
         """
         Returns the appropriate request builder for the current pagination state.
         """
-        if self.last_response is None:
-            return self._initial_request_builder
+        return self._initial_request_builder if self._last_request_builder is None else self._last_request_builder
 
-        return self._api_call.request_builder
 
     @property
     def page_size(self):
@@ -52,12 +50,14 @@ def __init__(self, api_call, paginated_items_converter):
         self._api_call = copy.deepcopy(api_call)
         self._paginated_items_converter = paginated_items_converter
         self._initial_request_builder = api_call.request_builder
+        self._last_request_builder = None
         self._pagination_strategies = self._api_call.get_pagination_strategies
         self._http_call_context =\
             self._api_call.global_configuration.get_http_client_configuration().http_callback or HttpCallContext()
         _http_client_configuration = self._api_call.global_configuration.get_http_client_configuration().clone(
             http_callback=self._http_call_context)
-        self._global_configuration = self._api_call.global_configuration.clone_with()
+        self._global_configuration = self._api_call.global_configuration.clone_with(
+            http_client_configuration=_http_client_configuration)
         self._paged_response = None
         self._items = []
         self._page_size = 0
@@ -128,6 +128,8 @@ def _fetch_next_page(self):
             if request_builder is None:
                 continue
 
+            self._last_request_builder = request_builder
+
             response = self._api_call.clone(
                 global_configuration=self._global_configuration, request_builder=request_builder
             ).execute()

apimatic_core/pagination/strategies/cursor_pagination.py

@@ -53,9 +53,10 @@ def apply(self, paginated_data):
         """
         last_response = paginated_data.last_response
         request_builder = paginated_data.request_builder
+        self._cursor_value = self._get_initial_cursor_value(request_builder, self._input)
 
+        # The last response is none which means this is going to be the 1st page
         if last_response is None:
-            self._cursor_value = self._get_initial_cursor_value(request_builder, self._input)
             return request_builder
 
         self._cursor_value = ApiHelper.resolve_response_pointer(

apimatic_core/pagination/strategies/link_pagination.py

@@ -45,6 +45,7 @@ def apply(self, paginated_data):
         last_response = paginated_data.last_response
         request_builder = paginated_data.request_builder
 
+        # The last response is none which means this is going to be the 1st page
         if last_response is None:
             return request_builder
 

apimatic_core/pagination/strategies/offset_pagination.py

@@ -46,13 +46,13 @@ def apply(self, paginated_data):
         """
         last_response = paginated_data.last_response
         request_builder = paginated_data.request_builder
-        last_page_size = paginated_data.page_size
+        self._offset = self._get_initial_request_param_value(request_builder, self._input)
+
         # The last response is none which means this is going to be the 1st page
         if last_response is None:
-            self._offset = self._get_initial_request_param_value(request_builder, self._input)
             return request_builder
 
-        self._offset += last_page_size
+        self._offset += paginated_data.page_size
 
         return self.get_updated_request_builder(request_builder, self._input, self._offset)
 

apimatic_core/pagination/strategies/page_pagination.py

@@ -41,12 +41,13 @@ def apply(self, paginated_data):
         """
         last_response = paginated_data.last_response
         request_builder = paginated_data.request_builder
-        last_page_size = paginated_data.page_size
+        self._page_number = self._get_initial_request_param_value(request_builder, self._input, 1)
+
         # The last response is none which means this is going to be the 1st page
         if last_response is None:
-            self._page_number = self._get_initial_request_param_value(request_builder, self._input, 1)
             return request_builder
-        self._page_number += 1 if last_page_size > 0 else 0
+
+        self._page_number += 1 if paginated_data.page_size > 0 else 0
 
         return self.get_updated_request_builder(request_builder, self._input, self._page_number)
 

tests/apimatic_core/pagination_tests/strategies/test_page_pagination.py

@@ -144,9 +144,9 @@ def test_apply_subsequent_call_does_not_increment_page_with_no_results(self, moc
 
         pp.apply(mock_paginated_data_subsequent_call_no_results)
 
-        assert pp._page_number == 3
+        assert pp._page_number == 2
         mock_get_updated_request_builder.assert_called_once_with(
-            mock_request_builder, "$request.query#/page", 3
+            mock_request_builder, "$request.query#/page", 2
         )
 
     def test_apply_metadata_wrapper(self, mock_metadata_wrapper, mocker):

tests/apimatic_core/pagination_tests/test_paginated_data.py

@@ -71,29 +71,6 @@ def test_init_paginated_items_converter_none_raises_error(self, mock_api_call):
         with pytest.raises(ValueError, match="paginated_items_converter cannot be None"):
             PaginatedData(api_call=mock_api_call, paginated_items_converter=None)
 
-    # Test properties
-    def test_last_response_property(self, mock_paginated_data_instance, mocker):
-        # Manually set the internal _http_call_context.response for testing
-        mock_response = mocker.Mock()
-        mock_paginated_data_instance._http_call_context.response = mock_response
-        assert mock_paginated_data_instance.last_response == mock_response
-
-    def test_last_response_property_none(self, mock_paginated_data_instance):
-        mock_paginated_data_instance._http_call_context.response = None
-        assert mock_paginated_data_instance.last_response is None
-
-    def test_request_builder_property_initial(self, mock_paginated_data_instance):
-        mock_paginated_data_instance._http_call_context.response = None
-        assert mock_paginated_data_instance.request_builder == mock_paginated_data_instance._initial_request_builder
-
-    def test_request_builder_property_after_response(self, mock_paginated_data_instance, mocker):
-        mock_paginated_data_instance._http_call_context.response = mocker.Mock()
-        assert mock_paginated_data_instance.request_builder == mock_paginated_data_instance._api_call.request_builder
-
-    def test_page_size_property(self, mock_paginated_data_instance):
-        mock_paginated_data_instance._page_size = 10
-        assert mock_paginated_data_instance.page_size == 10
-
     # Test __next__
     def test_next_iterates_current_items(self, mock_paginated_data_instance):
         mock_paginated_data_instance._items = ["item1", "item2"]