From d382dd4671074be2a2a8ac2a2746c78b6bdcbc4f Mon Sep 17 00:00:00 2001
From: Paul Schilling <mail@paulschilling.de>
Date: Wed, 26 Jun 2024 12:28:53 +0200
Subject: [PATCH] [#2581] Refactor notifications for expiring actions/plans,
 messages, cases

    - replace cron jobs with celery tasks
    - explicitly mark internal utility functions for case notifications
---
 src/open_inwoner/accounts/forms.py            |   1 +
 .../management/commands/actions_expire.py     |  48 ----
 .../commands/notify_about_messages.py         |  59 -----
 src/open_inwoner/accounts/managers.py         |  10 +
 .../accounts/notifications/__init__.py        |   9 +
 .../notifications/notify_expiring_actions.py  |  39 ++++
 .../notifications/notify_expiring_plans.py    |  42 ++++
 .../accounts/notifications/notify_messages.py |  47 ++++
 src/open_inwoner/accounts/tasks.py            | 116 ++++++++++
 .../accounts/registration_necessary.html      |   1 +
 .../accounts/tests/test_actions_expire.py     |  52 -----
 .../tests/test_notify_about_messages.py       |  95 --------
 .../tests/test_notify_expiring_actions.py     |  65 ++++++
 .../tests/test_notify_expiring_plans.py}      |  88 +++++---
 .../accounts/tests/test_notify_messages.py    |  77 +++++++
 src/open_inwoner/conf/base.py                 |  12 +
 src/open_inwoner/configurations/models.py     |  23 ++
 src/open_inwoner/openzaak/admin.py            |   9 +-
 src/open_inwoner/openzaak/notifications.py    | 213 +++++++++---------
 .../openzaak/tests/test_notification_utils.py |  10 +-
 .../test_notification_zaak_infoobject.py      |  22 +-
 .../tests/test_notification_zaak_status.py    |  20 +-
 src/open_inwoner/plans/management/__init__.py |   0
 .../plans/management/commands/__init__.py     |   0
 .../plans/management/commands/plans_expire.py |  62 -----
 src/open_inwoner/plans/managers.py            |  16 ++
 .../templates/pages/profile/me.html           |   1 +
 src/open_inwoner/utils/constants.py           |   6 +
 28 files changed, 665 insertions(+), 478 deletions(-)
 delete mode 100644 src/open_inwoner/accounts/management/commands/actions_expire.py
 delete mode 100644 src/open_inwoner/accounts/management/commands/notify_about_messages.py
 create mode 100644 src/open_inwoner/accounts/notifications/__init__.py
 create mode 100644 src/open_inwoner/accounts/notifications/notify_expiring_actions.py
 create mode 100644 src/open_inwoner/accounts/notifications/notify_expiring_plans.py
 create mode 100644 src/open_inwoner/accounts/notifications/notify_messages.py
 create mode 100644 src/open_inwoner/accounts/tasks.py
 delete mode 100644 src/open_inwoner/accounts/tests/test_actions_expire.py
 delete mode 100644 src/open_inwoner/accounts/tests/test_notify_about_messages.py
 create mode 100644 src/open_inwoner/accounts/tests/test_notify_expiring_actions.py
 rename src/open_inwoner/{plans/tests/test_plans_expire.py => accounts/tests/test_notify_expiring_plans.py} (56%)
 create mode 100644 src/open_inwoner/accounts/tests/test_notify_messages.py
 delete mode 100644 src/open_inwoner/plans/management/__init__.py
 delete mode 100644 src/open_inwoner/plans/management/commands/__init__.py
 delete mode 100644 src/open_inwoner/plans/management/commands/plans_expire.py
 create mode 100644 src/open_inwoner/utils/constants.py

diff --git a/src/open_inwoner/accounts/forms.py b/src/open_inwoner/accounts/forms.py
index e66f493d17..8f9131616d 100644
--- a/src/open_inwoner/accounts/forms.py
+++ b/src/open_inwoner/accounts/forms.py
@@ -202,6 +202,7 @@ def __init__(self, user, *args, **kwargs):
         self.fields["last_name"].required = True
 
         # notifications
+        # TODO: add condition to check if notifications should be displayed
         if not (user.login_type == LoginTypeChoices.digid and case_page_is_published()):
             del self.fields["cases_notifications"]
         if not inbox_page_is_published():
diff --git a/src/open_inwoner/accounts/management/commands/actions_expire.py b/src/open_inwoner/accounts/management/commands/actions_expire.py
deleted file mode 100644
index aebe951a6c..0000000000
--- a/src/open_inwoner/accounts/management/commands/actions_expire.py
+++ /dev/null
@@ -1,48 +0,0 @@
-import logging
-from datetime import date
-
-from django.core.management.base import BaseCommand
-from django.db.models.query import QuerySet
-from django.urls import reverse
-
-from mail_editor.helpers import find_template
-
-from open_inwoner.accounts.models import Action, User
-from open_inwoner.utils.url import build_absolute_url
-
-logger = logging.getLogger(__name__)
-
-
-class Command(BaseCommand):
-    help = "Send emails about expiring actions to the users"
-
-    def handle(self, *args, **options):
-        today = date.today()
-        user_ids = Action.objects.filter(end_date=today).values_list(
-            "is_for_id", flat=True
-        )
-        receivers = User.objects.filter(
-            is_active=True, pk__in=user_ids, plans_notifications=True
-        ).distinct()
-
-        for receiver in receivers:
-            """send email to each user"""
-            actions = Action.objects.filter(is_for=receiver, end_date=today)
-            self.send_email(
-                receiver=receiver,
-                actions=actions,
-            )
-
-            logger.info(
-                f"The email was sent to the user {receiver} about {actions.count()} expiring actions"
-            )
-
-    def send_email(self, receiver: User, actions: QuerySet[Action]):
-        actions_link = build_absolute_url(reverse("profile:action_list"))
-        template = find_template("expiring_action")
-        context = {
-            "actions": actions,
-            "actions_link": actions_link,
-        }
-
-        return template.send_email([receiver.email], context)
diff --git a/src/open_inwoner/accounts/management/commands/notify_about_messages.py b/src/open_inwoner/accounts/management/commands/notify_about_messages.py
deleted file mode 100644
index 216c0b74f3..0000000000
--- a/src/open_inwoner/accounts/management/commands/notify_about_messages.py
+++ /dev/null
@@ -1,59 +0,0 @@
-import logging
-
-from django.core.management.base import BaseCommand
-from django.db.models import Count
-from django.urls import reverse
-
-from mail_editor.helpers import find_template
-
-from open_inwoner.accounts.models import Message, User
-from open_inwoner.utils.url import build_absolute_url
-
-logger = logging.getLogger(__name__)
-
-
-class Command(BaseCommand):
-    help = "Send emails about new messages to the users"
-
-    def handle(self, *args, **options):
-        receivers = User.objects.filter(
-            received_messages__seen=False,
-            received_messages__sent=False,
-            is_active=True,
-            messages_notifications=True,
-        ).distinct()
-
-        for receiver in receivers:
-            """send email to each user"""
-            messages_to_update = Message.objects.filter(
-                receiver=receiver,
-                seen=False,
-                sent=False,
-            )
-            total_senders = messages_to_update.aggregate(
-                total_senders=Count("sender", distinct=True)
-            )["total_senders"]
-            total_messages = messages_to_update.count()
-            self.send_email(
-                receiver=receiver,
-                total_senders=total_senders,
-                total_messages=total_messages,
-            )
-
-            """update messages"""
-            messages_to_update.update(sent=True)
-
-            logger.info(
-                f"The email was sent to the user {receiver} about {total_messages} new messages"
-            )
-
-    def send_email(self, receiver: User, total_senders: int, total_messages: int):
-        inbox_url = build_absolute_url(reverse("inbox:index"))
-        template = find_template("new_messages")
-        context = {
-            "total_messages": total_messages,
-            "total_senders": total_senders,
-            "inbox_link": inbox_url,
-        }
-
-        return template.send_email([receiver.email], context)
diff --git a/src/open_inwoner/accounts/managers.py b/src/open_inwoner/accounts/managers.py
index bf4d3db227..65e84a6591 100644
--- a/src/open_inwoner/accounts/managers.py
+++ b/src/open_inwoner/accounts/managers.py
@@ -1,3 +1,5 @@
+from datetime import date
+
 from django.contrib.auth.models import BaseUserManager
 from django.db.models import Q, QuerySet
 
@@ -76,3 +78,11 @@ def visible(self):
 
     def connected(self, user):
         return self.filter(Q(created_by=user) | Q(is_for=user)).distinct()
