Merge pull request #109 from Flagsmith/release/1.6.6

Release 1.6.6

Author: matthewelwell

flag_engine/django_transform/fields.py

@@ -1,8 +1,9 @@
 import typing
-from datetime import datetime
 
 from marshmallow import fields
 
+from flag_engine.utils.datetime import utcnow_with_tz
+
 
 class DjangoRelatedManagerField(fields.List):
     def __init__(self, *args, filter_func: typing.Callable = None, **kwargs):
@@ -22,7 +23,7 @@ def get_value(self, obj, attr, **kwargs) -> typing.List[typing.Any]:
 
 class DjangoFeatureStatesRelatedManagerField(DjangoRelatedManagerField):
     def get_value(self, obj, attr, **kwargs):
-        now = datetime.now()
+        now = utcnow_with_tz()
         features_map = {}
         for fs in getattr(obj, attr).all():
             if self.filter_func and not self.filter_func(fs):

flag_engine/django_transform/schemas.py

@@ -1,5 +1,4 @@
 import typing
-from datetime import datetime
 
 from marshmallow import fields, post_dump, pre_dump
 
@@ -25,6 +24,7 @@
     BaseSegmentRuleSchema,
     BaseSegmentSchema,
 )
+from flag_engine.utils.datetime import utcnow_with_tz
 
 
 class DjangoFeatureStateSchema(BaseFeatureStateSchema):
@@ -73,7 +73,7 @@ def serialize_feature_states(self, instance: typing.Any) -> typing.List[dict]:
         # iterate over the feature segments and related feature states to end up with
         # a list consisting of the latest version feature state for each feature
         feature_states = {}
-        now = datetime.now()
+        now = utcnow_with_tz()
         for feature_segment in feature_segments:
             for feature_state in feature_segment.feature_states.all():
                 existing_feature_state = feature_states.get(feature_state.feature_id)

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name="flagsmith-flag-engine",
-    version="1.6.5",
+    version="1.6.6",
     author="Flagsmith",
     author_email="[email protected]",
     packages=find_packages(include=["flag_engine", "flag_engine.*"]),

tests/mock_django_classes.py

@@ -2,6 +2,8 @@
 from dataclasses import dataclass, field
 from datetime import datetime
 
+from flag_engine.utils.datetime import utcnow_with_tz
+
 
 @dataclass
 class DjangoSegmentCondition:
@@ -173,7 +175,7 @@ def __init__(
             )
         )
         self.version = version
-        self.live_from = live_from or datetime.now()
+        self.live_from = live_from or utcnow_with_tz()
 
     def get_feature_state_value(self):
         return self.value

tests/unit/django_transform/test_document_builders.py

@@ -1,12 +1,13 @@
 import json
-from datetime import datetime, timedelta
+from datetime import timedelta
 
 from flag_engine.django_transform.document_builders import (
     build_environment_api_key_document,
     build_environment_document,
     build_identity_document,
 )
 from flag_engine.features.constants import STANDARD
+from flag_engine.utils.datetime import utcnow_with_tz
 from flag_engine.utils.json.encoders import DecimalEncoder
 from tests.mock_django_classes import (
     DjangoEnvironment,
@@ -86,8 +87,8 @@ def test_build_environment_document_with_multiple_feature_state_versions(
     django_project,
 ):
     # Given
-    yesterday = datetime.now() - timedelta(days=1)
-    tomorrow = datetime.now() + timedelta(days=1)
+    yesterday = utcnow_with_tz() - timedelta(days=1)
+    tomorrow = utcnow_with_tz() + timedelta(days=1)
 
     # a feature
     feature = DjangoFeature(
@@ -122,8 +123,8 @@ def test_build_identity_document_with_multiple_feature_state_versions(
     django_environment, django_disabled_feature_state
 ):
     # Given
-    yesterday = datetime.now() - timedelta(days=1)
-    tomorrow = datetime.now() + timedelta(days=1)
+    yesterday = utcnow_with_tz() - timedelta(days=1)
+    tomorrow = utcnow_with_tz() + timedelta(days=1)
     feature = django_disabled_feature_state.feature
 
     identity_feature_state_v1 = DjangoFeatureState(

tests/unit/django_transform/test_fields.py

@@ -1,4 +1,4 @@
-from datetime import datetime, timedelta
+from datetime import timedelta
 from unittest import mock
 
 from marshmallow import fields
@@ -7,6 +7,7 @@
     DjangoFeatureStatesRelatedManagerField,
     DjangoRelatedManagerField,
 )
+from flag_engine.utils.datetime import utcnow_with_tz
 
 
 def test_django_related_manager_field_serialize():
@@ -74,7 +75,7 @@ def test_django_feature_state_related_manager_field_serialize_discards_old_versi
     # expect a django object to. Each feature state associated with the same feature
     # but with incrementing version numbers.
     feature_id = 1
-    yesterday = datetime.now() - timedelta(days=1)
+    yesterday = utcnow_with_tz() - timedelta(days=1)
     feature_states = [
         mock.MagicMock(id=i, feature_id=feature_id, version=i, live_from=yesterday)
         for i in (1, 2, 3, 4, 5)