From e979a9d9fb6489d6123318fede270f9748e0ed90 Mon Sep 17 00:00:00 2001
From: vasileios <zigras00@gmail.com>
Date: Thu, 4 Apr 2024 12:14:48 +0200
Subject: [PATCH 1/5] [#3725] Added failed registrations to the email digest

---
 src/openforms/emails/tasks.py                 | 28 ++----
 .../emails/templates/emails/admin_digest.html | 24 ++++-
 src/openforms/emails/tests/test_tasks.py      | 97 ++++++++++++++++++-
 src/openforms/emails/utils.py                 | 22 +++++
 src/openforms/logging/logevent.py             |  7 +-
 src/openforms/registrations/tasks.py          |  8 +-
 src/openforms/registrations/utils.py          | 33 +++++++
 src/openforms/submissions/admin.py            | 19 ++++
 src/openforms/submissions/utils.py            | 11 +++
 9 files changed, 218 insertions(+), 31 deletions(-)

diff --git a/src/openforms/emails/tasks.py b/src/openforms/emails/tasks.py
index 248e50ad53..85f832e560 100644
--- a/src/openforms/emails/tasks.py
+++ b/src/openforms/emails/tasks.py
@@ -5,13 +5,11 @@
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 
-from django_yubin.models import Message
-
 from openforms.celery import app
 from openforms.config.models import GlobalConfiguration
-from openforms.logging.models import TimelineLogProxy
+from openforms.registrations.utils import collect_registrations_failures
 
-from .utils import send_mail_html
+from .utils import collect_failed_emails, send_mail_html
 
 
 @app.task
@@ -20,32 +18,24 @@ def send_email_digest() -> None:
     if not (recipients := config.recipients_email_digest):
         return
 
-    period_start = timezone.now() - timedelta(days=1)
+    desired_period = timezone.now() - timedelta(days=1)
 
-    logs = TimelineLogProxy.objects.filter(
-        timestamp__gt=period_start,
-        extra_data__status=Message.STATUS_FAILED,
-        extra_data__include_in_daily_digest=True,
-    ).distinct("content_type", "extra_data__status", "extra_data__event")
+    failed_emails = collect_failed_emails(desired_period)
+    failed_registrations = collect_registrations_failures(desired_period)
 
-    if not logs:
+    if not (failed_emails or failed_registrations):
         return
 
     content = render_to_string(
         "emails/admin_digest.html",
         {
-            "logs": [
-                {
-                    "submission_uuid": log.content_object.uuid,
-                    "event": log.extra_data["event"],
-                }
-                for log in logs
-            ],
+            "failed_emails": failed_emails,
+            "failed_registrations": failed_registrations,
         },
     )
 
     send_mail_html(
-        _("[Open Forms] Daily summary of failed emails"),
+        _("[Open Forms] Daily summary of failed procedures"),
         content,
         settings.DEFAULT_FROM_EMAIL,
         recipients,
diff --git a/src/openforms/emails/templates/emails/admin_digest.html b/src/openforms/emails/templates/emails/admin_digest.html
index a644f27753..1f0b865606 100644
--- a/src/openforms/emails/templates/emails/admin_digest.html
+++ b/src/openforms/emails/templates/emails/admin_digest.html
@@ -1,10 +1,24 @@
 {% load static i18n %}
 
 <p>
-    {% blocktranslate %}Here is a summary of the emails that failed to send yesterday:{% endblocktranslate %}
+    {% blocktranslate %}Here is a summary of the failed procedures in the past 24 hours:{% endblocktranslate %}
 </p>
-<ul>
-    {% for log in logs %}<li>- Email for the event "{{ log.event }}" for submission {{ log.submission_uuid }}.</li>
-    {% endfor %}
-</ul>
 
+{% if failed_emails %}
+    <h5>{% trans "Emails" %}</h5>
+    <ul>
+        {% for email in failed_emails %}
+            <li>- Email for the event "{{ email.event }}" for submission {{ email.submission_uuid }}.</li>
+        {% endfor %}
+    </ul>
+{% endif %}
+
+{% if failed_registrations %}
+    <h5>{% trans "Registrations" %}</h5>
+    <ul>
+        {% for registration in failed_registrations %}
+            <li>- {{ registration.form_name }} failed {{ registration.failed_submissions_counter }} times between {{ registration.initial_failure_at|date:"H:i" }} and {{ registration.last_failure_at|date:"H:i" }}.</li>
+            <a href="{{ registration.admin_link }}">Click here to see all the failed submissions for form {{ registration.form_name }} in the admin</a>
+        {% endfor %}
+    </ul>
+{% endif %}
diff --git a/src/openforms/emails/tests/test_tasks.py b/src/openforms/emails/tests/test_tasks.py
index ab5b277b8f..48c4e1336c 100644
--- a/src/openforms/emails/tests/test_tasks.py
+++ b/src/openforms/emails/tests/test_tasks.py
@@ -9,7 +9,9 @@
 from freezegun import freeze_time
 
 from openforms.config.models import GlobalConfiguration
+from openforms.forms.tests.factories import FormFactory
 from openforms.logging.tests.factories import TimelineLogProxyFactory
+from openforms.submissions.constants import RegistrationStatuses
 from openforms.submissions.tests.factories import SubmissionFactory
 
 from ..tasks import send_email_digest
@@ -72,8 +74,9 @@ def test_create_digest_email(self):
         expected_content = dedent(
             f"""
             <p>
-                Here is a summary of the emails that failed to send yesterday:
+                Here is a summary of the failed procedures in the past 24 hours:
             </p>
+            <h5>Emails</h5>
             <ul>
                 <li>- Email for the event "registration" for submission {submission.uuid}.</li>
 
@@ -128,8 +131,9 @@ def test_that_repeated_failures_are_not_mentioned_multiple_times(self):
         expected_content = dedent(
             f"""
             <p>
-                Here is a summary of the emails that failed to send yesterday:
+                Here is a summary of the failed procedures in the past 24 hours:
             </p>
+            <h5>Emails</h5>
             <ul>
                 <li>- Email for the event "registration" for submission {submission.uuid}.</li>
 
@@ -177,3 +181,92 @@ def test_no_recipients(self):
             send_email_digest()
 
         self.assertEqual(0, len(mail.outbox))
+
+    def test_failed_submissions_are_correctly_sent(self):
+        # 1st form with 2 failures in the past 24 hours
+        form_1 = FormFactory.create()
+        failed_submission_1 = SubmissionFactory.create(
+            form=form_1, registration_status=RegistrationStatuses.failed
+        )
+        failed_submission_2 = SubmissionFactory.create(
+            form=form_1, registration_status=RegistrationStatuses.failed
+        )
+
+        # 1st failure
+        with freeze_time("2023-01-02T12:30:00+01:00"):
+            TimelineLogProxyFactory.create(
+                template="logging/events/registration_failure.txt",
+                content_object=failed_submission_1,
+                extra_data={
+                    "log_event": "registration_failure",
+                    "include_in_daily_digest": True,
+                },
+            )
+
+        # 2nd failure
+        with freeze_time("2023-01-02T18:30:00+01:00"):
+            TimelineLogProxyFactory.create(
+                template="logging/events/registration_failure.txt",
+                content_object=failed_submission_2,
+                extra_data={
+                    "log_event": "registration_failure",
+                    "include_in_daily_digest": True,
+                },
+            )
+
+        # 2nd form with 1 failure in the past 24 hours
+        form_2 = FormFactory.create()
+        failed_submission = SubmissionFactory.create(
+            form=form_2, registration_status=RegistrationStatuses.failed
+        )
+
+        # failure
+        with freeze_time("2023-01-02T12:30:00+01:00"):
+            TimelineLogProxyFactory.create(
+                template="logging/events/registration_failure.txt",
+                content_object=failed_submission,
+                extra_data={
+                    "log_event": "registration_failure",
+                    "include_in_daily_digest": True,
+                },
+            )
+
+        with (
+            freeze_time("2023-01-03T01:00:00+01:00"),
+            patch(
+                "openforms.emails.tasks.GlobalConfiguration.get_solo",
+                return_value=GlobalConfiguration(
+                    recipients_email_digest=["user@example.com"]
+                ),
+            ),
+            patch("openforms.emails.tasks.send_mail_html") as patch_email,
+        ):
+            send_email_digest()
+
+            patch_email.assert_called_once()
+
+            args = patch_email.call_args.args
+            expected_content = dedent(
+                f"""
+                <p>
+                    Here is a summary of the failed procedures in the past 24 hours:
+                </p>
+                <h5>Registrations</h5>
+                <ul>
+                    <li>- {form_1.name} failed 2 times between 12:30 and 18:30.</li>
+                    <a href="/admin/submissions/submission/?form__id__exact={form_1.id}&needs_on_completion_retry__exact=1&from_time=24hAgo">
+                    Click here to see all the failed submissions for form {form_1.name} in the admin
+                    </a>
+                    <li>- {form_2.name} failed 1 times between 12:30 and 12:30.</li>
+                    <a href="/admin/submissions/submission/?form__id__exact={form_2.id}&needs_on_completion_retry__exact=1&from_time=24hAgo">
+                    Click here to see all the failed submissions for form {form_2.name} in the admin
+                    </a>
+                </ul>
+
+            """
+            ).strip()
+
+        self.assertHTMLEqual(
+            expected_content,
+            args[1].strip(),
+        )
diff --git a/src/openforms/emails/utils.py b/src/openforms/emails/utils.py
index 17baeaa520..fdc20cfc15 100644
--- a/src/openforms/emails/utils.py
+++ b/src/openforms/emails/utils.py
@@ -6,11 +6,13 @@
 from django.conf import settings
 from django.template.loader import get_template
 
+from django_yubin.models import Message
 from mail_cleaner.mail import send_mail_plus
 from mail_cleaner.sanitizer import sanitize_content as _sanitize_content
 from mail_cleaner.text import strip_tags_plus
 
 from openforms.config.models import GlobalConfiguration, Theme
+from openforms.logging.models import TimelineLogProxy
 from openforms.template import openforms_backend, render_from_string
 
 from .context import get_wrapper_context
@@ -100,3 +102,23 @@ def render_email_template(
         backend=openforms_backend,
         disable_autoescape=disable_autoescape,
     )
+
+
+def collect_failed_emails(desired_period) -> list[dict[str, str] | None]:
+    logs = TimelineLogProxy.objects.filter(
+        timestamp__gt=desired_period,
+        extra_data__status=Message.STATUS_FAILED,
+        extra_data__include_in_daily_digest=True,
+    ).distinct("content_type", "extra_data__status", "extra_data__event")
+
+    if not logs:
+        return
+    failed_emails = [
+        {
+            "submission_uuid": log.content_object.uuid,
+            "event": log.extra_data["event"],
+        }
+        for log in logs
+    ]
+
+    return failed_emails
diff --git a/src/openforms/logging/logevent.py b/src/openforms/logging/logevent.py
index 616a67a4e4..22e55eb97c 100644
--- a/src/openforms/logging/logevent.py
+++ b/src/openforms/logging/logevent.py
@@ -208,12 +208,17 @@ def registration_success(submission: Submission, plugin):
     )
 
 
-def registration_failure(submission: Submission, error: Exception, plugin=None):
+def registration_failure(
+    submission: Submission, error: Exception, include_in_daily_digest: bool, plugin=None
+):
     _create_log(
         submission,
         "registration_failure",
         plugin=plugin,
         error=error,
+        extra_data={
+            "include_in_daily_digest": include_in_daily_digest,
+        },
     )
 
 
diff --git a/src/openforms/registrations/tasks.py b/src/openforms/registrations/tasks.py
index b98da06ae9..4d2a494c15 100644
--- a/src/openforms/registrations/tasks.py
+++ b/src/openforms/registrations/tasks.py
@@ -224,7 +224,7 @@ def register_submission(submission_id: int, event: PostSubmissionEvents | str) -
             RegistrationStatuses.failed,
             {"traceback": "".join(traceback.format_exception(exc))},
         )
-        logevent.registration_failure(submission, exc)
+        logevent.registration_failure(submission, exc, True)
         if event == PostSubmissionEvents.on_retry:
             raise exc
         return
@@ -238,7 +238,7 @@ def register_submission(submission_id: int, event: PostSubmissionEvents | str) -
     try:
         options_serializer.is_valid(raise_exception=True)
     except ValidationError as exc:
-        logevent.registration_failure(submission, exc, plugin)
+        logevent.registration_failure(submission, exc, True, plugin)
         logger.warning(
             "Registration using plugin '%r' for submission '%s' failed",
             plugin,
@@ -268,7 +268,7 @@ def register_submission(submission_id: int, event: PostSubmissionEvents | str) -
         submission.save_registration_status(
             RegistrationStatuses.failed, {"traceback": traceback.format_exc()}
         )
-        logevent.registration_failure(submission, exc, plugin)
+        logevent.registration_failure(submission, exc, True, plugin)
         submission.save_registration_status(
             RegistrationStatuses.failed, {"traceback": traceback.format_exc()}
         )
@@ -285,7 +285,7 @@ def register_submission(submission_id: int, event: PostSubmissionEvents | str) -
         submission.save_registration_status(
             RegistrationStatuses.failed, {"traceback": traceback.format_exc()}
         )
-        logevent.registration_failure(submission, exc, plugin)
+        logevent.registration_failure(submission, exc, True, plugin)
         if event == PostSubmissionEvents.on_retry:
             raise exc
         return
diff --git a/src/openforms/registrations/utils.py b/src/openforms/registrations/utils.py
index 2260aa225d..144b720986 100644
--- a/src/openforms/registrations/utils.py
+++ b/src/openforms/registrations/utils.py
@@ -2,7 +2,9 @@
 
 from glom import assign, glom
 
+from openforms.logging.models import TimelineLogProxy
 from openforms.submissions.models import Submission
+from openforms.submissions.utils import get_filtered_submission_admin_url
 
 unset = object()
 
@@ -30,3 +32,34 @@ def execute_unless_result_exists(
     assign(submission.registration_result, spec, result, missing=dict)
     submission.save(update_fields=["registration_result"])
     return callback_result
+
+
+def collect_registrations_failures(desired_period) -> list[dict[str, str] | None]:
+    logs = TimelineLogProxy.objects.filter(
+        timestamp__gt=desired_period,
+        extra_data__log_event="registration_failure",
+        extra_data__include_in_daily_digest=True,
+    ).order_by("timestamp")
+
+    if not logs:
+        return
+
+    connected_forms = {}
+    for log in logs:
+        form = log.content_object.form
+
+        if form.uuid in connected_forms:
+            connected_forms[form.uuid]["failed_submissions_counter"] += 1
+            connected_forms[form.uuid]["last_failure_at"] = log.timestamp
+        else:
+            connected_forms[form.uuid] = {
+                "form_name": form.name,
+                "failed_submissions_counter": 1,
+                "initial_failure_at": log.timestamp,
+                "last_failure_at": log.timestamp,
+                "admin_link": get_filtered_submission_admin_url(form.id, 1, "24hAgo"),
+            }
+
+    failed_registrations = [form_detail for form_detail in connected_forms.values()]
+
+    return failed_registrations
diff --git a/src/openforms/submissions/admin.py b/src/openforms/submissions/admin.py
index f1113e1911..3e20f28327 100644
--- a/src/openforms/submissions/admin.py
+++ b/src/openforms/submissions/admin.py
@@ -1,9 +1,12 @@
+from datetime import timedelta
+
 from django import forms
 from django.contrib import admin, messages
 from django.contrib.contenttypes.admin import GenericTabularInline
 from django.db.models import Q
 from django.http import Http404
 from django.template.defaultfilters import filesizeformat
+from django.utils import timezone
 from django.utils.translation import gettext_lazy as _, ngettext
 
 from privates.admin import PrivateMediaMixin
@@ -82,6 +85,21 @@ def expected_parameters(self):
         return [self.parameter_name]
 
 
+class SubmissionTimeListFilter(admin.SimpleListFilter):
+    title = _("time")
+    parameter_name = "from_time"
+
+    def lookups(self, request, model_admin):
+        return [
+            ("24hAgo", _("In the past 24 hours")),
+        ]
+
+    def queryset(self, request, queryset):
+        desired_period = timezone.now() - timedelta(days=1)
+        if self.value() == "24hAgo":
+            return queryset.filter(last_register_date__gt=desired_period)
+
+
 class SubmissionStepInline(admin.StackedInline):
     model = SubmissionStep
     extra = 0
@@ -170,6 +188,7 @@ class SubmissionAdmin(admin.ModelAdmin):
     )
     list_filter = (
         SubmissionTypeListFilter,
+        SubmissionTimeListFilter,
         "registration_status",
         "needs_on_completion_retry",
         "form",
diff --git a/src/openforms/submissions/utils.py b/src/openforms/submissions/utils.py
index 519b3f603b..c29b4bc1e7 100644
--- a/src/openforms/submissions/utils.py
+++ b/src/openforms/submissions/utils.py
@@ -8,6 +8,7 @@
 from django.http import HttpRequest
 from django.utils import translation
 
+from furl import furl
 from rest_framework.permissions import SAFE_METHODS
 from rest_framework.request import Request
 from rest_framework.reverse import reverse
@@ -335,3 +336,13 @@ def get_report_download_url(request: Request, report: SubmissionReport) -> str:
         kwargs={"report_id": report.id, "token": token},
     )
     return request.build_absolute_uri(download_url)
+
+
+def get_filtered_submission_admin_url(form_id: int, state: int, from_time: str) -> str:
+    query_params = {
+        "form__id__exact": form_id,
+        "needs_on_completion_retry__exact": state,
+        "from_time": from_time,
+    }
+    submissions_admin_url = furl(reverse("admin:submissions_submission_changelist"))
+    return submissions_admin_url.add(query_params).url

From 8410e69bce4188927fe1e3917556e735887acc81 Mon Sep 17 00:00:00 2001
From: vasileios <zigras00@gmail.com>
Date: Fri, 5 Apr 2024 09:12:44 +0200
Subject: [PATCH 2/5] [#3725] PR feedback

---
 src/openforms/emails/tasks.py        | 6 +++---
 src/openforms/emails/utils.py        | 5 +++--
 src/openforms/registrations/utils.py | 5 +++--
 src/openforms/submissions/admin.py   | 4 ++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/openforms/emails/tasks.py b/src/openforms/emails/tasks.py
index 85f832e560..b8ebf2f4af 100644
--- a/src/openforms/emails/tasks.py
+++ b/src/openforms/emails/tasks.py
@@ -18,10 +18,10 @@ def send_email_digest() -> None:
     if not (recipients := config.recipients_email_digest):
         return
 
-    desired_period = timezone.now() - timedelta(days=1)
+    yesterday = timezone.now() - timedelta(days=1)
 
-    failed_emails = collect_failed_emails(desired_period)
-    failed_registrations = collect_registrations_failures(desired_period)
+    failed_emails = collect_failed_emails(yesterday)
+    failed_registrations = collect_registrations_failures(yesterday)
 
     if not (failed_emails or failed_registrations):
         return
diff --git a/src/openforms/emails/utils.py b/src/openforms/emails/utils.py
index fdc20cfc15..5871c0ad24 100644
--- a/src/openforms/emails/utils.py
+++ b/src/openforms/emails/utils.py
@@ -1,5 +1,6 @@
 import logging
 import re
+from datetime import datetime
 from typing import Any, Sequence
 from urllib.parse import urlsplit
 
@@ -104,9 +105,9 @@ def render_email_template(
     )
 
 
-def collect_failed_emails(desired_period) -> list[dict[str, str] | None]:
+def collect_failed_emails(since: datetime) -> list[dict[str, str] | None]:
     logs = TimelineLogProxy.objects.filter(
-        timestamp__gt=desired_period,
+        timestamp__gt=since,
         extra_data__status=Message.STATUS_FAILED,
         extra_data__include_in_daily_digest=True,
     ).distinct("content_type", "extra_data__status", "extra_data__event")
diff --git a/src/openforms/registrations/utils.py b/src/openforms/registrations/utils.py
index 144b720986..f84d6ec9a5 100644
--- a/src/openforms/registrations/utils.py
+++ b/src/openforms/registrations/utils.py
@@ -1,3 +1,4 @@
+from datetime import datetime
 from typing import Any, Callable
 
 from glom import assign, glom
@@ -34,9 +35,9 @@ def execute_unless_result_exists(
     return callback_result
 
 
-def collect_registrations_failures(desired_period) -> list[dict[str, str] | None]:
+def collect_registrations_failures(since: datetime) -> list[dict[str, str] | None]:
     logs = TimelineLogProxy.objects.filter(
-        timestamp__gt=desired_period,
+        timestamp__gt=since,
         extra_data__log_event="registration_failure",
         extra_data__include_in_daily_digest=True,
     ).order_by("timestamp")
diff --git a/src/openforms/submissions/admin.py b/src/openforms/submissions/admin.py
index 3e20f28327..4b4aa4457a 100644
--- a/src/openforms/submissions/admin.py
+++ b/src/openforms/submissions/admin.py
@@ -95,9 +95,9 @@ def lookups(self, request, model_admin):
         ]
 
     def queryset(self, request, queryset):
-        desired_period = timezone.now() - timedelta(days=1)
+        yesterday = timezone.now() - timedelta(days=1)
         if self.value() == "24hAgo":
-            return queryset.filter(last_register_date__gt=desired_period)
+            return queryset.filter(last_register_date__gt=yesterday)
 
 
 class SubmissionStepInline(admin.StackedInline):

From 182bed2c87a8e24b046fa3c542e4610d82981774 Mon Sep 17 00:00:00 2001
From: vasileios <zigras00@gmail.com>
Date: Wed, 10 Apr 2024 08:58:03 +0200
Subject: [PATCH 3/5] [#3725] PR feedback,dev view for email digest and fixed
 email task tests

---
 src/openforms/emails/tasks.py                 |  50 +++--
 .../emails/templates/emails/admin_digest.html |  26 ++-
 src/openforms/emails/tests/test_tasks.py      | 212 ++++++------------
 src/openforms/emails/utils.py                 |  23 --
 src/openforms/emails/views.py                 |  40 +++-
 src/openforms/logging/logevent.py             |   7 +-
 src/openforms/logging/service.py              |  78 +++++++
 src/openforms/registrations/utils.py          |  34 ---
 src/openforms/submissions/admin.py            |   2 +-
 src/openforms/submissions/tests/test_admin.py |  41 ++++
 src/openforms/urls.py                         |   6 +
 11 files changed, 282 insertions(+), 237 deletions(-)
 create mode 100644 src/openforms/logging/service.py

diff --git a/src/openforms/emails/tasks.py b/src/openforms/emails/tasks.py
index b8ebf2f4af..5e96a0a421 100644
--- a/src/openforms/emails/tasks.py
+++ b/src/openforms/emails/tasks.py
@@ -1,4 +1,5 @@
-from datetime import timedelta
+from datetime import datetime, timedelta
+from typing import Any
 
 from django.conf import settings
 from django.template.loader import render_to_string
@@ -7,9 +8,35 @@
 
 from openforms.celery import app
 from openforms.config.models import GlobalConfiguration
-from openforms.registrations.utils import collect_registrations_failures
+from openforms.logging.service import (
+    collect_failed_emails,
+    collect_failed_registrations,
+)
 
-from .utils import collect_failed_emails, send_mail_html
+from .utils import send_mail_html
+
+
+class Digest:
+    def __init__(self, since: datetime) -> None:
+        self.since = since
+
+    def get_context_data(self) -> dict[str, Any]:
+        failed_emails = collect_failed_emails(self.since)
+        failed_registrations = collect_failed_registrations(self.since)
+
+        if not (failed_emails or failed_registrations):
+            return {}
+
+        return {
+            "failed_emails": failed_emails,
+            "failed_registrations": failed_registrations,
+        }
+
+    def render(self) -> str:
+        if not (context := self.get_context_data()):
+            return ""
+
+        return render_to_string("emails/admin_digest.html", context)
 
 
 @app.task
@@ -19,23 +46,14 @@ def send_email_digest() -> None:
         return
 
     yesterday = timezone.now() - timedelta(days=1)
+    digest = Digest(since=yesterday)
+    content = digest.render()
 
-    failed_emails = collect_failed_emails(yesterday)
-    failed_registrations = collect_registrations_failures(yesterday)
-
-    if not (failed_emails or failed_registrations):
+    if not content:
         return
 
-    content = render_to_string(
-        "emails/admin_digest.html",
-        {
-            "failed_emails": failed_emails,
-            "failed_registrations": failed_registrations,
-        },
-    )
-
     send_mail_html(
-        _("[Open Forms] Daily summary of failed procedures"),
+        _("[Open Forms] Daily summary of detected problems"),
         content,
         settings.DEFAULT_FROM_EMAIL,
         recipients,
diff --git a/src/openforms/emails/templates/emails/admin_digest.html b/src/openforms/emails/templates/emails/admin_digest.html
index 1f0b865606..b7a056c3eb 100644
--- a/src/openforms/emails/templates/emails/admin_digest.html
+++ b/src/openforms/emails/templates/emails/admin_digest.html
@@ -1,14 +1,18 @@
 {% load static i18n %}
 
-<p>
-    {% blocktranslate %}Here is a summary of the failed procedures in the past 24 hours:{% endblocktranslate %}
-</p>
+<h3>
+    {% blocktranslate %}Here is a summary of the problems detected in the past 24 hours:{% endblocktranslate %}
+</h3>
 
 {% if failed_emails %}
-    <h5>{% trans "Emails" %}</h5>
+    <h5>{% trans "Emails that failed to send" %}</h5>
     <ul>
         {% for email in failed_emails %}
-            <li>- Email for the event "{{ email.event }}" for submission {{ email.submission_uuid }}.</li>
+            <li>
+                {% blocktranslate with event=email.event submission_uuid=email.submission_uuid %}
+                    Email for the event "{{ event }}" for submission {{ submission_uuid }}.
+                {% endblocktranslate %}
+            </li>
         {% endfor %}
     </ul>
 {% endif %}
@@ -17,8 +21,16 @@ <h5>{% trans "Emails" %}</h5>
     <h5>{% trans "Registrations" %}</h5>
     <ul>
         {% for registration in failed_registrations %}
-            <li>- {{ registration.form_name }} failed {{ registration.failed_submissions_counter }} times between {{ registration.initial_failure_at|date:"H:i" }} and {{ registration.last_failure_at|date:"H:i" }}.</li>
-            <a href="{{ registration.admin_link }}">Click here to see all the failed submissions for form {{ registration.form_name }} in the admin</a>
+            <li>
+                {% blocktranslate with form_name=registration.form_name counter=registration.failed_submissions_counter first_failure_at=registration.initial_failure_at|time:"H:i" last_failure_at=registration.last_failure_at|time:"H:i" %}
+                    Form '{{ form_name }}' failed {{ counter }} times between {{ first_failure_at }} and {{ last_failure_at }}.
+                {% endblocktranslate %}
+            </li>
+            <a href="{{ registration.admin_link }}">
+                {% blocktranslate with form_name=registration.form_name %}
+                    View failed '{{ form_name }}' submissions
+                {% endblocktranslate %}
+            </a>
         {% endfor %}
     </ul>
 {% endif %}
diff --git a/src/openforms/emails/tests/test_tasks.py b/src/openforms/emails/tests/test_tasks.py
index 48c4e1336c..603e9dfd46 100644
--- a/src/openforms/emails/tests/test_tasks.py
+++ b/src/openforms/emails/tests/test_tasks.py
@@ -1,5 +1,3 @@
-from datetime import datetime
-from textwrap import dedent
 from unittest.mock import patch
 
 from django.core import mail
@@ -10,7 +8,8 @@
 
 from openforms.config.models import GlobalConfiguration
 from openforms.forms.tests.factories import FormFactory
-from openforms.logging.tests.factories import TimelineLogProxyFactory
+from openforms.logging import logevent
+from openforms.registrations.exceptions import RegistrationFailed
 from openforms.submissions.constants import RegistrationStatuses
 from openforms.submissions.tests.factories import SubmissionFactory
 
@@ -24,35 +23,31 @@ def test_create_digest_email(self):
 
         with freeze_time("2023-01-02T12:30:00+01:00"):
             # Log email failed within last day
-            TimelineLogProxyFactory.create(
-                template="logging/events/email_status_change.txt",
-                content_object=submission,
-                extra_data={
-                    "status": Message.STATUS_FAILED,
-                    "event": "registration",
-                    "include_in_daily_digest": True,
-                },
+            logevent.email_status_change(
+                submission,
+                event="registration",
+                status=Message.STATUS_FAILED,
+                status_label="Failed",
+                include_in_daily_digest=True,
             )
+
             # Successfully sent email
-            TimelineLogProxyFactory.create(
-                template="logging/events/email_status_change.txt",
-                content_object=submission,
-                extra_data={
-                    "status": Message.STATUS_SENT,
-                    "include_in_daily_digest": True,
-                },
+            logevent.email_status_change(
+                submission,
+                event="registration",
+                status=Message.STATUS_SENT,
+                status_label="Sent",
+                include_in_daily_digest=True,
             )
 
         with freeze_time("2023-01-01T12:30:00+01:00"):
             # Log email failed more than 24h ago
-            TimelineLogProxyFactory.create(
-                template="logging/events/email_status_change.txt",
-                content_object=submission,
-                timestamp=datetime(2023, 1, 1, 12, 30),
-                extra_data={
-                    "status": Message.STATUS_FAILED,
-                    "include_in_daily_digest": True,
-                },
+            logevent.email_status_change(
+                submission,
+                event="registration",
+                status=Message.STATUS_FAILED,
+                status_label="Failed",
+                include_in_daily_digest=True,
             )
 
         with (
@@ -63,55 +58,38 @@ def test_create_digest_email(self):
                     recipients_email_digest=["tralala@test.nl", "trblblb@test.nl"]
                 ),
             ),
-            patch("openforms.emails.tasks.send_mail_html") as patch_email,
         ):
             send_email_digest()
 
-        patch_email.assert_called_once()
-
-        args = patch_email.call_args.args
-
-        expected_content = dedent(
-            f"""
-            <p>
-                Here is a summary of the failed procedures in the past 24 hours:
-            </p>
-            <h5>Emails</h5>
-            <ul>
-                <li>- Email for the event "registration" for submission {submission.uuid}.</li>
+        sent_email = mail.outbox[0]
+        submission_occurencies = sent_email.body.count(str(submission.uuid))
 
-            </ul>
-        """
-        ).strip()
-
-        self.assertEqual(args[3], ["tralala@test.nl", "trblblb@test.nl"])
-        self.assertHTMLEqual(
-            expected_content,
-            args[1].strip(),
+        self.assertEqual(
+            sent_email.subject, "[Open Forms] Daily summary of detected problems"
+        )
+        self.assertEqual(
+            sent_email.recipients(), ["tralala@test.nl", "trblblb@test.nl"]
         )
+        self.assertEqual(submission_occurencies, 1)
 
     def test_that_repeated_failures_are_not_mentioned_multiple_times(self):
         submission = SubmissionFactory.create()
 
         with freeze_time("2023-01-02T12:30:00+01:00"):
-            TimelineLogProxyFactory.create(
-                template="logging/events/email_status_change.txt",
-                content_object=submission,
-                extra_data={
-                    "status": Message.STATUS_FAILED,
-                    "event": "registration",
-                    "include_in_daily_digest": True,
-                },
+            logevent.email_status_change(
+                submission,
+                event="registration",
+                status=Message.STATUS_FAILED,
+                status_label="Failed",
+                include_in_daily_digest=True,
             )
         with freeze_time("2023-01-02T13:30:00+01:00"):
-            TimelineLogProxyFactory.create(
-                template="logging/events/email_status_change.txt",
-                content_object=submission,
-                extra_data={
-                    "status": Message.STATUS_FAILED,
-                    "event": "registration",
-                    "include_in_daily_digest": True,
-                },
+            logevent.email_status_change(
+                submission,
+                event="registration",
+                status=Message.STATUS_FAILED,
+                status_label="Failed",
+                include_in_daily_digest=True,
             )
 
         with (
@@ -122,31 +100,21 @@ def test_that_repeated_failures_are_not_mentioned_multiple_times(self):
                     recipients_email_digest=["tralala@test.nl", "trblblb@test.nl"]
                 ),
             ),
-            patch("openforms.emails.tasks.send_mail_html") as patch_email,
         ):
             send_email_digest()
 
-        args = patch_email.call_args.args
+        sent_email = mail.outbox[0]
+        submission_occurencies = sent_email.body.count(str(submission.uuid))
 
-        expected_content = dedent(
-            f"""
-            <p>
-                Here is a summary of the failed procedures in the past 24 hours:
-            </p>
-            <h5>Emails</h5>
-            <ul>
-                <li>- Email for the event "registration" for submission {submission.uuid}.</li>
-
-            </ul>
-        """
-        ).strip()
-
-        self.assertHTMLEqual(
-            expected_content,
-            args[1].strip(),
+        self.assertEqual(
+            sent_email.subject, "[Open Forms] Daily summary of detected problems"
+        )
+        self.assertEqual(
+            sent_email.recipients(), ["tralala@test.nl", "trblblb@test.nl"]
         )
+        self.assertEqual(submission_occurencies, 1)
 
-    def test_no_email_send_if_no_logs(self):
+    def test_no_email_sent_if_no_logs(self):
         with patch(
             "openforms.emails.tasks.GlobalConfiguration.get_solo",
             return_value=GlobalConfiguration(
@@ -157,18 +125,16 @@ def test_no_email_send_if_no_logs(self):
 
         self.assertEqual(0, len(mail.outbox))
 
-    def test_no_recipients(self):
+    def test_no_email_sent_if_no_recipients(self):
         submission = SubmissionFactory.create()
 
         with freeze_time("2023-01-02T12:30:00+01:00"):
-            TimelineLogProxyFactory.create(
-                template="logging/events/email_status_change.txt",
-                content_object=submission,
-                extra_data={
-                    "status": Message.STATUS_FAILED,
-                    "event": "registration",
-                    "include_in_daily_digest": True,
-                },
+            logevent.email_status_change(
+                submission,
+                event="registration",
+                status=Message.STATUS_FAILED,
+                status_label="Failed",
+                include_in_daily_digest=True,
             )
 
         with (
@@ -182,7 +148,7 @@ def test_no_recipients(self):
 
         self.assertEqual(0, len(mail.outbox))
 
-    def test_failed_submissions_are_correctly_sent(self):
+    def test_email_sent_if_failed_submissions_exist(self):
         # 1st form with 2 failures in the past 24 hours
         form_1 = FormFactory.create()
         failed_submission_1 = SubmissionFactory.create(
@@ -194,24 +160,16 @@ def test_failed_submissions_are_correctly_sent(self):
 
         # 1st failure
         with freeze_time("2023-01-02T12:30:00+01:00"):
-            TimelineLogProxyFactory.create(
-                template="logging/events/registration_failure.txt",
-                content_object=failed_submission_1,
-                extra_data={
-                    "log_event": "registration_failure",
-                    "include_in_daily_digest": True,
-                },
+            logevent.registration_failure(
+                failed_submission_1,
+                RegistrationFailed("Registration plugin is not enabled"),
             )
 
         # 2nd failure
         with freeze_time("2023-01-02T18:30:00+01:00"):
-            TimelineLogProxyFactory.create(
-                template="logging/events/registration_failure.txt",
-                content_object=failed_submission_2,
-                extra_data={
-                    "log_event": "registration_failure",
-                    "include_in_daily_digest": True,
-                },
+            logevent.registration_failure(
+                failed_submission_2,
+                RegistrationFailed("Registration plugin is not enabled"),
             )
 
         # 2nd form with 1 failure in the past 24 hours
@@ -222,13 +180,9 @@ def test_failed_submissions_are_correctly_sent(self):
 
         # failure
         with freeze_time("2023-01-02T12:30:00+01:00"):
-            TimelineLogProxyFactory.create(
-                template="logging/events/registration_failure.txt",
-                content_object=failed_submission,
-                extra_data={
-                    "log_event": "registration_failure",
-                    "include_in_daily_digest": True,
-                },
+            logevent.registration_failure(
+                failed_submission,
+                RegistrationFailed("Registration plugin is not enabled"),
             )
 
         with (
@@ -239,34 +193,14 @@ def test_failed_submissions_are_correctly_sent(self):
                     recipients_email_digest=["user@example.com"]
                 ),
             ),
-            patch("openforms.emails.tasks.send_mail_html") as patch_email,
         ):
             send_email_digest()
 
-            patch_email.assert_called_once()
-
-            args = patch_email.call_args.args
-            expected_content = dedent(
-                f"""
-                <p>
-                    Here is a summary of the failed procedures in the past 24 hours:
-                </p>
-                <h5>Registrations</h5>
-                <ul>
-                    <li>- {form_1.name} failed 2 times between 12:30 and 18:30.</li>
-                    <a href="/admin/submissions/submission/?form__id__exact={form_1.id}&needs_on_completion_retry__exact=1&from_time=24hAgo">
-                    Click here to see all the failed submissions for form {form_1.name} in the admin
-                    </a>
-                    <li>- {form_2.name} failed 1 times between 12:30 and 12:30.</li>
-                    <a href="/admin/submissions/submission/?form__id__exact={form_2.id}&needs_on_completion_retry__exact=1&from_time=24hAgo">
-                    Click here to see all the failed submissions for form {form_2.name} in the admin
-                    </a>
-                </ul>
-
-            """
-            ).strip()
+        sent_email = mail.outbox[0]
 
-        self.assertHTMLEqual(
-            expected_content,
-            args[1].strip(),
+        self.assertEqual(
+            sent_email.subject, "[Open Forms] Daily summary of detected problems"
         )
+        self.assertEqual(sent_email.recipients(), ["user@example.com"])
+        self.assertIn(form_1.name, sent_email.body)
+        self.assertIn(form_2.name, sent_email.body)
diff --git a/src/openforms/emails/utils.py b/src/openforms/emails/utils.py
index 5871c0ad24..17baeaa520 100644
--- a/src/openforms/emails/utils.py
+++ b/src/openforms/emails/utils.py
@@ -1,19 +1,16 @@
 import logging
 import re
-from datetime import datetime
 from typing import Any, Sequence
 from urllib.parse import urlsplit
 
 from django.conf import settings
 from django.template.loader import get_template
 
-from django_yubin.models import Message
 from mail_cleaner.mail import send_mail_plus
 from mail_cleaner.sanitizer import sanitize_content as _sanitize_content
 from mail_cleaner.text import strip_tags_plus
 
 from openforms.config.models import GlobalConfiguration, Theme
-from openforms.logging.models import TimelineLogProxy
 from openforms.template import openforms_backend, render_from_string
 
 from .context import get_wrapper_context
@@ -103,23 +100,3 @@ def render_email_template(
         backend=openforms_backend,
         disable_autoescape=disable_autoescape,
     )
-
-
-def collect_failed_emails(since: datetime) -> list[dict[str, str] | None]:
-    logs = TimelineLogProxy.objects.filter(
-        timestamp__gt=since,
-        extra_data__status=Message.STATUS_FAILED,
-        extra_data__include_in_daily_digest=True,
-    ).distinct("content_type", "extra_data__status", "extra_data__event")
-
-    if not logs:
-        return
-    failed_emails = [
-        {
-            "submission_uuid": log.content_object.uuid,
-            "event": log.extra_data["event"],
-        }
-        for log in logs
-    ]
-
-    return failed_emails
diff --git a/src/openforms/emails/views.py b/src/openforms/emails/views.py
index fa6c065829..463efb0c73 100644
--- a/src/openforms/emails/views.py
+++ b/src/openforms/emails/views.py
@@ -1,6 +1,10 @@
+from datetime import timedelta
+
 from django.shortcuts import get_object_or_404
+from django.utils import timezone
 from django.views.generic import TemplateView
 
+from openforms.emails.tasks import Digest
 from openforms.submissions.models import Submission
 from openforms.utils.views import DevViewMixin, EmailDebugViewMixin
 
@@ -17,16 +21,30 @@ class EmailWrapperTestView(
     def get_email_content(self):
         content = "<b>content goes here</b>"
 
-        if self.kwargs.get("submission_id"):
-            submission = get_object_or_404(Submission, id=self.kwargs["submission_id"])
-
-            content_template = get_confirmation_email_templates(submission)[1]
-            context = get_confirmation_email_context_data(submission)
-            mode = self._get_mode()
-            if mode == "text":
-                context["rendering_text"] = True
-            content = render_email_template(content_template, context)
-            if mode == "text":
-                content = strip_tags_plus(content, keep_leading_whitespace=True)
+        match self.kwargs:
+            case {"submission_id": int()}:
+                submission = get_object_or_404(
+                    Submission, id=self.kwargs["submission_id"]
+                )
+
+                content_template = get_confirmation_email_templates(submission)[1]
+                context = get_confirmation_email_context_data(submission)
+                mode = self._get_mode()
+                if mode == "text":
+                    context["rendering_text"] = True
+                content = render_email_template(content_template, context)
+                if mode == "text":
+                    content = strip_tags_plus(content, keep_leading_whitespace=True)
+
+            case {"email_digest": True}:
+                interval = timezone.now() - timedelta(days=1)
+                if days_before := self.request.GET.get("days_before"):
+                    interval = timezone.now() - timedelta(days=int(days_before))
+
+                digest = Digest(since=interval)
+                return digest.render()
+
+            case _:
+                pass  # render wrapper
 
         return content
diff --git a/src/openforms/logging/logevent.py b/src/openforms/logging/logevent.py
index 22e55eb97c..616a67a4e4 100644
--- a/src/openforms/logging/logevent.py
+++ b/src/openforms/logging/logevent.py
@@ -208,17 +208,12 @@ def registration_success(submission: Submission, plugin):
     )
 
 
-def registration_failure(
-    submission: Submission, error: Exception, include_in_daily_digest: bool, plugin=None
-):
+def registration_failure(submission: Submission, error: Exception, plugin=None):
     _create_log(
         submission,
         "registration_failure",
         plugin=plugin,
         error=error,
-        extra_data={
-            "include_in_daily_digest": include_in_daily_digest,
-        },
     )
 
 
diff --git a/src/openforms/logging/service.py b/src/openforms/logging/service.py
new file mode 100644
index 0000000000..9b3239c9ae
--- /dev/null
+++ b/src/openforms/logging/service.py
@@ -0,0 +1,78 @@
+import uuid
+from dataclasses import dataclass
+from datetime import datetime
+from itertools import groupby
+from typing import Iterable
+
+from django_yubin.models import Message
+
+from openforms.logging.models import TimelineLogProxy
+from openforms.submissions.utils import get_filtered_submission_admin_url
+
+
+@dataclass
+class FailedEmail:
+    submission_uuid: uuid.UUID
+    event: str
+
+
+@dataclass
+class FailedRegistration:
+    form_uuid: uuid.UUID
+    form_name: str
+    failed_submissions_counter: int
+    initial_failure_at: datetime
+    last_failure_at: datetime
+    admin_link: str
+
+
+def collect_failed_emails(since: datetime) -> Iterable[FailedEmail]:
+    logs = TimelineLogProxy.objects.filter(
+        timestamp__gt=since,
+        extra_data__status=Message.STATUS_FAILED,
+        extra_data__include_in_daily_digest=True,
+    ).distinct("content_type", "extra_data__status", "extra_data__event")
+
+    if not logs:
+        return []
+
+    failed_emails = [
+        {
+            "submission_uuid": log.content_object.uuid,
+            "event": log.extra_data["event"],
+        }
+        for log in logs
+    ]
+
+    return failed_emails
+
+
+def collect_failed_registrations(since: datetime) -> Iterable[FailedRegistration]:
+    logs = TimelineLogProxy.objects.filter(
+        timestamp__gt=since,
+        extra_data__log_event="registration_failure",
+    ).order_by("timestamp")
+
+    if not logs:
+        return []
+
+    form_sorted_logs = sorted(logs, key=lambda x: x.content_object.form.id)
+
+    grouped_logs = {}
+    for form, logs_group in groupby(
+        form_sorted_logs, key=lambda log: log.content_object.form
+    ):
+        grouped_logs[form] = list(logs_group)
+
+    failed_registrations = {}
+    for form, submission_logs in grouped_logs.items():
+        timestamps = [log.timestamp for log in submission_logs]
+        failed_registrations[str(form.uuid)] = {
+            "form_name": form.name,
+            "failed_submissions_counter": len(submission_logs),
+            "initial_failure_at": min(timestamps),
+            "last_failure_at": max(timestamps),
+            "admin_link": get_filtered_submission_admin_url(form.id, 1, "24hAgo"),
+        }
+
+    return list(failed_registrations.values())
diff --git a/src/openforms/registrations/utils.py b/src/openforms/registrations/utils.py
index f84d6ec9a5..2260aa225d 100644
--- a/src/openforms/registrations/utils.py
+++ b/src/openforms/registrations/utils.py
@@ -1,11 +1,8 @@
-from datetime import datetime
 from typing import Any, Callable
 
 from glom import assign, glom
 
-from openforms.logging.models import TimelineLogProxy
 from openforms.submissions.models import Submission
-from openforms.submissions.utils import get_filtered_submission_admin_url
 
 unset = object()
 
@@ -33,34 +30,3 @@ def execute_unless_result_exists(
     assign(submission.registration_result, spec, result, missing=dict)
     submission.save(update_fields=["registration_result"])
     return callback_result
-
-
-def collect_registrations_failures(since: datetime) -> list[dict[str, str] | None]:
-    logs = TimelineLogProxy.objects.filter(
-        timestamp__gt=since,
-        extra_data__log_event="registration_failure",
-        extra_data__include_in_daily_digest=True,
-    ).order_by("timestamp")
-
-    if not logs:
-        return
-
-    connected_forms = {}
-    for log in logs:
-        form = log.content_object.form
-
-        if form.uuid in connected_forms:
-            connected_forms[form.uuid]["failed_submissions_counter"] += 1
-            connected_forms[form.uuid]["last_failure_at"] = log.timestamp
-        else:
-            connected_forms[form.uuid] = {
-                "form_name": form.name,
-                "failed_submissions_counter": 1,
-                "initial_failure_at": log.timestamp,
-                "last_failure_at": log.timestamp,
-                "admin_link": get_filtered_submission_admin_url(form.id, 1, "24hAgo"),
-            }
-
-    failed_registrations = [form_detail for form_detail in connected_forms.values()]
-
-    return failed_registrations
diff --git a/src/openforms/submissions/admin.py b/src/openforms/submissions/admin.py
index 4b4aa4457a..9c8b67f10b 100644
--- a/src/openforms/submissions/admin.py
+++ b/src/openforms/submissions/admin.py
@@ -91,7 +91,7 @@ class SubmissionTimeListFilter(admin.SimpleListFilter):
 
     def lookups(self, request, model_admin):
         return [
-            ("24hAgo", _("In the past 24 hours")),
+            ("24hAgo", _("Registered in the past 24 hours")),
         ]
 
     def queryset(self, request, queryset):
diff --git a/src/openforms/submissions/tests/test_admin.py b/src/openforms/submissions/tests/test_admin.py
index 9ce7238019..b06de20b3c 100644
--- a/src/openforms/submissions/tests/test_admin.py
+++ b/src/openforms/submissions/tests/test_admin.py
@@ -1,16 +1,22 @@
 from unittest.mock import patch
 
+from django.contrib.admin import AdminSite
+from django.test import TestCase
 from django.urls import reverse
+from django.utils import timezone
 
 from django_webtest import WebTest
+from freezegun import freeze_time
 from furl import furl
 from maykin_2fa.test import disable_admin_mfa
 
 from openforms.accounts.tests.factories import UserFactory
 from openforms.logging.logevent import submission_start
 from openforms.logging.models import TimelineLogProxy
+from openforms.submissions.models.submission import Submission
 
 from ...config.models import GlobalConfiguration
+from ..admin import SubmissionAdmin, SubmissionTimeListFilter
 from ..constants import PostSubmissionEvents, RegistrationStatuses
 from .factories import SubmissionFactory
 
@@ -213,3 +219,38 @@ def test_change_view(self):
             "admin:submissions_submission_change", kwargs={"object_id": "0"}
         )
         self.app.get(change_url, user=self.user, status=404)
+
+
+class TestSubmissionTimeListFilterAdmin(TestCase):
+    def test_time_filtering(self):
+        with freeze_time("2023-04-02T12:30:00+01:00"):
+            # registered in the past 24 hours
+            submission_1 = SubmissionFactory.create(
+                last_register_date=timezone.now(),
+                registration_status=RegistrationStatuses.failed,
+            )
+
+        with freeze_time("2023-01-02T12:30:00+01:00"):
+            # registered out of filtering bounds
+            submission_2 = SubmissionFactory.create(
+                last_register_date=timezone.now(),
+                registration_status=RegistrationStatuses.failed,
+            )
+
+        with freeze_time("2023-04-02T18:30:00+01:00"):
+            site = AdminSite()
+            model_admin = SubmissionAdmin(Submission, site)
+            filter_instance = SubmissionTimeListFilter(
+                request=None,
+                params={"from_time": "24hAgo"},
+                model=Submission,
+                model_admin=model_admin,
+            )
+
+            queryset = Submission.objects.all()
+            filtered_queryset = filter_instance.queryset(None, queryset)
+
+        self.assertIn(submission_1, queryset)
+        self.assertIn(submission_2, queryset)
+        self.assertIn(submission_1, filtered_queryset)
+        self.assertNotIn(submission_2, filtered_queryset)
diff --git a/src/openforms/urls.py b/src/openforms/urls.py
index b33ae47dcf..46e31d89cb 100644
--- a/src/openforms/urls.py
+++ b/src/openforms/urls.py
@@ -112,6 +112,12 @@
             EmailWrapperTestView.as_view(),
             name="dev-email-wrapper",
         ),
+        path(
+            "dev/email/digest",
+            EmailWrapperTestView.as_view(),
+            {"email_digest": True},
+            name="dev-email-digest",
+        ),
         path(
             "dev/email/confirmation/<int:submission_id>",
             EmailWrapperTestView.as_view(),

From c9d1e2ae278be85a14f0afacac8da8c194219832 Mon Sep 17 00:00:00 2001
From: vasileios <zigras00@gmail.com>
Date: Wed, 10 Apr 2024 09:16:23 +0200
Subject: [PATCH 4/5] [#3725] Removed forgitten variable from
 registration_failure log event

---
 src/openforms/registrations/tasks.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/openforms/registrations/tasks.py b/src/openforms/registrations/tasks.py
index 4d2a494c15..b98da06ae9 100644
--- a/src/openforms/registrations/tasks.py
+++ b/src/openforms/registrations/tasks.py
@@ -224,7 +224,7 @@ def register_submission(submission_id: int, event: PostSubmissionEvents | str) -
             RegistrationStatuses.failed,
             {"traceback": "".join(traceback.format_exception(exc))},
         )
-        logevent.registration_failure(submission, exc, True)
+        logevent.registration_failure(submission, exc)
         if event == PostSubmissionEvents.on_retry:
             raise exc
         return
@@ -238,7 +238,7 @@ def register_submission(submission_id: int, event: PostSubmissionEvents | str) -
     try:
         options_serializer.is_valid(raise_exception=True)
     except ValidationError as exc:
-        logevent.registration_failure(submission, exc, True, plugin)
+        logevent.registration_failure(submission, exc, plugin)
         logger.warning(
             "Registration using plugin '%r' for submission '%s' failed",
             plugin,
@@ -268,7 +268,7 @@ def register_submission(submission_id: int, event: PostSubmissionEvents | str) -
         submission.save_registration_status(
             RegistrationStatuses.failed, {"traceback": traceback.format_exc()}
         )
-        logevent.registration_failure(submission, exc, True, plugin)
+        logevent.registration_failure(submission, exc, plugin)
         submission.save_registration_status(
             RegistrationStatuses.failed, {"traceback": traceback.format_exc()}
         )
@@ -285,7 +285,7 @@ def register_submission(submission_id: int, event: PostSubmissionEvents | str) -
         submission.save_registration_status(
             RegistrationStatuses.failed, {"traceback": traceback.format_exc()}
         )
-        logevent.registration_failure(submission, exc, True, plugin)
+        logevent.registration_failure(submission, exc, plugin)
         if event == PostSubmissionEvents.on_retry:
             raise exc
         return

From 0eee5b5a7c83281a9b60131763419fbeb40168a2 Mon Sep 17 00:00:00 2001
From: vasileios <zigras00@gmail.com>
Date: Wed, 10 Apr 2024 16:33:31 +0200
Subject: [PATCH 5/5] [#3725] Process feedback

---
 .../emails/templates/emails/admin_digest.html | 17 +++++-----
 src/openforms/emails/tests/test_tasks.py      |  4 +--
 src/openforms/emails/views.py                 |  6 ++--
 src/openforms/logging/service.py              | 31 +++++++++----------
 src/openforms/submissions/admin.py            |  6 ++--
 src/openforms/submissions/tests/test_admin.py |  8 ++---
 src/openforms/submissions/utils.py            |  8 +++--
 7 files changed, 39 insertions(+), 41 deletions(-)

diff --git a/src/openforms/emails/templates/emails/admin_digest.html b/src/openforms/emails/templates/emails/admin_digest.html
index b7a056c3eb..f3a70dcc97 100644
--- a/src/openforms/emails/templates/emails/admin_digest.html
+++ b/src/openforms/emails/templates/emails/admin_digest.html
@@ -9,7 +9,7 @@ <h5>{% trans "Emails that failed to send" %}</h5>
     <ul>
         {% for email in failed_emails %}
             <li>
-                {% blocktranslate with event=email.event submission_uuid=email.submission_uuid %}
+                {% blocktranslate with event=email.event submission_uuid=email.submission_uuid trimmed %}
                     Email for the event "{{ event }}" for submission {{ submission_uuid }}.
                 {% endblocktranslate %}
             </li>
@@ -22,15 +22,16 @@ <h5>{% trans "Registrations" %}</h5>
     <ul>
         {% for registration in failed_registrations %}
             <li>
-                {% blocktranslate with form_name=registration.form_name counter=registration.failed_submissions_counter first_failure_at=registration.initial_failure_at|time:"H:i" last_failure_at=registration.last_failure_at|time:"H:i" %}
-                    Form '{{ form_name }}' failed {{ counter }} times between {{ first_failure_at }} and {{ last_failure_at }}.
+                {% blocktranslate with form_name=registration.form_name counter=registration.failed_submissions_counter first_failure_at=registration.initial_failure_at|time:"H:i" last_failure_at=registration.last_failure_at|time:"H:i" trimmed %}
+                    Form '{{ form_name }}' failed {{ counter }} times between {{ first_failure_at }} and {{ last_failure_at }}.</br>
                 {% endblocktranslate %}
+            
+                <a href="{{ registration.admin_link }}">
+                    {% blocktranslate with form_name=registration.form_name %}
+                        View failed '{{ form_name }}' submissions
+                    {% endblocktranslate %}
+                </a>
             </li>
-            <a href="{{ registration.admin_link }}">
-                {% blocktranslate with form_name=registration.form_name %}
-                    View failed '{{ form_name }}' submissions
-                {% endblocktranslate %}
-            </a>
         {% endfor %}
     </ul>
 {% endif %}
diff --git a/src/openforms/emails/tests/test_tasks.py b/src/openforms/emails/tests/test_tasks.py
index 603e9dfd46..63f5d59b0c 100644
--- a/src/openforms/emails/tests/test_tasks.py
+++ b/src/openforms/emails/tests/test_tasks.py
@@ -62,7 +62,7 @@ def test_create_digest_email(self):
             send_email_digest()
 
         sent_email = mail.outbox[0]
-        submission_occurencies = sent_email.body.count(str(submission.uuid))
+        submission_occurences = sent_email.body.count(str(submission.uuid))
 
         self.assertEqual(
             sent_email.subject, "[Open Forms] Daily summary of detected problems"
@@ -70,7 +70,7 @@ def test_create_digest_email(self):
         self.assertEqual(
             sent_email.recipients(), ["tralala@test.nl", "trblblb@test.nl"]
         )
-        self.assertEqual(submission_occurencies, 1)
+        self.assertEqual(submission_occurences, 1)
 
     def test_that_repeated_failures_are_not_mentioned_multiple_times(self):
         submission = SubmissionFactory.create()
diff --git a/src/openforms/emails/views.py b/src/openforms/emails/views.py
index 463efb0c73..be12b8041c 100644
--- a/src/openforms/emails/views.py
+++ b/src/openforms/emails/views.py
@@ -37,10 +37,8 @@ def get_email_content(self):
                     content = strip_tags_plus(content, keep_leading_whitespace=True)
 
             case {"email_digest": True}:
-                interval = timezone.now() - timedelta(days=1)
-                if days_before := self.request.GET.get("days_before"):
-                    interval = timezone.now() - timedelta(days=int(days_before))
-
+                days_before = int(self.request.GET.get("days_before", 1))
+                interval = timezone.now() - timedelta(days=days_before)
                 digest = Digest(since=interval)
                 return digest.render()
 
diff --git a/src/openforms/logging/service.py b/src/openforms/logging/service.py
index 9b3239c9ae..b0642fbf81 100644
--- a/src/openforms/logging/service.py
+++ b/src/openforms/logging/service.py
@@ -18,7 +18,6 @@ class FailedEmail:
 
 @dataclass
 class FailedRegistration:
-    form_uuid: uuid.UUID
     form_name: str
     failed_submissions_counter: int
     initial_failure_at: datetime
@@ -37,17 +36,18 @@ def collect_failed_emails(since: datetime) -> Iterable[FailedEmail]:
         return []
 
     failed_emails = [
-        {
-            "submission_uuid": log.content_object.uuid,
-            "event": log.extra_data["event"],
-        }
+        FailedEmail(
+            submission_uuid=log.content_object.uuid, event=log.extra_data["event"]
+        )
         for log in logs
     ]
 
     return failed_emails
 
 
-def collect_failed_registrations(since: datetime) -> Iterable[FailedRegistration]:
+def collect_failed_registrations(
+    since: datetime,
+) -> Iterable[dict[str, FailedRegistration]]:
     logs = TimelineLogProxy.objects.filter(
         timestamp__gt=since,
         extra_data__log_event="registration_failure",
@@ -56,23 +56,22 @@ def collect_failed_registrations(since: datetime) -> Iterable[FailedRegistration
     if not logs:
         return []
 
-    form_sorted_logs = sorted(logs, key=lambda x: x.content_object.form.id)
+    form_sorted_logs = sorted(logs, key=lambda x: x.content_object.form.admin_name)
 
-    grouped_logs = {}
-    for form, logs_group in groupby(
-        form_sorted_logs, key=lambda log: log.content_object.form
-    ):
-        grouped_logs[form] = list(logs_group)
+    grouped_logs = groupby(form_sorted_logs, key=lambda log: log.content_object.form)
 
     failed_registrations = {}
-    for form, submission_logs in grouped_logs.items():
-        timestamps = [log.timestamp for log in submission_logs]
+    for form, submission_logs in grouped_logs:
+        logs = list(submission_logs)
+        timestamps = [log.timestamp for log in logs]
         failed_registrations[str(form.uuid)] = {
             "form_name": form.name,
-            "failed_submissions_counter": len(submission_logs),
+            "failed_submissions_counter": len(logs),
             "initial_failure_at": min(timestamps),
             "last_failure_at": max(timestamps),
-            "admin_link": get_filtered_submission_admin_url(form.id, 1, "24hAgo"),
+            "admin_link": get_filtered_submission_admin_url(
+                form.id, filter_retry=True, registration_time="24hAgo"
+            ),
         }
 
     return list(failed_registrations.values())
diff --git a/src/openforms/submissions/admin.py b/src/openforms/submissions/admin.py
index 9c8b67f10b..688e9875d6 100644
--- a/src/openforms/submissions/admin.py
+++ b/src/openforms/submissions/admin.py
@@ -86,12 +86,12 @@ def expected_parameters(self):
 
 
 class SubmissionTimeListFilter(admin.SimpleListFilter):
-    title = _("time")
-    parameter_name = "from_time"
+    title = _("registration time")
+    parameter_name = "registration_time"
 
     def lookups(self, request, model_admin):
         return [
-            ("24hAgo", _("Registered in the past 24 hours")),
+            ("24hAgo", _("In the past 24 hours")),
         ]
 
     def queryset(self, request, queryset):
diff --git a/src/openforms/submissions/tests/test_admin.py b/src/openforms/submissions/tests/test_admin.py
index b06de20b3c..7a2e051578 100644
--- a/src/openforms/submissions/tests/test_admin.py
+++ b/src/openforms/submissions/tests/test_admin.py
@@ -242,7 +242,7 @@ def test_time_filtering(self):
             model_admin = SubmissionAdmin(Submission, site)
             filter_instance = SubmissionTimeListFilter(
                 request=None,
-                params={"from_time": "24hAgo"},
+                params={"registration_time": "24hAgo"},
                 model=Submission,
                 model_admin=model_admin,
             )
@@ -250,7 +250,5 @@ def test_time_filtering(self):
             queryset = Submission.objects.all()
             filtered_queryset = filter_instance.queryset(None, queryset)
 
-        self.assertIn(submission_1, queryset)
-        self.assertIn(submission_2, queryset)
-        self.assertIn(submission_1, filtered_queryset)
-        self.assertNotIn(submission_2, filtered_queryset)
+        self.assertQuerySetEqual(queryset, [submission_1, submission_2], ordered=False)
+        self.assertQuerySetEqual(filtered_queryset, [submission_1], ordered=False)
diff --git a/src/openforms/submissions/utils.py b/src/openforms/submissions/utils.py
index c29b4bc1e7..16294f1c60 100644
--- a/src/openforms/submissions/utils.py
+++ b/src/openforms/submissions/utils.py
@@ -338,11 +338,13 @@ def get_report_download_url(request: Request, report: SubmissionReport) -> str:
     return request.build_absolute_uri(download_url)
 
 
-def get_filtered_submission_admin_url(form_id: int, state: int, from_time: str) -> str:
+def get_filtered_submission_admin_url(
+    form_id: int, *, filter_retry: bool, registration_time: str
+) -> str:
     query_params = {
         "form__id__exact": form_id,
-        "needs_on_completion_retry__exact": state,
-        "from_time": from_time,
+        "needs_on_completion_retry__exact": 1 if filter_retry else 0,
+        "registration_time": registration_time,
     }
     submissions_admin_url = furl(reverse("admin:submissions_submission_changelist"))
     return submissions_admin_url.add(query_params).url