+
+    def expiring_actions_user_ids(self, end_date: date):
+        """
+        Returns:
+            id's of users with expiring actions
+        """
+        user_ids = self.filter(end_date=end_date).values_list("is_for_id", flat=True)
+        return user_ids
diff --git a/src/open_inwoner/accounts/notifications/__init__.py b/src/open_inwoner/accounts/notifications/__init__.py
new file mode 100644
index 0000000000..f5e020e492
--- /dev/null
+++ b/src/open_inwoner/accounts/notifications/__init__.py
@@ -0,0 +1,9 @@
+from .notify_expiring_actions import notify_about_expiring_actions
+from .notify_expiring_plans import notify_about_expiring_plans
+from .notify_messages import notify_about_messages
+
+__all__ = [
+    "notify_about_expiring_actions",
+    "notify_about_expiring_plans",
+    "notify_about_messages",
+]
diff --git a/src/open_inwoner/accounts/notifications/notify_expiring_actions.py b/src/open_inwoner/accounts/notifications/notify_expiring_actions.py
new file mode 100644
index 0000000000..d28d2f3d76
--- /dev/null
+++ b/src/open_inwoner/accounts/notifications/notify_expiring_actions.py
@@ -0,0 +1,39 @@
+import logging
+
+from django.db.models.query import QuerySet
+from django.urls import reverse
+
+from mail_editor.helpers import find_template
+
+from open_inwoner.accounts.models import Action, User
+from open_inwoner.utils.url import build_absolute_url
+
+logger = logging.getLogger(__name__)
+
+
+def notify_about_expiring_actions(
+    receiver: User, objects: QuerySet[Action], channel: str
+):
+    send = _channels[channel]
+
+    send(receiver=receiver, actions=objects)
+
+
+def _send_email(receiver: User, actions: QuerySet[Action]):
+    actions_link = build_absolute_url(reverse("profile:action_list"))
+    template = find_template("expiring_action")
+    context = {
+        "actions": actions,
+        "actions_link": actions_link,
+    }
+
+    template.send_email([receiver.email], context)
+
+    logger.info(
+        f"The email was sent to the user {receiver} about {actions.count()} expiring actions"
+    )
+
+
+_channels = {
+    "email": _send_email,
+}
diff --git a/src/open_inwoner/accounts/notifications/notify_expiring_plans.py b/src/open_inwoner/accounts/notifications/notify_expiring_plans.py
new file mode 100644
index 0000000000..4d964815d2
--- /dev/null
+++ b/src/open_inwoner/accounts/notifications/notify_expiring_plans.py
@@ -0,0 +1,42 @@
+import logging
+
+from django.db.models.query import QuerySet
+from django.urls import reverse
+
+from mail_editor.helpers import find_template
+
+from open_inwoner.accounts.models import User
+from open_inwoner.plans.models import Plan
+from open_inwoner.userfeed import hooks as userfeed_hooks
+from open_inwoner.utils.url import build_absolute_url
+
+logger = logging.getLogger(__name__)
+
+
+def notify_about_expiring_plans(receiver: User, objects: QuerySet[Plan], channel: str):
+    for plan in objects:
+        userfeed_hooks.plan_expiring(receiver, plan)
+
+    send = _channels[channel]
+
+    send(receiver=receiver, plans=objects)
+
+
+def _send_email(receiver: User, plans: QuerySet[Plan]):
+    plan_list_link = build_absolute_url(reverse("collaborate:plan_list"))
+    template = find_template("expiring_plan")
+    context = {
+        "plans": plans,
+        "plan_list_link": plan_list_link,
+    }
+
+    template.send_email([receiver.email], context)
+
+    logger.info(
+        f"The email was sent to the user {receiver} about {plans.count()} expiring plans"
+    )
+
+
+_channels = {
+    "email": _send_email,
+}
diff --git a/src/open_inwoner/accounts/notifications/notify_messages.py b/src/open_inwoner/accounts/notifications/notify_messages.py
new file mode 100644
index 0000000000..5914923944
--- /dev/null
+++ b/src/open_inwoner/accounts/notifications/notify_messages.py
@@ -0,0 +1,47 @@
+import logging
+
+from django.db.models import Count
+from django.db.models.query import QuerySet
+from django.urls import reverse
+
+from mail_editor.helpers import find_template
+
+from open_inwoner.accounts.models import Message, User
+from open_inwoner.utils.url import build_absolute_url
+
+logger = logging.getLogger(__name__)
+
+
+def notify_about_messages(receiver: User, objects: QuerySet[Message], channel: str):
+    send = _channels[channel]
+
+    send(receiver=receiver, messages=objects)
+
+
+def _send_email(receiver: User, messages: QuerySet[Message]):
+    inbox_url = build_absolute_url(reverse("inbox:index"))
+    template = find_template("new_messages")
+
+    total_messages = messages.count()
+    total_senders = messages.aggregate(total_senders=Count("sender", distinct=True))[
+        "total_senders"
+    ]
+
+    context = {
+        "total_messages": total_messages,
+        "total_senders": total_senders,
+        "inbox_link": inbox_url,
+    }
+
+    template.send_email([receiver.email], context)
+
+    messages.update(sent=True)
+
+    logger.info(
+        f"The email was sent to the user {receiver} about {total_messages} new messages"
+    )
+
+
+_channels = {
+    "email": _send_email,
+}
diff --git a/src/open_inwoner/accounts/tasks.py b/src/open_inwoner/accounts/tasks.py
new file mode 100644
index 0000000000..1e37a79e34
--- /dev/null
+++ b/src/open_inwoner/accounts/tasks.py
@@ -0,0 +1,116 @@
+from datetime import date
+from typing import Callable
+
+from django.db.models import Q
+from django.db.models.query import QuerySet
+from django.utils.translation import gettext as _
+
+from celery import group
+from celery.result import allow_join_result
+
+from open_inwoner.accounts.models import Action, Message, User
+from open_inwoner.celery import app
+from open_inwoner.plans.models import Plan
+from open_inwoner.utils.constants import NotificationChannel
+
+from .notifications import (
+    notify_about_expiring_actions,
+    notify_about_expiring_plans,
+    notify_about_messages,
+)
+
+
+@app.task
+def send_email(receiver: User, objects: QuerySet, notify: Callable):
+    """
+    Send email to `receiver` about `objects` using `notify`
+    """
+    notify(
+        receiver=receiver,
+        objects=objects,
+        channel=NotificationChannel.email,
+    )
+
+
+@app.task(name=_("Send emails about expiring actions"))
+def send_emails_about_expiring_actions():
+    today = date.today()
+    user_ids = Action.objects.expiring_actions_user_ids(end_date=today)
+    receivers = User.objects.filter(
+        is_active=True, plans_notifications=True, pk__in=user_ids
+    ).distinct()
+
+    task_group = group(
+        send_email.s(
+            receiver=receiver,
+            objects=Action.objects.filter(is_for=receiver, end_date=today),
+            notify=notify_about_expiring_actions,
+        )
+        for receiver in receivers
+    )
+
+    promise = task_group.apply_async()
+    with allow_join_result():
+        return promise.get()
+
+
+@app.task(name=_("Send emails about expiring plans"))
+def send_emails_about_expiring_plans():
+    today = date.today()
+    user_ids = Plan.objects.expiring_plans_user_ids(end_date=today)
+    receivers = User.objects.filter(
+        is_active=True, plans_notifications=True, pk__in=user_ids
+    ).distinct()
+
+    task_group = group(
+        send_email.s(
+            receiver=receiver,
+            objects=Plan.objects.filter(end_date=today).filter(
+                Q(created_by=receiver) | Q(plan_contacts=receiver)
+            ),
+            notify=notify_about_expiring_plans,
+        )
+        for receiver in receivers
+    )
+
+    promise = task_group.apply_async()
+    with allow_join_result():
+        return promise.get()
+
+
+@app.task(name=_("Send emails about messages"))
+def send_emails_about_messages():
+    receivers = User.objects.filter(
+        received_messages__seen=False,
+        received_messages__sent=False,
+        is_active=True,
+        messages_notifications=True,
+    ).distinct()
+
+    email_data = []
+
+    for receiver in receivers:
+        messages_to_update = Message.objects.filter(
+            receiver=receiver,
+            seen=False,
+            sent=False,
+        )
+        email_data.append(
+            {
+                "receiver": receiver,
+                "messages_to_update": messages_to_update,
+            }
+        )
+
+    task_group = group(
+        send_email.s(
+            receiver=data["receiver"],
+            objects=data["messages_to_update"],
+            notify=notify_about_messages,
+        )
+        for data in email_data
+    )
+
+    promise = task_group.apply_async()
+    with allow_join_result():
+        return promise.get()
diff --git a/src/open_inwoner/accounts/templates/accounts/registration_necessary.html b/src/open_inwoner/accounts/templates/accounts/registration_necessary.html
index 95d0a02fbd..bec0a12c26 100644
--- a/src/open_inwoner/accounts/templates/accounts/registration_necessary.html
+++ b/src/open_inwoner/accounts/templates/accounts/registration_necessary.html
@@ -34,6 +34,7 @@ <h1 class="utrecht-heading-1">{% trans "Registratie voltooien" %}</h1><br>
                 <h3 class="utrecht-heading-3">Notificatie voorkeuren</h3>
 
                 {# Start of multiple checkbox fields #}
+                {# TODO: only show notifications if enabled in siteconfig #}
                 <ul class="choice-list choice-list-multiple">
 
                     {% if form.cases_notifications %}
diff --git a/src/open_inwoner/accounts/tests/test_actions_expire.py b/src/open_inwoner/accounts/tests/test_actions_expire.py
deleted file mode 100644
index c9319de5e9..0000000000
--- a/src/open_inwoner/accounts/tests/test_actions_expire.py
+++ /dev/null
@@ -1,52 +0,0 @@
-from datetime import date, timedelta
-
-from django.core import mail
-from django.core.management import call_command
-from django.test import TestCase, override_settings
-from django.urls import reverse
-
-from open_inwoner.accounts.tests.factories import ActionFactory, UserFactory
-
-
-@override_settings(ROOT_URLCONF="open_inwoner.cms.tests.urls")
-class NotifyComandTests(TestCase):
-    def test_notify_about_expiring_action(self):
-        user = UserFactory()
-        action = ActionFactory(end_date=date.today(), created_by=user)
-
-        call_command("actions_expire")
-        self.assertEqual(len(mail.outbox), 1)
-
-        sent_mail = mail.outbox[0]
-        html_body = sent_mail.alternatives[0][0]
-
-        self.assertEqual(
-            sent_mail.subject, "Acties verlopen vandaag op Open Inwoner Platform"
-        )
-        self.assertEqual(sent_mail.to, [user.email])
-        self.assertIn(action.name, html_body)
-        self.assertIn(reverse("profile:action_list"), html_body)
-
-    def test_no_notification_about_expiring_action_when_disabled(self):
-        user = UserFactory(plans_notifications=False)
-        action = ActionFactory(end_date=date.today(), created_by=user)
-        call_command("actions_expire")
-        self.assertEqual(len(mail.outbox), 0)
-
-    def test_action_does_not_expire_yet(self):
-        user = UserFactory()
-        ActionFactory(end_date=date.today() + timedelta(days=1), created_by=user)
-        call_command("actions_expire")
-        self.assertEqual(len(mail.outbox), 0)
-
-    def test_action_does_not_expired(self):
-        user = UserFactory()
-        ActionFactory(end_date=date.today() - timedelta(days=1), created_by=user)
-        call_command("actions_expire")
-        self.assertEqual(len(mail.outbox), 0)
-
-    def test_notify_about_expiring_action_inactive_user(self):
-        user = UserFactory(is_active=False)
-        action = ActionFactory(end_date=date.today(), created_by=user)
-        call_command("actions_expire")
-        self.assertEqual(len(mail.outbox), 0)
diff --git a/src/open_inwoner/accounts/tests/test_notify_about_messages.py b/src/open_inwoner/accounts/tests/test_notify_about_messages.py
deleted file mode 100644
index 4a4244ab97..0000000000
--- a/src/open_inwoner/accounts/tests/test_notify_about_messages.py
+++ /dev/null
@@ -1,95 +0,0 @@
-from django.core import mail
-from django.core.management import call_command
-from django.test import TestCase, override_settings
-from django.urls import reverse
-
-from .factories import MessageFactory, UserFactory
-
-
-@override_settings(ROOT_URLCONF="open_inwoner.cms.tests.urls")
-class NotifyComandTests(TestCase):
-    def test_notify_about_received_message(self):
-        user, sender1, sender2 = UserFactory.create_batch(3)
-        message1 = MessageFactory.create(receiver=user, sender=sender1)
-        messages2 = MessageFactory.create_batch(2, receiver=user, sender=sender2)
-        messages = [message1] + messages2
-        for message in messages:
-            self.assertFalse(message.sent)
-
-        call_command("notify_about_messages")
-
-        self.assertEqual(len(mail.outbox), 1)
-
-        sent_mail = mail.outbox[0]
-        html_body = sent_mail.alternatives[0][0]
-
-        self.assertEqual(sent_mail.subject, "Nieuwe berichten op Open Inwoner Platform")
-        self.assertEqual(sent_mail.to, [user.email])
-        self.assertIn("U heeft 3 berichten ontvangen van 2 gebruikers.", sent_mail.body)
-        self.assertIn(reverse("inbox:index"), html_body)
-
-        for message in messages:
-            message.refresh_from_db()
-            self.assertTrue(message.sent)
-
-    def test_no_notification_about_received_message_when_disabled_by_user(self):
-        user = UserFactory(messages_notifications=False)
-        sender = UserFactory()
-        message = MessageFactory.create(receiver=user, sender=sender)
-
-        self.assertFalse(message.sent)
-
-        call_command("notify_about_messages")
-
-        self.assertEqual(len(mail.outbox), 0)
-
-        message.refresh_from_db()
-
-        self.assertFalse(message.sent)
-
-    def test_seen_message(self):
-        user = UserFactory.create()
-
-        message = MessageFactory.create(receiver=user, seen=True)
-
-        call_command("notify_about_messages")
-
-        self.assertEqual(len(mail.outbox), 0)
-
-        message.refresh_from_db()
-        self.assertFalse(message.sent)
-
-    def test_sent_message(self):
-        user = UserFactory.create()
-
-        MessageFactory.create(receiver=user, sent=True)
-
-        call_command("notify_about_messages")
-
-        self.assertEqual(len(mail.outbox), 0)
-
-    def test_notify_several_users(self):
-        user1, user2, sender = sorted(
-            UserFactory.create_batch(3, first_name="John", last_name="Smith"),
-            key=lambda x: x.email,
-        )
-        messages1 = MessageFactory.create_batch(3, receiver=user1, sender=sender)
-        messages2 = MessageFactory.create_batch(2, receiver=user2, sender=sender)
-        messages = messages1 + messages2
-        for message in messages:
-            self.assertFalse(message.sent)
-
-        call_command("notify_about_messages")
-
-        self.assertEqual(len(mail.outbox), 2)
-
-        email1, email2 = sorted(mail.outbox, key=lambda x: x.to, reverse=True)
-        for email in [email1, email2]:
-            self.assertEqual(email.subject, "Nieuwe berichten op Open Inwoner Platform")
-            html_body = email.alternatives[0][0]
-            self.assertIn(reverse("inbox:index"), html_body)
-
-        self.assertEqual(email1.to, [user2.email])
-        self.assertIn("U heeft 2 berichten ontvangen van 1 gebruikers.", email1.body)
-        self.assertEqual(email2.to, [user1.email])
-        self.assertIn("U heeft 3 berichten ontvangen van 1 gebruikers.", email2.body)
diff --git a/src/open_inwoner/accounts/tests/test_notify_expiring_actions.py b/src/open_inwoner/accounts/tests/test_notify_expiring_actions.py
new file mode 100644
index 0000000000..5069724b9b
--- /dev/null
+++ b/src/open_inwoner/accounts/tests/test_notify_expiring_actions.py
@@ -0,0 +1,65 @@
+from datetime import date, timedelta
+
+from django.core import mail
+from django.test import TestCase, override_settings
+from django.urls import reverse
+
+from open_inwoner.accounts.tests.factories import ActionFactory, UserFactory
+
+from ..tasks import send_emails_about_expiring_actions
+
+
+@override_settings(ROOT_URLCONF="open_inwoner.cms.tests.urls")
+@override_settings(CELERY_TASK_ALWAYS_EAGER=True)
+class ExpiringActionsNotificationTest(TestCase):
+    def test_send_emails_about_expiring_actions(self):
+        harry = UserFactory()
+        sally = UserFactory()
+        ActionFactory(end_date=date.today(), created_by=harry)
+        ActionFactory(end_date=date.today(), created_by=sally)
+        # contrast: no email for user without action
+        UserFactory()
+
+        send_emails_about_expiring_actions.delay()
+
+        self.assertEqual(len(mail.outbox), 2)
+
+        email1, email2 = sorted(mail.outbox, key=lambda x: x.to, reverse=True)
+        for email in [email1, email2]:
+            self.assertEqual(
+                email.subject, "Acties verlopen vandaag op Open Inwoner Platform"
+            )
+            html_body = email.alternatives[0][0]
+            self.assertIn(reverse("profile:action_list"), html_body)
+
+    def test_no_email_about_expiring_action_when_disabled(self):
+        user = UserFactory(plans_notifications=False)
+        ActionFactory(end_date=date.today(), created_by=user)
+
+        send_emails_about_expiring_actions.delay()
+
+        self.assertEqual(len(mail.outbox), 0)
+
+    def test_no_email_about_action_not_yet_expiring(self):
+        user = UserFactory()
+        ActionFactory(end_date=date.today() + timedelta(days=1), created_by=user)
+
+        send_emails_about_expiring_actions.delay()
+
+        self.assertEqual(len(mail.outbox), 0)
+
+    def test_no_email_about_action_already_expired(self):
+        user = UserFactory()
+        ActionFactory(end_date=date.today() - timedelta(days=1), created_by=user)
+
+        send_emails_about_expiring_actions.delay()
+
+        self.assertEqual(len(mail.outbox), 0)
+
+    def test_no_email_about_expiring_action_inactive_user(self):
+        user = UserFactory(is_active=False)
+        ActionFactory(end_date=date.today(), created_by=user)
+
+        send_emails_about_expiring_actions.delay()
+
+        self.assertEqual(len(mail.outbox), 0)
diff --git a/src/open_inwoner/plans/tests/test_plans_expire.py b/src/open_inwoner/accounts/tests/test_notify_expiring_plans.py
similarity index 56%
rename from src/open_inwoner/plans/tests/test_plans_expire.py
rename to src/open_inwoner/accounts/tests/test_notify_expiring_plans.py
index d2319de0a1..3a9918546d 100644
--- a/src/open_inwoner/plans/tests/test_plans_expire.py
+++ b/src/open_inwoner/accounts/tests/test_notify_expiring_plans.py
@@ -2,76 +2,101 @@
 from unittest.mock import Mock, patch
 
 from django.core import mail
-from django.core.management import call_command
 from django.test import TestCase, override_settings
 from django.urls import reverse
 
 from open_inwoner.accounts.tests.factories import UserFactory
 from open_inwoner.plans.models import Plan
+from open_inwoner.plans.tests.factories import PlanFactory
 
-from .factories import PlanFactory
+from ..tasks import send_emails_about_expiring_plans
 
 
 @override_settings(ROOT_URLCONF="open_inwoner.cms.tests.urls")
-class NotifyComandTests(TestCase):
-    def test_notify_about_expiring_plan(self):
-        user = UserFactory()
-        plan = PlanFactory(end_date=date.today(), created_by=user)
+@override_settings(CELERY_TASK_ALWAYS_EAGER=True)
+class ExpiringPlansNotificationTest(TestCase):
+    def test_send_emails_about_expiring_plans(self):
+        harry = UserFactory(first_name="Harry")
+        sally = UserFactory(first_name="Sally")
+        plan_harry = PlanFactory(
+            end_date=date.today(), created_by=harry, title="Harry's plan"
+        )
+        plan_sally = PlanFactory(
+            end_date=date.today(), created_by=sally, title="Sally's plan"
+        )
 
-        call_command("plans_expire")
-        self.assertEqual(len(mail.outbox), 1)
+        send_emails_about_expiring_plans.delay()
 
-        sent_mail = mail.outbox[0]
-        html_body = sent_mail.alternatives[0][0]
+        self.assertEqual(len(mail.outbox), 2)
 
-        self.assertEqual(
-            sent_mail.subject, "Plannen vervallen vandaag op Open Inwoner Platform"
+        email_harry, email_sally = sorted(
+            mail.outbox, key=lambda x: x.to, reverse=False
         )
-        self.assertEqual(sent_mail.to, [user.email])
-        self.assertIn(plan.title, html_body)
-        self.assertIn(plan.goal, html_body)
-        self.assertIn(reverse("collaborate:plan_list"), html_body)
+        for email in (email_harry, email_sally):
+            self.assertEqual(
+                email.subject, "Plannen vervallen vandaag op Open Inwoner Platform"
+            )
+            html_body = email.alternatives[0][0]
+            self.assertIn(reverse("collaborate:plan_list"), html_body)
+
+        html_body = email_harry.alternatives[0][0]
+        self.assertEqual(email_harry.to, [harry.email])
+        self.assertIn(plan_harry.title, html_body)
+        self.assertIn(plan_harry.goal, html_body)
+
+        html_body = email_sally.alternatives[0][0]
+        self.assertEqual(email_sally.to, [sally.email])
+        self.assertIn(plan_sally.title, html_body)
+        self.assertIn(plan_sally.goal, html_body)
 
     @patch("open_inwoner.userfeed.hooks.plan_expiring", autospec=True)
     def test_notify_about_expiring_plan_userfeed_hook(self, mock_plan_expiring: Mock):
         user = UserFactory()
-        plan = PlanFactory(end_date=date.today(), created_by=user)
+        PlanFactory(end_date=date.today(), created_by=user)
 
-        call_command("plans_expire")
+        send_emails_about_expiring_plans.delay()
 
         mock_plan_expiring.assert_called_once()
 
-    def test_no_notification_about_expiring_plan_when_disabled(self):
+    def test_dont_notify_about_expiring_plan_when_disabled(self):
         user = UserFactory(plans_notifications=False)
-        plan = PlanFactory(end_date=date.today(), created_by=user)
-        call_command("plans_expire")
+        PlanFactory(end_date=date.today(), created_by=user)
+
+        send_emails_about_expiring_plans.delay()
+
         self.assertEqual(len(mail.outbox), 0)
 
-    def test_plan_does_not_expire_yet(self):
+    def test_dont_notify_about_plan_not_expiring(self):
         user = UserFactory()
         PlanFactory(end_date=date.today() + timedelta(days=1), created_by=user)
-        call_command("plans_expire")
+
+        send_emails_about_expiring_plans.delay()
+
         self.assertEqual(len(mail.outbox), 0)
 
-    def test_plan_does_not_expired(self):
+    def test_dont_notify_about_expired_plan(self):
         user = UserFactory()
         PlanFactory(end_date=date.today() - timedelta(days=1), created_by=user)
-        call_command("plans_expire")
+
+        send_emails_about_expiring_plans.delay()
+
         self.assertEqual(len(mail.outbox), 0)
 
-    def test_notify_about_expiring_plan_inactive_user(self):
+    def test_dont_notify_about_expiring_plan_inactive_user(self):
         user = UserFactory(is_active=False)
-        plan = PlanFactory(end_date=date.today(), created_by=user)
-        call_command("plans_expire")
+        PlanFactory(end_date=date.today(), created_by=user)
+
+        send_emails_about_expiring_plans.delay()
+
         self.assertEqual(len(mail.outbox), 0)
 
-    def test_notify_about_expiring_plan_email_contact(self):
+    def test_send_emails_about_expiring_plan_email_contact(self):
         user = UserFactory()
         contact = UserFactory()
         plan = PlanFactory(end_date=date.today(), created_by=user)
         plan.plan_contacts.add(contact)
 
-        call_command("plans_expire")
+        send_emails_about_expiring_plans()
         self.assertEqual(len(mail.outbox), 2)
         self.assertEqual(Plan.objects.count(), 1)
 
@@ -103,7 +128,8 @@ def test_notify_only_user_with_active_notifications(self):
         plan = PlanFactory(end_date=date.today(), created_by=user)
         plan.plan_contacts.add(contact)
 
-        call_command("plans_expire")
+        send_emails_about_expiring_plans.delay()
+
         self.assertEqual(len(mail.outbox), 1)
         self.assertEqual(Plan.objects.count(), 1)
 
diff --git a/src/open_inwoner/accounts/tests/test_notify_messages.py b/src/open_inwoner/accounts/tests/test_notify_messages.py
new file mode 100644
index 0000000000..9f56fe6050
--- /dev/null
+++ b/src/open_inwoner/accounts/tests/test_notify_messages.py
@@ -0,0 +1,77 @@
+from django.core import mail
+from django.test import TestCase, override_settings
+from django.urls import reverse
+
+from ..tasks import send_emails_about_messages
+from .factories import MessageFactory, UserFactory
+
+
+@override_settings(ROOT_URLCONF="open_inwoner.cms.tests.urls")
+@override_settings(CELERY_TASK_ALWAYS_EAGER=True)
+class MessagesNotificationTest(TestCase):
+    def test_send_emails_about_messages(self):
+        jack = UserFactory.create(first_name="Jack")
+        jill = UserFactory.create(first_name="Jill")
+        harry = UserFactory.create(first_name="Harry")
+        sally = UserFactory.create(first_name="Sally")
+        harry_to_jack = MessageFactory.create(receiver=jack, sender=harry)
+        sally_to_jack = MessageFactory.create_batch(2, receiver=jack, sender=sally)
+        harry_to_jill = MessageFactory.create(receiver=jill, sender=harry)
+        sally_to_jill = MessageFactory.create_batch(3, receiver=jill, sender=sally)
+
+        messages = [harry_to_jack, *sally_to_jack, harry_to_jill, *sally_to_jill]
+
+        send_emails_about_messages.delay()
+
+        self.assertEqual(len(mail.outbox), 2)
+
+        email1, email2 = sorted(mail.outbox, key=lambda x: x.to, reverse=True)
+        for email in [email1, email2]:
+            self.assertEqual(email.subject, "Nieuwe berichten op Open Inwoner Platform")
+            html_body = email.alternatives[0][0]
+            self.assertIn(reverse("inbox:index"), html_body)
+
+        self.assertEqual(email1.to, [jill.email])
+        self.assertIn("U heeft 4 berichten ontvangen van 2 gebruikers.", email1.body)
+        self.assertEqual(email2.to, [jack.email])
+        self.assertIn("U heeft 3 berichten ontvangen van 2 gebruikers.", email2.body)
+
+        for message in messages:
+            message.refresh_from_db()
+            self.assertTrue(message.sent)
+
+    def test_no_email_about_received_message_when_disabled_by_user(self):
+        user = UserFactory(messages_notifications=False)
+        sender = UserFactory()
+        message = MessageFactory.create(receiver=user, sender=sender)
+
+        self.assertFalse(message.sent)
+
+        send_emails_about_messages.delay()
+
+        self.assertEqual(len(mail.outbox), 0)
+
+        message.refresh_from_db()
+
+        self.assertFalse(message.sent)
+
+    def test_no_email_about_already_seen_message(self):
+        user = UserFactory.create()
+
+        message = MessageFactory.create(receiver=user, seen=True)
+
+        send_emails_about_messages.delay()
+
+        self.assertEqual(len(mail.outbox), 0)
+
+        message.refresh_from_db()
+        self.assertFalse(message.sent)
+
+    def test_no_email_about_sent_message(self):
+        user = UserFactory.create()
+
+        MessageFactory.create(receiver=user, sent=True)
+
+        send_emails_about_messages.delay()
+
+        self.assertEqual(len(mail.outbox), 0)
diff --git a/src/open_inwoner/conf/base.py b/src/open_inwoner/conf/base.py
index e99485a02a..1c5061b08f 100644
--- a/src/open_inwoner/conf/base.py
+++ b/src/open_inwoner/conf/base.py
@@ -687,6 +687,18 @@
         "task": "django_yubin.tasks.delete_old_emails",
         "schedule": crontab(minute="0", hour="6", day_of_month="*"),
     },
+    "Send emails about expiring actions": {
+        "task": "Send emails about expiring actions",
+        "schedule": crontab(minute="15", hour="9", day_of_month="*"),
+    },
+    "Send emails about expiring plans": {
+        "task": "Send emails about expiring plans",
+        "schedule": crontab(minute="5", hour="9", day_of_month="*"),
+    },
+    "Send emails about messages": {
+        "task": "Send emails about messages",
+        "schedule": crontab(minute="*/15", hour="*", day_of_month="*"),
+    },
 }
 
 # Only ACK when the task has been executed. This prevents tasks from getting lost, with
diff --git a/src/open_inwoner/configurations/models.py b/src/open_inwoner/configurations/models.py
index 8b021a166f..68034e479d 100644
--- a/src/open_inwoner/configurations/models.py
+++ b/src/open_inwoner/configurations/models.py
@@ -359,6 +359,7 @@ class SiteConfiguration(SingletonModel):
     )
 
     # email notifications
