LITE-23027 Fixed Date and DateTime fields dumping in previous data

Author: maxipavlovic

dj_cqrs/tracker.py

@@ -1,4 +1,6 @@
-#  Copyright © 2021 Ingram Micro Inc. All rights reserved.
+#  Copyright © 2022 Ingram Micro Inc. All rights reserved.
+
+from datetime import date, datetime
 
 from dj_cqrs.constants import ALL_BASIC_FIELDS, FIELDS_TRACKER_FIELD_NAME
 
@@ -25,6 +27,14 @@ def changed(self):
     def changed_initial(self):
         return {field: None for field in self.fields if self.get_field_value(field) is not None}
 
+    def get_field_value(self, field):
+        value = super().get_field_value(field)
+
+        if isinstance(value, (date, datetime)):
+            value = str(value)
+
+        return value
+
 
 class CQRSTracker(FieldTracker):
 

tests/test_master/test_mixin.py

@@ -1,5 +1,6 @@
-#  Copyright © 2021 Ingram Micro Inc. All rights reserved.
+#  Copyright © 2022 Ingram Micro Inc. All rights reserved.
 
+from datetime import timedelta
 from time import sleep
 from uuid import uuid4
 
@@ -636,6 +637,29 @@ def test_cqrs_tracked_fields_tracking(mocker):
     assert tracked_data == {'cqrs_revision': 0, 'char_field': 'Value'}
 
 
+@pytest.mark.django_db(transaction=True)
+def test_cqrs_tracked_fields_date_and_datetime_tracking(mocker):
+    old_dt = now()
+    old_d = (old_dt + timedelta(days=1)).date()
+
+    models.BasicFieldsModel.objects.create(
+        int_field=1,
+        datetime_field=old_dt,
+        date_field=old_d,
+    )
+
+    publisher_mock = mocker.patch('dj_cqrs.controller.producer.produce')
+    instance = models.BasicFieldsModel.objects.first()
+    instance.datetime_field = now()
+    instance.date_field = now().date()
+    instance.save()
+
+    tracked_data = instance.get_tracked_fields_data()
+    assert publisher_mock.call_args[0][0].previous_data == tracked_data == {
+        'cqrs_revision': 0, 'datetime_field': str(old_dt), 'date_field': str(old_d),
+    }
+
+
 def test_mptt_cqrs_tracked_fields_model_has_tracker():
     instance = models.MPTTWithTrackingModel()
     tracker = getattr(instance, FIELDS_TRACKER_FIELD_NAME)