Silently clear schedule_config for non-batch triggers

Author: dmarchuk

posthog/api/hog_flow.py

@@ -328,8 +328,14 @@ def validate(self, data):
             if "bytecode" not in data["conversion"]:
                 data["conversion"]["bytecode"] = []
 
-        # Validate schedule_config if present and not a draft
+        # Silently clear schedule_config for trigger types that don't support scheduling
+        SCHEDULABLE_TRIGGER_TYPES = {"batch"}
         schedule_config = data.get("schedule_config")
+        if schedule_config and data["trigger"].get("type") not in SCHEDULABLE_TRIGGER_TYPES:
+            data["schedule_config"] = None
+            schedule_config = None
+
+        # Validate schedule_config if present and not a draft
         if schedule_config and not self.context.get("is_draft"):
             rrule_str = schedule_config.get("rrule")
             if not rrule_str:

products/workflows/backend/test/test_hog_flow_schedule.py

@@ -17,8 +17,15 @@
     "filters": {"properties": [{"key": "$browser", "type": "person", "value": ["Chrome"], "operator": "exact"}]},
 }
 
+EVENT_TRIGGER = {
+    "type": "event",
+    "filters": {
+        "events": [{"id": "$pageview", "name": "$pageview", "type": "events", "order": 0}],
+    },
+}
+
 
-def _make_workflow_payload(workflow_status="draft", schedule_config=None):
+def _make_workflow_payload(workflow_status="draft", schedule_config=None, trigger_config=None):
     payload = {
         "name": "Test Batch Workflow",
         "status": workflow_status,
@@ -27,7 +34,7 @@ def _make_workflow_payload(workflow_status="draft", schedule_config=None):
                 "id": "trigger_node",
                 "name": "trigger",
                 "type": "trigger",
-                "config": BATCH_TRIGGER,
+                "config": trigger_config or BATCH_TRIGGER,
             }
         ],
     }
@@ -356,3 +363,43 @@ def test_schedule_with_timezone_stores_timezone(self):
         hog_flow = HogFlow.objects.get(id=workflow["id"])
         assert hog_flow.schedule_config is not None
         assert hog_flow.schedule_config["timezone"] == "US/Eastern"
+
+    def test_schedule_config_cleared_for_non_batch_trigger(self):
+        schedule_config = {
+            "rrule": "FREQ=WEEKLY;INTERVAL=1;BYDAY=MO",
+            "starts_at": "2030-01-01T09:00:00.000Z",
+        }
+        payload = _make_workflow_payload(
+            workflow_status="active",
+            schedule_config=schedule_config,
+            trigger_config=EVENT_TRIGGER,
+        )
+        response = self.client.post(f"/api/projects/{self.team.id}/hog_flows", payload)
+        assert response.status_code == status.HTTP_201_CREATED
+
+        hog_flow = HogFlow.objects.get(id=response.json()["id"])
+        assert hog_flow.schedule_config is None
+        assert HogFlowScheduledRun.objects.filter(hog_flow=hog_flow, status="pending").count() == 0
+
+    def test_switching_from_batch_to_event_trigger_clears_schedule_and_pending_run(self):
+        schedule_config = {
+            "rrule": "FREQ=WEEKLY;INTERVAL=1;BYDAY=MO",
+            "starts_at": "2030-01-01T09:00:00.000Z",
+        }
+        workflow = self._create_batch_workflow(schedule_config=schedule_config)
+        hog_flow = HogFlow.objects.get(id=workflow["id"])
+        assert hog_flow.schedule_config is not None
+        assert HogFlowScheduledRun.objects.filter(hog_flow=hog_flow, status="pending").count() == 1
+
+        # Switch to event trigger
+        payload = _make_workflow_payload(
+            workflow_status="active",
+            schedule_config=schedule_config,
+            trigger_config=EVENT_TRIGGER,
+        )
+        response = self.client.patch(f"/api/projects/{self.team.id}/hog_flows/{workflow['id']}", payload)
+        assert response.status_code == status.HTTP_200_OK
+
+        hog_flow.refresh_from_db()
+        assert hog_flow.schedule_config is None
+        assert HogFlowScheduledRun.objects.filter(hog_flow=hog_flow, status="pending").count() == 0

products/workflows/backend/utils/schedule_sync.py

@@ -22,7 +22,8 @@ def sync_schedule(hog_flow: HogFlow, team_id: int) -> None:
         HogFlowScheduledRun.objects.filter(hog_flow=hog_flow, status=HogFlowScheduledRun.Status.PENDING).delete()
 
         schedule_config = hog_flow.schedule_config
-        if not schedule_config or hog_flow.status != HogFlow.State.ACTIVE:
+        trigger_type = (hog_flow.trigger or {}).get("type")
+        if not schedule_config or hog_flow.status != HogFlow.State.ACTIVE or trigger_type != "batch":
             return
 
         rrule_str = schedule_config.get("rrule")