diff --git a/src/authentic2/apps/journal/models.py b/src/authentic2/apps/journal/models.py index d1202fe18..5c205e7a7 100644 --- a/src/authentic2/apps/journal/models.py +++ b/src/authentic2/apps/journal/models.py @@ -384,7 +384,7 @@ class Event(models.Model): """Expire old events by default retention days or customized at the EventTypeDefinition level.""" event_types_by_retention_days = defaultdict(set) - default_retention_days = getattr(settings, 'JOURNAL_DEFAULT_RETENTION_DAYS', 365 * 2) + default_retention_days = getattr(settings, 'JOURNAL_DEFAULT_RETENTION_DAYS', 365) for event_type in EventType.objects.all(): evd = event_type.definition retention_days = evd.retention_days if evd else None diff --git a/tests/test_journal.py b/tests/test_journal.py index 0be8c57a1..5a48c1ba5 100644 --- a/tests/test_journal.py +++ b/tests/test_journal.py @@ -416,7 +416,7 @@ def test_cleanup(user_events, some_event_types, freezer, monkeypatch): monkeypatch.setattr(some_event_types['UserRegistration'], 'retention_days', 0) count = Event.objects.count() - freezer.move_to(timedelta(days=365 * 2 - 1)) + freezer.move_to(timedelta(days=365 - 1)) call_command('cleanupauthentic') assert Event.objects.count() == count freezer.move_to(timedelta(days=2))