Return items, items_count for Data Extension Rows Retrieve via REST API

Sebastien.Dangelo · Sebastien.Dangelo · commit 3b13f1dcc80a · 2020-03-16T04:27:18.000-05:00
diff --git a/FuelSDKWrapper.py b/FuelSDKWrapper.py
@@ -476,15 +476,16 @@ def get_data_extension_rows_rest(self, customer_key, search_filter=None, propert
 
         result = []
         r = requests.get(endpoint, headers=headers)
-        if r.status_code == 200 and r.json()['count']:
+        items_count = r.json()['count']
+        if r.status_code == 200 and items_count:
             result = r.json()['items'][:max_rows]
             if not page:
                 while 'next' in r.json()['links'] and len(result) < max_rows:
                     endpoint = '{}data{}'.format(self.client.base_api_url, r.json()['links']['next'])
                     r = requests.get(endpoint, headers=headers)
-                    if r.status_code == 200 and r.json()['count']:
+                    if r.status_code == 200 and r.json()['items']:
                         result += r.json()['items'][:max_rows-len(result)]
-        return result
+        return result, items_count
 
     def get_data_extension_rows(self, customer_key, search_filter=None, property_list=None):
         de_row = FuelSDK.ET_DataExtension_Row()
diff --git a/README.md b/README.md
@@ -150,7 +150,7 @@ values_list = [
 response = api.create_data_extension_rows("DE_Key", keys_list, values_list)
 
 # Retrieve Data Extension Rows via REST API for more advanced parameters
-response = api.get_data_extension_rows_rest(
+items, items_count = api.get_data_extension_rows_rest(
     customer_key="DE_CUSTOMER_KEY",
     search_filter=complex_filter(
         simple_filter("first_name", Operator.EQUALS, "John"),
@@ -163,7 +163,7 @@ response = api.get_data_extension_rows_rest(
     page=5
 )
 
-response = api.get_data_extension_rows_rest(
+items, items_count = api.get_data_extension_rows_rest(
     customer_key="DE_CUSTOMER_KEY",
     search_filter=simple_filter("full_name", Operator.LIKE, "Jo%Doe"),
     property_list=["email_address", "full_name"],
diff --git a/__init__.py b/__init__.py
@@ -1,4 +1,4 @@
 __title__ = 'FuelSDKWrapper'
-__version__ = '1.1.8'
+__version__ = '1.1.9'
 __author__ = 'Seb Angel'
 __license__ = 'MIT'
diff --git a/setup.py b/setup.py
@@ -4,7 +4,7 @@
     readme = f.read()
 
 setup(
-    version='1.1.8',
+    version='1.1.9',
     name='FuelSDKWrapper',
     description='Simplify and enhance the FuelSDK for Salesforce Marketing Cloud (ExactTarget)',
     long_description=readme,
