fix the issue

Author: khvn26

api/audit/signals.py

@@ -10,6 +10,7 @@
 from audit.serializers import AuditLogListSerializer
 from audit.services import get_audited_instance_from_audit_log_record
 from features.models import FeatureState, FeatureStateValue
+from features.multivariate.models import MultivariateFeatureStateValue
 from features.signals import feature_state_change_went_live
 from integrations.common.models import IntegrationsModel
 from integrations.datadog.datadog import DataDogWrapper
@@ -214,9 +215,9 @@ def send_audit_log_event_to_slack(sender, instance, **kwargs):  # type: ignore[n
 def send_feature_flag_went_live_signal(sender, instance, **kwargs):  # type: ignore[no-untyped-def]
     audited_instance = get_audited_instance_from_audit_log_record(instance)
 
-    # Handle both FeatureState and FeatureStateValue audit logs
-    # FeatureStateValue changes also have related_object_type=FEATURE_STATE
-    if isinstance(audited_instance, FeatureStateValue):
+    # Handle FeatureState, FeatureStateValue, and MultivariateFeatureStateValue audit logs
+    # All these types have related_object_type=FEATURE_STATE
+    if isinstance(audited_instance, (FeatureStateValue, MultivariateFeatureStateValue)):
         feature_state = audited_instance.feature_state
     elif isinstance(audited_instance, FeatureState):
         feature_state = audited_instance

api/environments/models.py

