Remove mailing list feature

club/forms.py

@@ -31,20 +31,10 @@ from django.forms.models import ModelChoiceField, ModelChoiceIterator
 from django.utils.functional import cached_property
 from django.utils.translation import gettext_lazy as _
 
-from club.models import (
-    Club,
-    ClubLink,
-    ClubRole,
-    Mailing,
-    MailingSubscription,
-    Membership,
-)
+from club.models import Club, ClubLink, ClubRole, Membership
 from core.models import User
 from core.views.forms import SelectDateTime
-from core.views.widgets.ajax_select import (
-    AutoCompleteSelectMultipleUser,
-    AutoCompleteSelectUser,
-)
+from core.views.widgets.ajax_select import AutoCompleteSelectUser
 from counter.models import Counter, Selling
 from counter.schemas import SaleFilterSchema
 
@@ -131,107 +121,6 @@ class ClubAdminEditForm(ClubEditForm):
         fields = ["name", "parent", "is_active", *ClubEditForm.Meta.fields]
 
 
-class MailingForm(forms.Form):
-    """Form handling mailing lists right."""
-
-    ACTION_NEW_MAILING = 1
-    ACTION_NEW_SUBSCRIPTION = 2
-    ACTION_REMOVE_SUBSCRIPTION = 3
-
-    subscription_users = forms.ModelMultipleChoiceField(
-        label=_("Users to add"),
-        help_text=_("Search users to add (one or more)."),
-        required=False,
-        widget=AutoCompleteSelectMultipleUser,
-        queryset=User.objects.all(),
-    )
-
-    def __init__(self, club_id, user_id, mailings, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        self.fields["action"] = forms.TypedChoiceField(
-            choices=(
-                (self.ACTION_NEW_MAILING, _("New Mailing")),
-                (self.ACTION_NEW_SUBSCRIPTION, _("Subscribe")),
-                (self.ACTION_REMOVE_SUBSCRIPTION, _("Remove")),
-            ),
-            coerce=int,
-            label=_("Action"),
-            initial=1,
-            required=True,
-            widget=forms.HiddenInput(),
-        )
-
-        # Generate bulk removal forms, they are never required
-        for mailing in mailings:
-            self.fields["removal_" + str(mailing.id)] = forms.ModelMultipleChoiceField(
-                mailing.subscriptions.all(),
-                label=_("Remove"),
-                required=False,
-                widget=forms.CheckboxSelectMultiple,
-            )
-
-        # Include fields for handling mailing creation
-        mailing_fields = ("email",)
-        self.fields.update(forms.fields_for_model(Mailing, fields=mailing_fields))
-        for field in mailing_fields:
-            self.fields["mailing_" + field] = self.fields.pop(field)
-            self.fields["mailing_" + field].required = False
-
-        # Include fields for handling subscription creation
-        subscription_fields = ("mailing", "email")
-        self.fields.update(
-            forms.fields_for_model(MailingSubscription, fields=subscription_fields)
-        )
-        for field in subscription_fields:
-            self.fields["subscription_" + field] = self.fields.pop(field)
-            self.fields["subscription_" + field].required = False
-
-        self.fields["subscription_mailing"].queryset = Mailing.objects.filter(
-            club__id=club_id, is_moderated=True
-        )
-
-    def check_required(self, cleaned_data, field):
-        """If the given field doesn't exist or has no value, add a required error on it."""
-        if not cleaned_data.get(field, None):
-            self.add_error(field, _("This field is required"))
-
-    def clean_subscription_users(self):
-        """Convert given users into real users and check their validity."""
-        cleaned_data = super().clean()
-        users = []
-        for user in cleaned_data["subscription_users"]:
-            if not user.email:
-                raise forms.ValidationError(
-                    _("One of the selected users doesn't have an email address"),
-                    code="invalid",
-                )
-            users.append(user)
-        return users
-
-    def clean(self):
-        cleaned_data = super().clean()
-
-        if "action" not in cleaned_data:
-            # If there is no action provided, we can stop here
-            raise forms.ValidationError(_("An action is required"), code="invalid")
-
-        if cleaned_data["action"] == self.ACTION_NEW_MAILING:
-            self.check_required(cleaned_data, "mailing_email")
-
-        if cleaned_data["action"] == self.ACTION_NEW_SUBSCRIPTION:
-            self.check_required(cleaned_data, "subscription_mailing")
-            if not cleaned_data.get(
-                "subscription_users", None
-            ) and not cleaned_data.get("subscription_email", None):
-                raise forms.ValidationError(
-                    _("You must specify at least an user or an email address"),
-                    code="invalid",
-                )
-
-        return cleaned_data
-
-
 class SellingsForm(forms.Form):
     begin_date = forms.DateTimeField(
         label=_("Begin date"), widget=SelectDateTime, required=False

club/migrations/0019_remove_mailingsubscription_mailing_and_more.py

@@ -0,0 +1,16 @@
+# Generated by Django 5.2.17 on 2026-10-15 13:13
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [("club", "0018_clubrole_linked_groups")]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name="mailingsubscription", unique_together=None
+        ),
+        migrations.RemoveField(model_name="mailingsubscription", name="user"),
+        migrations.DeleteModel(name="Mailing"),
+        migrations.DeleteModel(name="MailingSubscription"),
+    ]

