make shared update_owner, refresh from db in tests, call .sae()

ceorourke · ceorourke · commit 670304caeb39 · 2026-03-16T13:20:57.000-07:00
diff --git a/src/sentry/workflow_engine/endpoints/validators/base/detector.py b/src/sentry/workflow_engine/endpoints/validators/base/detector.py
@@ -28,6 +28,7 @@
     get_unknown_detector_type_error,
     log_alerting_quota_hit,
     toggle_detector,
+    update_owner,
 )
 from sentry.workflow_engine.models import (
     DataConditionGroup,
@@ -193,18 +194,9 @@ def update(self, instance: Detector, validated_data: dict[str, Any]) -> Detector
 
             # Handle owner field update
             if "owner" in validated_data:
-                owner = validated_data.get("owner")
-                if owner:
-                    if owner.is_user:
-                        instance.owner_user_id = owner.id
-                        instance.owner_team_id = None
-                    elif owner.is_team:
-                        instance.owner_user_id = None
-                        instance.owner_team_id = owner.id
-                else:
-                    # Clear owner if None is passed
-                    instance.owner_user_id = None
-                    instance.owner_team_id = None
+                instance.owner_user_id, instance.owner_team_id = update_owner(
+                    validated_data.get("owner")
+                )
 
             if "condition_group" in validated_data:
                 condition_group = validated_data.pop("condition_group")
diff --git a/src/sentry/workflow_engine/endpoints/validators/base/workflow.py b/src/sentry/workflow_engine/endpoints/validators/base/workflow.py
@@ -23,6 +23,7 @@
 from sentry.workflow_engine.endpoints.validators.utils import (
     log_alerting_quota_hit,
     remove_items_by_api_input,
+    update_owner,
     validate_json_schema,
 )
 from sentry.workflow_engine.models import (
@@ -253,21 +254,13 @@ def update(self, instance: Workflow, validated_data: InputData) -> Workflow:
 
             # Handle owner field update
             if "owner" in validated_data:
-                owner = validated_data.pop("owner")
-                if owner:
-                    if owner.is_user:
-                        instance.owner_user_id = owner.id
-                        instance.owner_team_id = None
-                    elif owner.is_team:
-                        instance.owner_user_id = None
-                        instance.owner_team_id = owner.id
-                else:
-                    # Clear owner if None is passed
-                    instance.owner_user_id = None
-                    instance.owner_team_id = None
+                instance.owner_user_id, instance.owner_team_id = update_owner(
+                    validated_data.get("owner")
+                )
 
             # Update the workflow
             instance.update(**validated_data)
+            instance.save()
             return instance
 
     def _validate_workflow_limits(self) -> None:
diff --git a/src/sentry/workflow_engine/endpoints/validators/utils.py b/src/sentry/workflow_engine/endpoints/validators/utils.py
@@ -5,6 +5,7 @@
 from jsonschema import ValidationError as JsonValidationError
 from jsonschema import validate
 
+from sentry.api.fields.actor import OwnerActorField
 from sentry.issues import grouptype
 from sentry.models.organization import Organization
 from sentry.users.models.user import User
@@ -15,6 +16,22 @@
 logger = logging.getLogger(__name__)
 
 
+def update_owner(owner: OwnerActorField) -> tuple[int | None, int | None]:
+    if owner:
+        if owner.is_user:
+            owner_user_id = owner.id
+            owner_team_id = None
+        elif owner.is_team:
+            owner_user_id = None
+            owner_team_id = owner.id
+    else:
+        # Clear owner if None is passed
+        owner_user_id = None
+        owner_team_id = None
+
+    return owner_user_id, owner_team_id
+
+
 def log_alerting_quota_hit(
     object_type: str, organization: Organization, actor: User | RpcUser | None
 ) -> None:
diff --git a/tests/sentry/workflow_engine/endpoints/validators/test_base_workflow.py b/tests/sentry/workflow_engine/endpoints/validators/test_base_workflow.py
@@ -160,8 +160,8 @@ def test_create__owner_user_id(self) -> None:
         self.valid_data["owner"] = f"user:{self.user.id}"
         validator = WorkflowValidator(data=self.valid_data, context=self.context)
         assert validator.is_valid() is True
-
         workflow = validator.create(validator.validated_data)
+        workflow.refresh_from_db()
         assert workflow.owner_user_id == self.user.id
 
     def test_team_owner(self) -> None:
@@ -170,6 +170,7 @@ def test_team_owner(self) -> None:
         validator = WorkflowValidator(data=self.valid_data, context=self.context)
         assert validator.is_valid() is True
         workflow = validator.create(validator.validated_data)
+        workflow.refresh_from_db()
         assert workflow.owner_team_id == team.id
         assert workflow.owner_user_id is None
 
@@ -825,12 +826,14 @@ def test_update_owner_type(self, mock_action_validator: mock.MagicMock) -> None:
         validator = WorkflowValidator(data=self.valid_data, context=context)
         assert validator.is_valid() is True
         workflow = validator.update(self.workflow, validator.validated_data)
+        workflow.refresh_from_db()
         assert workflow.owner_team_id == team.id
         assert workflow.owner_user_id is None
 
         self.valid_data["owner"] = f"user:{self.user.id}"
         validator = WorkflowValidator(data=self.valid_data, context=context)
         assert validator.is_valid() is True
+        workflow.refresh_from_db()
         workflow = validator.update(self.workflow, validator.validated_data)
         assert workflow.owner_user_id == self.user.id
         assert workflow.owner_team_id is None
