Merge pull request #16 from Ultimaker/CS-453_add_bson_support_to_datetime

CS-453 add bson support to datetime

Author: Chris ter Beke

jsonmodels/fields.py

@@ -648,6 +648,14 @@ def to_struct(self, value):
             return value.strftime(self.str_format)
         return value.isoformat()
 
+    def toBsonEncodable(self, value: datetime) -> datetime:
+        """
+        Keep datetime object a datetime object, since pymongo supports that.
+        """
+        if not isinstance(value, self.types):
+            raise BadTypeError(value, self.types, is_list=False)
+        return value
+
     def parse_value(self, value):
         """Parse string into instance of `datetime`."""
         if isinstance(value, datetime.datetime):

tests/test_fields.py

@@ -1,4 +1,6 @@
 from collections import OrderedDict
+import datetime
+from datetime import timezone
 
 import pytest
 from jsonmodels import models, fields, validators, errors
@@ -41,6 +43,22 @@ class Person(models.Base):
     assert field.parse_value([]) is False
 
 
+def test_datetime_field():
+    field = fields.DateTimeField()
+
+    class Event(models.Base):
+        when = field
+
+    event = Event()
+    assert event.when is None
+    event.when = datetime.datetime(2019, 10, 30, 1, 2, 3)
+    assert field.toBsonEncodable(event.when) == \
+        datetime.datetime(2019, 10, 30, 1, 2, 3)
+    assert event.when == datetime.datetime(2019, 10, 30, 1, 2, 3)
+    assert field.parse_value("2019-10-30T01:02:03.000000Z") == \
+        datetime.datetime(2019, 10, 30, 1, 2, 3, tzinfo=timezone.utc)
+
+
 def test_custom_field():
     class NameField(fields.StringField):
         def __init__(self):