+    # TODO: remove/replace with notification fields below
     email_new_message = models.BooleanField(
         verbose_name=_("Send email about a new message"),
         default=True,
@@ -558,6 +559,28 @@ class SiteConfiguration(SingletonModel):
         ),
     )
 
+    # notifications
+    # TODO: for case notifications: create property that checks for existence of notificaties webhook;
+    #       or: fetch Subscription.objects.all(), check if there is a sub st. 'zaken' in sub.channels
+    #       also: add note here as well as in admin about this
+
+    # notifications_messages_enabled = models.BooleanField(
+    #     verbose_name=_("Enable notifications for messages"),
+    #     default=True,
+    #     help_text=_(
+    #         "If checked, the user will have the option to receive notifications for new messages "
+    #         "(on registration and in the profile)"
+    #     ),
+    # )
+    # notifications_plans_enabled = models.BooleanField(
+    #     verbose_name=_("Enable notifications for plans"),
+    #     default=True,
+    #     help_text=_(
+    #         "If checked, the user will have the option to receive notifications for plans + actions "
+    #         "(on registration and in the profile)"
+    #     ),
+    # )
+
     class Meta:
         verbose_name = _("Site Configuration")
 
diff --git a/src/open_inwoner/openzaak/admin.py b/src/open_inwoner/openzaak/admin.py
index 9c61daccdc..5f72df10ef 100644
--- a/src/open_inwoner/openzaak/admin.py
+++ b/src/open_inwoner/openzaak/admin.py
@@ -245,6 +245,8 @@ def has_delete_permission(self, request, obj=None):
 
 @admin.register(ZaakTypeConfig)
 class ZaakTypeConfigAdmin(admin.ModelAdmin):
