Private
Public Access
Make the feed-poll interval site-wide instead of per-feed
Replaces Feed.fetch_interval_minutes with a single admin-editable SiteSettings.fetch_interval_minutes (apps.core), following the same singleton-row pattern as accounts.SetupLock. Per-feed error backoff is unchanged — only the configured baseline interval is now shared across every feed, loaded once per poll_due_feeds run rather than queried per feed. EVECTION_MIN_FETCH_INTERVAL_MINUTES keeps working as the floor underneath it. SiteSettings is registered in Django admin as a singleton: "Add" is only offered when no row exists yet, and delete is always refused. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
1 parent
a1ea2e5662
commit
dc8b9ff83b
11 files changed
+203
-20
No files matched your search
+18
-1
@@ -1 +1,18 @@
|
||||
# Register your models here.
|
||||
from django.contrib import admin
|
||||
|
||||
from .models import SiteSettings
|
||||
|
||||
|
||||
@admin.register(SiteSettings)
|
||||
class SiteSettingsAdmin(admin.ModelAdmin):
|
||||
list_display = ["fetch_interval_minutes"]
|
||||
fields = ["fetch_interval_minutes"]
|
||||
|
||||
def has_add_permission(self, request):
|
||||
# Singleton — only offer "Add" when the row doesn't exist yet
|
||||
# (a fresh install before the first poll_due_feeds run or admin
|
||||
# visit has created it via SiteSettings.load()).
|
||||
return not SiteSettings.objects.exists()
|
||||
|
||||
def has_delete_permission(self, request, obj=None):
|
||||
return False
|
||||
@@ -0,0 +1,33 @@
|
||||
# Generated by Django 5.2.18 on 2026-10-31 18:56
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
initial = True
|
||||
|
||||
dependencies = []
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name="SiteSettings",
|
||||
fields=[
|
||||
(
|
||||
"id",
|
||||
models.PositiveSmallIntegerField(default=1, primary_key=True, serialize=False),
|
||||
),
|
||||
(
|
||||
"fetch_interval_minutes",
|
||||
models.PositiveIntegerField(
|
||||
default=60,
|
||||
help_text="How often, in minutes, every feed is polled for new articles. Can't be set lower than EVECTION_MIN_FETCH_INTERVAL_MINUTES (see .env).",
|
||||
),
|
||||
),
|
||||
],
|
||||
options={
|
||||
"verbose_name": "Site settings",
|
||||
"verbose_name_plural": "Site settings",
|
||||
},
|
||||
),
|
||||
]
|
||||
+35
-1
@@ -1 +1,35 @@
|
||||
# Create your models here.
|
||||
from django.db import models
|
||||
|
||||
|
||||
class SiteSettings(models.Model):
|
||||
"""Singleton row (pk=1, same pattern as accounts.SetupLock) holding
|
||||
instance-wide configuration an operator reasonably wants to change
|
||||
without touching the server or .env — editable via Django admin.
|
||||
Currently just the feed-poll interval, which used to be a per-feed
|
||||
field; it's site-wide now (see apps.feeds.tasks.poll_due_feeds).
|
||||
"""
|
||||
|
||||
id = models.PositiveSmallIntegerField(primary_key=True, default=1)
|
||||
fetch_interval_minutes = models.PositiveIntegerField(
|
||||
default=60,
|
||||
help_text=(
|
||||
"How often, in minutes, every feed is polled for new articles. "
|
||||
"Can't be set lower than EVECTION_MIN_FETCH_INTERVAL_MINUTES (see .env)."
|
||||
),
|
||||
)
|
||||
|
||||
class Meta:
|
||||
verbose_name = "Site settings"
|
||||
verbose_name_plural = "Site settings"
|
||||
|
||||
def __str__(self):
|
||||
return "Site settings"
|
||||
|
||||
@classmethod
|
||||
def load(cls):
|
||||
"""Returns the singleton row, creating it with defaults on first
|
||||
use so callers never need to special-case "no row exists yet"
|
||||
(e.g. a fresh install whose first poll_due_feeds run hasn't
|
||||
created it, and whose admin hasn't visited the settings page)."""
|
||||
obj, _ = cls.objects.get_or_create(pk=1)
|
||||
return obj
|
||||
@@ -0,0 +1,74 @@
|
||||
from datetime import timedelta
|
||||
from unittest.mock import patch
|
||||
|
||||
import pytest
|
||||
from django.contrib.auth import get_user_model
|
||||
from django.urls import reverse
|
||||
from django.utils import timezone
|
||||
|
||||
from apps.feeds.models import Feed
|
||||
from apps.feeds.tasks import poll_due_feeds
|
||||
|
||||
from .models import SiteSettings
|
||||
|
||||
User = get_user_model()
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_load_creates_the_singleton_row_with_defaults():
|
||||
assert not SiteSettings.objects.exists()
|
||||
settings_row = SiteSettings.load()
|
||||
assert settings_row.fetch_interval_minutes == 60
|
||||
assert SiteSettings.objects.count() == 1
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_load_returns_the_existing_row_without_creating_a_second_one():
|
||||
SiteSettings.objects.create(fetch_interval_minutes=30)
|
||||
settings_row = SiteSettings.load()
|
||||
assert settings_row.fetch_interval_minutes == 30
|
||||
assert SiteSettings.objects.count() == 1
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_poll_due_feeds_uses_the_site_wide_interval_for_every_feed():
|
||||
SiteSettings.objects.create(fetch_interval_minutes=120)
|
||||
due = Feed.objects.create(
|
||||
feed_url="https://a.example.com/feed.xml",
|
||||
last_fetched_at=timezone.now() - timedelta(minutes=150),
|
||||
)
|
||||
not_due = Feed.objects.create(
|
||||
feed_url="https://b.example.com/feed.xml",
|
||||
last_fetched_at=timezone.now() - timedelta(minutes=90),
|
||||
)
|
||||
|
||||
with patch("apps.feeds.tasks.fetch_feed.delay") as mock_delay:
|
||||
poll_due_feeds()
|
||||
|
||||
dispatched_ids = {call.args[0] for call in mock_delay.call_args_list}
|
||||
assert dispatched_ids == {due.id}
|
||||
assert not_due.id not in dispatched_ids
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_admin_offers_add_only_once_and_never_offers_delete(client):
|
||||
# ModelAdmin.has_add_permission/has_delete_permission returning False
|
||||
# makes Django raise PermissionDenied rather than build a 403 response
|
||||
# directly — the test client's default behavior re-raises that for
|
||||
# debugging convenience instead of returning it as a response.
|
||||
client.raise_request_exception = False
|
||||
|
||||
User.objects.create_superuser("admin", password="pw-admin-123")
|
||||
client.login(username="admin", password="pw-admin-123")
|
||||
|
||||
add_url = reverse("admin:core_sitesettings_add")
|
||||
response = client.get(add_url)
|
||||
assert response.status_code == 200 # no row yet — "Add" is offered
|
||||
|
||||
settings_row = SiteSettings.load()
|
||||
response = client.get(add_url)
|
||||
assert response.status_code == 403 # a row exists now — add is refused
|
||||
|
||||
delete_url = reverse("admin:core_sitesettings_delete", args=[settings_row.pk])
|
||||
response = client.get(delete_url)
|
||||
assert response.status_code == 403
|
||||
Reference in new issue
Block a user