Merge pull request #142 from Flagsmith/release/2.2.0

Release v2.2.0

Author: gagantrivedi

.pre-commit-config.yaml

@@ -5,7 +5,7 @@ repos:
           - id: isort
             name: isort (python)
     - repo: https://github.com/psf/black
-      rev: 21.6b0
+      rev: 22.6.0
       hooks:
           - id: black
             language_version: python3

flag_engine/identities/models.py

@@ -39,3 +39,12 @@ def update_traits(self, traits: typing.List[TraitModel]) -> typing.List[TraitMod
 
         self.identity_traits = list(existing_traits.values())
         return self.identity_traits
+
+    def prune_features(self, valid_feature_names: typing.List[str]) -> None:
+        self.identity_features = IdentityFeaturesList(
+            [
+                fs
+                for fs in self.identity_features
+                if fs.feature.name in valid_feature_names
+            ]
+        )

setup.cfg

@@ -1,2 +1,2 @@
 [flake8]
-max-line-length = 88
+max-line-length = 120

setup.py

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

tests/unit/conftest.py

@@ -76,6 +76,16 @@ def feature_2():
     return FeatureModel(id=2, name="feature_2", type=STANDARD)
 
 
+@pytest.fixture()
+def feature_state_1(feature_1):
+    return FeatureStateModel(feature=feature_1, enabled=True)
+
+
+@pytest.fixture()
+def feature_state_2(feature_2):
+    return FeatureStateModel(feature=feature_2, enabled=True)
+
+
 @pytest.fixture()
 def environment(feature_1, feature_2, project):
     return EnvironmentModel(

tests/unit/identities/test_identities_models.py

@@ -98,3 +98,19 @@ def test_append_feature_state(identity, feature_1):
     identity.identity_features.append(fs_1)
     # Then
     fs_1 in identity.identity_features
+
+
+def test_prune_features_only_keeps_valid_features(
+    identity, feature_state_1, feature_state_2
+):
+    # Given
+    identity.identity_features.append(feature_state_1)
+    identity.identity_features.append(feature_state_2)
+
+    valid_features = [feature_state_1.feature.name]
+
+    # When
+    identity.prune_features(valid_features)
+
+    # Then
+    assert identity.identity_features == [feature_state_1]