Merge pull request #106 from ral-facilities/105_problem_with_returnin…

…g_decimals

Problem with returning decimals

common/models/db_models.py

@@ -1,6 +1,8 @@
 import enum
 
 from datetime import datetime
+from decimal import Decimal
+
 from sqlalchemy import Index, Column, BigInteger, String, DateTime, ForeignKey, Integer, Float, FetchedValue, \
     TypeDecorator, Boolean
 from sqlalchemy.ext.declarative import declarative_base
@@ -50,9 +52,22 @@ def to_dict(self):
         dictionary = {}
         for column in self.__table__.columns:
             attribute = getattr(self, column.name)
-            dictionary[column.name] = str(attribute) if isinstance(attribute, datetime) else attribute
+            dictionary[column.name] = self._make_serializable(attribute)
         return dictionary
 
+    def _make_serializable(self, field):
+        """
+        Given a field, convert to a JSON serializable type
+        :param field: The field to be converted
+        :return: The converted field
+        """
+        if isinstance(field, datetime):
+            return str(field)
+        elif isinstance(field, Decimal):
+            return float(field)
+        else:
+            return field
+
     def to_nested_dict(self, includes):
         """
         Given related models return a nested dictionary with the child or parent rows nested.