0.0.4 - test fixes, denest fix, conversions

Author: robswc

src/quickbase_json/qb_response.py

@@ -1,4 +1,5 @@
 import datetime
+from functools import wraps
 
 
 class Bcolors:
@@ -13,10 +14,20 @@ class Bcolors:
     UNDERLINE = '\033[4m'
 
 
+def operation(method):
+    @wraps(method)
+    def wrapper(self, *args, **kwargs):
+        self.operations.append(method.__name__)
+        return method(self, *args, **kwargs)
+
+    return wrapper
+
+
 class QBResponse(dict):
+
     def __init__(self, response_type, **kwargs):
         self.response_type = response_type
-        self.transformations = {}
+        self.operations = []
         # potential to load sample data for testing
         if kwargs.get('sample_data'):
             self.update(kwargs.get('sample_data'))
@@ -84,6 +95,7 @@ def prd(self, data):
         """
         print("\033[91m", 'Relevant Data:\n\n', data, '\n', "\033[0m")
 
+    @operation
     def denest(self):
         """
         Denests data, i.e. if in {'key': {'value': actual_value}} format. -> {'key': actual_value}
@@ -102,8 +114,16 @@ def denest(self):
                 new_records.update({record: new_record_value})
 
             self.update({'data': new_records})
+
+        if type(data) is list:
+            for d in data:
+                for k, v in d.items():
+                    d.update({k: v.get('value')})
+
+        print('++++', self.data)
         return self
 
+    @operation
     def orient(self, orient, **kwargs):
         """
         Orients the data, given orientation argument.
@@ -125,7 +145,10 @@ def orient(self, orient, **kwargs):
             records = {}
             try:
                 for i in self.get('data'):
-                    key = i.pop(selector).get('value') if self.get('data') else i.pop(selector)
+                    if 'denest' in self.operations:
+                        key = i.pop(selector)
+                    else:
+                        key = i.pop(selector).get('value')
                     records.update({key: i})
             except KeyError as e:
                 print('KeyError:', e, 'Attempting to use Record ID#')
@@ -182,41 +205,55 @@ def transform(self, transformation, **kwargs):
                 records.append(record)
             self.update({'data': records})
 
-        if transformation == 'datetime':
-            """Finds columns that are of type datetime and converts them into python datetime objects"""
-            # transform fids into labels
+        if transformation == 'intround':
+            """Rounds numbers and transforms them to ints"""
 
             data = self.get('data')
             fields = self.get('fields')
 
             for field in fields:
-                if field.get('type') == 'date time':
-                    if type(self.get('data') == list):
-                        for row in data:
-                            dt_field = row.get(str(field.get('id')))
-                            if dt_field.get('value') is None:
-                                str_dt = dt_field
-                                dt = datetime.datetime.strptime(str_dt, '%Y-%m-%dT%H:%M:%S.%fZ')
-                                row.update({str(field.get('id')): dt})
-                            else:
-                                str_dt = dt_field.get('value')
-                                dt = datetime.datetime.strptime(str_dt, '%Y-%m-%dT%H:%M:%S.%fZ')
-                                row.update({str(field.get('id')): {'value': dt}})
+                if field.get('type') == 'numeric':
 
-                if field.get('type') == 'date':
                     if type(self.get('data') == list):
                         for row in data:
-                            dt_field = row.get(str(field.get('id')))
-                            if dt_field.get('value') is None:
-                                str_dt = dt_field
-                                dt = datetime.datetime.strptime(str_dt, kwargs.get('datestring'))
-                                row.update({str(field.get('id')): dt})
+                            numeric_field = row.get(str(field.get('id')))
+                            if numeric_field.get('value') is None:
+                                row.update({str(field.get('id')): int(round(numeric_field))})
                             else:
-                                str_dt = dt_field.get('value')
-                                dt = datetime.datetime.strptime(str_dt, kwargs.get('datestring'))
-                                row.update({str(field.get('id')): {'value': dt}})
+                                numeric_field = numeric_field.get('value')
+                                row.update({str(field.get('id')): {'value': int(round(numeric_field))}})
 
-        if transformation == 'intround':
+        return self
+
+    def convert_type(self, field_type, **kwargs):
+        """
+        Converts data of certain field types to standard python objects
+        :param field_type:
+        :param kwargs:
+        :return:
+        """
+
+        def c_datetime():
+
+            for f in self.get('fields'):
+                fid = str(f.get('id'))
+                if f.get('type') == 'date time':
+
+                    if 'denest' in self.operations:
+                        for d in self.get('data'):
+                            print('>>>>>>>>', self.operations, d)
+                            d.update({fid: datetime.datetime.strptime(d.get(fid), '%Y-%m-%dT%H:%M:%S.%fZ')})
+                    else:
+                        for d in self.get('data'):
+                            print('>>>>>>>>', fid, d.get(fid), d)
+                            d.update({fid: {'value': datetime.datetime.strptime(d.get(fid).get('value'), '%Y-%m-%dT%H:%M:%S.%fZ')}})
+
+
+
+        if field_type == 'datetime':
+            c_datetime()
+
+        if field_type == 'intround':
             """Rounds numbers and transforms them to ints"""
 
             data = self.get('data')

tests/test_response.py

@@ -1,9 +1,12 @@
+import datetime
+
 import pytest
 
 # test where
 from src.quickbase_json.qb_response import QBResponse
 from src.quickbase_json.helpers import Where, IncorrectParameters
 from tests import sample_data
+from copy import deepcopy
 
 
 # test loading in data
@@ -16,4 +19,39 @@ def test_load(data, expected):
 
 # test getting info, basic tests, does not test formatting
 def test_get_info():
-    assert "{'6': {'value': 'Andre Harris'}, '7': {'value': 10}, '8': {'value': '2019-12-18T08:00:00.000Z'}}" in QBResponse('records', sample_data=sample_data.record_data).info(prt=False)
+    assert "{'6': {'value': 'Andre Harris'}, '7': {'value': 10}, '8': {'value': '2019-12-18T08:00:00.000Z'}}" in QBResponse(
+        'records', sample_data=sample_data.record_data.copy()).info(prt=False)
+
+
+# test getting info, basic tests, does not test formatting
+def test_denest():
+    res = QBResponse('records', sample_data=deepcopy(sample_data.record_data))
+    res.denest()
+    assert res.data() == [{'8': '2019-12-18T08:00:00.000Z', '6': 'Andre Harris', '7': 10}]
+
+
+# test datetime convert
+def test_convert_datetime():
+    # test datetime convert w/o denest
+    res = QBResponse('records', sample_data=deepcopy(sample_data.record_data))
+    res.convert_type('datetime')
+    dt_test = res.data()[0].get('8').get('value')
+
+    # test datetime convert w/ denest
+    res2 = QBResponse('records', sample_data=deepcopy(sample_data.record_data))
+    res2.denest()
+    res2.convert_type('datetime')
+    dt_test2 = res2.data()[0].get('8')
+
+    # make sure both are datetime
+    assert isinstance(dt_test, datetime.datetime)
+    assert isinstance(dt_test2, datetime.datetime)
+
+
+def test_operations():
+    res = QBResponse('records', sample_data=sample_data.record_data)
+    assert res.operations == []
+    res.denest()
+    assert res.operations == ['denest']
+    res.orient('records', key=6)
+    assert res.operations == ['denest', 'orient']