Private
Public Access
Add the filter/rules engine
Implements FilterRule (one condition -> action, scoped to a feed and/or folder or global) with an evaluation engine applied at ingest time: after the fetch pipeline commits new/updated articles, each affected subscriber's enabled rules run in priority order against them, with tag/star/mark_read actions stacking and hide short-circuiting further evaluation for that article. Adds rule management (create/edit/delete) and a "Re-apply" action that re-evaluates a user's full ruleset against their unread backlog, scoped by the triggering rule's own feed/folder — so a newly added rule can retroactively affect already-ingested articles, not just future ones. Verified live in-browser: created a "title contains 'Show HN' -> star" rule scoped to the subscribed Hacker News feed, re-applied it against the existing unread backlog, and confirmed both matching articles were starred. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
1 parent
579696efc0
commit
5ed0499845
18 files changed
+1072
-6
No files matched your search
@@ -0,0 +1,157 @@
|
||||
import pytest
|
||||
from django.contrib.auth import get_user_model
|
||||
from django.urls import reverse
|
||||
|
||||
from apps.articles.models import Article, UserArticleState
|
||||
from apps.feeds.models import Feed, Subscription
|
||||
|
||||
from .models import FilterRule
|
||||
from .tasks import reapply_rules_for_user_backlog
|
||||
|
||||
User = get_user_model()
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def alice(db):
|
||||
return User.objects.create_user("alice", password="pw-alice-123")
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def bob(db):
|
||||
return User.objects.create_user("bob", password="pw-bob-123")
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def feed(db):
|
||||
return Feed.objects.create(feed_url="https://example.com/feed.xml", title="Example Feed")
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_create_rule(client, alice, feed):
|
||||
Subscription.objects.create(user=alice, feed=feed)
|
||||
client.login(username="alice", password="pw-alice-123")
|
||||
|
||||
response = client.post(
|
||||
reverse("rules:create_rule"),
|
||||
{
|
||||
"match_field": FilterRule.FIELD_TITLE,
|
||||
"match_type": FilterRule.MATCH_CONTAINS,
|
||||
"match_value": "Python",
|
||||
"action": FilterRule.ACTION_STAR,
|
||||
"priority": 0,
|
||||
"is_enabled": "on",
|
||||
},
|
||||
)
|
||||
assert response.status_code == 302
|
||||
assert FilterRule.objects.filter(user=alice, match_value="Python").exists()
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_tag_action_requires_action_value(client, alice):
|
||||
client.login(username="alice", password="pw-alice-123")
|
||||
response = client.post(
|
||||
reverse("rules:create_rule"),
|
||||
{
|
||||
"match_field": FilterRule.FIELD_TITLE,
|
||||
"match_type": FilterRule.MATCH_CONTAINS,
|
||||
"match_value": "Python",
|
||||
"action": FilterRule.ACTION_TAG,
|
||||
"action_value": "",
|
||||
"priority": 0,
|
||||
},
|
||||
)
|
||||
assert response.status_code == 200
|
||||
assert not FilterRule.objects.exists()
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_user_cannot_edit_another_users_rule(client, alice, bob):
|
||||
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="bob", password="pw-bob-123")
|
||||
|
||||
response = client.get(reverse("rules:edit_rule", args=[rule.pk]))
|
||||
assert response.status_code == 404
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_delete_rule(client, alice):
|
||||
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")
|
||||
|
||||
response = client.post(reverse("rules:delete_rule", args=[rule.pk]))
|
||||
assert response.status_code == 302
|
||||
assert not FilterRule.objects.filter(pk=rule.pk).exists()
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_reapply_rule_view_applies_to_unread_backlog(client, alice, feed):
|
||||
Subscription.objects.create(user=alice, feed=feed)
|
||||
article = Article.objects.create(feed=feed, guid="guid-1", title="Python 4 released")
|
||||
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")
|
||||
|
||||
response = client.post(reverse("rules:reapply_rule", args=[rule.pk]))
|
||||
assert response.status_code == 302
|
||||
assert UserArticleState.objects.get(user=alice, article=article).is_starred is True
|
||||
|
||||
|
||||
@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")
|
||||
Subscription.objects.create(user=alice, feed=feed)
|
||||
UserArticleState.objects.create(user=alice, article=article, is_read=True)
|
||||
rule = FilterRule.objects.create(
|
||||
user=alice,
|
||||
match_field=FilterRule.FIELD_TITLE,
|
||||
match_type=FilterRule.MATCH_CONTAINS,
|
||||
match_value="Python",
|
||||
action=FilterRule.ACTION_STAR,
|
||||
)
|
||||
|
||||
count = reapply_rules_for_user_backlog(rule.pk)
|
||||
|
||||
assert count == 0
|
||||
state = UserArticleState.objects.get(user=alice, article=article)
|
||||
assert state.is_starred is False
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_reapply_respects_feed_scope(alice):
|
||||
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")
|
||||
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")
|
||||
article_b = Article.objects.create(feed=feed_b, guid="guid-2", title="Python in B")
|
||||
|
||||
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,
|
||||
)
|
||||
|
||||
reapply_rules_for_user_backlog(rule.pk)
|
||||
|
||||
assert UserArticleState.objects.get(user=alice, article=article_a).is_starred is True
|
||||
assert not UserArticleState.objects.filter(user=alice, article=article_b).exists()
|
||||
Reference in new issue
Block a user