+    oz_config = OpenZaakConfig
+
     inlines = [
         ZaakTypeInformatieObjectTypeConfigInline,
         ZaakTypeStatusTypeConfigInline,
@@ -294,7 +296,7 @@ class ZaakTypeConfigAdmin(admin.ModelAdmin):
         "omschrijving",
     ]
     list_filter = [
-        "notify_status_changes",
+        # "notify_status_changes",
         HasDocNotifyListFilter,
         CatalogUsedListFilter,
     ]
@@ -307,6 +309,11 @@ class ZaakTypeConfigAdmin(admin.ModelAdmin):
     ]
     ordering = ("identificatie", "catalogus__domein")
 
+    # TODO: override to add/remove `notify_status_changes` based on siteconfig
+    def get_fields(self, request, obj=None):
+        fields = super().get_fields(request, obj)
+        return fields
+
     def has_add_permission(self, request):
         return False
 
diff --git a/src/open_inwoner/openzaak/notifications.py b/src/open_inwoner/openzaak/notifications.py
index 2b779dfe3e..ac3a0dafc8 100644
--- a/src/open_inwoner/openzaak/notifications.py
+++ b/src/open_inwoner/openzaak/notifications.py
@@ -46,21 +46,13 @@
 logger = logging.getLogger(__name__)
 
 