@@ -638,6 +638,8 @@ def generate_webhook_feature_state_data(
         identity_id: int | str | None = None,
         identity_identifier: str | None = None,
         feature_segment: FeatureSegment | None = None,
+        multivariate_feature_state_values: list[MultivariateFeatureStateValue]
+        | None = None,
     ) -> dict:  # type: ignore[type-arg]
         if (identity_id or identity_identifier) and not (
             identity_id and identity_identifier
@@ -647,8 +649,20 @@ def generate_webhook_feature_state_data(
         if (identity_id and identity_identifier) and feature_segment:
             raise ValueError("Cannot provide identity information and feature segment")
 
+        mv_values_data = [
+            {
+                "id": mv.id,
+                "multivariate_feature_option": {
+                    "id": mv.multivariate_feature_option_id,
+                    "value": mv.multivariate_feature_option.value,
+                },
+                "percentage_allocation": mv.percentage_allocation,
+            }
+            for mv in (multivariate_feature_state_values or [])
+        ]
+
         # TODO: refactor to use a serializer / schema
-        data = {
+        data: dict[str, typing.Any] = {
             "feature": {
                 "id": feature.id,
                 "created_date": feature.created_date.strftime("%Y-%m-%dT%H:%M:%S.%fZ"),
@@ -671,6 +685,7 @@ def generate_webhook_feature_state_data(
             "feature_segment": None,
             "enabled": enabled,
             "feature_state_value": value,
+            "multivariate_feature_state_values": mv_values_data,
         }
         if feature_segment:
             data["feature_segment"] = {

api/features/tasks.py

@@ -1,11 +1,13 @@
 import logging
+from typing import Any
 
 from task_processor.decorators import (
     register_task_handler,
 )
 
 from environments.models import Webhook
 from features.models import Feature, FeatureState
+from features.multivariate.models import MultivariateFeatureStateValue
 from webhooks.constants import WEBHOOK_DATETIME_FORMAT
 from webhooks.tasks import (
     call_environment_webhooks,
@@ -41,7 +43,7 @@ def trigger_feature_state_change_webhooks(  # type: ignore[no-untyped-def]
     new_state = (
         None
         if event_type == WebhookEventType.FLAG_DELETED
-        else _get_feature_state_webhook_data(instance)  # type: ignore[no-untyped-call]
+        else _get_feature_state_webhook_data(instance)
     )
     data = {"new_state": new_state, "changed_by": changed_by, "timestamp": timestamp}
     previous_state = _get_previous_state(instance, history_instance, event_type)
@@ -68,33 +70,55 @@ def _get_previous_state(
     event_type: WebhookEventType,
 ) -> dict:  # type: ignore[type-arg]
     if event_type == WebhookEventType.FLAG_DELETED:
-        return _get_feature_state_webhook_data(instance)  # type: ignore[no-untyped-call,no-any-return]
+        return _get_feature_state_webhook_data(instance)
     if history_instance and history_instance.prev_record:
-        return _get_feature_state_webhook_data(  # type: ignore[no-untyped-call,no-any-return]
+        return _get_feature_state_webhook_data(
             history_instance.prev_record.instance, previous=True
         )
     return None  # type: ignore[return-value]
 
 
-def _get_feature_state_webhook_data(feature_state, previous=False):  # type: ignore[no-untyped-def]
-    # TODO: fix circular imports and use serializers instead.
-    feature_state_value = (
-        feature_state.get_feature_state_value()
-        if not previous
-        else feature_state.previous_feature_state_value
-    )
+def _get_feature_state_webhook_data(
+    feature_state: FeatureState,
+    previous: bool = False,
+) -> dict[str, Any]:
+    if previous:
+        value = feature_state.previous_feature_state_value
+        mv_values = _get_previous_multivariate_values(feature_state)
+    else:
+        value = feature_state.get_feature_state_value()
+        mv_values = list(feature_state.multivariate_feature_state_values.all())
 
+    assert feature_state.environment is not None
     return Webhook.generate_webhook_feature_state_data(
         feature_state.feature,
         environment=feature_state.environment,
         enabled=feature_state.enabled,
-        value=feature_state_value,
+        value=value,
         identity_id=feature_state.identity_id,
         identity_identifier=getattr(feature_state.identity, "identifier", None),
         feature_segment=feature_state.feature_segment,
+        multivariate_feature_state_values=mv_values,
     )
 
 
+def _get_previous_multivariate_values(
+    feature_state: FeatureState,
+) -> list[MultivariateFeatureStateValue]:
+    """Get previous multivariate values from history."""
+    mv_values: list[MultivariateFeatureStateValue] = []
+    for mv in MultivariateFeatureStateValue.objects.filter(
+        feature_state_id=feature_state.id
+    ):
+        history = mv.history.first()
+        if history and history.prev_record:
+            mv_values.append(history.prev_record.instance)
+        else:
+            # No previous record, use current value
+            mv_values.append(mv)
+    return mv_values
+
+
 @register_task_handler()
 def delete_feature(feature_id: int) -> None:
     Feature.objects.get(pk=feature_id).delete()

api/tests/integration/features/featurestate/test_webhooks.py

@@ -4,6 +4,7 @@
 import responses
 from django.urls import reverse
 from pytest_lazyfixture import lazy_fixture  # type: ignore[import-untyped]
+from pytest_mock import MockerFixture
 from rest_framework import status
 from rest_framework.test import APIClient
 
@@ -133,7 +134,9 @@ def test_update_multivariate_percentage__webhook_payload_includes_multivariate_v
     environment: int,
     feature: int,
     mv_option_50_percent: int,
+    mv_option_value: str,
     webhook: str,
+    mocker: MockerFixture,
 ) -> None:
     """
     Test for issue #6190: Webhook payloads do not include multivariate values.
@@ -143,8 +146,6 @@ def test_update_multivariate_percentage__webhook_payload_includes_multivariate_v
     with their percentage allocations.
     """
     # Given
-    responses.add(responses.POST, webhook, status=200)
-
     # Get the feature state for this environment
     feature_states_url = reverse("api-v1:features:featurestates-list")
     feature_states_response = admin_client.get(
@@ -160,7 +161,10 @@ def test_update_multivariate_percentage__webhook_payload_includes_multivariate_v
     old_percentage = mv_fs_value["percentage_allocation"]
     new_percentage = 75
 
-    # When - update only the multivariate percentage allocation
+    responses.add(responses.POST, webhook, status=200)
+
+    # When
+    # update only the multivariate percentage allocation
     url = reverse("api-v1:features:featurestates-detail", args=[feature_state_id])
     data = {
         "id": feature_state_id,
@@ -178,28 +182,39 @@ def test_update_multivariate_percentage__webhook_payload_includes_multivariate_v
             }
         ],
     }
-    response = admin_client.put(
-        url, data=json.dumps(data), content_type="application/json"
-    )
+    admin_client.put(url, data=json.dumps(data), content_type="application/json")
 
     # Then
-    assert response.status_code == status.HTTP_200_OK
-
-    # Verify webhook was called
-    assert len(responses.calls) >= 1
-    webhook_payload = json.loads(responses.calls[0].request.body)["data"]  # type: ignore[union-attr]
-
-    # Verify the payload includes multivariate values
-    # This currently fails - issue #6190
-    assert "multivariate_feature_state_values" in webhook_payload["new_state"]
-    assert "multivariate_feature_state_values" in webhook_payload["previous_state"]
-
-    new_mv_values = webhook_payload["new_state"]["multivariate_feature_state_values"]
-    previous_mv_values = webhook_payload["previous_state"][
-        "multivariate_feature_state_values"
+    # `FLAG_UPDATED`` webhook was called
+    # (should be the last sent event)
+    last_call = responses.calls[-1]
+    assert not isinstance(last_call, list)
+    webhook_payload = json.loads(last_call.request.body)
+    assert webhook_payload["event_type"] == "FLAG_UPDATED"
+
+    # the payload includes multivariate values
+    event_data = webhook_payload["data"]
+
+    assert "multivariate_feature_state_values" in event_data["new_state"]
+    assert "multivariate_feature_state_values" in event_data["previous_state"]
+
+    assert event_data["new_state"]["multivariate_feature_state_values"] == [
+        {
+            "id": mocker.ANY,
+            "multivariate_feature_option": {
+                "id": mv_option_50_percent,
+                "value": mv_option_value,
+            },
+            "percentage_allocation": new_percentage,
+        },
+    ]
+    assert event_data["previous_state"]["multivariate_feature_state_values"] == [
+        {
+            "id": mocker.ANY,
+            "multivariate_feature_option": {
+                "id": mv_option_50_percent,
+                "value": mv_option_value,
+            },
+            "percentage_allocation": old_percentage,
+        },
     ]
-
-    assert len(new_mv_values) == 1
-    assert len(previous_mv_values) == 1
-    assert new_mv_values[0]["percentage_allocation"] == new_percentage
-    assert previous_mv_values[0]["percentage_allocation"] == old_percentage