0.0.5 - new conversions, round_ints() method

Author: robswc

src/quickbase_json/qb_response.py

@@ -120,7 +120,6 @@ def denest(self):
                 for k, v in d.items():
                     d.update({k: v.get('value')})
 
-        print('++++', self.data)
         return self
 
     @operation
@@ -206,22 +205,27 @@ def transform(self, transformation, **kwargs):
             self.update({'data': records})
 
         if transformation == 'intround':
-            """Rounds numbers and transforms them to ints"""
+            raise ValueError('This transformation has been deprecated, please use the "round_ints()" method.')
 
-            data = self.get('data')
-            fields = self.get('fields')
-
-            for field in fields:
-                if field.get('type') == 'numeric':
+        return self
 
-                    if type(self.get('data') == list):
-                        for row in data:
-                            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:
-                                numeric_field = numeric_field.get('value')
-                                row.update({str(field.get('id')): {'value': int(round(numeric_field))}})
+    def round_ints(self):
+        """
+        Round int fields (remove floating .0 from int fields)
+        :return:
+        """
+        for f in self.get('fields'):
+            fid = str(f.get('id'))
+            if f.get('type') == 'numeric':
+
+                if 'denest' in self.operations:
+                    for d in self.get('data'):
+                        if d.get(fid).is_integer():
+                            d.update({fid: int(round(d.get(fid)))})
+                else:
+                    for d in self.get('data'):
+                        d.update({fid: {
+                            'value': int(round(d.get(fid).get('value')))}})
 
         return self
 
@@ -241,34 +245,13 @@ def c_datetime():
 
                     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')}})
-
-
+                            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')
-            fields = self.get('fields')
-
-            for field in fields:
-                if field.get('type') == 'numeric':
-
-                    if type(self.get('data') == list):
-                        for row in data:
-                            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:
-                                numeric_field = numeric_field.get('value')
-                                row.update({str(field.get('id')): {'value': int(round(numeric_field))}})
-
         return self

tests/sample_data.py

@@ -5,7 +5,7 @@
                 "value": "Andre Harris"
             },
             "7": {
-                "value": 10
+                "value": 10.0
             },
             "8": {
                 "value": "2019-12-18T08:00:00.000Z"

tests/test_response.py

@@ -19,7 +19,7 @@ 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(
+    assert "{'6': {'value': 'Andre Harris'}, '7': {'value': 10.0}, '8': {'value': '2019-12-18T08:00:00.000Z'}}" in QBResponse(
         'records', sample_data=sample_data.record_data.copy()).info(prt=False)
 
 
@@ -48,6 +48,17 @@ def test_convert_datetime():
     assert isinstance(dt_test2, datetime.datetime)
 
 
+# test datetime convert
+def test_round_ints():
+    # test converting ints with floating point
+    res = QBResponse('records', sample_data=deepcopy(sample_data.record_data))
+
+    # assert float, then int
+    assert type(res.data()[0].get('7').get('value')) == float
+    res.round_ints()
+    assert type(res.data()[0].get('7').get('value')) == int
+
+
 def test_operations():
     res = QBResponse('records', sample_data=sample_data.record_data)
     assert res.operations == []