Assignment Fix (#42)

* Fixing bug where assignment is worng

* Update test_feature_variants.py

* Update test_feature_variants.py

Author: mrm9084

featuremanagement/_featuremanagerbase.py

@@ -168,13 +168,13 @@ def _assign_variant(
                 if targeting_context.user_id in user_allocation.users:
                     evaluation_event.reason = VariantAssignmentReason.USER
                     variant_name = user_allocation.variant
-        elif feature.allocation.group and len(targeting_context.groups) > 0:
+        if not variant_name and feature.allocation.group and len(targeting_context.groups) > 0:
             for group_allocation in feature.allocation.group:
                 for group in targeting_context.groups:
                     if group in group_allocation.groups:
                         evaluation_event.reason = VariantAssignmentReason.GROUP
                         variant_name = group_allocation.variant
-        elif feature.allocation.percentile:
+        if not variant_name and feature.allocation.percentile:
             context_id = targeting_context.user_id + "\n" + feature.allocation.seed
             box: float = self._is_targeted(context_id)
             for percentile_allocation in feature.allocation.percentile:

tests/test_feature_variants.py

@@ -112,6 +112,46 @@ def test_basic_feature_variant_allocation_users(self):
         assert feature_manager.is_enabled("Alpha", "Charlie")
         assert feature_manager.get_variant("Alpha", "Charlie") is None
 
+    def test_user_and_group_allocation(self):
+        feature_flags = {
+            "feature_management": {
+                "feature_flags": [
+                    {
+                        "id": "Alpha",
+                        "enabled": True,
+                        "variants": [
+                            {"name": "Off", "status_override": "Enabled"},
+                            {"name": "On", "status_override": "Disabled"},
+                        ],
+                        "allocation": {
+                            "user": [{"variant": "On", "users": ["Adam"]}, {"variant": "Off", "users": ["Brittney"]}],
+                            "group": [
+                                {"variant": "On", "groups": ["Group1"]},
+                                {"variant": "Off", "groups": ["Group2"]},
+                            ],
+                        },
+                        "conditions": {
+                            "client_filters": [
+                                {
+                                    "name": "AlwaysOnFilter",
+                                    "parameters": {},
+                                }
+                            ]
+                        },
+                    }
+                ]
+            }
+        }
+        feature_manager = FeatureManager(feature_flags, feature_filters=[AlwaysOnFilter()])
+        assert feature_manager.is_enabled("Alpha")
+        assert feature_manager.get_variant("Alpha") is None
+        assert not feature_manager.is_enabled("Alpha", TargetingContext(user_id="NotAdam", groups=["Group1"]))
+        assert feature_manager.get_variant("Alpha", TargetingContext(user_id="NotAdam", groups=["Group1"])).name == "On"
+        assert not feature_manager.is_enabled("Alpha", TargetingContext(user_id="NotAdam", groups=["Group1"]))
+        assert feature_manager.get_variant("Alpha", TargetingContext(groups=["Group2"])).name == "Off"
+        assert feature_manager.is_enabled("Alpha", TargetingContext(user_id="NotCharlie", groups=["Group3"]))
+        assert feature_manager.get_variant("Alpha", TargetingContext(user_id="NotCharlie", groups=["Group3"])) is None
+
     # method: is_enabled
     def test_basic_feature_variant_allocation_groups(self):
         feature_flags = {