refactor pagination [#20]

Author: dnl-blkv

bunq/sdk/client.py

@@ -52,6 +52,9 @@ class ApiClient(object):
     _METHOD_GET = 'GET'
     _METHOD_DELETE = 'DELETE'
 
+    # Delimiter between path and params in URI
+    _DELIMITER_PATH_AND_PARAMS = '?'
+
     # Status code for successful execution
     _STATUS_CODE_OK = 200
 
@@ -97,11 +100,8 @@ def _request(self, method, uri_relative, request_bytes, params,
         :return: BunqResponseRaw
         """
 
-        if params:
-            uri_relative_with_params = uri_relative + '?' + urlencode(params)
-        else:
-            uri_relative_with_params = uri_relative
-
+        uri_relative_with_params = self._append_params_to_uri(uri_relative,
+                                                              params)
         self._api_context.ensure_session_active()
         all_headers = self._get_all_headers(
             method,
@@ -130,6 +130,20 @@ def _request(self, method, uri_relative, request_bytes, params,
 
         return self._create_bunq_response_raw(response)
 
+    @classmethod
+    def _append_params_to_uri(cls, uri, params):
+        """
+        :type uri: str
+        :type params: dict[str, str]
+
+        :rtype: str
+        """
+
+        if params:
+            return uri + cls._DELIMITER_PATH_AND_PARAMS + urlencode(params)
+
+        return uri
+
     def _get_all_headers(self, method, endpoint, request_bytes, custom_headers):
         """
         :type method: str
@@ -376,9 +390,9 @@ class Pagination(object):
     """
 
     # Field constants
-    _FIELD_OLDER_ID = 'older_id'
-    _FIELD_NEWER_ID = 'newer_id'
-    _FIELD_COUNT = 'count'
+    FIELD_OLDER_ID = 'older_id'
+    FIELD_NEWER_ID = 'newer_id'
+    FIELD_COUNT = 'count'
 
     def __init__(self):
         self._older_id = None
@@ -393,7 +407,7 @@ def url_params_previous(self):
         """
 
         params = {
-            self._FIELD_OLDER_ID: str(self._older_id),
+            self.FIELD_OLDER_ID: str(self._older_id),
         }
         self._add_count_to_params_if_needed(params)
 
@@ -407,7 +421,7 @@ def _add_count_to_params_if_needed(self, params):
         """
 
         if self._count is not None:
-            params[self._FIELD_COUNT] = str(self._count)
+            params[self.FIELD_COUNT] = str(self._count)
 
     @property
     def _next_id(self):
@@ -434,7 +448,7 @@ def url_params_next(self):
         """
 
         params = {
-            self._FIELD_NEWER_ID: str(self._next_id),
+            self.FIELD_NEWER_ID: str(self._next_id),
         }
         self._add_count_to_params_if_needed(params)
 

bunq/sdk/json/adapters.py

@@ -483,29 +483,33 @@ def parse_pagination_dict(cls, response_obj):
 
         pagination_dict = {}
 
-        cls.update_dict_id_field_from_response_field(pagination_dict,
-                                                     cls._FIELD_OLDER_ID,
-                                                     response_obj,
-                                                     cls._FIELD_OLDER_URL,
-                                                     cls._FIELD_OLDER_ID)
-        cls.update_dict_id_field_from_response_field(pagination_dict,
-                                                     cls._FIELD_NEWER_ID,
-                                                     response_obj,
-                                                     cls._FIELD_NEWER_URL,
-                                                     cls._FIELD_NEWER_ID)
-        cls.update_dict_id_field_from_response_field(pagination_dict,
-                                                     cls._FIELD_FUTURE_ID,
-                                                     response_obj,
-                                                     cls._FIELD_FUTURE_URL,
-                                                     cls._FIELD_NEWER_ID)
+        cls.update_dict_id_field_from_response_field(
+            pagination_dict,
+            cls._FIELD_OLDER_ID,
+            response_obj,
+            cls._FIELD_OLDER_URL,
+            client.Pagination.FIELD_OLDER_ID
+        )
+        cls.update_dict_id_field_from_response_field(
+            pagination_dict,
+            cls._FIELD_NEWER_ID,
+            response_obj,
+            cls._FIELD_NEWER_URL,
+            client.Pagination.FIELD_NEWER_ID
+        )
+        cls.update_dict_id_field_from_response_field(
+            pagination_dict,
+            cls._FIELD_FUTURE_ID,
+            response_obj,
+            cls._FIELD_FUTURE_URL,
+            client.Pagination.FIELD_NEWER_ID
+        )
 
         return pagination_dict
 
     @classmethod
-    def update_dict_id_field_from_response_field(cls, dict_,
-                                                 dict_id_field,
-                                                 response_obj,
-                                                 response_field,
+    def update_dict_id_field_from_response_field(cls, dict_, dict_id_field,
+                                                 response_obj, response_field,
                                                  response_param):
         """
         :type dict_: dict
@@ -526,7 +530,7 @@ def update_dict_id_field_from_response_field(cls, dict_,
 
             if cls._FIELD_COUNT in parameters:
                 dict_[cls._FIELD_COUNT] = int(
-                    parameters[cls._FIELD_COUNT][cls._INDEX_FIRST]
+                    parameters[client.Pagination.FIELD_COUNT][cls._INDEX_FIRST]
                 )
 
     @classmethod