fix(webhook): 'rows enter view' webhook shows stale rows when webhook is deleted and recreated (baserow#4438)

* Fix bug

* Update enterprise/backend/src/baserow_enterprise/webhook_event_types.py

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Address feedback

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: silvestrid

backend/src/baserow/contrib/database/views/handler.py

@@ -3711,6 +3711,50 @@ def _get_prepared_values_for_data(
 
 
 class ViewSubscriptionHandler:
+    @classmethod
+    def get_subscribed_views(cls, subscriber: django_models.Model) -> QuerySet[View]:
+        """
+        Returns all views a subscriber is subscribed to.
+
+        :param subscriber: The subscriber to get the views for.
+        :return: A list of views the subscriber is subscribed to.
+        """
+
+        return View.objects.filter(
+            id__in=ViewSubscription.objects.filter(
+                subscriber_content_type=ContentType.objects.get_for_model(subscriber),
+                subscriber_id=subscriber.pk,
+            ).values("view_id")
+        )
+
+    @classmethod
+    def sync_view_rows(cls, views: list[View], model=None) -> list[ViewRows]:
+        """
+        Updates or creates the ViewRows objects for the given views by executing
+        the view queries and storing the resulting row IDs.
+
+        :param views: The views for which to create ViewRows objects.
+        :param model: The table model to use for the views. If not provided, the model
+            will be generated automatically.
+        :return: A list of created or updated ViewRows objects.
+        """
+
+        view_rows = []
+        for view in views:
+            row_ids = (
+                ViewHandler()
+                .get_queryset(None, view, model=model, apply_sorts=False)
+                .values_list("id", flat=True)
+            )
+            view_rows.append(ViewRows(view=view, row_ids=list(row_ids)))
+
+        return ViewRows.objects.bulk_create(
+            view_rows,
+            update_conflicts=True,
+            update_fields=["row_ids"],
+            unique_fields=["view_id"],
+        )
+
     @classmethod
     def subscribe_to_views(cls, subscriber: django_models.Model, views: list[View]):
         """
@@ -3723,7 +3767,7 @@ def subscribe_to_views(cls, subscriber: django_models.Model, views: list[View]):
         """
 
         cls.notify_table_views_updates(views)
-        ViewRows.create_missing_for_views(views)
+        cls.sync_view_rows(views)
 
         new_subscriptions = []
         for view in views:

backend/src/baserow/contrib/database/views/models.py

@@ -977,34 +977,6 @@ class ViewRows(CreatedAndUpdatedOnMixin, models.Model):
         "to determine which rows have been changed since the last check.",
     )
 
-    @classmethod
-    def create_missing_for_views(cls, views: list[View], model=None):
-        """
-        Creates ViewRows objects for the given views if they don't already exist.
-
-        :param views: The views for which to create ViewRows objects.
-        """
-
-        from baserow.contrib.database.views.handler import ViewHandler
-
-        existing_view_ids = ViewRows.objects.filter(view__in=views).values_list(
-            "view_id", flat=True
-        )
-        view_map = {view.id: view for view in views}
-        missing_view_ids = list(set(view_map.keys()) - set(existing_view_ids))
-
-        view_rows = []
-        for view_id in missing_view_ids:
-            view = view_map[view_id]
-            row_ids = (
-                ViewHandler()
-                .get_queryset(None, view, model=model, apply_sorts=False)
-                .values_list("id", flat=True)
-            )
-            view_rows.append(ViewRows(view=view, row_ids=list(row_ids)))
-
-        return ViewRows.objects.bulk_create(view_rows, ignore_conflicts=True)
-
     def get_diff(self, model=None):
         """
         Executes the view query and returns the current row IDs in the view,

backend/src/baserow/contrib/database/webhooks/handler.py

@@ -255,10 +255,6 @@ def create_table_webhook(
         if event_config is not None and not values.get("include_all_events"):
             self._update_webhook_event_config(webhook, event_config, webhook_events)
 
-        for webhook_event in webhook_events:
-            webhook_event_type = webhook_event.get_type()
-            webhook_event_type.after_create(webhook_event)
-
         if headers is not None:
             header_objects = []
             for key, value in headers.items():
@@ -324,7 +320,6 @@ def update_table_webhook(
             kwargs.get("include_all_events", False) and not old_include_all_events
         )
 
-        created_events = []
         if not should_update_events:
             TableWebhookEvent.objects.filter(webhook=webhook).delete()
         elif events is not None:
@@ -349,15 +344,11 @@ def update_table_webhook(
             ]
 
             if len(events_to_create) > 0:
-                created_events = TableWebhookEvent.objects.bulk_create(events_to_create)
+                TableWebhookEvent.objects.bulk_create(events_to_create)
 
         if event_config is not None and should_update_events:
             self._update_webhook_event_config(webhook, event_config)
 
-        for webhook_event in created_events:
-            webhook_event_type = webhook_event.get_type()
-            webhook_event_type.after_create(webhook_event)
-
         if headers is not None:
             existing_headers = webhook.headers.all()
 

backend/src/baserow/contrib/database/webhooks/registries.py

@@ -214,14 +214,6 @@ def listener_after_commit(self, **kwargs):
             except SkipWebhookCall:
                 pass
 
-    def after_create(self, webhook_event: TableWebhookEvent):
-        """
-        This method is called after a webhook event has been created. By default it
-        does nothing, but can be overwritten to add additional functionality.
-
-        :param webhook_event: The created webhook event.
-        """
-
     def after_update(self, webhook_event: TableWebhookEvent):
         """
         This method is called after a webhook event has been updated. By default it

changelog/entries/unreleased/bug/4437_fix_rows_enter_view_webhook_type_reports_wrong_list_of_rows_.json

@@ -0,0 +1,9 @@
+{
+    "type": "bug",
+    "message": "Fix an issue where \"Rows enter view\" webhook shows stale rows when webhook is deleted and recreated",
+    "issue_origin": "github",
+    "issue_number": 4437,
+    "domain": "database",
+    "bullet_points": [],
+    "created_at": "2025-12-12"
+}

enterprise/backend/src/baserow_enterprise/webhook_event_types.py

@@ -121,7 +121,18 @@ def get_payload(self, event_id, webhook, view, row_ids, **kwargs):
     def after_update(self, webhook_event):
         # This is called also during webhook creation, when setting the
         # webhook_event_config
-        ViewSubscriptionHandler.unsubscribe_from_views(webhook_event)
-        views = webhook_event.views.all()
-        if views:
-            ViewSubscriptionHandler.subscribe_to_views(webhook_event, views)
+        subscribed_views = ViewSubscriptionHandler.get_subscribed_views(webhook_event)
+        requested_views = webhook_event.views.all()
+
+        subscriptions_to_add = set(requested_views) - set(subscribed_views)
+        if subscriptions_to_add:
+            # Automatically initialize the current rows in the views subscriptions
+            ViewSubscriptionHandler.subscribe_to_views(
+                webhook_event, list(subscriptions_to_add)
+            )
+
+        subscriptions_to_delete = set(subscribed_views) - set(requested_views)
+        if subscriptions_to_delete:
+            ViewSubscriptionHandler.unsubscribe_from_views(
+                webhook_event, list(subscriptions_to_delete)
+            )

enterprise/backend/tests/baserow_enterprise_tests/webhooks/test_webhook_event_types.py

@@ -14,6 +14,10 @@
 
 @pytest.mark.django_db()
 def test_rows_enter_view_event_type(enterprise_data_fixture):
+    """
+    Test the payload structure for the view.rows_entered webhook event type.
+    """
+
     user = enterprise_data_fixture.create_user()
     table = enterprise_data_fixture.create_database_table(user=user)
     view = enterprise_data_fixture.create_grid_view(table=table)
@@ -44,7 +48,6 @@ def test_rows_enter_view_event_type(enterprise_data_fixture):
             "name": table.name,
             "database_id": table.database_id,
         },