club/models.py

@@ -28,8 +28,7 @@ from functools import reduce
 from typing import Iterable, Self
 
 from django.conf import settings
-from django.core.exceptions import ObjectDoesNotExist, ValidationError
-from django.core.validators import RegexValidator, validate_email
+from django.core.exceptions import ValidationError
 from django.db import ProgrammingError, models, transaction
 from django.db.models import Exists, F, OuterRef, Q
 from django.urls import reverse
@@ -41,7 +40,7 @@ from django.utils.translation import gettext_lazy as _
 from ordered_model.models import OrderedModel
 
 from core.fields import ResizedImageField
-from core.models import Group, Notification, Page, SithFile, User
+from core.models import Group, Page, SithFile, User
 
 
 class ClubQuerySet(models.QuerySet):
@@ -633,169 +632,6 @@ class Membership(models.Model):
         return User.groups.through.objects.bulk_create(groups, ignore_conflicts=True)
 
 
-class Mailing(models.Model):
-    """A Mailing list for a club.
-
-    Warning:
-        Remember that mailing lists should be validated by UTBM.
-    """
-
-    club = models.ForeignKey(
-        Club,
-        verbose_name=_("Club"),
-        related_name="mailings",
-        null=False,
-        blank=False,
-        on_delete=models.CASCADE,
-    )
-    email = models.CharField(
-        _("Email address"),
-        unique=True,
-        null=False,
-        blank=False,
-        max_length=256,
-        validators=[
-            RegexValidator(
-                validate_email.user_regex,
-                _("Enter a valid address. Only the root of the address is needed."),
-            )
-        ],
-    )
-    is_moderated = models.BooleanField(_("is moderated"), default=False)
-    moderator = models.ForeignKey(
-        User,
-        related_name="moderated_mailings",
-        verbose_name=_("moderator"),
-        null=True,
-        on_delete=models.CASCADE,
-    )
-
-    def __str__(self):
-        return "%s - %s" % (self.club, self.email_full)
-
-    def save(self, *args, **kwargs):
-        if not self.is_moderated:
-            unread_notif_subquery = Notification.objects.filter(
-                user=OuterRef("pk"), type="MAILING_MODERATION", viewed=False
-            )
-            for user in User.objects.filter(
-                ~Exists(unread_notif_subquery),
-                groups__id__in=[settings.SITH_GROUP_COM_ADMIN_ID],
-            ):
-                Notification(
-                    user=user,
-                    url=reverse("com:mailing_admin"),
-                    type="MAILING_MODERATION",
-                ).save(*args, **kwargs)
-        super().save(*args, **kwargs)
-
-    def clean(self):
-        if Mailing.objects.filter(email=self.email).exists():
-            raise ValidationError(_("This mailing list already exists."))
-        if self.can_moderate(self.moderator):
-            self.is_moderated = True
-        else:
-            self.moderator = None
-        super().clean()
-
-    @property
-    def email_full(self):
-        return self.email + "@" + settings.SITH_MAILING_DOMAIN
-
-    def can_moderate(self, user):
-        return user.is_root or user.is_com_admin
-
-    def is_owned_by(self, user):
-        if user.is_anonymous:
-            return False
-        return user.is_root or user.is_com_admin
-
-    def can_view(self, user):
-        return self.club.has_rights_in_club(user)
-
-    def can_be_edited_by(self, user):
-        return self.club.has_rights_in_club(user)
-
-    def delete(self, *args, **kwargs):
-        self.subscriptions.all().delete()
-        super().delete()
-
-    def fetch_format(self):
-        destination = "".join(s.fetch_format() for s in self.subscriptions.all())
-        return f"{self.email}: {destination}"
-
-
-class MailingSubscription(models.Model):
-    """Link between user and mailing list."""
-
-    mailing = models.ForeignKey(
-        Mailing,
-        verbose_name=_("Mailing"),
-        related_name="subscriptions",
-        null=False,
-        blank=False,
-        on_delete=models.CASCADE,
-    )
-    user = models.ForeignKey(
-        User,
-        verbose_name=_("User"),
-        related_name="mailing_subscriptions",
-        null=True,
-        blank=True,
-        on_delete=models.CASCADE,
-    )
-    email = models.EmailField(_("Email address"), blank=False, null=False)
-
-    class Meta:
-        unique_together = (("user", "email", "mailing"),)
-
-    def __str__(self):
-        return "(%s) - %s : %s" % (self.mailing, self.get_username, self.email)
-
-    def clean(self):
-        if not self.user and not self.email:
-            raise ValidationError(_("At least user or email is required"))
-        try:
-            if self.user and not self.email:
-                self.email = self.user.email
-                if MailingSubscription.objects.filter(
-                    mailing=self.mailing, email=self.email
-                ).exists():
-                    raise ValidationError(
-                        _("This email is already suscribed in this mailing")
-                    )
-        except ObjectDoesNotExist:
-            pass
-        super().clean()
-
-    def is_owned_by(self, user):
-        if user.is_anonymous:
-            return False
-        return (
-            self.mailing.club.has_rights_in_club(user)
-            or user.is_root
-            or self.user.is_com_admin
-        )
-
-    def can_be_edited_by(self, user):
-        return self.user is not None and user.id == self.user.id
-
-    @cached_property
-    def get_email(self):
-        if self.user and not self.email:
-            return self.user.email
-        return self.email
-
-    @cached_property
-    def get_username(self):
-        if self.user:
-            return str(self.user)
-        return _("Unregistered user")
-
-    def fetch_format(self):
-        return self.get_email + " "
-
-
 class LinkType(models.Model):
     """A link type, in order to group links and give them icons.
 

club/templates/club/club_tools.jinja

@@ -15,9 +15,6 @@
           {% trans %}Post in the Weekmail{% endtrans %}
         </a>
       </li>
-      {% if object.can_roles_be_edited_by(user) %}
-        <li><a href="{{ url("club:club_roles", club_id=object.id) }}"></a></li>
-      {% endif %}
       {% if object.trombi %}
         <li> <a href="{{ url('trombi:detail', trombi_id=object.trombi.id) }}">{% trans %}Edit Trombi{% endtrans %}</a></li>
       {% else %}

club/templates/club/mailing.jinja

@@ -1,108 +0,0 @@
-{% extends "core/base.jinja" %}
-{% from 'core/macros.jinja' import select_all_checkbox %}
-
-{% block title %}
-  {% trans %}Mailing lists{% endtrans %}
-{% endblock %}
-
-{% block content %}
-
-  <b>{% trans %}Remember : mailing lists need to be moderated, if your new created list is not shown wait until moderation takes action{% endtrans %}</b>
-
-  {% if mailings_not_moderated %}
-    <p>{% trans %}Mailing lists waiting for moderation{% endtrans %}</p>
-    <ul>
-      {% for mailing in mailings_not_moderated %}
-        <li>{{ mailing.email_full }}<a href="{{ url('club:mailing_delete', mailing_id=mailing.id) }}"> - {% trans %}Delete{% endtrans %}</a></li>
-      {% endfor %}
-    </ul>
-  {% endif %}
-
-  {% if mailings_moderated %}
-    {% for mailing in mailings_moderated %}
-      <h2>{% trans %}Mailing{% endtrans %} {{ mailing.email_full }}
-        {%- if user.is_owner(mailing) -%}
-          <a href="{{ url('club:mailing_delete', mailing_id=mailing.id) }}"> - {% trans %}Delete{% endtrans %}</a>
-        {%- endif -%}
-      </h2>
-      <form method="GET" action="{{ url('club:mailing_generate', mailing_id=mailing.id) }}" style="display:inline-block;">
-        <input type="submit" name="generateMalingList" value="{% trans %}Generate mailing list{% endtrans %}">
-      </form>
-      {% set form_mailing_removal = form["removal_" + mailing.id|string] %}
-      {% if form_mailing_removal.field.choices %}
-        {% set ms = dict(mailing.subscriptions.all() | groupby('id')) %}
-        <form action="{{ url('club:mailing', club_id=club.id) }}" id="{{ form_mailing_removal.auto_id }}" method="post" enctype="multipart/form-data">
-          <p style="margin-bottom: 1em;">{{ select_all_checkbox(form_mailing_removal.auto_id) }}</p>
-          {% csrf_token %}
-          <input hidden type="number" name="{{ form.action.name }}" value="{{ form_actions.REMOVE_SUBSCRIPTION }}" />
-          <table>
-            <thead>
-              <tr>
-                <td>{% trans %}User{% endtrans %}</td>
-                <td>{% trans %}Email{% endtrans %}</td>
-                <td>{% trans %}Delete{% endtrans %}</td>
-              </tr>
-            </thead>
-            <tbody>
-              {% for widget in form_mailing_removal.subwidgets %}
-                {% set user = ms[widget.data.value.value][0] %}
-                <tr>
-                  <td>{{ user.get_username }}</td>
-                  <td>{{ user.get_email }}</td>
-                  <td>{{ widget.tag() }}</td>
-                </tr>
-              {% endfor %}
-            </tbody>
-          </table>
-          {{ form_mailing_removal.errors }}
-          <p><input type="submit" value="{% trans %}Remove from mailing list{% endtrans %}" /></p>
-        </form>
-
-      {% else %}
-        <p><b>{% trans %}There is no subscriber for this mailing list{% endtrans %}</b></p>
-      {% endif %}
-    {% endfor %}
-
-  {% else %}
-    <p>{% trans %}No mailing list existing for this club{% endtrans %}</p>
-  {% endif %}
-
-  <p>{{ form.non_field_errors() }}</p>
-  {% if mailings_moderated %}
-    <h2>{% trans %}New member{% endtrans %}</h2>
-    <form action="{{ url('club:mailing', club_id=club.id) }}" method="post" enctype="multipart/form-data">
-      {% csrf_token %}
-      <p>
-        {{ form.subscription_mailing.errors }}
-        <label for="{{ form.subscription_mailing.id_for_label }}">{{ form.subscription_mailing.label }}</label>
-        {{ form.subscription_mailing }}
-      </p>
-      <p>
-        {{ form.subscription_users.errors }}
-        <label for="{{ form.subscription_users.id_for_label }}">{{ form.subscription_users.label }}</label>
-        {{ form.subscription_users }}
-        <span class="helptext">{{ form.subscription_users.help_text }}</span>
-      </p>
-      <p>
-        {{ form.subscription_email.errors }}
-        <label for="{{ form.subscription_email.id_for_label }}">{{ form.subscription_email.label }}</label>
-        {{ form.subscription_email }}
-      </p>
-      <input hidden type="number" name="{{ form.action.name }}" value="{{ form_actions.NEW_SUBSCRIPTION }}" />
-      <p><input type="submit" value="{% trans %}Add to mailing list{% endtrans %}" /></p>
-    </form>
-  {% endif %}
-
-  <h2>{% trans %}New mailing{% endtrans %}</h2>
-  <form action="{{ url('club:mailing', club_id=club.id) }}" method="post" enctype="multipart/form-data">
-    {% csrf_token %}
-    <p>
-      {{ form.mailing_email.errors }}
-      <label for="{{ form.mailing_email.id_for_label }}">{{ form.mailing_email.label }}</label>
-      {{ form.mailing_email }}
-    </p>
-    <input hidden type="number" name="{{ form.action.name }}" value="{{ form_actions.NEW_MALING }}" />
-    <p><input type="submit" value="{% trans %}Create mailing list{% endtrans %}" /></p>
-  </form>
-
-{% endblock %}

club/tests/test_mailing.py

@@ -1,328 +0,0 @@
-from django.conf import settings
-from django.test import TestCase
-from django.urls import reverse
-from django.utils import timezone
-from django.utils.translation import gettext as _
-from model_bakery import baker
-
-from club.forms import MailingForm
-from club.models import Club, ClubRole, Mailing, Membership
-from core.models import User
-
-
-class TestMailingForm(TestCase):
-    """Perform validation tests for MailingForm."""
-
-    @classmethod
-    def setUpTestData(cls):
-        cls.skia = User.objects.get(username="skia")
-        cls.rbatsbak = User.objects.get(username="rbatsbak")
-        cls.krophil = User.objects.get(username="krophil")
-        cls.comunity = User.objects.get(username="comunity")
-        cls.root = User.objects.get(username="root")
-        cls.club = Club.objects.get(id=settings.SITH_PDF_CLUB_ID)
-        cls.mail_url = reverse("club:mailing", kwargs={"club_id": cls.club.id})
-        Membership(
-            user=cls.rbatsbak,
-            club=cls.club,
-            start_date=timezone.now(),
-            role=baker.make(ClubRole, club=cls.club, is_board=True),
-        ).save()
-
-    def test_mailing_list_add_no_moderation(self):
-        # Test with Communication admin
-        self.client.force_login(self.comunity)
-        response = self.client.post(
-            self.mail_url,
-            {"action": MailingForm.ACTION_NEW_MAILING, "mailing_email": "foyer"},
-        )
-        self.assertRedirects(response, self.mail_url)
-        response = self.client.get(self.mail_url)
-        assert response.status_code == 200
-        assert "Liste de diffusion foyer@utbm.fr" in response.text
-
-        # Test with Root
-        self.client.force_login(self.root)
-        self.client.post(
-            self.mail_url,
-            {"action": MailingForm.ACTION_NEW_MAILING, "mailing_email": "mde"},
-        )
-        response = self.client.get(self.mail_url)
-        assert response.status_code == 200
-        assert "Liste de diffusion mde@utbm.fr" in response.text
-
-    def test_mailing_list_add_moderation(self):
-        self.client.force_login(self.rbatsbak)
-        self.client.post(
-            self.mail_url,
-            {"action": MailingForm.ACTION_NEW_MAILING, "mailing_email": "mde"},
-        )
-        response = self.client.get(self.mail_url)
-        assert response.status_code == 200
-        content = response.text
-        assert "Liste de diffusion mde@utbm.fr" not in content
-        assert "<p>Listes de diffusions en attente de modération</p>" in content
-        assert "<li>mde@utbm.fr" in content
-
-    def test_mailing_list_forbidden(self):
-        # With anonymous user
-        response = self.client.get(self.mail_url)
-        self.assertContains(response, "", status_code=403)
-
-        # With user not in club
-        self.client.force_login(self.krophil)
-        response = self.client.get(self.mail_url)
-        assert response.status_code == 403
-
-    def test_add_new_subscription_fail_not_moderated(self):
-        self.client.force_login(self.rbatsbak)
-        self.client.post(
-            self.mail_url,
-            {"action": MailingForm.ACTION_NEW_MAILING, "mailing_email": "mde"},
-        )
-
-        self.client.post(
-            self.mail_url,
-            {
-                "action": MailingForm.ACTION_NEW_SUBSCRIPTION,
-                "subscription_users": self.skia.id,
-                "subscription_mailing": Mailing.objects.get(email="mde").id,
-            },
-        )
-        response = self.client.get(self.mail_url)
-        assert response.status_code == 200
-        assert "skia@git.an" not in response.text
-
-    def test_add_new_subscription_success(self):
-        # Prepare mailing list
-        self.client.force_login(self.comunity)
-        self.client.post(
-            self.mail_url,
-            {"action": MailingForm.ACTION_NEW_MAILING, "mailing_email": "mde"},
-        )
-
-        # Add single user
-        self.client.post(
-            self.mail_url,
-            {
-                "action": MailingForm.ACTION_NEW_SUBSCRIPTION,
-                "subscription_users": self.skia.id,
-                "subscription_mailing": Mailing.objects.get(email="mde").id,
-            },
-        )
-        response = self.client.get(self.mail_url)
-        assert response.status_code == 200
-        assert "skia@git.an" in response.text
-
-        # Add multiple users
-        self.client.post(
-            self.mail_url,
-            {
-                "action": MailingForm.ACTION_NEW_SUBSCRIPTION,
-                "subscription_users": (self.comunity.id, self.rbatsbak.id),
-                "subscription_mailing": Mailing.objects.get(email="mde").id,
-            },
-        )
-        response = self.client.get(self.mail_url)
-        assert response.status_code == 200
-        content = response.text
-        assert "richard@git.an" in content
-        assert "comunity@git.an" in content
-        assert "skia@git.an" in content
-
-        # Add arbitrary email
-        self.client.post(
-            self.mail_url,
-            {
-                "action": MailingForm.ACTION_NEW_SUBSCRIPTION,
-                "subscription_email": "arbitrary@git.an",
-                "subscription_mailing": Mailing.objects.get(email="mde").id,
-            },
-        )
-        response = self.client.get(self.mail_url)
-        assert response.status_code == 200
-        content = response.text
-        assert "richard@git.an" in content
-        assert "comunity@git.an" in content
-        assert "skia@git.an" in content
-        assert "arbitrary@git.an" in content
-
-        # Add user and arbitrary email
-        self.client.post(
-            self.mail_url,
-            {
-                "action": MailingForm.ACTION_NEW_SUBSCRIPTION,
-                "subscription_email": "more.arbitrary@git.an",
-                "subscription_users": self.krophil.id,
-                "subscription_mailing": Mailing.objects.get(email="mde").id,
-            },
-        )
-        response = self.client.get(self.mail_url)
-        assert response.status_code == 200
-        content = response.text
-        assert "richard@git.an" in content
-        assert "comunity@git.an" in content
-        assert "skia@git.an" in content
-        assert "arbitrary@git.an" in content
-        assert "more.arbitrary@git.an" in content
-        assert "krophil@git.an" in content
-
-    def test_add_new_subscription_fail_form_errors(self):
-        # Prepare mailing list
-        self.client.force_login(self.comunity)
-        self.client.post(
-            self.mail_url,
-            {"action": MailingForm.ACTION_NEW_MAILING, "mailing_email": "mde"},
-        )
-
-        # Neither email or email is specified
-        response = self.client.post(
-            self.mail_url,
-            {
-                "action": MailingForm.ACTION_NEW_SUBSCRIPTION,
-                "subscription_mailing": Mailing.objects.get(email="mde").id,
-            },
-        )
-        assert response.status_code
-        self.assertInHTML(
-            _("You must specify at least an user or an email address"),
-            response.text,
-        )
-
-        # No mailing specified
-        response = self.client.post(
-            self.mail_url,
-            {
-                "action": MailingForm.ACTION_NEW_SUBSCRIPTION,
-                "subscription_users": self.krophil.id,
-            },
-        )
-        assert response.status_code == 200
-        assert _("This field is required") in response.text
-
-        # One of the selected users doesn't exist
-        response = self.client.post(
-            self.mail_url,
-            {
-                "action": MailingForm.ACTION_NEW_SUBSCRIPTION,
-                "subscription_users": [789],
-                "subscription_mailing": Mailing.objects.get(email="mde").id,
-            },
-        )
-        assert response.status_code == 200
-        self.assertInHTML(
-            _("You must specify at least an user or an email address"),
-            response.text,
-        )
-
-        # An user has no email address
-        self.krophil.email = ""
-        self.krophil.save()
-
-        response = self.client.post(
-            self.mail_url,
-            {
-                "action": MailingForm.ACTION_NEW_SUBSCRIPTION,
-                "subscription_users": self.krophil.id,
-                "subscription_mailing": Mailing.objects.get(email="mde").id,
-            },
-        )
-        assert response.status_code == 200
-        self.assertInHTML(
-            _("One of the selected users doesn't have an email address"),
-            response.text,
-        )
-
-        self.krophil.email = "krophil@git.an"
-        self.krophil.save()
-
-        # An user is added twice
-
-        self.client.post(
-            self.mail_url,
-            {
-                "action": MailingForm.ACTION_NEW_SUBSCRIPTION,
-                "subscription_users": self.krophil.id,
-                "subscription_mailing": Mailing.objects.get(email="mde").id,
-            },
-        )
-
-        response = self.client.post(
-            self.mail_url,
-            {
-                "action": MailingForm.ACTION_NEW_SUBSCRIPTION,
-                "subscription_users": self.krophil.id,
-                "subscription_mailing": Mailing.objects.get(email="mde").id,
-            },
-        )
-        assert response.status_code == 200
-        self.assertInHTML(
-            _("This email is already suscribed in this mailing"),
-            response.text,
-        )
-
-    def test_remove_subscription_success(self):
-        # Prepare mailing list
-        self.client.force_login(self.comunity)
-        self.client.post(
-            self.mail_url,
-            {"action": MailingForm.ACTION_NEW_MAILING, "mailing_email": "mde"},
-        )
-        mde = Mailing.objects.get(email="mde")
-        self.client.post(
-            self.mail_url,
-            {
-                "action": MailingForm.ACTION_NEW_SUBSCRIPTION,
-                "subscription_users": (
-                    self.comunity.id,
-                    self.rbatsbak.id,
-                    self.krophil.id,
-                ),
-                "subscription_mailing": mde.id,
-            },
-        )
-
-        response = self.client.get(self.mail_url)
-        assert response.status_code == 200
-        content = response.text
-
-        assert "comunity@git.an" in content
-        assert "richard@git.an" in content
-        assert "krophil@git.an" in content
-
-        # Delete one user
-        self.client.post(
-            self.mail_url,
-            {
-                "action": MailingForm.ACTION_REMOVE_SUBSCRIPTION,
-                "removal_%d" % mde.id: mde.subscriptions.get(user=self.krophil).id,
-            },
-        )
-        response = self.client.get(self.mail_url)
-        assert response.status_code == 200
-        content = response.text
-
-        assert "comunity@git.an" in content
-        assert "richard@git.an" in content
-        assert "krophil@git.an" not in content
-
-        # Delete multiple users
-        self.client.post(
-            self.mail_url,
-            {
-                "action": MailingForm.ACTION_REMOVE_SUBSCRIPTION,
-                "removal_%d" % mde.id: [
-                    user.id
-                    for user in mde.subscriptions.filter(
-                        user__in=[self.rbatsbak, self.comunity]
-                    ).all()
-                ],
-            },
-        )
-        response = self.client.get(self.mail_url)
-        assert response.status_code == 200
-        content = response.text
-
-        assert "comunity@git.an" not in content
-        assert "richard@git.an" not in content
-        assert "krophil@git.an" not in content

club/urls.py

@@ -29,7 +29,6 @@ from club.views import (
     ClubCreateView,
     ClubEditView,
     ClubListView,
-    ClubMailingView,
     ClubMembersView,
     ClubOldMembersView,
     ClubPageEditView,
@@ -43,9 +42,6 @@ from club.views import (
     ClubSellingView,
     ClubToolsView,
     ClubView,
-    MailingAutoGenerationView,
-    MailingDeleteView,
-    MailingSubscriptionDeleteView,
     MembershipDeleteView,
     MembershipSetOldView,
     PosterCreateView,
@@ -96,22 +92,6 @@ urlpatterns = [
         "<int:club_id>/sellings/csv/", ClubSellingCSVView.as_view(), name="sellings_csv"
     ),
     path("<int:club_id>/tools/", ClubToolsView.as_view(), name="tools"),
-    path("<int:club_id>/mailing/", ClubMailingView.as_view(), name="mailing"),
-    path(
-        "<int:mailing_id>/mailing/generate/",
-        MailingAutoGenerationView.as_view(),
-        name="mailing_generate",
-    ),
-    path(
-        "<int:mailing_id>/mailing/delete/",
-        MailingDeleteView.as_view(),
-        name="mailing_delete",
-    ),
-    path(
-        "<int:mailing_subscription_id>/mailing/delete/subscription/",
-        MailingSubscriptionDeleteView.as_view(),
-        name="mailing_subscription_delete",
-    ),
     path(
         "membership/<int:membership_id>/set_old/",
         MembershipSetOldView.as_view(),

club/views.py

@@ -34,7 +34,6 @@ from django.contrib.auth.mixins import (
     UserPassesTestMixin,
 )
 from django.contrib.messages.views import SuccessMessageMixin
-from django.core.exceptions import NON_FIELD_ERRORS, PermissionDenied, ValidationError
 from django.core.paginator import InvalidPage, Paginator
 from django.db.models import F, Prefetch, Q, Sum
 from django.db.models.functions import Length
@@ -59,7 +58,6 @@ from club.forms import (
     ClubRoleFormSet,
     ClubSearchForm,
     JoinClubForm,
-    MailingForm,
     SellingsForm,
 )
 from club.models import (
@@ -67,8 +65,6 @@ from club.models import (
     ClubLink,
     ClubRole,
     LinkType,
-    Mailing,
-    MailingSubscription,
     Membership,
 )
 from com.models import Poster
@@ -181,13 +177,6 @@ class ClubTabsMixin(TabedViewMixin):
                         "slug": "sellings",
                         "name": _("Sellings"),
                     },
-                    {
-                        "url": reverse(
-                            "club:mailing", kwargs={"club_id": self.object.id}
-                        ),
-                        "slug": "mailing",
-                        "name": _("Mailing list"),
-                    },
                     {
                         "url": reverse(
                             "club:poster_list", kwargs={"club_id": self.object.id}
@@ -742,166 +731,6 @@ class MembershipDeleteView(PermissionRequiredMixin, DeleteView):
         return reverse_lazy("core:user_clubs", kwargs={"user_id": self.object.user_id})
 
 
-class ClubMailingView(ClubTabsMixin, CanEditMixin, DetailFormView):
-    """A list of mailing for a given club."""
-
-    model = Club
-    form_class = MailingForm
-    pk_url_kwarg = "club_id"
-    template_name = "club/mailing.jinja"
-    current_tab = "mailing"
-
-    def get_form_kwargs(self):
-        kwargs = super().get_form_kwargs()
-        kwargs["club_id"] = self.object.id
-        kwargs["user_id"] = self.request.user.id
-        kwargs["mailings"] = self.object.mailings.all()
-        return kwargs
-
-    def get_context_data(self, **kwargs):
-        kwargs = super().get_context_data(**kwargs)
-        mailings = list(self.object.mailings.all())
-        kwargs["club"] = self.object
-        kwargs["user"] = self.request.user
-        kwargs["mailings"] = mailings
-        kwargs["mailings_moderated"] = [m for m in mailings if m.is_moderated]
-        kwargs["mailings_not_moderated"] = [m for m in mailings if not m.is_moderated]
-        kwargs["form_actions"] = {
-            "NEW_MALING": self.form_class.ACTION_NEW_MAILING,
-            "NEW_SUBSCRIPTION": self.form_class.ACTION_NEW_SUBSCRIPTION,
-            "REMOVE_SUBSCRIPTION": self.form_class.ACTION_REMOVE_SUBSCRIPTION,
-        }
-        return kwargs
-
-    def add_new_mailing(self, cleaned_data) -> ValidationError | None:
-        """Create a new mailing list from the form."""
-        mailing = Mailing(
-            club=self.object,
-            email=cleaned_data["mailing_email"],
-            moderator=self.request.user,
-            is_moderated=False,
-        )
-        try:
-            mailing.clean()
-        except ValidationError as validation_error:
-            return validation_error
-        mailing.save()
-        return None
-
-    def add_new_subscription(self, cleaned_data) -> ValidationError | None:
-        """Add mailing subscriptions for each user given and/or for the specified email in form."""
-        users_to_save = []
-
-        for user in cleaned_data["subscription_users"]:
-            sub = MailingSubscription(
-                mailing=cleaned_data["subscription_mailing"], user=user
-            )
-            try:
-                sub.clean()
-            except ValidationError as validation_error:
-                return validation_error
-
-            sub.save()
-            users_to_save.append(sub)
-
-        if cleaned_data["subscription_email"]:
-            sub = MailingSubscription(
-                mailing=cleaned_data["subscription_mailing"],
-                email=cleaned_data["subscription_email"],
-            )
-
-        try:
-            sub.clean()
-        except ValidationError as validation_error:
-            return validation_error
-        sub.save()
-
-        # Save users after we are sure there is no error
-        for user in users_to_save:
-            user.save()
-
-        return None
-
-    def remove_subscription(self, cleaned_data):
-        """Remove specified users from a mailing list."""
-        fields = [
-            val for key, val in cleaned_data.items() if key.startswith("removal_")
-        ]
-        for field in fields:
-            for sub in field:
-                sub.delete()
-
-    def form_valid(self, form):
-        resp = super().form_valid(form)
-
-        cleaned_data = form.clean()
-        error = None
-
-        if cleaned_data["action"] == self.form_class.ACTION_NEW_MAILING:
-            error = self.add_new_mailing(cleaned_data)
-
-        if cleaned_data["action"] == self.form_class.ACTION_NEW_SUBSCRIPTION:
-            error = self.add_new_subscription(cleaned_data)
-
-        if cleaned_data["action"] == self.form_class.ACTION_REMOVE_SUBSCRIPTION:
-            self.remove_subscription(cleaned_data)
-
-        if error:
-            form.add_error(NON_FIELD_ERRORS, error)
-            return self.form_invalid(form)
-
-        return resp
-
-    def get_success_url(self, **kwargs):
-        return reverse("club:mailing", kwargs={"club_id": self.object.id})
-
-
-class MailingDeleteView(CanEditMixin, DeleteView):
-    model = Mailing
-    template_name = "core/delete_confirm.jinja"
-    pk_url_kwarg = "mailing_id"
-    redirect_page = None
-
-    def dispatch(self, request, *args, **kwargs):
-        self.club_id = self.get_object().club.id
-        return super().dispatch(request, *args, **kwargs)
-
-    def get_success_url(self, **kwargs):
-        if self.redirect_page:
-            return reverse_lazy(self.redirect_page)
-        else:
-            return reverse_lazy("club:mailing", kwargs={"club_id": self.club_id})
-
-
-class MailingSubscriptionDeleteView(CanEditMixin, DeleteView):
-    model = MailingSubscription
-    template_name = "core/delete_confirm.jinja"
-    pk_url_kwarg = "mailing_subscription_id"
-
-    def dispatch(self, request, *args, **kwargs):
-        self.club_id = self.get_object().mailing.club.id
-        return super().dispatch(request, *args, **kwargs)
-
-    def get_success_url(self, **kwargs):
-        return reverse_lazy("club:mailing", kwargs={"club_id": self.club_id})
-
-
-class MailingAutoGenerationView(View):
-    def dispatch(self, request, *args, **kwargs):
-        self.mailing = get_object_or_404(Mailing, pk=kwargs["mailing_id"])
-        if not request.user.can_edit(self.mailing):
-            raise PermissionDenied
-        return super().dispatch(request, *args, **kwargs)
-
-    def get(self, request, *args, **kwargs):
-        club = self.mailing.club
-        self.mailing.subscriptions.all().delete()
-        members = club.members.ongoing().filter(role__is_board=True)
-        for member in members.all():
-            MailingSubscription(user=member.user, mailing=self.mailing).save()
-        return redirect("club:mailing", club_id=club.id)
-
-
 class PosterListView(
     PermissionOrClubBoardRequiredMixin, ClubTabsMixin, PosterListBaseView
 ):