Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix alumni mailinglist missing people #3482

Merged
merged 2 commits into from
Dec 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion website/mailinglists/services.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ def get_automatic_lists():
m.current_membership is None
or m.current_membership.type != Membership.MEMBER
)
and m.has_been_member()
]

lists = [
Expand Down
13 changes: 13 additions & 0 deletions website/members/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from django.core.validators import RegexValidator
from django.utils.translation import gettext_lazy as _

from members.models import Member
from thabloid.models.thabloid_user import ThabloidUser

from .models import Profile
Expand Down Expand Up @@ -54,6 +55,18 @@ def __init__(self, *args, **kwargs):
"email_gsuite_only"
].hidden_widget()

if (
not Member.objects.get(pk=kwargs["instance"].user_id).has_been_member()
and not kwargs["instance"].receive_oldmembers
):
self.fields["receive_oldmembers"].disabled = True
self.fields["receive_oldmembers"].help_text = (
"If you are a past member, receive emails about Thalia events aimed at alumni. "
"You cannot enable this option, as we don't have any records of you having been a member "
"(a long time ago, we didn't keep track of this yet). Contact "
"<a href='mailto:[email protected]'>[email protected]</a> if you want to receive alumni emails."
)

self.render_app_specific_profile_form_fields()

def render_app_specific_profile_form_fields(self):
Expand Down
50 changes: 50 additions & 0 deletions website/members/migrations/0048_auto_20231121_2025.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# Generated by Django 4.2.7 on 2023-11-21 19:25

from django.db import migrations
from django.db.models import Exists, OuterRef


def deregister_recent_benefactors_from_oldmembers_mailinglist(apps, schema_editor):
"""Deregister all benefactors since 2017 from the oldmembers mailinglist.

We've changed the oldmembers list to include everyone with the 'receive_oldmembers'
preference set, regardless of whether they have been a member in the past. Newly made
benefactors are automatically excluded, and any existing members or benefactors are
included. This is because for many people, we don't have a complete history of their
memberships.

To prevent recently created benefactors (of which we do have a complete history) from
being included in the oldmembers list, we need to set their 'receive_oldmembers' False.
"""
Profile = apps.get_model("members", "Profile")
Member = apps.get_model("members", "Member")
Membership = apps.get_model("members", "Membership")

# Get people made after the initial migration (+- 2016-12-06) who have only been a benefactor.
benefactors = (
Member.objects.filter(date_joined__gte="2017-01-01")
.filter(
Exists(Membership.objects.filter(user=OuterRef("pk"), type="benefactor"))
)
.exclude(
Exists(
Membership.objects.filter(user=OuterRef("pk"), type="member"),
)
)
)

# Set 'receive_oldmembers' to False for all benefactors since 2017
Profile.objects.filter(user__in=benefactors).update(receive_oldmembers=False)


class Migration(migrations.Migration):
dependencies = [
("members", "0048_alter_profile_photo"),
]

operations = [
migrations.RunPython(
deregister_recent_benefactors_from_oldmembers_mailinglist,
migrations.RunPython.noop,
)
]
1 change: 1 addition & 0 deletions website/registrations/services.py
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,7 @@ def _create_member(registration: Registration) -> Member:
birthday=registration.birthday,
show_birthday=registration.optin_birthday,
receive_optin=registration.optin_mailinglist,
receive_oldmembers=registration.membership_type == Membership.MEMBER,
)

if registration.direct_debit:
Expand Down