-def wrap_join(iter, glue="") -> str:
-    parts = list(sorted(f"'{v}'" for v in iter))
-    if not parts:
-        return ""
-    elif len(parts) == 1:
-        return parts[0]
-    elif glue:
-        end = parts.pop()
-        lead = ", ".join(parts)
-        return f"{lead} {glue} {end}"
-    else:
-        return ", ".join(parts)
-
-
+# TODO: check siteconfig for notification enabled
 def handle_zaken_notification(notification: Notification):
+    """
+    Perform basic checks, then dispatch to
+        - `handle_status_notification` or
+        - `handle_zaakinformatieobject_notification`
+    """
     if notification.kanaal != "zaken":
         raise Exception(
             f"handler expects kanaal 'zaken' but received '{notification.kanaal}'"
@@ -83,7 +75,8 @@ def handle_zaken_notification(notification: Notification):
 
     if notification.resource not in resources:
         log_system_action(
-            f"ignored {r} notification: resource is not {wrap_join(resources, 'or')} but '{notification.resource}' for case {case_url}",
+            f"ignored {r} notification: resource is not "
+            f"{_wrap_join(resources, 'or')} but '{notification.resource}' for case {case_url}",
             log_level=logging.INFO,
         )
         return
@@ -93,12 +86,13 @@ def handle_zaken_notification(notification: Notification):
     if not roles:
         log_system_action(
             f"ignored {r} notification: cannot retrieve rollen for case {case_url}",
-            # NOTE this used to be logging.ERROR, but as this is also our first call we get a lot of 403 "Niet geautoriseerd voor zaaktype"
+            # NOTE this used to be logging.ERROR, but as this is also our first call
+            # we get a lot of 403 "Niet geautoriseerd voor zaaktype"
             log_level=logging.INFO,
         )
         return
 
-    inform_users = get_initiator_users_from_roles(roles)
+    inform_users = _get_initiator_users_from_roles(roles)
     if not inform_users:
         log_system_action(
             f"ignored {r} notification: no users with bsn/nnp_id as (mede)initiators in case {case_url}",
@@ -130,19 +124,70 @@ def handle_zaken_notification(notification: Notification):
 
     if not is_zaak_visible(case):
         log_system_action(
-            f"ignored {r} notification: case not visible after applying website visibility filter for case {case_url}",
+            f"ignored {r} notification: case not visible after applying website "
+            f"visibility filter for case {case_url}",
             log_level=logging.INFO,
         )
         return
 
     if notification.resource == "status":
-        handle_status_notification(notification, case, inform_users)
+        _handle_status_notification(notification, case, inform_users)
     elif notification.resource == "zaakinformatieobject":
         _handle_zaakinformatieobject_notification(notification, case, inform_users)
     else:
         raise NotImplementedError("programmer error in earlier resource filter")
 
 
+def send_case_update_email(
+    user: User,
+    case: Zaak,
+    template_name: str,
+    status: Status | None = None,
+    extra_context: dict = None,
+):
+    case_detail_url = build_absolute_url(
+        reverse("cases:case_detail", kwargs={"object_id": str(case.uuid)})
+    )
+
+    config = OpenZaakConfig.get_solo()
+
+    template = find_template(template_name)
+    context = {
+        "identification": case.identification,
+        "type_description": case.zaaktype.omschrijving,
+        "start_date": case.startdatum,
+        "end_date": date.today() + timedelta(days=config.action_required_deadline_days),
+        "case_link": case_detail_url,
+    }
+    if status:
+        status_type = status.statustype
+        context["status_description"] = (
+            status_type.statustekst
+            or status_type.omschrijving
+            or _("No data available")
+        )
+    if extra_context:
+        context.update(extra_context)
+    template.send_email([user.email], context)
+
+
+def _wrap_join(iter, glue="") -> str:
+    parts = list(sorted(f"'{v}'" for v in iter))
+    if not parts:
+        return ""
+    elif len(parts) == 1:
+        return parts[0]
+    elif glue:
+        end = parts.pop()
+        lead = ", ".join(parts)
+        return f"{lead} {glue} {end}"
+    else:
+        return ", ".join(parts)
+
+
+#
+# Helper functions for ZaakInformatieObject notifications
+#
 def _handle_zaakinformatieobject_notification(
     notification: Notification, case: Zaak, inform_users
 ):
@@ -157,21 +202,6 @@ def _handle_zaakinformatieobject_notification(
         )
         return
 
-    """
-    {
-    "kanaal": "zaken",
-    "hoofdObject": "https://test.openzaak.nl/zaken/api/v1/zaken/af715571-a542-4b68-9a46-3821b9589045",
-    "resource": "zaakinformatieobject",
-    "resourceUrl": "https://test.openzaak.nl/zaken/api/v1/zaakinformatieobjecten/348d0669-0145-48de-859f-29dafa8a885a",
-    "actie": "create",
-    "aanmaakdatum": "2023-02-06T09:33:17.402799Z",
-    "kenmerken": {
-        "bronorganisatie": "100000009",
-        "zaaktype": "https://test.openzaak.nl/catalogi/api/v1/zaaktypen/2c1feba6-3163-4e15-9afa-fa4f01dcb4f9",
-        "vertrouwelijkheidaanduiding": "openbaar"
-    }}
-    """
-
     # check if this is a zaakinformatieobject we want to inform on
     ziobj_url = notification.resource_url
 
@@ -187,7 +217,8 @@ def _handle_zaakinformatieobject_notification(
     info_object = fetch_single_information_object_url(ziobj.informatieobject)
     if not info_object:
         log_system_action(
-            f"ignored {r} notification: cannot retrieve informatieobject {ziobj.informatieobject} for case {case.url}",
+            f"ignored {r} notification: cannot retrieve informatieobject "
+            f"{ziobj.informatieobject} for case {case.url}",
             log_level=logging.ERROR,
         )
         return
@@ -196,7 +227,8 @@ def _handle_zaakinformatieobject_notification(
 
     if not is_info_object_visible(info_object, oz_config.document_max_confidentiality):
         log_system_action(
-            f"ignored {r} notification: informatieobject not visible after applying website visibility filter for case {case.url}",
+            f"ignored {r} notification: informatieobject not visible after "
+            f"applying website visibility filter for case {case.url}",
             log_level=logging.INFO,
         )
         return
@@ -207,28 +239,30 @@ def _handle_zaakinformatieobject_notification(
     )
     if not ztiotc:
         log_system_action(
-            f"ignored {r} notification: cannot retrieve info_type configuration {info_object.informatieobjecttype} and case {case.url}",
+            f"ignored {r} notification: cannot retrieve info_type "
+            f"configuration {info_object.informatieobjecttype} and case {case.url}",
             log_level=logging.INFO,
         )
         return
     elif not ztiotc.document_notification_enabled:
         log_system_action(
-            f"ignored {r} notification: info_type configuration '{ztiotc.omschrijving}' {info_object.informatieobjecttype} found but 'document_notification_enabled' is False for case {case.url}",
+            f"ignored {r} notification: info_type configuration "
+            f"'{ztiotc.omschrijving}' {info_object.informatieobjecttype} "
+            f"found but 'document_notification_enabled' is False for case {case.url}",
             log_level=logging.INFO,
         )
         return
 
     # reaching here means we're going to inform users
     log_system_action(
-        f"accepted {r} notification: attempt informing users {wrap_join(inform_users)} for case {case.url}",
+        f"accepted {r} notification: attempt informing users {_wrap_join(inform_users)} for case {case.url}",
         log_level=logging.INFO,
     )
     for user in inform_users:
-        # TODO run in try/except so it can't bail?
-        handle_zaakinformatieobject_update(user, case, ziobj)
+        _handle_zaakinformatieobject_update(user, case, ziobj)
 
 
-def handle_zaakinformatieobject_update(
+def _handle_zaakinformatieobject_update(
     user: User, case: Zaak, zaak_info_object: ZaakInformatieObject
 ):
     template_name = "case_document_notification"
@@ -238,7 +272,8 @@ def handle_zaakinformatieobject_update(
 
     if not user.cases_notifications or not user.get_contact_email():
         log_system_action(
-            f"ignored user-disabled notification delivery for user '{user}' zaakinformatieobject {zaak_info_object.url} case {case.url}",
+            f"ignored user-disabled notification delivery for user "
+            f"'{user}' zaakinformatieobject {zaak_info_object.url} case {case.url}",
             log_level=logging.INFO,
         )
         return
@@ -251,7 +286,8 @@ def handle_zaakinformatieobject_update(
     )
     if not note:
         log_system_action(
-            f"ignored duplicate zaakinformatieobject notification delivery for user '{user}' zaakinformatieobject {zaak_info_object.url} case {case.url}",
+            f"ignored duplicate zaakinformatieobject notification delivery "
+            f"for user '{user}' zaakinformatieobject {zaak_info_object.url} case {case.url}",
             log_level=logging.INFO,
         )
         return
@@ -260,7 +296,8 @@ def handle_zaakinformatieobject_update(
     period = timedelta(seconds=settings.ZGW_LIMIT_NOTIFICATIONS_FREQUENCY)
     if note.has_received_similar_notes_within(period, template_name):
         log_system_action(
-            f"blocked over-frequent zaakinformatieobject notification email for user '{user}' zaakinformatieobject {zaak_info_object.url} case {case.url}",
+            f"blocked over-frequent zaakinformatieobject notification email "
+            f"for user '{user}' zaakinformatieobject {zaak_info_object.url} case {case.url}",
             log_level=logging.INFO,
         )
         return
@@ -269,15 +306,16 @@ def handle_zaakinformatieobject_update(
     note.mark_sent()
 
     log_system_action(
-        f"send zaakinformatieobject notification email for user '{user}' zaakinformatieobject {zaak_info_object.url} case {case.url}",
+        f"send zaakinformatieobject notification email for user '{user}' "
+        f"zaakinformatieobject {zaak_info_object.url} case {case.url}",
         log_level=logging.INFO,
     )
 
 
 #
-# Helper functions for handling status update notifications
+# Helper functions for status update notifications
 #
-def check_status_history(
+def _check_status_history(
     notification: Notification, case: Zaak, client: ZakenClient
 ) -> list[Status] | None:
     """
@@ -303,7 +341,7 @@ def check_status_history(
     return status_history
 
 
-def check_status(
+def _check_status(
     notification: Notification,
     case: Zaak,
     status_history: list[Status],
@@ -334,7 +372,7 @@ def check_status(
     return status
 
 
-def check_status_type(
+def _check_status_type(
     notification: Notification,
     case: Zaak,
     status: Status,
@@ -369,7 +407,7 @@ def check_status_type(
     return status_type
 
 
-def check_zaaktype_config(
+def _check_zaaktype_config(
     notification: Notification,
     case: Zaak,
     oz_config: OpenZaakConfig,
@@ -401,7 +439,7 @@ def check_zaaktype_config(
     return ztc
 
 
-def check_statustype_config(
+def _check_statustype_config(
     notification: Notification,
     case: Zaak,
     ztc: ZaakTypeConfig,
@@ -436,7 +474,7 @@ def check_statustype_config(
     return statustype_config
 
 
-def check_user_status_notitifactions(
+def _check_user_status_notitifactions(
     user: User,
     case: Zaak,
     status: Status,
@@ -461,7 +499,7 @@ def check_user_status_notitifactions(
     return True
 
 
-def handle_status_notification(
+def _handle_status_notification(
     notification: Notification,
     case: Zaak,
     inform_users: list[User],
@@ -487,42 +525,45 @@ def handle_status_notification(
         )
         return
 
-    if not (status_history := check_status_history(notification, case, zaken_client)):
+    if not (status_history := _check_status_history(notification, case, zaken_client)):
         return
 
-    if not (status := check_status(notification, case, status_history, zaken_client)):
+    if not (status := _check_status(notification, case, status_history, zaken_client)):
         return
 
     if not (
-        status_type := check_status_type(
+        status_type := _check_status_type(
             notification, case, status, oz_config, catalogi_client
         )
     ):
         return
 
-    if not (ztc := check_zaaktype_config(notification, case, oz_config)):
+    if not (ztc := _check_zaaktype_config(notification, case, oz_config)):
         return
 
     resolve_status(case, client=zaken_client)
-    if not (status_type_config := check_statustype_config(notification, case, ztc)):
+    if not (status_type_config := _check_statustype_config(notification, case, ztc)):
         return
 
     status.statustype = status_type
 
     for user in inform_users:
-        if not check_user_status_notitifactions(user, case, status, status_type_config):
+        if not _check_user_status_notitifactions(
+            user, case, status, status_type_config
+        ):
             return
 
         # all checks have passed
         log_system_action(
             f"accepted {notification.resource} notification: attempt informing users "
-            f"{wrap_join(inform_users)} for case {case.url}",
+            f"{_wrap_join(inform_users)} for case {case.url}",
             log_level=logging.INFO,
         )
-        handle_status_update(user, case, status, status_type_config)
+        # TODO: replace with notify_about_status_update(...args, method: Callable)
+        _handle_status_update(user, case, status, status_type_config)
 
 
-def handle_status_update(
+def _handle_status_update(
     user: User,
     case: Zaak,
     status: Status,
@@ -571,46 +612,10 @@ def handle_status_update(
     )
 
 
-def send_case_update_email(
-    user: User,
-    case: Zaak,
-    template_name: str,
-    status: Status | None = None,
-    extra_context: dict = None,
-):
-    """
-    send the actual mail
-    """
-    case_detail_url = build_absolute_url(
-        reverse("cases:case_detail", kwargs={"object_id": str(case.uuid)})
-    )
-
-    config = OpenZaakConfig.get_solo()
-
-    template = find_template(template_name)
-    context = {
-        "identification": case.identification,
-        "type_description": case.zaaktype.omschrijving,
-        "start_date": case.startdatum,
-        "end_date": date.today() + timedelta(days=config.action_required_deadline_days),
-        "case_link": case_detail_url,
-    }
-    if status:
-        status_type = status.statustype
-        context["status_description"] = (
-            status_type.statustekst
-            or status_type.omschrijving
-            or _("No data available")
-        )
-    if extra_context:
-        context.update(extra_context)
-    template.send_email([user.email], context)
-
-
 # - - - - -
 
 
-def get_np_initiator_bsns_from_roles(roles: list[Rol]) -> list[str]:
+def _get_np_initiator_bsns_from_roles(roles: list[Rol]) -> list[str]:
     """
     iterate over Rollen and for all natural-person initiators return their BSN
     """
@@ -634,7 +639,7 @@ def get_np_initiator_bsns_from_roles(roles: list[Rol]) -> list[str]:
     return list(ret)
 
 
-def get_nnp_initiator_nnp_id_from_roles(roles: list[Rol]) -> list[str]:
+def _get_nnp_initiator_nnp_id_from_roles(roles: list[Rol]) -> list[str]:
     """
     iterate over Rollen and for all non-natural-person initiators return their nnpId
     """
@@ -658,17 +663,17 @@ def get_nnp_initiator_nnp_id_from_roles(roles: list[Rol]) -> list[str]:
     return list(ret)
 
 
-def get_initiator_users_from_roles(roles: list[Rol]) -> list[User]:
+def _get_initiator_users_from_roles(roles: list[Rol]) -> list[User]:
     """
     iterate over Rollen and return User objects for initiators
     """
     users = []
 
-    bsn_list = get_np_initiator_bsns_from_roles(roles)
+    bsn_list = _get_np_initiator_bsns_from_roles(roles)
     if bsn_list:
         users += list(User.objects.filter(bsn__in=bsn_list, is_active=True))
 
-    nnp_id_list = get_nnp_initiator_nnp_id_from_roles(roles)
+    nnp_id_list = _get_nnp_initiator_nnp_id_from_roles(roles)
     if nnp_id_list:
         config = OpenZaakConfig.get_solo()
         if config.fetch_eherkenning_zaken_with_rsin:
diff --git a/src/open_inwoner/openzaak/tests/test_notification_utils.py b/src/open_inwoner/openzaak/tests/test_notification_utils.py
index 07782f43df..06c6ac9a55 100644
--- a/src/open_inwoner/openzaak/tests/test_notification_utils.py
+++ b/src/open_inwoner/openzaak/tests/test_notification_utils.py
@@ -11,8 +11,8 @@
 from open_inwoner.accounts.tests.factories import DigidUserFactory, UserFactory
 from open_inwoner.configurations.models import SiteConfiguration
 from open_inwoner.openzaak.notifications import (
-    get_initiator_users_from_roles,
-    get_np_initiator_bsns_from_roles,
+    _get_initiator_users_from_roles,
+    _get_np_initiator_bsns_from_roles,
     send_case_update_email,
 )
 from open_inwoner.openzaak.tests.factories import generate_rol
@@ -136,7 +136,7 @@ def test_get_np_initiator_bsns_from_roles(self):
             "100000001",
             "100000002",
         }
-        actual = get_np_initiator_bsns_from_roles(roles)
+        actual = _get_np_initiator_bsns_from_roles(roles)
         self.assertEqual(set(actual), expected)
 
     def test_get_initiator_users_from_roles(self):
@@ -207,7 +207,7 @@ def test_get_initiator_users_from_roles(self):
         ]
 
         # verify we have a lot of Roles with initiators & bsn's
-        check_roles = get_np_initiator_bsns_from_roles(roles)
+        check_roles = _get_np_initiator_bsns_from_roles(roles)
         expected_roles = {
             user_1.bsn,
             user_2.bsn,
@@ -217,6 +217,6 @@ def test_get_initiator_users_from_roles(self):
 
         # of all the Users with Roles only these match all conditions
         expected = {user_1, user_2}
-        actual = get_initiator_users_from_roles(roles)
+        actual = _get_initiator_users_from_roles(roles)
 
         self.assertEqual(set(actual), expected)
diff --git a/src/open_inwoner/openzaak/tests/test_notification_zaak_infoobject.py b/src/open_inwoner/openzaak/tests/test_notification_zaak_infoobject.py
index f65684d280..beca52f907 100644
--- a/src/open_inwoner/openzaak/tests/test_notification_zaak_infoobject.py
+++ b/src/open_inwoner/openzaak/tests/test_notification_zaak_infoobject.py
@@ -11,7 +11,7 @@
 
 from open_inwoner.accounts.tests.factories import UserFactory
 from open_inwoner.openzaak.notifications import (
-    handle_zaakinformatieobject_update,
+    _handle_zaakinformatieobject_update,
     handle_zaken_notification,
 )
 from open_inwoner.openzaak.tests.factories import (
@@ -29,7 +29,7 @@
 
 @requests_mock.Mocker()
 @patch(
-    "open_inwoner.openzaak.notifications.handle_zaakinformatieobject_update",
+    "open_inwoner.openzaak.notifications._handle_zaakinformatieobject_update",
     autospec=True,
 )
 class ZaakInformatieObjectNotificationHandlerTestCase(
@@ -44,7 +44,7 @@ def setUpTestData(cls):
         super().setUpTestData()
         MockAPIData.setUpServices()
 
-    def test_zio_handle_zaken_notification(self, m, mock_handle: Mock):
+    def test_ziohandle_zaken_notification(self, m, mock_handle: Mock):
         """
         happy-flow from valid data calls the (mocked) handle_zaakinformatieobject()
         """
@@ -70,7 +70,7 @@ def test_zio_handle_zaken_notification(self, m, mock_handle: Mock):
             level=logging.INFO,
         )
 
-    def test_zio_handle_zaken_notification_niet_natuurlijk_persoon_initiator(
+    def test_ziohandle_zaken_notification_niet_natuurlijk_persoon_initiator(
         self, m, mock_handle: Mock
     ):
         """
@@ -351,7 +351,7 @@ def test_handle_zaak_info_object_update_filters_disabled_notifications(
         zio = factory(ZaakInformatieObject, data.zaak_informatie_object)
         zio.informatieobject = factory(InformatieObject, data.informatie_object)
 
-        handle_zaakinformatieobject_update(user, case, zio)
+        _handle_zaakinformatieobject_update(user, case, zio)
 
         # not called because disabled notifications
         mock_send.assert_not_called()
@@ -384,7 +384,7 @@ def test_handle_zaak_info_object_update_filters_bad_email(
         zio = factory(ZaakInformatieObject, data.zaak_informatie_object)
         zio.informatieobject = factory(InformatieObject, data.informatie_object)
 
-        handle_zaakinformatieobject_update(user, case, zio)
+        _handle_zaakinformatieobject_update(user, case, zio)
 
         # not called because bad email
         mock_send.assert_not_called()
@@ -416,7 +416,7 @@ def test_handle_zaak_info_object_update(
         zio.informatieobject = factory(InformatieObject, data.informatie_object)
 
         # first call
-        handle_zaakinformatieobject_update(user, case, zio)
+        _handle_zaakinformatieobject_update(user, case, zio)
 
         mock_send.assert_called_once()
 
@@ -442,7 +442,7 @@ def test_handle_zaak_info_object_update(
         )
 
         # second call with same case/status
-        handle_zaakinformatieobject_update(user, case, zio)
+        _handle_zaakinformatieobject_update(user, case, zio)
 
         # no duplicate mail for this user/case/status
         mock_send.assert_not_called()
@@ -455,7 +455,7 @@ def test_handle_zaak_info_object_update(
 
         # other user is fine
         other_user = UserFactory.create()
-        handle_zaakinformatieobject_update(other_user, case, zio)
+        _handle_zaakinformatieobject_update(other_user, case, zio)
 
         mock_send.assert_called_once()
 
@@ -474,7 +474,7 @@ def test_handle_zaak_info_object_update(
             InformatieObject, copy_with_new_uuid(data.informatie_object)
         )
 
-        handle_zaakinformatieobject_update(user, case, zio)
+        _handle_zaakinformatieobject_update(user, case, zio)
 
         # not sent because we already send to this user within the frequency
         mock_send.assert_not_called()
@@ -493,7 +493,7 @@ def test_handle_zaak_info_object_update(
             zio.informatieobject = factory(
                 InformatieObject, copy_with_new_uuid(data.informatie_object)
             )
-            handle_zaakinformatieobject_update(user, case, zio)
+            _handle_zaakinformatieobject_update(user, case, zio)
 
             # this one succeeds
             mock_send.assert_called_once()
diff --git a/src/open_inwoner/openzaak/tests/test_notification_zaak_status.py b/src/open_inwoner/openzaak/tests/test_notification_zaak_status.py
index 07e19a1d8f..d86bc44efa 100644
--- a/src/open_inwoner/openzaak/tests/test_notification_zaak_status.py
+++ b/src/open_inwoner/openzaak/tests/test_notification_zaak_status.py
@@ -11,7 +11,7 @@
 
 from open_inwoner.accounts.tests.factories import UserFactory
 from open_inwoner.openzaak.notifications import (
-    handle_status_update,
+    _handle_status_update,
     handle_zaken_notification,
 )
 from open_inwoner.utils.test import ClearCachesMixin
@@ -29,7 +29,7 @@
 
 
 @requests_mock.Mocker()
-@patch("open_inwoner.openzaak.notifications.handle_status_update", autospec=True)
+@patch("open_inwoner.openzaak.notifications._handle_status_update", autospec=True)
 class StatusNotificationHandlerTestCase(
     AssertTimelineLogMixin, ClearCachesMixin, TestCase
 ):
@@ -44,7 +44,7 @@ def setUpTestData(cls):
 
     def test_status_handle_zaken_notification(self, m, mock_handle: Mock):
         """
-        happy-flow from valid data calls the (mocked) handle_status_update()
+        happy-flow from valid data calls the (mocked) _handle_status_update()
         """
         data = MockAPIData().install_mocks(m)
 
@@ -551,7 +551,7 @@ def test_handle_status_update(self, mock_send: Mock, mock_feed_hook: Mock):
         )
 
         # first call
-        handle_status_update(user, case, status_initial, status_type_config_initial)
+        _handle_status_update(user, case, status_initial, status_type_config_initial)
 
         mock_send.assert_called_once()
 
@@ -579,14 +579,14 @@ def test_handle_status_update(self, mock_send: Mock, mock_feed_hook: Mock):
         )
 
         # second call with same case/status
-        handle_status_update(user, case, status_initial, status_type_config_initial)
+        _handle_status_update(user, case, status_initial, status_type_config_initial)
 
         # no duplicate mail for this user/case/status
         mock_send.assert_not_called()
 
         with self.subTest("mails are throttled based on template_name"):
             # call with different status and different configuration with action_required=True
-            handle_status_update(user, case, status_final, status_type_config_final)
+            _handle_status_update(user, case, status_final, status_type_config_final)
 
             mock_send.assert_called_once()
 
@@ -608,7 +608,7 @@ def test_handle_status_update(self, mock_send: Mock, mock_feed_hook: Mock):
         )
         # other user is fine
         other_user = UserFactory.create()
-        handle_status_update(
+        _handle_status_update(
             other_user, case, status_initial, status_type_config_initial
         )
 
@@ -626,7 +626,7 @@ def test_handle_status_update(self, mock_send: Mock, mock_feed_hook: Mock):
         status.statustype = factory(
             StatusType, copy_with_new_uuid(data.status_type_final)
         )
-        handle_status_update(user, case, status, status_type_config_initial)
+        _handle_status_update(user, case, status, status_type_config_initial)
 
         # not sent because we already send to this user within the frequency
         mock_send.assert_not_called()
@@ -643,7 +643,7 @@ def test_handle_status_update(self, mock_send: Mock, mock_feed_hook: Mock):
             status.statustype = factory(
                 StatusType, copy_with_new_uuid(data.status_type_final)
             )
-            handle_status_update(user, case, status, status_type_config_initial)
+            _handle_status_update(user, case, status, status_type_config_initial)
 
             # this one succeeds
             mock_send.assert_called_once()
@@ -675,7 +675,7 @@ def test_action_required_template(self, mock_send: Mock, mock_feed_hook: Mock):
             action_required=True,
         )
 
-        handle_status_update(user, case, status, status_type_config)
+        _handle_status_update(user, case, status, status_type_config)
 
         mock_send.assert_called_once()
         # check call arguments
diff --git a/src/open_inwoner/plans/management/__init__.py b/src/open_inwoner/plans/management/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/open_inwoner/plans/management/commands/__init__.py b/src/open_inwoner/plans/management/commands/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/open_inwoner/plans/management/commands/plans_expire.py b/src/open_inwoner/plans/management/commands/plans_expire.py
deleted file mode 100644
index f0e7f8c8c5..0000000000
--- a/src/open_inwoner/plans/management/commands/plans_expire.py
+++ /dev/null
@@ -1,62 +0,0 @@
-import logging
-from datetime import date
-
-from django.core.management.base import BaseCommand
-from django.db.models import Q
-from django.urls import reverse
-
-from mail_editor.helpers import find_template
-
-from open_inwoner.accounts.models import User
-from open_inwoner.plans.models import Plan
-from open_inwoner.userfeed import hooks
-from open_inwoner.utils.url import build_absolute_url
-
-logger = logging.getLogger(__name__)
-
-
-class Command(BaseCommand):
-    help = "Send emails about expiring plans to the users"
-
-    def handle(self, *args, **options):
-        today = date.today()
-        created_by_ids = list(
-            Plan.objects.filter(end_date=today).values_list("created_by_id", flat=True)
-        )
-        contact_ids = list(
-            Plan.objects.filter(end_date=today).values_list(
-                "plan_contacts__id", flat=True
-            )
-        )
-
-        user_ids = created_by_ids + contact_ids
-        receivers = User.objects.filter(
-            is_active=True, pk__in=user_ids, plans_notifications=True
-        ).distinct()
-
-        for receiver in receivers:
-            """send email to each user"""
-            plans = Plan.objects.filter(end_date=today).filter(
-                Q(created_by=receiver) | Q(plan_contacts=receiver)
-            )
-            self.send_email(
-                receiver=receiver,
-                plans=plans,
-            )
-
-            logger.info(
-                f"The email was sent to the user {receiver} about {plans.count()} expiring plans"
-            )
-
-            for p in plans:
-                hooks.plan_expiring(receiver, p)
-
-    def send_email(self, receiver: User, plans: list[Plan]):
-        plan_list_link = build_absolute_url(reverse("collaborate:plan_list"))
-        template = find_template("expiring_plan")
-        context = {
-            "plans": plans,
-            "plan_list_link": plan_list_link,
-        }
-
-        return template.send_email([receiver.email], context)
diff --git a/src/open_inwoner/plans/managers.py b/src/open_inwoner/plans/managers.py
index 6263e3fa62..db5e0ff2fc 100644
--- a/src/open_inwoner/plans/managers.py
+++ b/src/open_inwoner/plans/managers.py
@@ -1,6 +1,22 @@
+from datetime import date
+
 from django.db.models import QuerySet
 
 
 class PlanQuerySet(QuerySet):
     def connected(self, user):
         return self.filter(plan_contacts=user)
+
+    def expiring_plans_user_ids(self, end_date: date) -> list[int]:
+        """
+        Returns:
+            id's of users who created or received messages expiring at `end_date`
+        """
+        created_by_ids = list(
+            self.filter(end_date=end_date).values_list("created_by__id", flat=True)
+        )
+        contact_ids = list(
+            self.filter(end_date=end_date).values_list("plan_contacts__id", flat=True)
+        )
+        user_ids = created_by_ids + contact_ids
+        return user_ids
diff --git a/src/open_inwoner/templates/pages/profile/me.html b/src/open_inwoner/templates/pages/profile/me.html
index d097f43403..6b42ff117c 100644
--- a/src/open_inwoner/templates/pages/profile/me.html
+++ b/src/open_inwoner/templates/pages/profile/me.html
@@ -93,6 +93,7 @@ <h2 class="utrecht-heading-2 title" id="personal-overview">{% trans "Persoonlijk
 {% endif %}
 
     {# Notifications #}
+    {# TODO: display section only if there are active notifications from user.get_active_notifications #}
     <section class="tabled tabled--flexible profile-section profile-section--bordered profile-section__notifications" id="profile-notifications">
         <div class="tabled__section">
             <h2 class="utrecht-heading-2 title" id="notifications">{% trans "Voorkeuren voor meldingen" %}
diff --git a/src/open_inwoner/utils/constants.py b/src/open_inwoner/utils/constants.py
new file mode 100644
index 0000000000..19232ea520
--- /dev/null
+++ b/src/open_inwoner/utils/constants.py
@@ -0,0 +1,6 @@
+from django.db import models
+from django.utils.translation import gettext as _
+
+
+class NotificationChannel(models.TextChoices):
+    email = "email", _("Email")