-        "type": "grid",
         "filters_disabled": False,
         "show_logo": True,
         "allow_public_export": False,
@@ -127,6 +130,10 @@ def test_rows_enter_view_event_type(enterprise_data_fixture):
 def test_rows_enter_view_event_type_require_enterprise_license(
     mock_call_webhook, enterprise_data_fixture, synced_roles
 ):
+    """
+    Test that the view.rows_entered event only triggers with an enterprise license.
+    """
+
     user = enterprise_data_fixture.create_user()
     table = enterprise_data_fixture.create_database_table(user=user)
     view = enterprise_data_fixture.create_grid_view(table=table)
@@ -166,6 +173,8 @@ def test_rows_enter_view_event_type_require_enterprise_license(
 def test_rows_enter_view_event_type_not_triggerd_with_include_all_events(
     mock_call_webhook, enterprise_data_fixture, enable_enterprise, synced_roles
 ):
+    """Test that view.rows_entered is not triggered when include_all_events is True."""
+
     user = enterprise_data_fixture.create_user()
     table = enterprise_data_fixture.create_database_table(user=user)
     view = enterprise_data_fixture.create_grid_view(table=table)
@@ -183,6 +192,8 @@ def test_rows_enter_view_event_type_not_triggerd_with_include_all_events(
 
 @pytest.mark.django_db()
 def test_rows_enter_view_event_event_type_test_payload(enterprise_data_fixture):
+    """Test the test/mock payload generation for the view.rows_entered event type."""
+
     user = enterprise_data_fixture.create_user()
     table = enterprise_data_fixture.create_database_table(user=user)
     field = enterprise_data_fixture.create_text_field(
@@ -210,7 +221,6 @@ def test_rows_enter_view_event_event_type_test_payload(enterprise_data_fixture):
             "name": table.name,
             "database_id": table.database_id,
         },
-        "type": "grid",
         "filters_disabled": False,
         "show_logo": True,
         "allow_public_export": False,
@@ -238,6 +248,8 @@ def test_rows_enter_view_event_event_type_test_payload(enterprise_data_fixture):
 def test_rows_enter_view_event_type_not_called_without_view(
     mock_call_webhook, enterprise_data_fixture, enable_enterprise, synced_roles
 ):
+    """Test that the webhook is not called when no views are configured."""
+
     user = enterprise_data_fixture.create_user()
     table = enterprise_data_fixture.create_database_table(user=user)
     view = enterprise_data_fixture.create_grid_view(table=table)
@@ -277,6 +289,8 @@ def test_rows_enter_view_event_type_not_called_without_view(
 def test_rows_enter_view_event_type_called_once_per_view(
     mock_call_webhook, enterprise_data_fixture, enable_enterprise, synced_roles
 ):
+    """Test that the webhook is called once for each configured view."""
+
     user = enterprise_data_fixture.create_user()
     table = enterprise_data_fixture.create_database_table(user=user)
     view_a = enterprise_data_fixture.create_grid_view(table=table)
@@ -306,6 +320,8 @@ def test_rows_enter_view_event_type_called_once_per_view(
 def test_rows_enter_view_event_type_only_right_webhook_is_called(
     mock_call_webhook, enterprise_data_fixture, enable_enterprise, synced_roles
 ):
+    """Test that only the webhook for the correct table/view is triggered."""
+
     user = enterprise_data_fixture.create_user()
     table_a = enterprise_data_fixture.create_database_table(user=user)
     view_a = enterprise_data_fixture.create_grid_view(table=table_a)
@@ -350,6 +366,8 @@ def test_rows_enter_view_event_type_only_right_webhook_is_called(
 def test_rows_enter_view_event_type_paginate_data(
     mock_make_request, enterprise_data_fixture, enable_enterprise, synced_roles
 ):
+    """Test that large row batches are paginated into multiple webhook calls."""
+
     user = enterprise_data_fixture.create_user()
     table = enterprise_data_fixture.create_database_table(user=user)
     text_field = enterprise_data_fixture.create_text_field(table=table, name="text")
@@ -376,7 +394,6 @@ def test_rows_enter_view_event_type_paginate_data(
             "name": table.name,
             "database_id": table.database_id,
         },
-        "type": "grid",
         "filters_disabled": False,
         "show_logo": True,
         "allow_public_export": False,
@@ -513,6 +530,7 @@ def test_rows_enter_view_webhook_does_not_trigger_for_events_before_creation(
             table=table,
             rows_values=[
                 {"id": rows[0].id, f"field_{text_field.id}": "Banana"},
+                {"id": rows[3].id, f"field_{text_field.id}": "Banana no more"},
             ],
         )
     with transaction.atomic():
@@ -540,3 +558,5 @@ def test_rows_enter_view_webhook_does_not_trigger_for_events_before_creation(
 
     assert mock_call_webhook.delay.call_count == 1
     assert mock_call_webhook.delay.call_args[1]["event_type"] == "view.rows_entered"
+    # Only row[2] entered the view since we recreated the webhook
+    assert mock_call_webhook.delay.call_args[1]["payload"]["row_ids"] == [rows[2].id]