fix: bad pagination

foxchip-fr · Jan 21, 2025 · ba25795 · ba25795
1 parent dab6248
commit ba25795
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/psebpconnector/connector.py b/src/psebpconnector/connector.py
@@ -406,6 +406,10 @@ def export_orders_and_products(self):
                 self._process_order(order)
             except InvalidOrder:
                 self.logger.warning(f"Skipping order {order.id}")
+                if order.is_refund:
+                    self.webservice.refund_error_counter += 1
+                else:
+                    self.webservice.order_error_counter += 1
             finally:
                 exported_orders_counter += 1
 

diff --git a/src/psebpconnector/webservice.py b/src/psebpconnector/webservice.py
@@ -51,6 +51,9 @@ def __init__(self, url: str, apikey: str):
             'Io-Format': 'JSON',
         }
 
+        self.order_error_counter = 0
+        self.refund_error_counter = 0
+
     def _build_credentials(self) -> HTTPBasicAuth:
         return HTTPBasicAuth(self.apikey, '')
 
@@ -134,21 +137,19 @@ def get_orders_to_export(self, valid_orders_status: List[str], refund_orders_sta
         exporting_regular_orders = True
         exporting_refunds = False
         for i in range(self._MAX_CALLS):
-            offset = i * self._PAGINATION_SIZE
-
             if exporting_regular_orders:
                 result = self._do_api_call(self._build_url('orders_with_printed', {
                     'filter[orders_printed][exported]': '0',
                     'filter[current_state]': '[' + '|'.join(valid_orders_status) + ']',
                     'sort': '[id_ASC]',
-                    'limit': f"{offset},{self._PAGINATION_SIZE}"
+                    'limit': f"{self.order_error_counter},{self.order_error_counter + self._PAGINATION_SIZE}"
                 }))
             elif exporting_refunds:
                 result = self._do_api_call(self._build_url('orders_with_printed', {
                     'filter[orders_printed][exported]': '1',
                     'filter[current_state]': '[' + '|'.join(refund_orders_status) + ']',
                     'sort': '[id_ASC]',
-                    'limit': f"{offset},{self._PAGINATION_SIZE}"
+                    'limit': f"{self.refund_error_counter},{self.refund_error_counter + self._PAGINATION_SIZE}"
                 }))
             else:
                 break