Private
Public Access
Scope backlog re-apply per-feed and always queue it through Celery (T5, S5)
Completes the T5 fix: reapply_rules_for_user_backlog now computes each feed's subscription-tag ids up front and passes them to evaluate_rules_for_article per article, so a feed/tag-scoped rule from a different feed can't fire on this backlog (see the previous commit's rule_in_scope() in apps.rules.engine). Also completes S5's second half: the "Re-apply" view now always dispatches reapply_rules_for_user.delay() instead of calling the backlog function inline from the request — a large backlog or a regex that outruns the new timeout guard no longer risks tying up a web worker. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
1 parent
91c0b1dd26
commit
fd8eeb605e
3 files changed
+133
-12
No files matched your search
+103
-1
@@ -1,8 +1,17 @@
|
||||
from unittest.mock import patch
|
||||
|
||||
import pytest
|
||||
from django.contrib.auth import get_user_model
|
||||
from django.urls import reverse
|
||||
|
||||
from apps.articles.models import STARRED_TAG_NAME, Article, ArticleTag, UserArticleState
|
||||
from apps.articles.models import (
|
||||
STARRED_TAG_NAME,
|
||||
Article,
|
||||
ArticleTag,
|
||||
SubscriptionTag,
|
||||
Tag,
|
||||
UserArticleState,
|
||||
)
|
||||
from apps.feeds.models import Feed, Subscription
|
||||
|
||||
from .models import FilterRule
|
||||
@@ -119,6 +128,28 @@ def test_reapply_rule_view_applies_to_unread_backlog(client, alice, feed):
|
||||
assert is_starred(alice, article) is True
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_reapply_rule_view_always_queues_through_celery_never_runs_inline(client, alice, feed):
|
||||
# A large backlog or a pathological regex must not be able to tie up
|
||||
# the request/response cycle — the view should dispatch a task, not
|
||||
# call reapply_rules_for_user_backlog directly.
|
||||
Subscription.objects.create(user=alice, feed=feed)
|
||||
rule = FilterRule.objects.create(
|
||||
user=alice,
|
||||
match_field=FilterRule.FIELD_TITLE,
|
||||
match_type=FilterRule.MATCH_CONTAINS,
|
||||
match_value="Python",
|
||||
action=FilterRule.ACTION_STAR,
|
||||
)
|
||||
client.login(username="alice", password="pw-alice-123")
|
||||
|
||||
with patch("apps.rules.views.reapply_rules_for_user.delay") as mock_delay:
|
||||
response = client.post(reverse("rules:reapply_rule", args=[rule.pk]))
|
||||
|
||||
assert response.status_code == 302
|
||||
mock_delay.assert_called_once_with(rule.pk)
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_reapply_skips_already_read_articles(alice, feed):
|
||||
article = Article.objects.create(feed=feed, guid="guid-1", title="Python 4 released")
|
||||
@@ -160,3 +191,74 @@ def test_reapply_respects_feed_scope(alice):
|
||||
|
||||
assert is_starred(alice, article_a) is True
|
||||
assert not UserArticleState.objects.filter(user=alice, article=article_b).exists()
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_reapply_does_not_apply_a_different_feeds_scoped_rule_to_the_backlog():
|
||||
# Regression test for a bug where re-applying one feed-scoped rule
|
||||
# loaded *every* enabled rule and ran it against the whole backlog
|
||||
# with no scope check — so a same-matching rule scoped to a feed
|
||||
# the user isn't re-applying would still fire on this backlog.
|
||||
feed_a = Feed.objects.create(feed_url="https://a.example.com/feed.xml")
|
||||
feed_b = Feed.objects.create(feed_url="https://b.example.com/feed.xml")
|
||||
alice = User.objects.create_user("alice", password="pw-alice-123")
|
||||
Subscription.objects.create(user=alice, feed=feed_a)
|
||||
Subscription.objects.create(user=alice, feed=feed_b)
|
||||
article_a = Article.objects.create(feed=feed_a, guid="guid-1", title="Python in A")
|
||||
|
||||
triggering_rule = FilterRule.objects.create(
|
||||
user=alice,
|
||||
feed=feed_a,
|
||||
match_field=FilterRule.FIELD_TITLE,
|
||||
match_type=FilterRule.MATCH_CONTAINS,
|
||||
match_value="Python",
|
||||
action=FilterRule.ACTION_STAR,
|
||||
)
|
||||
FilterRule.objects.create(
|
||||
user=alice,
|
||||
feed=feed_b,
|
||||
match_field=FilterRule.FIELD_TITLE,
|
||||
match_type=FilterRule.MATCH_CONTAINS,
|
||||
match_value="Python",
|
||||
action=FilterRule.ACTION_TAG,
|
||||
action_value="feed-b-only",
|
||||
)
|
||||
|
||||
reapply_rules_for_user_backlog(triggering_rule.pk)
|
||||
|
||||
assert is_starred(alice, article_a) is True
|
||||
assert not Tag.objects.filter(user=alice, name="feed-b-only").exists()
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_reapply_applies_a_tag_scoped_rule_only_to_that_tags_feeds():
|
||||
feed_a = Feed.objects.create(feed_url="https://a.example.com/feed.xml")
|
||||
feed_b = Feed.objects.create(feed_url="https://b.example.com/feed.xml")
|
||||
alice = User.objects.create_user("alice", password="pw-alice-123")
|
||||
sub_a = Subscription.objects.create(user=alice, feed=feed_a)
|
||||
Subscription.objects.create(user=alice, feed=feed_b)
|
||||
tag = Tag.objects.create(user=alice, name="work")
|
||||
SubscriptionTag.objects.create(user=alice, subscription=sub_a, tag=tag)
|
||||
article_a = Article.objects.create(feed=feed_a, guid="guid-1", title="Python in A")
|
||||
article_b = Article.objects.create(feed=feed_b, guid="guid-2", title="Python in B")
|
||||
|
||||
unscoped_trigger = FilterRule.objects.create(
|
||||
user=alice,
|
||||
match_field=FilterRule.FIELD_TITLE,
|
||||
match_type=FilterRule.MATCH_CONTAINS,
|
||||
match_value="unrelated-trigger-value",
|
||||
action=FilterRule.ACTION_MARK_READ,
|
||||
)
|
||||
FilterRule.objects.create(
|
||||
user=alice,
|
||||
tag=tag,
|
||||
match_field=FilterRule.FIELD_TITLE,
|
||||
match_type=FilterRule.MATCH_CONTAINS,
|
||||
match_value="Python",
|
||||
action=FilterRule.ACTION_STAR,
|
||||
)
|
||||
|
||||
reapply_rules_for_user_backlog(unscoped_trigger.pk)
|
||||
|
||||
assert is_starred(alice, article_a) is True
|
||||
assert is_starred(alice, article_b) is False
|
||||
Reference in new issue
Block a user