[BUG] Fix issue with results_iter when API returns an object CAT-213

.gitignore

@@ -1,3 +1,4 @@
+.idea
 *.egg-info
 *.pyc
 .tox

learnosity_sdk/request/dataapi.py

@@ -1,4 +1,3 @@
-
 import requests
 import copy
 
@@ -7,8 +6,8 @@
 
 
 class DataApi(object):
-
-    def request(self, endpoint, security_packet,
+    @staticmethod
+    def request(endpoint, security_packet,
                 secret, request_packet={}, action='get'):
         """
         Make a request to Data API
@@ -60,8 +59,12 @@ def results_iter(self, endpoint, security_packet,
         for response in self.request_iter(endpoint, security_packet,
                                           secret, request_packet,
                                           action):
-            for result in response['data']:
-                yield result
+            if isinstance(response['data'], dict):
+                for key, value in self.__iteritems(response['data']):
+                    yield {key: value}
+            else:
+                for result in response['data']:
+                    yield result
 
     def request_iter(self, endpoint, security_packet,
                      secret, request_packet={},
@@ -92,7 +95,9 @@ def request_iter(self, endpoint, security_packet,
         # are modified between yields
         security_packet = copy.deepcopy(security_packet)
         request_packet = copy.deepcopy(request_packet)
+
         data_end = False
+
         while not data_end:
             res = self.request(
                 endpoint,
@@ -101,10 +106,12 @@ def request_iter(self, endpoint, security_packet,
                 request_packet,
                 action
             )
+
             if not res.ok:
                 raise DataApiException(
                     'server returned HTTP status ' + str(res.status_code)
                     + ': ' + res.text)
+
             try:
                 data = res.json()
             except ValueError:
@@ -122,4 +129,11 @@ def request_iter(self, endpoint, security_packet,
             else:
                 yield data
 
+    @staticmethod
+    def __iteritems(obj, **kwargs):
+        func = getattr(obj, "iteritems", None)
+
+        if not func:
+            func = obj.items
 
+        return func(**kwargs)

tests/integration/test_dataapi.py

@@ -8,32 +8,25 @@
     'consumer_key': 'yis0TYCu7U9V4o7M',
     'domain': 'demos.learnosity.com'
 }
+
 # WARNING: Normally the consumer secret should not be committed to a public
 # repository like this one. Only this specific key is publically available.
 consumer_secret = '74c5fd430cf1242a527f6223aebd42d30464be22'
-request = {
+action = 'get'
+
+items_request = {
     # These items should already exist for the demos consumer
     'references': ['item_2', 'item_3'],
     'limit': 1
 }
-action = 'get'
-endpoint = '/itembank/items'
-dummy_responses = [{
-    'meta': {
-        'status': True,
-        'timestamp': 1514874527,
-        'records': 2,
-        'next': '1'
-    },
-    'data': [{'id': 'a'}]
-}, {
-    'meta': {
-        'status': True,
-        'timestamp': 1514874527,
-        'records': 2
-    },
-    'data': [{'id': 'b'}]
-}]
+items_endpoint = '/itembank/items'
+
+questions_request = {
+    # These items should already exist for the demos consumer
+    'item_references': ['py-sdk-test-2019-1', 'py-sdk-test-2019-2'],
+    'limit': 1
+}
+questions_endpoint = '/itembank/questions'
 
 
 class IntegrationTestDataApiClient(unittest.TestCase):
@@ -59,30 +52,100 @@ def _build_base_url(self):
 
         return base_url
 
-
     def test_real_request(self):
         """Make a request against Data Api to ensure the SDK works"""
         client = DataApi()
-        res = client.request(self._build_base_url() + endpoint, security, consumer_secret, request,
+
+        test_url = self._build_base_url() + items_endpoint
+
+        print("test_url is", test_url)
+
+        res = client.request(test_url, security, consumer_secret, items_request,
                              action)
-        print(res.request.url)
-        print(res.request.body)
-        print(res.content)
+
         returned_json = res.json()
+
         assert len(returned_json['data']) > 0
+
         returned_ref = returned_json['data'][0]['reference']
-        assert returned_ref in request['references']
+
+        assert returned_ref in items_request['references']
 
     def test_paging(self):
         """Verify that paging works"""
         client = DataApi()
-        pages = client.request_iter(self._build_base_url() + endpoint, security, consumer_secret,
-                                    request, action)
+
+        test_url = self._build_base_url() + items_endpoint
+
+        print("test_url is", test_url)
+
+        pages = client.request_iter(test_url, security, consumer_secret,
+                                    items_request, action)
+
         results = set()
+
         for page in pages:
             if page['data']:
                 results.add(page['data'][0]['reference'])
 
         assert len(results) == 2
         assert results == {'item_2', 'item_3'}
 
+    def test_real_question_request(self):
+        """Make a request against Data Api to ensure the SDK works"""
+        client = DataApi()
+
+        test_url = self._build_base_url() + questions_endpoint
+
+        print("test_url is", test_url)
+
+        questions_request['limit'] = 3
+
+        res = client.request(test_url, security, consumer_secret, questions_request,
+                             action)
+
+        returned_json = res.json()
+
+        assert len(returned_json['data']) > 0
+
+        keys = set()
+
+        for key, value in self.__iteritems(returned_json['data']):
+            keys.add(key)
+
+        assert keys == {'py-sdk-test-2019-1', 'py-sdk-test-2019-2'}
+
+    def test_question_paging(self):
+        """Verify that paging works"""
+        client = DataApi()
+
+        test_url = self._build_base_url() + questions_endpoint
+
+        print("test_url is", test_url)
+
+        pages = client.request_iter(test_url, security, consumer_secret,
+                                    questions_request, action)
+
+        results = []
+
+        for page in pages:
+            if page['data']:
+                results.append(page['data'])
+
+        keys = set()
+
+        for row in results:
+            for key in row.keys():
+                keys.add(key)
+
+        assert len(results) == 3
+        assert keys == {'py-sdk-test-2019-1', 'py-sdk-test-2019-2'}
+
+    @staticmethod
+    def __iteritems(obj, **kwargs):
+        func = getattr(obj, "iteritems", None)
+
+        if not func:
+            func = obj.items
+
+        return func(**kwargs)