From debb967e94a693be71ae73db06109069a0ba9dc6 Mon Sep 17 00:00:00 2001 From: Laurenz Bougan Date: Mon, 26 Oct 2026 18:59:39 +0100 Subject: [PATCH 01/13] feat: add membership validity date helpers --- dds_registration/core/helpers/dates.py | 10 ++++ dds_registration/core/membership/__init__.py | 0 dds_registration/core/membership/validity.py | 38 ++++++++++++++ tests/test_membership_validity.py | 53 ++++++++++++++++++++ 4 files changed, 101 insertions(+) create mode 100644 dds_registration/core/membership/__init__.py create mode 100644 dds_registration/core/membership/validity.py create mode 100644 tests/test_membership_validity.py diff --git a/dds_registration/core/helpers/dates.py b/dds_registration/core/helpers/dates.py index 24730145..35f88e7b 100644 --- a/dds_registration/core/helpers/dates.py +++ b/dds_registration/core/helpers/dates.py @@ -1,5 +1,7 @@ from datetime import date +from ..membership.validity import add_one_year + def this_year(): return date.today().year @@ -7,3 +9,11 @@ def this_year(): def next_year(): return this_year() + 1 + + +def one_year_from_today(): + return add_one_year(date.today()) + + +def end_of_this_year(): + return date(this_year(), 12, 31) diff --git a/dds_registration/core/membership/__init__.py b/dds_registration/core/membership/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/dds_registration/core/membership/validity.py b/dds_registration/core/membership/validity.py new file mode 100644 index 00000000..713d39da --- /dev/null +++ b/dds_registration/core/membership/validity.py @@ -0,0 +1,38 @@ +"""Pure date rules for DdS membership validity and renewal. + +A membership runs for one year from its start. Renewing while still active +extends from the current end date; renewing after a lapse restarts from today. +""" + +from datetime import date, timedelta + + +def add_one_year(day: date) -> date: + """Same calendar date next year; Feb 29 becomes Feb 28.""" + try: + return day.replace(year=day.year + 1) + except ValueError: + return day.replace(year=day.year + 1, day=28) + + +def renewal_until(current_until: date | None, today: date) -> date: + """End date after a renewal submitted on ``today``.""" + if current_until is None or current_until < today: + return add_one_year(today) + return add_one_year(current_until) + + +def within_renewal_window(current_until: date | None, today: date, window_days: int) -> bool: + """True when a member may renew: no membership, lapsed, or ending within ``window_days``.""" + if current_until is None: + return True + return current_until - today <= timedelta(days=window_days) + + +def until_label(value) -> str: + """ISO date for an ``until`` value stored as date, ISO string, or legacy year int.""" + if isinstance(value, date): + return value.isoformat() + if isinstance(value, int): + return date(value, 12, 31).isoformat() + return str(value) diff --git a/tests/test_membership_validity.py b/tests/test_membership_validity.py new file mode 100644 index 00000000..7d574c89 --- /dev/null +++ b/tests/test_membership_validity.py @@ -0,0 +1,53 @@ +from datetime import date + +import pytest + +from dds_registration.core.membership.validity import ( + add_one_year, + renewal_until, + until_label, + within_renewal_window, +) + + +def test_add_one_year_same_calendar_date(): + assert add_one_year(date(2026, 10, 26)) == date(2027, 10, 26) + + +def test_add_one_year_feb_29_maps_to_feb_28(): + assert add_one_year(date(2028, 2, 29)) == date(2029, 2, 28) + + +def test_renewal_until_new_member_runs_one_year_from_today(): + assert renewal_until(None, today=date(2026, 10, 26)) == date(2027, 10, 26) + + +def test_renewal_until_lapsed_member_restarts_from_today(): + assert renewal_until(date(2026, 1, 31), today=date(2026, 10, 26)) == date(2027, 10, 26) + + +def test_renewal_until_active_member_extends_from_current_end(): + assert renewal_until(date(2026, 12, 31), today=date(2026, 11, 15)) == date(2027, 12, 31) + + +def test_renewal_until_on_last_valid_day_extends_from_current_end(): + assert renewal_until(date(2026, 12, 31), today=date(2026, 12, 31)) == date(2027, 12, 31) + + +@pytest.mark.parametrize( + "until,today,expected", + [ + (date(2026, 12, 31), date(2026, 11, 1), True), # exactly 60 days before + (date(2026, 12, 31), date(2026, 10, 31), False), # 61 days before + (date(2026, 12, 31), date(2027, 3, 1), True), # lapsed is always allowed + (None, date(2026, 10, 26), True), # no membership yet + ], +) +def test_within_renewal_window(until, today, expected): + assert within_renewal_window(until, today=today, window_days=60) is expected + + +def test_until_label_accepts_legacy_year_and_date_string(): + assert until_label(2026) == "2026-12-31" + assert until_label("2027-03-04") == "2027-03-04" + assert until_label(date(2027, 3, 4)) == "2027-03-04" From 5a2b8f0a8a93f40342513590a2317fd55f03d7e3 Mon Sep 17 00:00:00 2001 From: Laurenz Bougan Date: Mon, 26 Oct 2026 19:00:52 +0100 Subject: [PATCH 02/13] feat: membership validity as dates, organization fields, reminder log --- .../0025_membership_dates_and_organization.py | 145 ++++++++++++++++++ dds_registration/models.py | 99 ++++++++---- tests/test_membership_migration.py | 63 ++++++++ 3 files changed, 276 insertions(+), 31 deletions(-) create mode 100644 dds_registration/migrations/0025_membership_dates_and_organization.py create mode 100644 tests/test_membership_migration.py diff --git a/dds_registration/migrations/0025_membership_dates_and_organization.py b/dds_registration/migrations/0025_membership_dates_and_organization.py new file mode 100644 index 00000000..9ecb155a --- /dev/null +++ b/dds_registration/migrations/0025_membership_dates_and_organization.py @@ -0,0 +1,145 @@ +"""Membership validity as dates, organization fields, reminder log. + +Existing rows keep their entitlement: ``until`` year N becomes N-12-31. ``started`` +uses the linked payment's paid date when known, else Jan 1 of the stored year. +""" + +from datetime import date + +import django.db.models.deletion +from django.db import migrations, models + +import dds_registration.core.helpers.dates + + +def year_to_until(year: int) -> date: + return date(int(year), 12, 31) + + +def started_from(payment_data, started_year: int) -> date: + paid = (payment_data or {}).get("paid_date") + if paid: + return date.fromisoformat(paid) + return date(int(started_year), 1, 1) + + +def forwards(apps, schema_editor): + Membership = apps.get_model("dds_registration", "Membership") + for membership in Membership.objects.select_related("payment").iterator(): + membership.until_date = year_to_until(membership.until) + payment_data = membership.payment.data if membership.payment_id else None + membership.started_date = started_from(payment_data, membership.started) + membership.save(update_fields=["until_date", "started_date"]) + RegistrationOption = apps.get_model("dds_registration", "RegistrationOption") + for option in RegistrationOption.objects.iterator(): + option.membership_until_date = year_to_until(option.membership_end_year) + option.save(update_fields=["membership_until_date"]) + + +def backwards(apps, schema_editor): + Membership = apps.get_model("dds_registration", "Membership") + for membership in Membership.objects.iterator(): + membership.until = membership.until_date.year + membership.started = membership.started_date.year + membership.save(update_fields=["until", "started"]) + RegistrationOption = apps.get_model("dds_registration", "RegistrationOption") + for option in RegistrationOption.objects.iterator(): + option.membership_end_year = option.membership_until_date.year + option.save(update_fields=["membership_end_year"]) + + +ORGANIZATION_TYPES = [ + ("UNIVERSITY", "University"), + ("RESEARCH", "Research institute"), + ("COMPANY", "Company"), + ("CONSULTANCY", "Consultancy"), + ("PUBLIC", "Public sector"), + ("NGO", "NGO / non-profit"), + ("INDEPENDENT", "Independent / freelance"), + ("STUDENT", "Student"), + ("OTHER", "Other"), +] + +REMINDER_STAGES = [ + ("before_60", "60 days before expiry"), + ("before_30", "30 days before expiry"), + ("expiry", "On expiry"), + ("after_30", "30 days after expiry"), + ("after_60", "60 days after expiry"), +] + + +class Migration(migrations.Migration): + + dependencies = [ + ("dds_registration", "0024_event_has_invitation_event_invitation_text_and_more"), + ] + + operations = [ + migrations.AddField( + model_name="membership", + name="organization", + field=models.CharField(blank=True, default="", max_length=200), + ), + migrations.AddField( + model_name="membership", + name="organization_type", + field=models.CharField(blank=True, choices=ORGANIZATION_TYPES, default="", max_length=16), + ), + migrations.AddField(model_name="membership", name="started_date", field=models.DateField(null=True)), + migrations.AddField(model_name="membership", name="until_date", field=models.DateField(null=True)), + migrations.AddField( + model_name="registrationoption", name="membership_until_date", field=models.DateField(null=True) + ), + migrations.CreateModel( + name="MembershipReminder", + fields=[ + ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")), + ("until", models.DateField()), + ("stage", models.CharField(choices=REMINDER_STAGES, max_length=16)), + ("sent_at", models.DateTimeField(auto_now_add=True)), + ( + "membership", + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name="reminders", + to="dds_registration.membership", + ), + ), + ], + ), + migrations.AddConstraint( + model_name="membershipreminder", + constraint=models.UniqueConstraint(fields=("membership", "until", "stage"), name="one_reminder_per_stage"), + ), + migrations.RunPython(forwards, backwards), + migrations.RemoveField(model_name="membership", name="started"), + migrations.RemoveField(model_name="membership", name="until"), + migrations.RemoveField(model_name="registrationoption", name="membership_end_year"), + migrations.RenameField(model_name="membership", old_name="started_date", new_name="started"), + migrations.RenameField(model_name="membership", old_name="until_date", new_name="until"), + migrations.RenameField( + model_name="registrationoption", old_name="membership_until_date", new_name="membership_until" + ), + migrations.AlterField( + model_name="membership", + name="started", + field=models.DateField(default=date.today, help_text="Date the member first joined"), + ), + migrations.AlterField( + model_name="membership", + name="until", + field=models.DateField( + default=dds_registration.core.helpers.dates.one_year_from_today, + help_text="Last day the membership is valid (inclusive)", + ), + ), + migrations.AlterField( + model_name="registrationoption", + name="membership_until", + field=models.DateField( + default=dds_registration.core.helpers.dates.end_of_this_year, + help_text="If membership is included, last day it is valid (inclusive)", + ), + ), + ] diff --git a/dds_registration/models.py b/dds_registration/models.py index ed8bd034..8b637028 100644 --- a/dds_registration/models.py +++ b/dds_registration/models.py @@ -31,7 +31,8 @@ ) from .core.helpers.create_certificate import create_certificate_pdf from .core.helpers.create_invitation import create_invitation_pdf -from .core.helpers.dates import this_year +from .core.helpers.dates import end_of_this_year, one_year_from_today, this_year +from .core.membership.validity import until_label from .core.helpers.email import send_email alphabet = string.ascii_lowercase + string.digits @@ -416,22 +417,40 @@ def public_choice_field_with_prices(self): HUMANS = ("ACADEMIC", "NORMAL", "HONORARY") +class OrganizationType(models.TextChoices): + UNIVERSITY = "UNIVERSITY", "University" + RESEARCH = "RESEARCH", "Research institute" + COMPANY = "COMPANY", "Company" + CONSULTANCY = "CONSULTANCY", "Consultancy" + PUBLIC = "PUBLIC", "Public sector" + NGO = "NGO", "NGO / non-profit" + INDEPENDENT = "INDEPENDENT", "Independent / freelance" + STUDENT = "STUDENT", "Student" + OTHER = "OTHER", "Other" + + class Membership(Model): user = models.OneToOneField(User, on_delete=models.CASCADE) membership_type = models.TextField(choices=MEMBERSHIP_DATA.choices, default=MEMBERSHIP_DATA.default) + organization = models.CharField(max_length=200, blank=True, default="") + organization_type = models.CharField(max_length=16, choices=OrganizationType.choices, blank=True, default="") - started = models.IntegerField(default=this_year) - until = models.IntegerField(default=this_year) + started = models.DateField(default=date.today, help_text="Date the member first joined") + until = models.DateField(default=one_year_from_today, help_text="Last day the membership is valid (inclusive)") payment = models.OneToOneField(Payment, on_delete=models.SET_NULL, null=True, blank=True) mailing_list = models.BooleanField(default=False) @property def active(self) -> bool: - return this_year() <= self.until + return date.today() <= self.until + + @property + def needs_details(self) -> bool: + return not self.organization or not self.organization_type @classmethod def mailinglist_people(cls): - return cls.objects.filter(until__gte=this_year(), mailing_list=True, membership_type__in=HUMANS) + return cls.objects.filter(until__gte=date.today(), mailing_list=True, membership_type__in=HUMANS) def __str__(self): items = [ @@ -443,6 +462,31 @@ def __str__(self): return info +class MembershipReminder(Model): + """One row per reminder email actually sent; keyed on the end date it was about.""" + + STAGES = [ + ("before_60", "60 days before expiry"), + ("before_30", "30 days before expiry"), + ("expiry", "On expiry"), + ("after_30", "30 days after expiry"), + ("after_60", "60 days after expiry"), + ] + + membership = models.ForeignKey(Membership, on_delete=models.CASCADE, related_name="reminders") + until = models.DateField() + stage = models.CharField(max_length=16, choices=STAGES) + sent_at = models.DateTimeField(auto_now_add=True) + + class Meta: + constraints = [ + models.UniqueConstraint(fields=["membership", "until", "stage"], name="one_reminder_per_stage"), + ] + + def __str__(self): + return f"{self.membership.user.email} {self.stage} ({self.until})" + + class Event(Model): code = models.TextField(unique=True, default=random_code) # Show as an input title = models.TextField(unique=True, null=False, blank=False) # Show as an input @@ -473,18 +517,18 @@ class Event(Model): help_text="Maximum number of participants (0 = no limit)", ) has_certificate = models.BooleanField(default=False, help_text="Event has certificate of participation") - certificate_title = models.TextField( - blank=True, null=True, help_text="Certificate title." - ) + certificate_title = models.TextField(blank=True, null=True, help_text="Certificate title.") certificate_text = models.TextField( - blank=True, null=True, help_text="Certificate text. Can include MarkDown. MUST include `{attendee_name}` template variable where the name of the attendee will be substituted." + blank=True, + null=True, + help_text="Certificate text. Can include MarkDown. MUST include `{attendee_name}` template variable where the name of the attendee will be substituted.", ) has_invitation = models.BooleanField(default=False, help_text="Event has letter of invitation") - invitation_title = models.TextField( - blank=True, null=True, help_text="Invtation letter title." - ) + invitation_title = models.TextField(blank=True, null=True, help_text="Invtation letter title.") invitation_text = models.TextField( - blank=True, null=True, help_text="Invitation letter text. Can include MarkDown. MUST include `{attendee_name}` template variable where the name of the attendee will be substituted." + blank=True, + null=True, + help_text="Invitation letter text. Can include MarkDown. MUST include `{attendee_name}` template variable where the name of the attendee will be substituted.", ) free = models.BooleanField(default=False) @@ -548,7 +592,10 @@ def can_register(self, user): if self.max_participants and self.active_registration_count >= self.max_participants: return False if self.application_form: - if user.is_authenticated and Registration.objects.filter(user=user, event__id=self.id, status="SELECTED").count(): + if ( + user.is_authenticated + and Registration.objects.filter(user=user, event__id=self.id, status="SELECTED").count() + ): return self.today_within_registration_band() return self.today_within_application_band() return self.today_within_registration_band() @@ -588,8 +635,8 @@ class RegistrationOption(Model): includes_membership = models.BooleanField( default=False, help_text="Does this registration option include DdS membership?" ) - membership_end_year = models.IntegerField( - default=this_year, help_text="If membership is included, until what year is it valid?" + membership_until = models.DateField( + default=end_of_this_year, help_text="If membership is included, last day it is valid (inclusive)" ) max_participants = models.PositiveIntegerField( default=0, @@ -617,7 +664,7 @@ def vat_percentage(self): @property def form_label(self): if self.includes_membership: - membership = " (includes DdS membership through {})".format(self.membership_end_year) + membership = " (includes DdS membership through {})".format(self.membership_until.isoformat()) else: membership = "" if self.has_vat: @@ -827,17 +874,12 @@ def __str__(self): class Certificate(Model): - registration = models.OneToOneField( - Registration, - related_name="certificate", - on_delete=models.CASCADE - ) + registration = models.OneToOneField(Registration, related_name="certificate", on_delete=models.CASCADE) uuid = models.UUIDField(default=uuid.uuid4, editable=False) def pdf(self): url = "https://{}{}".format( - Site.objects.get_current().domain, - reverse("event_certificate_validation", args=(self.uuid,)) + Site.objects.get_current().domain, reverse("event_certificate_validation", args=(self.uuid,)) ) return create_certificate_pdf( attendee_name=self.registration.user.get_full_name(), @@ -848,17 +890,12 @@ def pdf(self): class InvitationLetter(Model): - registration = models.OneToOneField( - Registration, - related_name="invitation", - on_delete=models.CASCADE - ) + registration = models.OneToOneField(Registration, related_name="invitation", on_delete=models.CASCADE) uuid = models.UUIDField(default=uuid.uuid4, editable=False) def pdf(self): url = "https://{}{}".format( - Site.objects.get_current().domain, - reverse("event_invitation_validation", args=(self.uuid,)) + Site.objects.get_current().domain, reverse("event_invitation_validation", args=(self.uuid,)) ) return create_invitation_pdf( attendee_name=self.registration.user.get_full_name(), diff --git a/tests/test_membership_migration.py b/tests/test_membership_migration.py new file mode 100644 index 00000000..e2b93b35 --- /dev/null +++ b/tests/test_membership_migration.py @@ -0,0 +1,63 @@ +"""The data-migration helpers are plain functions in the migration module.""" + +import importlib +from datetime import date + +import pytest +from django.contrib.auth import get_user_model + +from dds_registration.models import Membership, MembershipReminder, OrganizationType, RegistrationOption + +migration = importlib.import_module("dds_registration.migrations.0025_membership_dates_and_organization") + + +def test_until_year_to_date_is_end_of_year(): + assert migration.year_to_until(2026) == date(2026, 12, 31) + + +def test_started_from_paid_date_when_present(): + assert migration.started_from({"paid_date": "2025-03-14"}, 2025) == date(2025, 3, 14) + + +def test_started_from_falls_back_to_jan_1(): + assert migration.started_from({}, 2024) == date(2024, 1, 1) + assert migration.started_from(None, 2024) == date(2024, 1, 1) + + +@pytest.mark.django_db +def test_membership_fields_are_dates_and_organization_defaults_blank(): + user = get_user_model().objects.create_user(username="m@example.com", email="m@example.com", password="x") + membership = Membership.objects.create(user=user) + assert membership.started == date.today() + assert membership.until > membership.started + assert membership.organization == "" + assert membership.organization_type == "" + assert membership.needs_details is True + membership.organization = "ETH" + membership.organization_type = OrganizationType.UNIVERSITY + assert membership.needs_details is False + + +@pytest.mark.django_db +def test_membership_active_compares_dates(): + user = get_user_model().objects.create_user(username="a@example.com", email="a@example.com", password="x") + membership = Membership.objects.create(user=user, until=date.today()) + assert membership.active is True + membership.until = date.today().replace(year=date.today().year - 1) + assert membership.active is False + + +@pytest.mark.django_db +def test_reminder_log_is_unique_per_membership_until_stage(): + from django.db import IntegrityError + + user = get_user_model().objects.create_user(username="r@example.com", email="r@example.com", password="x") + membership = Membership.objects.create(user=user) + MembershipReminder.objects.create(membership=membership, until=membership.until, stage="expiry") + with pytest.raises(IntegrityError): + MembershipReminder.objects.create(membership=membership, until=membership.until, stage="expiry") + + +def test_registration_option_membership_until_default_is_end_of_year(): + option = RegistrationOption() + assert option.membership_until == date(date.today().year, 12, 31) From 89a82ecd6441d6301b97196ae38107651491c229 Mon Sep 17 00:00:00 2001 From: Laurenz Bougan Date: Mon, 26 Oct 2026 19:02:01 +0100 Subject: [PATCH 03/13] refactor: treat membership until as a date everywhere --- dds_registration/admin.py | 16 +++--- dds_registration/core/helpers/create_pdf.py | 3 +- dds_registration/models.py | 12 +++-- .../billing/stripe_payment.html.django | 2 +- .../membership/membership_start.html.django | 2 +- .../dds_registration/profile.html.django | 7 ++- dds_registration/views/billing_stripe.py | 2 +- dds_registration/views/event_registration.py | 26 ++++------ tests/test_mark_paid_membership.py | 51 +++++++++++++++++++ 9 files changed, 89 insertions(+), 32 deletions(-) create mode 100644 tests/test_mark_paid_membership.py diff --git a/dds_registration/admin.py b/dds_registration/admin.py index 1bc6b798..5a20e560 100644 --- a/dds_registration/admin.py +++ b/dds_registration/admin.py @@ -63,9 +63,9 @@ def lookups(self, request, model_admin): def queryset(self, request, queryset): if self.value() == "1": - return queryset.filter(until__gte=date.today().year) + return queryset.filter(until__gte=date.today()) if self.value() == "0": - return queryset.filter(until__lt=date.today().year) + return queryset.filter(until__lt=date.today()) class UserAdmin(BaseUserAdmin): @@ -163,17 +163,20 @@ class MembershipAdmin(admin.ModelAdmin): @admin.action(description="Export all current members to excel") def export_current_member_list(self, request, queryset): - queryset = Membership.objects.filter(until__gte=date.today().year) + queryset = Membership.objects.filter(until__gte=date.today()).select_related("user") df = pd.DataFrame( [ { "email": obj.user.email, "id": obj.user.id, - "name": obj.user.get_full_name(), + "first_name": obj.user.first_name, + "last_name": obj.user.last_name, + "organization": obj.organization, + "organization_type": obj.get_organization_type_display(), "started": obj.started, - "unit": obj.until, + "until": obj.until, "on_mailing_list": obj.mailing_list, - "type": str(obj.membership_type), + "type": obj.get_membership_type_display(), } for obj in queryset ] @@ -190,6 +193,7 @@ def export_current_member_list(self, request, queryset): response["Content-Disposition"] = "attachment; filename=memberships.xlsx" return response + @admin.register(Registration) class RegistrationAdmin(admin.ModelAdmin): readonly_fields = [ diff --git a/dds_registration/core/helpers/create_pdf.py b/dds_registration/core/helpers/create_pdf.py index ed5b7aac..d1fc200b 100644 --- a/dds_registration/core/helpers/create_pdf.py +++ b/dds_registration/core/helpers/create_pdf.py @@ -10,6 +10,7 @@ payment_recipient_address, payment_recipient_name, ) +from ..membership.validity import until_label __all__ = [ "create_invoice_pdf_from_payment", @@ -253,7 +254,7 @@ def get_common_pdf_table_items(payment: Model) -> (list, tuple): ( user.get_full_name(), payment.data["membership"]["label"], - str(payment.data["until"]) + "-12-31", + until_label(payment.data["until"]), payment.data["price"], ), ("", "", "**Total**", payment.data["price"]), diff --git a/dds_registration/models.py b/dds_registration/models.py index 8b637028..442019ae 100644 --- a/dds_registration/models.py +++ b/dds_registration/models.py @@ -210,7 +210,7 @@ class Payment(Model): # "price": option.price, # "currency": option.currency, # "includes_membership": option.includes_membership, - # "membership_end_year": option.membership_end_year, + # "membership_until": option.membership_until.isoformat(), # } data = models.JSONField(help_text="JSON object", default=dict) @@ -246,9 +246,12 @@ def mark_paid(self): if self.data.get("includes_membership"): user = User.objects.get(id=self.data["user"]["id"]) + granted_until = date.fromisoformat( + until_label(self.data.get("membership_until") or self.data.get("membership_end_year")) + ) try: membership = Membership.objects.get(user=user) - membership.until = max(membership.until, self.data["membership_end_year"]) + membership.until = max(membership.until, granted_until) membership.save() except ObjectDoesNotExist: Membership( @@ -256,7 +259,7 @@ def mark_paid(self): membership_type="NORMAL", payment=self, mailing_list=True, - until=self.data["membership_end_year"], + until=granted_until, ).save() if settings.SLACK_PAYMENTS_WEBHOOK: @@ -339,7 +342,8 @@ def email_invoice(self, extra_address: str | None = None): # TODO: Issue #149: To extract these (and all other hardcoded here, in `send_email` methods?) texts to template files, with substiting names, urls and emails from settings or preferences values? if self.data["kind"] == "membership": subject = f"DdS Membership Invoice {self.invoice_no}" - message = f"Thanks for signing up for Départ de Sentier membership! Membership fees allow us to write awesome open source code, deploy open infrastructure, and run community events without spending all our time fundraising.\n\nYour membership will run until December 31st, {user.membership.until} (Don't worry, you will get a reminder to renew for another year :).\n\nPlease find attached the membership invoice. Your membership is not in force until the bank transfer is received.\n\nYou can change your invoice details here: https://events.d-d-s.ch{reverse('membership_application')}.\n\nIf you have any questions, please contact events@d-d-s.ch." + until_text = user.membership.until.strftime("%-d %B %Y") + message = f"Thanks for signing up for Départ de Sentier membership! Membership fees allow us to write awesome open source code, deploy open infrastructure, and run community events without spending all our time fundraising.\n\nYour membership will run until {until_text} (Don't worry, you will get a reminder to renew for another year :).\n\nPlease find attached the membership invoice. Your membership is not in force until the bank transfer is received.\n\nYou can change your invoice details here: https://events.d-d-s.ch{reverse('membership_application')}.\n\nIf you have any questions, please contact events@d-d-s.ch." else: event = Event.objects.get(id=self.data["event"]["id"]) subject = f"DdS Event {event.title} Registration Invoice {self.invoice_no}" diff --git a/dds_registration/templates/dds_registration/billing/stripe_payment.html.django b/dds_registration/templates/dds_registration/billing/stripe_payment.html.django index b3d44673..ec88f23e 100644 --- a/dds_registration/templates/dds_registration/billing/stripe_payment.html.django +++ b/dds_registration/templates/dds_registration/billing/stripe_payment.html.django @@ -27,7 +27,7 @@ {% include "assets/render-messages/render-messages.django" %} -

Payment of {% if payment.data.stripe_charge_in_progress %}{{ payment.data.stripe_charge_in_progress }}{% else %}{{ payment.data.price }}{% endif %} {{ payment.currency_label }} for {% if payment.data.kind == "membership" %}Départ de Sentier membership valid until December 31st, {{ year }}{% else %}{{ payment.data.event.title }} ({{ payment.data.option.item }}){% endif %}.

+

Payment of {% if payment.data.stripe_charge_in_progress %}{{ payment.data.stripe_charge_in_progress }}{% else %}{{ payment.data.price }}{% endif %} {{ payment.currency_label }} for {% if payment.data.kind == "membership" %}Départ de Sentier membership valid until {{ until|date:"j F Y" }}{% else %}{{ payment.data.event.title }} ({{ payment.data.option.item }}){% endif %}.

diff --git a/dds_registration/templates/dds_registration/membership/membership_start.html.django b/dds_registration/templates/dds_registration/membership/membership_start.html.django index d383d48d..221d32d8 100644 --- a/dds_registration/templates/dds_registration/membership/membership_start.html.django +++ b/dds_registration/templates/dds_registration/membership/membership_start.html.django @@ -22,7 +22,7 @@ {% include "assets/render-messages/render-messages.django" %} -

Membership in the Départ de Sentier association means you have an equal vote in all decisions, the right to propose agenda items at the General or Extraordinary Assemblies, and can vote on or even run for the board. You can read more about membership or the DdS governing rules in our legal statutes, available in English and German. Membership is by calendar year, i.e. from January 1st to December 31st.

+

Membership in the Départ de Sentier association means you have an equal vote in all decisions, the right to propose agenda items at the General or Extraordinary Assemblies, and can vote on or even run for the board. You can read more about membership or the DdS governing rules in our legal statutes, available in English and German. Membership runs for one year from the day you join; renewing early adds a year to your current end date.

{% csrf_token %} diff --git a/dds_registration/templates/dds_registration/profile.html.django b/dds_registration/templates/dds_registration/profile.html.django index 79b49d12..b2e5acea 100644 --- a/dds_registration/templates/dds_registration/profile.html.django +++ b/dds_registration/templates/dds_registration/profile.html.django @@ -47,7 +47,12 @@ {% with membership=user.membership %} {% if user.is_member %} -

Member from {{ membership.started }} until December 31, {{ membership.until }}. Membership type: {{ membership.get_membership_type_display }}.

+

Member since {{ membership.started|date:"j F Y" }}, valid until {{ membership.until|date:"j F Y" }}. Membership type: {{ membership.get_membership_type_display }}.

+ {% if membership.organization %} +

Organization: {{ membership.organization }} ({{ membership.get_organization_type_display }}). Edit

+ {% else %} + + {% endif %} {% else %}

Not yet a DdS member. Apply for membership.

{% endif %} diff --git a/dds_registration/views/billing_stripe.py b/dds_registration/views/billing_stripe.py index 6f8f3d59..8b468a6c 100644 --- a/dds_registration/views/billing_stripe.py +++ b/dds_registration/views/billing_stripe.py @@ -58,7 +58,7 @@ def payment_stripe(request: HttpRequest, payment_id: int): context={ "client_secret": stripe_intent.client_secret, "payment": payment, - "year": membership.until if membership else "", + "until": membership.until if membership else "", "site": get_current_site(request), "scheme": "https" if request.is_secure() else "http", }, diff --git a/dds_registration/views/event_registration.py b/dds_registration/views/event_registration.py index 355bef51..d10f840c 100644 --- a/dds_registration/views/event_registration.py +++ b/dds_registration/views/event_registration.py @@ -23,11 +23,10 @@ def event_certificate(request: HttpRequest, event_code: str) -> HttpResponse: if not event.has_certificate or not registration: raise Http404 - response = HttpResponse( - content=bytes(registration.get_certificate().output()), - content_type="application/pdf" + response = HttpResponse(content=bytes(registration.get_certificate().output()), content_type="application/pdf") + response["Content-Disposition"] = ( + f'attachment; filename="DdS event certificate {registration.certificate.uuid}.pdf"' ) - response["Content-Disposition"] = f'attachment; filename="DdS event certificate {registration.certificate.uuid}.pdf"' return response @@ -37,10 +36,7 @@ def event_certificate_validation(request: HttpRequest, certificate_code: str) -> except ObjectDoesNotExist: raise Http404 - response = HttpResponse( - content=bytes(certificate.pdf().output()), - content_type="application/pdf" - ) + response = HttpResponse(content=bytes(certificate.pdf().output()), content_type="application/pdf") response["Content-Disposition"] = f'attachment; filename="DdS event certificate {certificate.uuid}.pdf"' return response @@ -57,11 +53,10 @@ def event_invitation(request: HttpRequest, event_code: str) -> HttpResponse: if not event.has_invitation or not registration: raise Http404 - response = HttpResponse( - content=bytes(registration.get_invitation().output()), - content_type="application/pdf" + response = HttpResponse(content=bytes(registration.get_invitation().output()), content_type="application/pdf") + response["Content-Disposition"] = ( + f'attachment; filename="DdS Letter of Invitation {registration.invitation.uuid}.pdf"' ) - response["Content-Disposition"] = f'attachment; filename="DdS Letter of Invitation {registration.invitation.uuid}.pdf"' return response @@ -71,10 +66,7 @@ def event_invitation_validation(request: HttpRequest, invitation_code: str) -> H except ObjectDoesNotExist: raise Http404 - response = HttpResponse( - content=bytes(letter.pdf().output()), - content_type="application/pdf" - ) + response = HttpResponse(content=bytes(letter.pdf().output()), content_type="application/pdf") response["Content-Disposition"] = f'attachment; filename="DdS Letter of Invitation {letter.uuid}.pdf"' return response @@ -210,7 +202,7 @@ def event_registration(request: HttpRequest, event_code: str): "net_price": option.net_price(), "currency": option.currency, "includes_membership": option.includes_membership, - "membership_end_year": option.membership_end_year, + "membership_until": option.membership_until.isoformat(), }, ) payment.save() diff --git a/tests/test_mark_paid_membership.py b/tests/test_mark_paid_membership.py new file mode 100644 index 00000000..ce56c6d5 --- /dev/null +++ b/tests/test_mark_paid_membership.py @@ -0,0 +1,51 @@ +from datetime import date +from unittest import mock + +import pytest +from django.contrib.auth import get_user_model + +from dds_registration.models import Membership, Payment + + +def make_user(email="p@example.com"): + return get_user_model().objects.create_user(username=email, email=email, password="x") + + +def event_payment(user, **membership_keys): + data = { + "kind": "event", + "user": {"id": user.id, "name": "P", "address": ""}, + "event": {"id": 1, "title": "Spring School"}, + "option": {"item": "Ticket"}, + "price": 100, + "currency": "EUR", + "method": "INVOICE", + "includes_membership": True, + } + data.update(membership_keys) + return Payment.objects.create(status="ISSUED", data=data) + + +@pytest.mark.django_db +@mock.patch("dds_registration.models.Payment.email_receipt") +def test_mark_paid_creates_membership_from_new_date_key(_receipt): + user = make_user() + event_payment(user, membership_until="2027-06-30").mark_paid() + assert Membership.objects.get(user=user).until == date(2027, 6, 30) + + +@pytest.mark.django_db +@mock.patch("dds_registration.models.Payment.email_receipt") +def test_mark_paid_accepts_legacy_year_key(_receipt): + user = make_user() + event_payment(user, membership_end_year=2027).mark_paid() + assert Membership.objects.get(user=user).until == date(2027, 12, 31) + + +@pytest.mark.django_db +@mock.patch("dds_registration.models.Payment.email_receipt") +def test_mark_paid_never_shortens_an_existing_membership(_receipt): + user = make_user() + Membership.objects.create(user=user, until=date(2028, 1, 1)) + event_payment(user, membership_until="2027-06-30").mark_paid() + assert Membership.objects.get(user=user).until == date(2028, 1, 1) From e23adb6ad4c2b482b631d70b2d062a71ab7af491 Mon Sep 17 00:00:00 2001 From: Laurenz Bougan Date: Mon, 26 Oct 2026 19:02:59 +0100 Subject: [PATCH 04/13] feat: member names, organization and dates in membership admin --- dds_registration/admin.py | 64 +++++++++++++++++++---- pyproject.toml | 1 + tests/test_membership_admin.py | 94 ++++++++++++++++++++++++++++++++++ 3 files changed, 148 insertions(+), 11 deletions(-) create mode 100644 tests/test_membership_admin.py diff --git a/dds_registration/admin.py b/dds_registration/admin.py index 5a20e560..f04747d0 100644 --- a/dds_registration/admin.py +++ b/dds_registration/admin.py @@ -18,6 +18,7 @@ from .models import ( Event, Membership, + MembershipReminder, Message, Payment, Registration, @@ -139,28 +140,69 @@ def email_selected_users(self, request, queryset): # mailing_list = models.BooleanField(default=False) +class MembershipReminderInline(admin.TabularInline): + model = MembershipReminder + extra = 0 + can_delete = False + readonly_fields = ["until", "stage", "sent_at"] + + def has_add_permission(self, request, obj=None): + return False + + @admin.register(Membership) class MembershipAdmin(admin.ModelAdmin): fieldsets = ( - (None, {"fields": ("user", "membership_type")}), + ("Member", {"fields": ("user", "membership_type", "organization", "organization_type")}), ("Validity", {"fields": ("started", "until")}), ("Communication", {"fields": ("mailing_list",)}), ) - + inlines = [MembershipReminderInline] list_display = [ - "user", - "started", - "until", - # "paid", - "active", + "full_name", + "last_name", + "first_name", + "email", + "organization", + "organization_type", "membership_type", + "started_iso", + "until_iso", + "active", ] - search_fields = [ - "user__username", - ] - list_filter = [IsActiveFilter, "membership_type"] + list_select_related = ["user"] + search_fields = ["user__email", "user__first_name", "user__last_name", "organization"] + list_filter = [IsActiveFilter, "membership_type", "organization_type"] actions = ["export_current_member_list"] + @admin.display(description="Name", ordering="user__last_name") + def full_name(self, obj): + return obj.user.get_full_name() or obj.user.email + + @admin.display(description="Last name", ordering="user__last_name") + def last_name(self, obj): + return obj.user.last_name + + @admin.display(description="First name", ordering="user__first_name") + def first_name(self, obj): + return obj.user.first_name + + @admin.display(description="Email", ordering="user__email") + def email(self, obj): + return obj.user.email + + @admin.display(description="Started", ordering="started") + def started_iso(self, obj): + return obj.started.isoformat() + + @admin.display(description="Until", ordering="until") + def until_iso(self, obj): + return obj.until.isoformat() + + @admin.display(description="Active", boolean=True, ordering="until") + def active(self, obj): + return obj.active + @admin.action(description="Export all current members to excel") def export_current_member_list(self, request, queryset): queryset = Membership.objects.filter(until__gte=date.today()).select_related("user") diff --git a/pyproject.toml b/pyproject.toml index 6f573033..346cf443 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -76,6 +76,7 @@ tracker = "https://github.com/Depart-de-Sentier/dds_registration/issues" # seems to work, at least for now testing = [ "dds_registration", + "openpyxl", # read back the xlsx export in tests "pytest", "pytest-cov", "pytest-django", diff --git a/tests/test_membership_admin.py b/tests/test_membership_admin.py new file mode 100644 index 00000000..9390aa15 --- /dev/null +++ b/tests/test_membership_admin.py @@ -0,0 +1,94 @@ +from datetime import date +from io import BytesIO + +import pandas as pd +import pytest +from django.urls import reverse + +from dds_registration.models import Membership, OrganizationType + + +@pytest.fixture +def admin_client(client, django_user_model): + admin = django_user_model.objects.create_superuser( + username="adm@example.com", email="adm@example.com", password="x" + ) + client.force_login(admin) + return client + + +@pytest.fixture +def members(django_user_model): + out = [] + for first, last, org in [("Ada", "Lovelace", "ETH"), ("Bo", "Weidema", "2.-0 LCA")]: + user = django_user_model.objects.create_user( + username=f"{first}@example.com", + email=f"{first}@example.com", + password="x", + first_name=first, + last_name=last, + ) + out.append( + Membership.objects.create( + user=user, + organization=org, + organization_type=OrganizationType.UNIVERSITY if first == "Ada" else OrganizationType.CONSULTANCY, + started=date(2025, 3, 1), + until=date(2026, 12, 31), + ) + ) + return out + + +CHANGELIST = "admin:dds_registration_membership_changelist" + + +@pytest.mark.django_db +def test_changelist_shows_names_and_organization(admin_client, members): + body = admin_client.get(reverse(CHANGELIST)).content.decode() + for text in [ + "Lovelace", + "Ada", + "ETH", + "University", + "Weidema", + "2.-0 LCA", + "Consultancy", + "2025-03-01", + "2026-12-31", + ]: + assert text in body + + +@pytest.mark.django_db +def test_changelist_sorts_by_last_name(admin_client, members): + body = admin_client.get(reverse(CHANGELIST) + "?o=-2").content.decode() + assert body.index("Weidema") < body.index("Lovelace") + + +@pytest.mark.django_db +def test_search_by_organization(admin_client, members): + body = admin_client.get(reverse(CHANGELIST) + "?q=ETH").content.decode() + assert "Lovelace" in body and "Weidema" not in body + + +@pytest.mark.django_db +def test_export_contains_new_columns(admin_client, members): + response = admin_client.post( + reverse(CHANGELIST), + {"action": "export_current_member_list", "_selected_action": [m.pk for m in members]}, + ) + df = pd.read_excel(BytesIO(response.content)) + assert list(df.columns) == [ + "email", + "id", + "first_name", + "last_name", + "organization", + "organization_type", + "started", + "until", + "on_mailing_list", + "type", + ] + assert set(df["organization"]) == {"ETH", "2.-0 LCA"} From b8dfbf52006554e3be4430f8186460892e79ee06 Mon Sep 17 00:00:00 2001 From: Laurenz Bougan Date: Mon, 26 Oct 2026 19:04:04 +0100 Subject: [PATCH 05/13] feat: organization on membership form, rolling-year renewal window --- dds_registration/forms.py | 27 ++++- dds_registration/settings.py | 3 + dds_registration/urls/membership_urls.py | 9 +- dds_registration/views/membership.py | 148 ++++++++--------------- tests/test_membership_form.py | 90 ++++++++++++++ 5 files changed, 174 insertions(+), 103 deletions(-) create mode 100644 tests/test_membership_form.py diff --git a/dds_registration/forms.py b/dds_registration/forms.py index 66cac789..d70c8a02 100644 --- a/dds_registration/forms.py +++ b/dds_registration/forms.py @@ -8,7 +8,7 @@ from django_registration.forms import RegistrationForm as BaseRegistrationForm from prettyjson import PrettyJSONWidget -from .models import MEMBERSHIP_DATA, Event, Payment, RegistrationOption, User +from .models import MEMBERSHIP_DATA, Event, Membership, OrganizationType, Payment, RegistrationOption, User # A text field to use in those TextField's which don't require large texts, but can use one-line text inputs textInputWidget = forms.TextInput(attrs={"class": "vLargeTextField"}) @@ -35,6 +35,18 @@ class MembershipForm(forms.Form): required=True, label="Membership type", ) + organization = forms.CharField( + label="Organization", + max_length=200, + widget=textInputWidget, + required=True, + help_text="University, company, institute, or 'Independent'.", + ) + organization_type = forms.ChoiceField( + choices=[("", "---------")] + list(OrganizationType.choices), + required=True, + label="Type of organization", + ) payment_method = forms.ChoiceField( choices=Payment.METHODS, required=True, @@ -229,3 +241,16 @@ def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) self.fields["first_name"].required = True self.fields["last_name"].required = True + + +class MembershipDetailsForm(ModelForm): + class Meta: + model = Membership + fields = ["organization", "organization_type"] + widgets = {"organization": textInputWidget} + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.fields["organization"].required = True + self.fields["organization_type"].required = True + self.fields["organization_type"].choices = [("", "---------")] + list(OrganizationType.choices) diff --git a/dds_registration/settings.py b/dds_registration/settings.py index eb4980ea..cf73a128 100644 --- a/dds_registration/settings.py +++ b/dds_registration/settings.py @@ -313,6 +313,9 @@ def random_string(length: int = 32) -> str: # Site config # TODO: Use `Site.objects.get_current().name` (via `from django.contrib.sites.models import Site`) as site title. +# Members may renew this many days before their membership ends. +MEMBERSHIP_RENEWAL_WINDOW_DAYS = 60 + SITE_NAME = "Départ de Sentier Events and Membership Portal" SITE_TITLE = SITE_NAME # TODO: Issue #40: Add proper site description and keywords... diff --git a/dds_registration/urls/membership_urls.py b/dds_registration/urls/membership_urls.py index 9394bc7c..3eb163e8 100644 --- a/dds_registration/urls/membership_urls.py +++ b/dds_registration/urls/membership_urls.py @@ -1,11 +1,8 @@ from django.urls import path -from ..views.membership import membership_application +from ..views.membership import membership_application, membership_details urlpatterns = [ - path( - "membership/apply", - membership_application, - name="membership_application", - ), + path("membership/apply", membership_application, name="membership_application"), + path("membership/details", membership_details, name="membership_details"), ] diff --git a/dds_registration/views/membership.py b/dds_registration/views/membership.py index b67625a1..ae8d3200 100644 --- a/dds_registration/views/membership.py +++ b/dds_registration/views/membership.py @@ -1,39 +1,38 @@ from datetime import date +from django.conf import settings from django.contrib import messages -from django.core.exceptions import ObjectDoesNotExist +from django.contrib.auth.decorators import login_required from django.http import HttpRequest -from django.shortcuts import redirect, render +from django.shortcuts import get_object_or_404, redirect, render -from ..core.helpers.dates import this_year -from ..forms import MembershipForm +from ..core.membership.validity import renewal_until, within_renewal_window +from ..forms import MembershipDetailsForm, MembershipForm from ..models import MEMBERSHIP_DATA, Membership, Payment def membership_application(request: HttpRequest): - if not request.user: + if not request.user or not request.user.is_authenticated: messages.error(request, "You have to have an account before you can register for membership") return redirect("login") - if not request.user.is_authenticated: - messages.error(request, "You have to authenticate your account before you can register for membership") - return redirect("login") - try: - membership = Membership.objects.get(user=request.user) - if membership.active: - messages.error(request, "You are already a DdS member") - return redirect("profile") - except ObjectDoesNotExist: - pass + membership = Membership.objects.filter(user=request.user).first() + today = date.today() + current_until = membership.until if membership else None + if not within_renewal_window(current_until, today, settings.MEMBERSHIP_RENEWAL_WINDOW_DAYS): + messages.error( + request, + f"Your membership is valid until {current_until:%-d %B %Y}; renewal opens " + f"{settings.MEMBERSHIP_RENEWAL_WINDOW_DAYS} days before that.", + ) + return redirect("profile") if request.method == "POST": form = MembershipForm(request.POST) if form.is_valid(): - today = date.today() - september = date(year=today.year, month=9, day=15) - until = today.year if today < september else today.year + 1 - + until = renewal_until(current_until, today) + membership_type = form.cleaned_data["membership_type"] payment = Payment( status="CREATED", data={ @@ -45,32 +44,28 @@ def membership_application(request: HttpRequest): "extra": form.cleaned_data["extra"], "kind": "membership", "membership": { - "type": form.cleaned_data["membership_type"], - "label": MEMBERSHIP_DATA[form.cleaned_data["membership_type"]]["label"], + "type": membership_type, + "label": MEMBERSHIP_DATA[membership_type]["label"], + "organization": form.cleaned_data["organization"], + "organization_type": form.cleaned_data["organization_type"], }, "method": form.cleaned_data["payment_method"], - "price": MEMBERSHIP_DATA[form.cleaned_data["membership_type"]]["price"], - "currency": MEMBERSHIP_DATA[form.cleaned_data["membership_type"]]["currency"], - "until": until, + "price": MEMBERSHIP_DATA[membership_type]["price"], + "currency": MEMBERSHIP_DATA[membership_type]["currency"], + "until": until.isoformat(), }, ) payment.save() - try: - membership = Membership.objects.get(user=request.user) - membership.mailing_list = form.cleaned_data["mailing_list"] - membership.membership_type = form.cleaned_data["membership_type"] - membership.until = until - membership.payment = payment - membership.save() - except ObjectDoesNotExist: - membership = Membership( - user=request.user, - membership_type=form.cleaned_data["membership_type"], - payment=payment, - mailing_list=form.cleaned_data["mailing_list"], - ) - membership.save() + if membership is None: + membership = Membership(user=request.user, started=today) + membership.mailing_list = form.cleaned_data["mailing_list"] + membership.membership_type = membership_type + membership.organization = form.cleaned_data["organization"] + membership.organization_type = form.cleaned_data["organization_type"] + membership.until = until + membership.payment = payment + membership.save() if payment.data["method"] == "INVOICE": payment.status = "ISSUED" @@ -89,6 +84,8 @@ def membership_application(request: HttpRequest): "name": request.user.get_full_name(), "address": request.user.address, "extra": "", + "organization": membership.organization if membership else "", + "organization_type": membership.organization_type if membership else "", } ) @@ -99,60 +96,19 @@ def membership_application(request: HttpRequest): ) -# @login_required -# def membership_proceed_success(request: HttpRequest): -# context = { -# "action": "membership_proceed_success", -# } -# return render(request, "dds_registration/membership/membership_test.html.django", context) - - -# def send_membership_registration_success_message(request: HttpRequest): -# """ -# Send successful membership registration message to the user - -# TODO: Send different messages depending on the `payment_method`? -# """ - -# email_body_template = "dds_registration/membership/membership_registration_new_success_message_body.txt" -# email_subject_template = "dds_registration/membership/membership_registration_new_success_message_subject.txt" - -# user = request.user - -# context = get_membership_invoice_context(request) - -# invoice = context.get("invoice") - -# try: -# subject = render_to_string( -# template_name=email_subject_template, -# context=context, -# request=request, -# ) -# subject = " ".join(subject.splitlines()).strip() -# body = render_to_string( -# template_name=email_body_template, -# context=context, -# request=request, -# ) - -# if invoice.payment_method == "INVOICE" and invoice.status in ("ISSUED", "CREATED"): -# user.email_user( -# subject=subject, -# message=body, -# attachment_content=create_invoice_pdf(context), -# attachment_name="DdS Membership Invoice {}.pdf".format(user.get_full_name()), -# ) -# invoice.status = "ISSUED" -# invoice.save() -# else: -# user.email_user(subject=subject, message=body) -# except Exception as err: -# sError = errorToString(err, show_stacktrace=False) -# sTraceback = str(traceback.format_exc()) -# debug_data = { -# "err": err, -# "traceback": sTraceback, -# } -# LOG.error("Caught error %s (re-raising): %s", sError, debug_data) -# raise err +@login_required +def membership_details(request: HttpRequest): + membership = get_object_or_404(Membership, user=request.user) + if request.method == "POST": + form = MembershipDetailsForm(request.POST, instance=membership) + if form.is_valid(): + form.save() + messages.success(request, "Thanks, your membership record is complete.") + return redirect("profile") + else: + form = MembershipDetailsForm(instance=membership) + return render( + request=request, + template_name="dds_registration/membership/membership_details.html.django", + context={"form": form, "membership": membership}, + ) diff --git a/tests/test_membership_form.py b/tests/test_membership_form.py new file mode 100644 index 00000000..803d48df --- /dev/null +++ b/tests/test_membership_form.py @@ -0,0 +1,90 @@ +from datetime import date, timedelta +from unittest import mock + +import pytest +from django.urls import reverse + +from dds_registration.forms import MembershipForm +from dds_registration.models import Membership, OrganizationType + + +def form_data(**overrides): + data = { + "name": "Ada Lovelace", + "address": "Zurich", + "extra": "", + "membership_type": "NORMAL", + "payment_method": "INVOICE", + "mailing_list": "on", + "organization": "ETH", + "organization_type": "UNIVERSITY", + } + data.update(overrides) + return data + + +def test_organization_is_required(): + form = MembershipForm(form_data(organization="")) + assert not form.is_valid() + assert "organization" in form.errors + + +def test_organization_type_is_required(): + form = MembershipForm(form_data(organization_type="")) + assert not form.is_valid() + assert "organization_type" in form.errors + + +@pytest.fixture +def user(django_user_model): + return django_user_model.objects.create_user( + username="ada@example.com", email="ada@example.com", password="x", first_name="Ada", last_name="Lovelace" + ) + + +@pytest.mark.django_db +@mock.patch("dds_registration.models.Payment.email_invoice") +def test_new_member_gets_one_year_and_organization_stored(_invoice, client, user): + client.force_login(user) + response = client.post(reverse("membership_application"), form_data()) + assert response.status_code == 302 + membership = Membership.objects.get(user=user) + assert membership.started == date.today() + assert membership.until == date.today().replace(year=date.today().year + 1) + assert membership.organization == "ETH" + assert membership.organization_type == OrganizationType.UNIVERSITY + assert membership.payment.data["until"] == membership.until.isoformat() + assert membership.payment.data["membership"]["organization"] == "ETH" + + +@pytest.mark.django_db +def test_active_member_outside_window_is_refused(client, user): + Membership.objects.create(user=user, until=date.today() + timedelta(days=200)) + client.force_login(user) + response = client.get(reverse("membership_application")) + assert response.status_code == 302 + assert response["Location"] == reverse("profile") + + +@pytest.mark.django_db +@mock.patch("dds_registration.models.Payment.email_invoice") +def test_active_member_inside_window_renews_from_current_end(_invoice, client, user): + current_until = date.today() + timedelta(days=30) + Membership.objects.create(user=user, until=current_until, started=date(2024, 5, 5)) + client.force_login(user) + response = client.post(reverse("membership_application"), form_data()) + assert response.status_code == 302 + membership = Membership.objects.get(user=user) + assert membership.until == current_until.replace(year=current_until.year + 1) + assert membership.started == date(2024, 5, 5) + + +@pytest.mark.django_db +def test_form_prefilled_from_existing_membership(client, user): + Membership.objects.create( + user=user, until=date.today() - timedelta(days=1), organization="ETH", organization_type="UNIVERSITY" + ) + client.force_login(user) + response = client.get(reverse("membership_application")) + assert response.status_code == 200 + assert response.context["form"].initial["organization"] == "ETH" From 96180e27b4cacd4a44c1739e3ce0c08b6c2ef6d0 Mon Sep 17 00:00:00 2001 From: Laurenz Bougan Date: Mon, 26 Oct 2026 19:05:01 +0100 Subject: [PATCH 06/13] feat: membership details form and backfill middleware --- .../middleware/MembershipDetailsMiddleware.py | 41 +++++++++++ dds_registration/settings.py | 1 + .../membership/membership_details.html.django | 29 ++++++++ tests/test_membership_details_middleware.py | 70 +++++++++++++++++++ 4 files changed, 141 insertions(+) create mode 100644 dds_registration/middleware/MembershipDetailsMiddleware.py create mode 100644 dds_registration/templates/dds_registration/membership/membership_details.html.django create mode 100644 tests/test_membership_details_middleware.py diff --git a/dds_registration/middleware/MembershipDetailsMiddleware.py b/dds_registration/middleware/MembershipDetailsMiddleware.py new file mode 100644 index 00000000..46b4c936 --- /dev/null +++ b/dds_registration/middleware/MembershipDetailsMiddleware.py @@ -0,0 +1,41 @@ +"""Send members with an incomplete membership record to the details form.""" + +from django.contrib import messages +from django.shortcuts import redirect +from django.urls import reverse + +from ..models import Membership + +EXEMPT_PREFIXES = ( + "/admin/", + "/accounts/", + "/dashboards/", + "/static/", + "/media/", + "/payments/", + "/membership/", + "/hijack/", + "/captcha/", + "/robots.txt", +) + + +class MembershipDetailsMiddleware: + def __init__(self, get_response): + self.get_response = get_response + + def __call__(self, request): + if self._needs_redirect(request): + messages.info(request, "Please tell us your organization to complete your membership record.") + return redirect(reverse("membership_details")) + return self.get_response(request) + + @staticmethod + def _needs_redirect(request) -> bool: + user = getattr(request, "user", None) + if user is None or not user.is_authenticated or user.is_staff: + return False + if request.path.startswith(EXEMPT_PREFIXES): + return False + membership = Membership.objects.filter(user=user).only("organization", "organization_type").first() + return bool(membership and membership.needs_details) diff --git a/dds_registration/settings.py b/dds_registration/settings.py index cf73a128..641cb95b 100644 --- a/dds_registration/settings.py +++ b/dds_registration/settings.py @@ -187,6 +187,7 @@ def random_string(length: int = 32) -> str: "django.contrib.messages.middleware.MessageMiddleware", "django.middleware.clickjacking.XFrameOptionsMiddleware", "hijack.middleware.HijackUserMiddleware", + APP_NAME + ".middleware.MembershipDetailsMiddleware.MembershipDetailsMiddleware", APP_NAME + ".middleware.BeautifulMiddleware.BeautifulMiddleware", # Html content prettifier ] diff --git a/dds_registration/templates/dds_registration/membership/membership_details.html.django b/dds_registration/templates/dds_registration/membership/membership_details.html.django new file mode 100644 index 00000000..f1320633 --- /dev/null +++ b/dds_registration/templates/dds_registration/membership/membership_details.html.django @@ -0,0 +1,29 @@ +{% extends "base-regular.html.django" %} + +{% load crispy_forms_tags %} + +{% block title %}Membership details — {{ block.super }}{% endblock title %} + +{% block content %} +{{ block.super }} + +
+ +

Your membership details

+
+
+ +{% include "assets/render-messages/render-messages.django" %} + +

Please tell us which organization you belong to. We use this to understand who our members are; it is never shared outside the association.

+ + + {% csrf_token %} + {{ form|crispy }} + +
+ +
+ + +{% endblock content %} diff --git a/tests/test_membership_details_middleware.py b/tests/test_membership_details_middleware.py new file mode 100644 index 00000000..7a3c8eba --- /dev/null +++ b/tests/test_membership_details_middleware.py @@ -0,0 +1,70 @@ +from datetime import date + +import pytest +from django.urls import reverse + +from dds_registration.models import Membership + + +@pytest.fixture +def member(django_user_model): + user = django_user_model.objects.create_user(username="m@example.com", email="m@example.com", password="x") + Membership.objects.create(user=user, until=date.today()) # inside the renewal window + return user + + +@pytest.mark.django_db +def test_member_without_details_is_redirected_from_profile(client, member): + client.force_login(member) + response = client.get(reverse("profile")) + assert response.status_code == 302 + assert response["Location"] == reverse("membership_details") + + +@pytest.mark.django_db +def test_details_page_itself_and_apply_page_are_reachable(client, member): + client.force_login(member) + assert client.get(reverse("membership_details")).status_code == 200 + assert client.get(reverse("membership_application")).status_code == 200 + + +@pytest.mark.django_db +def test_sso_gateway_is_never_redirected(client, member): + client.force_login(member) + response = client.get(reverse("dashboard_auth", args=["somekey"])) + assert response.status_code in (200, 403) + + +@pytest.mark.django_db +def test_user_without_membership_is_not_redirected(client, django_user_model): + user = django_user_model.objects.create_user(username="n@example.com", email="n@example.com", password="x") + client.force_login(user) + assert client.get(reverse("profile")).status_code == 200 + + +@pytest.mark.django_db +def test_staff_is_not_redirected(client, django_user_model): + staff = django_user_model.objects.create_user( + username="s@example.com", email="s@example.com", password="x", is_staff=True + ) + Membership.objects.create(user=staff) + client.force_login(staff) + assert client.get(reverse("profile")).status_code == 200 + + +@pytest.mark.django_db +def test_posting_details_clears_the_redirect(client, member): + client.force_login(member) + response = client.post(reverse("membership_details"), {"organization": "ETH", "organization_type": "UNIVERSITY"}) + assert response.status_code == 302 + assert response["Location"] == reverse("profile") + assert Membership.objects.get(user=member).organization == "ETH" + assert client.get(reverse("profile")).status_code == 200 + + +@pytest.mark.django_db +def test_profile_links_to_details_when_filled(client, member): + Membership.objects.filter(user=member).update(organization="ETH", organization_type="UNIVERSITY") + client.force_login(member) + body = client.get(reverse("profile")).content.decode() + assert "ETH" in body and reverse("membership_details") in body From dec9ca295baa11f8b595eb351cd1a5a7abc30daa Mon Sep 17 00:00:00 2001 From: Laurenz Bougan Date: Mon, 26 Oct 2026 19:05:48 +0100 Subject: [PATCH 07/13] feat: renewal reminder selection and email --- dds_registration/core/membership/reminders.py | 93 +++++++++++++++ .../membership/reminder/body.txt | 14 +++ .../membership/reminder/subject.txt | 1 + tests/test_membership_reminders.py | 112 ++++++++++++++++++ 4 files changed, 220 insertions(+) create mode 100644 dds_registration/core/membership/reminders.py create mode 100644 dds_registration/templates/dds_registration/membership/reminder/body.txt create mode 100644 dds_registration/templates/dds_registration/membership/reminder/subject.txt create mode 100644 tests/test_membership_reminders.py diff --git a/dds_registration/core/membership/reminders.py b/dds_registration/core/membership/reminders.py new file mode 100644 index 00000000..ac92ae57 --- /dev/null +++ b/dds_registration/core/membership/reminders.py @@ -0,0 +1,93 @@ +"""Which members get a renewal reminder today, and sending one. + +Stages fire at fixed offsets from the membership end date. For a given member only +the latest stage that is already due is considered, so a backlog never produces a +burst of stale emails. Each send is logged in ``MembershipReminder`` keyed on the +end date it was about, which keeps sends idempotent and lets next year's cycle start +clean once the end date moves. +""" + +from datetime import date, timedelta +from typing import Iterator + +from django.template.loader import render_to_string +from loguru import logger + +from ...models import Membership, MembershipReminder +from ..helpers.email import send_email + +STAGES = ( + ("before_60", -60), + ("before_30", -30), + ("expiry", 0), + ("after_30", 30), + ("after_60", 60), +) +WINDOW_DAYS = 60 +PENDING_PAYMENT_STATUSES = ("CREATED", "ISSUED") +RENEW_URL = "https://events.d-d-s.ch/membership/apply" +SUBJECT_TEMPLATE = "dds_registration/membership/reminder/subject.txt" +BODY_TEMPLATE = "dds_registration/membership/reminder/body.txt" + + +def stage_due(until: date, today: date) -> str | None: + """Latest stage whose fire date is on or before ``today``; None when nothing is due yet.""" + due = None + for name, offset in STAGES: + if until + timedelta(days=offset) <= today: + due = name + return due + + +def _has_pending_renewal(membership: Membership) -> bool: + """A renewal invoice is already out: issued within this end date's reminder window, unpaid.""" + payment = membership.payment + return bool( + payment + and payment.status in PENDING_PAYMENT_STATUSES + and payment.data.get("kind") == "membership" + and payment.created >= membership.until - timedelta(days=WINDOW_DAYS) + ) + + +def due_reminders(today: date) -> Iterator[tuple[Membership, str]]: + """Yield ``(membership, stage)`` pairs that should be emailed today.""" + window = ( + Membership.objects.filter( + until__gte=today - timedelta(days=WINDOW_DAYS), + until__lte=today + timedelta(days=WINDOW_DAYS), + ) + .exclude(membership_type="HONORARY") + .select_related("user", "payment") + .order_by("until", "pk") + ) + for membership in window: + stage = stage_due(membership.until, today) + if stage is None or _has_pending_renewal(membership): + continue + if MembershipReminder.objects.filter(membership=membership, until=membership.until, stage=stage).exists(): + continue + yield membership, stage + + +def send_reminder(membership_id: int, until: date, stage: str, today: date | None = None) -> bool: + """Render and send one reminder; return False when it was already sent.""" + today = today or date.today() + membership = Membership.objects.select_related("user").get(pk=membership_id) + if MembershipReminder.objects.filter(membership=membership, until=until, stage=stage).exists(): + return False + context = { + "user": membership.user, + "membership": membership, + "until": until, + "stage": stage, + "days_left": (until - today).days, + "expired": until < today, + "renew_url": RENEW_URL, + } + subject = " ".join(render_to_string(SUBJECT_TEMPLATE, context).split()) + body = render_to_string(BODY_TEMPLATE, context) + send_email(recipient_address=membership.user.email, subject=subject, message=body) + MembershipReminder.objects.create(membership=membership, until=until, stage=stage) + logger.info("Membership reminder {} sent to {}", stage, membership.user.email) + return True diff --git a/dds_registration/templates/dds_registration/membership/reminder/body.txt b/dds_registration/templates/dds_registration/membership/reminder/body.txt new file mode 100644 index 00000000..fadd8018 --- /dev/null +++ b/dds_registration/templates/dds_registration/membership/reminder/body.txt @@ -0,0 +1,14 @@ +{% autoescape off %}Dear {{ user.first_name|default:user.email }}, + +Thank you for being a member of Départ de Sentier. {% if expired %}Your membership expired on {{ until|date:"j F Y" }}.{% else %}Your membership is valid until {{ until|date:"j F Y" }}, which is in {{ days_left }} day{{ days_left|pluralize }}.{% endif %} + +Membership fees allow us to write open source code, deploy open infrastructure, and run community events without spending all our time fundraising. Renewing takes two minutes: + +{{ renew_url }} + +Renewing early adds a full year to your current end date, so you never lose time. If you have already renewed, please ignore this message. + +If you have any questions, please contact events@d-d-s.ch. + +Départ de Sentier +{% endautoescape %} diff --git a/dds_registration/templates/dds_registration/membership/reminder/subject.txt b/dds_registration/templates/dds_registration/membership/reminder/subject.txt new file mode 100644 index 00000000..e4b18f56 --- /dev/null +++ b/dds_registration/templates/dds_registration/membership/reminder/subject.txt @@ -0,0 +1 @@ +{% autoescape off %}{% if expired %}Your DdS membership expired on {{ until|date:"j F Y" }}{% else %}Your DdS membership expires on {{ until|date:"j F Y" }}{% endif %}{% endautoescape %} diff --git a/tests/test_membership_reminders.py b/tests/test_membership_reminders.py new file mode 100644 index 00000000..85de2e9d --- /dev/null +++ b/tests/test_membership_reminders.py @@ -0,0 +1,112 @@ +from datetime import date, timedelta +from unittest import mock + +import pytest + +from dds_registration.core.membership.reminders import due_reminders, send_reminder, stage_due +from dds_registration.models import Membership, MembershipReminder, Payment + +TODAY = date(2026, 11, 1) +UNTIL = date(2026, 12, 31) + + +@pytest.mark.parametrize( + "today,expected", + [ + (date(2026, 10, 31), None), + (date(2026, 11, 1), "before_60"), + (date(2026, 11, 30), "before_60"), + (date(2026, 12, 1), "before_30"), + (date(2026, 12, 31), "expiry"), + (date(2027, 1, 30), "after_30"), + (date(2027, 3, 1), "after_60"), + (date(2027, 3, 2), "after_60"), + ], +) +def test_stage_due(today, expected): + assert stage_due(UNTIL, today) == expected + + +def make_member(django_user_model, email, **kwargs): + user = django_user_model.objects.create_user(username=email, email=email, password="x", first_name="M") + kwargs.setdefault("until", UNTIL) + return Membership.objects.create(user=user, **kwargs) + + +@pytest.mark.django_db +def test_due_reminders_picks_members_in_window(django_user_model): + in_window = make_member(django_user_model, "in@example.com") + make_member(django_user_model, "later@example.com", until=TODAY + timedelta(days=61)) + make_member(django_user_model, "long_gone@example.com", until=TODAY - timedelta(days=61)) + assert [(m.pk, s) for m, s in due_reminders(TODAY)] == [(in_window.pk, "before_60")] + + +@pytest.mark.django_db +def test_due_reminders_skips_honorary(django_user_model): + make_member(django_user_model, "h@example.com", membership_type="HONORARY") + assert list(due_reminders(TODAY)) == [] + + +@pytest.mark.django_db +def test_due_reminders_skips_pending_renewal_invoice(django_user_model): + member = make_member(django_user_model, "p@example.com") + payment = Payment.objects.create(status="ISSUED", data={"kind": "membership", "user": {"id": member.user_id}}) + Payment.objects.filter(pk=payment.pk).update(created=TODAY) # issued inside this end date's window + member.payment = payment + member.save() + assert list(due_reminders(TODAY)) == [] + + +@pytest.mark.django_db +def test_due_reminders_ignores_old_unpaid_invoice(django_user_model): + member = make_member(django_user_model, "o@example.com") + payment = Payment.objects.create(status="ISSUED", data={"kind": "membership", "user": {"id": member.user_id}}) + Payment.objects.filter(pk=payment.pk).update(created=UNTIL - timedelta(days=400)) + member.payment = payment + member.save() + assert [s for _, s in due_reminders(TODAY)] == ["before_60"] + + +@pytest.mark.django_db +def test_due_reminders_skips_already_sent_stage(django_user_model): + member = make_member(django_user_model, "s@example.com") + MembershipReminder.objects.create(membership=member, until=UNTIL, stage="before_60") + assert list(due_reminders(TODAY)) == [] + assert [s for _, s in due_reminders(date(2026, 12, 1))] == ["before_30"] + + +@pytest.mark.django_db +def test_backlog_sends_only_latest_stage(django_user_model): + make_member(django_user_model, "b@example.com") + assert [s for _, s in due_reminders(date(2027, 1, 15))] == ["expiry"] + + +@pytest.mark.django_db +@mock.patch("dds_registration.core.membership.reminders.send_email") +def test_send_reminder_emails_and_logs(send_email, django_user_model): + member = make_member(django_user_model, "e@example.com") + assert send_reminder(member.pk, UNTIL, "before_30", today=date(2026, 12, 1)) is True + send_email.assert_called_once() + kwargs = send_email.call_args.kwargs + assert kwargs["recipient_address"] == "e@example.com" + assert kwargs["subject"] == "Your DdS membership expires on 31 December 2026" + assert "https://events.d-d-s.ch/membership/apply" in kwargs["message"] + assert "30 days" in kwargs["message"] + assert MembershipReminder.objects.filter(membership=member, until=UNTIL, stage="before_30").count() == 1 + + +@pytest.mark.django_db +@mock.patch("dds_registration.core.membership.reminders.send_email") +def test_send_reminder_is_idempotent(send_email, django_user_model): + member = make_member(django_user_model, "i@example.com") + send_reminder(member.pk, UNTIL, "expiry", today=UNTIL) + assert send_reminder(member.pk, UNTIL, "expiry", today=UNTIL) is False + assert send_email.call_count == 1 + + +@pytest.mark.django_db +@mock.patch("dds_registration.core.membership.reminders.send_email") +def test_send_reminder_after_expiry_wording(send_email, django_user_model): + member = make_member(django_user_model, "x@example.com") + send_reminder(member.pk, UNTIL, "after_30", today=date(2027, 1, 30)) + assert send_email.call_args.kwargs["subject"] == "Your DdS membership expired on 31 December 2026" From 1b0ec964dfaa2583d2964f541869a4ee6ddb5871 Mon Sep 17 00:00:00 2001 From: Laurenz Bougan Date: Mon, 26 Oct 2026 19:12:02 +0100 Subject: [PATCH 08/13] feat: celery app with daily membership reminder sweep --- conftest.py | 18 +++++++ dds_registration/__init__.py | 3 ++ dds_registration/celery.py | 11 +++++ dds_registration/settings.py | 16 +++++++ dds_registration/tasks/__init__.py | 1 + .../tasks/membership_reminders.py | 27 +++++++++++ pyproject.toml | 1 + tests/test_membership_reminder_tasks.py | 47 +++++++++++++++++++ 8 files changed, 124 insertions(+) create mode 100644 dds_registration/celery.py create mode 100644 dds_registration/tasks/__init__.py create mode 100644 dds_registration/tasks/membership_reminders.py create mode 100644 tests/test_membership_reminder_tasks.py diff --git a/conftest.py b/conftest.py index 9948e1b8..7080acf4 100644 --- a/conftest.py +++ b/conftest.py @@ -25,7 +25,25 @@ "SLACK_REGISTRATIONS_WEBHOOK": "", "SENTRY_DSN": "", "DEFAULT_FROM_EMAIL": "test@example.com", + "CELERY_TASK_ALWAYS_EAGER": "True", + "CELERY_BROKER_URL": "memory://", } for _key, _value in _TEST_ENV_DEFAULTS.items(): os.environ.setdefault(_key, _value) + + +def pytest_configure(config): + """Run Celery tasks inline during tests. + + pytest-django imports the settings module before this conftest runs, so the + env defaults above do not reach import-time settings such as the Celery + block; configure the app object directly instead. + """ + from django.conf import settings + + # Celery resolves the namespaced Django name (CELERY_*) before its own conf + # overrides, so the attributes have to change on the settings object itself. + settings.CELERY_TASK_ALWAYS_EAGER = True + settings.CELERY_TASK_EAGER_PROPAGATES = True + settings.CELERY_BROKER_URL = "memory://" diff --git a/dds_registration/__init__.py b/dds_registration/__init__.py index 414c06f3..f548c933 100644 --- a/dds_registration/__init__.py +++ b/dds_registration/__init__.py @@ -4,10 +4,13 @@ __timetag__ = "240430-1501" +from .celery import app as celery_app # noqa: E402 + __all__ = ( __version__, __timestamp__, __timetag__, + "celery_app", ) diff --git a/dds_registration/celery.py b/dds_registration/celery.py new file mode 100644 index 00000000..c3571e07 --- /dev/null +++ b/dds_registration/celery.py @@ -0,0 +1,11 @@ +"""Celery application; the worker and beat run ``celery -A dds_registration``.""" + +import os + +from celery import Celery + +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "dds_registration.settings") + +app = Celery("dds_registration") +app.config_from_object("django.conf:settings", namespace="CELERY") +app.autodiscover_tasks() diff --git a/dds_registration/settings.py b/dds_registration/settings.py index 641cb95b..a9cdec4e 100644 --- a/dds_registration/settings.py +++ b/dds_registration/settings.py @@ -8,6 +8,7 @@ import environ import sentry_sdk +from celery.schedules import crontab from loguru import logger # Working folder @@ -42,6 +43,8 @@ def random_string(length: int = 32) -> str: SLACK_PAYMENTS_WEBHOOK=(str, ""), SLACK_REGISTRATIONS_WEBHOOK=(str, ""), SENTRY_DSN=(str, ""), + CELERY_BROKER_URL=(str, "redis://127.0.0.1:6379/2"), + CELERY_TASK_ALWAYS_EAGER=(bool, False), ) environ.Env.read_env(os.path.join(BASE_DIR, ".env")) @@ -317,6 +320,19 @@ def random_string(length: int = 32) -> str: # Members may renew this many days before their membership ends. MEMBERSHIP_RENEWAL_WINDOW_DAYS = 60 +# Celery: on hubdds the broker is the Redis instance Indico already runs (db0/db1), +# so this app uses db2. In dev and tests tasks run inline (eager). +CELERY_BROKER_URL = env("CELERY_BROKER_URL") +CELERY_TASK_ALWAYS_EAGER = env("CELERY_TASK_ALWAYS_EAGER") or DEBUG +CELERY_TASK_EAGER_PROPAGATES = CELERY_TASK_ALWAYS_EAGER +# Daily at 06:00 UTC (server and TIME_ZONE are UTC): 07:00 CET / 08:00 CEST. +CELERY_BEAT_SCHEDULE = { + "membership-reminders": { + "task": "dds_registration.tasks.membership_reminders.sweep", + "schedule": crontab(hour=6, minute=0), + }, +} + SITE_NAME = "Départ de Sentier Events and Membership Portal" SITE_TITLE = SITE_NAME # TODO: Issue #40: Add proper site description and keywords... diff --git a/dds_registration/tasks/__init__.py b/dds_registration/tasks/__init__.py new file mode 100644 index 00000000..03134324 --- /dev/null +++ b/dds_registration/tasks/__init__.py @@ -0,0 +1 @@ +from .membership_reminders import send_reminder, sweep # noqa: F401 diff --git a/dds_registration/tasks/membership_reminders.py b/dds_registration/tasks/membership_reminders.py new file mode 100644 index 00000000..578aeb97 --- /dev/null +++ b/dds_registration/tasks/membership_reminders.py @@ -0,0 +1,27 @@ +"""Celery entry points for membership renewal reminders.""" + +from datetime import date + +from celery import shared_task + +from ..core.membership import reminders + + +@shared_task(name="dds_registration.tasks.membership_reminders.sweep") +def sweep() -> int: + """Daily beat task: enqueue one send per member who is due today.""" + count = 0 + for membership, stage in reminders.due_reminders(date.today()): + send_reminder.delay(membership.pk, membership.until.isoformat(), stage) + count += 1 + return count + + +@shared_task( + name="dds_registration.tasks.membership_reminders.send_reminder", + autoretry_for=(Exception,), + retry_backoff=True, + max_retries=3, +) +def send_reminder(membership_id: int, until_iso: str, stage: str) -> bool: + return reminders.send_reminder(membership_id, date.fromisoformat(until_iso), stage) diff --git a/pyproject.toml b/pyproject.toml index 346cf443..c3d88130 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -38,6 +38,7 @@ dependencies = [ "pyyaml", "beautifulsoup4>=4.12.3", # Html content prettifier + "celery[redis]>=5.4", # renewal reminders (beat + worker) "crispy-bootstrap5>=2024.2", "django-compressor>=4.4", "django-crispy-forms>=2.1", diff --git a/tests/test_membership_reminder_tasks.py b/tests/test_membership_reminder_tasks.py new file mode 100644 index 00000000..0fdb0b51 --- /dev/null +++ b/tests/test_membership_reminder_tasks.py @@ -0,0 +1,47 @@ +from datetime import date, timedelta +from unittest import mock + +import pytest +from celery.exceptions import Retry + +from dds_registration.models import Membership, MembershipReminder +from dds_registration.tasks.membership_reminders import send_reminder, sweep + + +@pytest.mark.django_db +@mock.patch("dds_registration.core.membership.reminders.send_email") +def test_sweep_sends_one_email_per_due_member_eagerly(send_email, django_user_model): + for email in ["a@example.com", "b@example.com"]: + user = django_user_model.objects.create_user(username=email, email=email, password="x") + Membership.objects.create(user=user, until=date.today() + timedelta(days=10)) + assert sweep() == 2 + assert send_email.call_count == 2 + assert MembershipReminder.objects.count() == 2 + assert sweep() == 0 + + +@pytest.mark.django_db +@mock.patch("dds_registration.core.membership.reminders.send_email", side_effect=RuntimeError("gmail down")) +def test_send_reminder_failure_leaves_no_log_row(send_email, django_user_model): + user = django_user_model.objects.create_user(username="f@example.com", email="f@example.com", password="x") + m = Membership.objects.create(user=user, until=date.today()) + # Eager mode re-runs retries inline and surfaces Celery's Retry (or the original error). + with pytest.raises((RuntimeError, Retry)): + send_reminder.apply(args=(m.pk, m.until.isoformat(), "expiry")) + assert send_email.call_count >= 1 + assert MembershipReminder.objects.count() == 0 + + +def test_beat_schedule_runs_sweep_daily(settings): + entry = settings.CELERY_BEAT_SCHEDULE["membership-reminders"] + assert entry["task"] == "dds_registration.tasks.membership_reminders.sweep" + + +def test_tasks_are_registered_on_the_app(): + from dds_registration.celery import app + + names = {name for name in app.tasks if name.startswith("dds_registration")} + assert names == { + "dds_registration.tasks.membership_reminders.sweep", + "dds_registration.tasks.membership_reminders.send_reminder", + } From a7607e255b7feac44efc67d38a2fd541265c09c5 Mon Sep 17 00:00:00 2001 From: Laurenz Bougan Date: Mon, 26 Oct 2026 19:12:22 +0100 Subject: [PATCH 09/13] feat: send_membership_reminders management command --- .../commands/send_membership_reminders.py | 32 +++++++++++++++++ .../test_send_membership_reminders_command.py | 34 +++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 dds_registration/management/commands/send_membership_reminders.py create mode 100644 tests/test_send_membership_reminders_command.py diff --git a/dds_registration/management/commands/send_membership_reminders.py b/dds_registration/management/commands/send_membership_reminders.py new file mode 100644 index 00000000..fa08c1dd --- /dev/null +++ b/dds_registration/management/commands/send_membership_reminders.py @@ -0,0 +1,32 @@ +"""Send (or list) today's membership renewal reminders without going through Celery. + +Use ``--dry-run`` on the server before the first automated sweep, and the plain form +for manual catch-up if the worker was down. +""" + +from datetime import date + +from django.core.management.base import BaseCommand + +from ...core.membership.reminders import due_reminders, send_reminder + + +class Command(BaseCommand): + help = "Send membership renewal reminders that are due today (synchronously)." + + def add_arguments(self, parser): + parser.add_argument( + "--today", type=date.fromisoformat, default=None, help="Pretend today is this date (YYYY-MM-DD)" + ) + parser.add_argument("--dry-run", action="store_true", help="List what would be sent, send nothing") + + def handle(self, *args, **options): + today = options["today"] or date.today() + due = list(due_reminders(today)) + for membership, stage in due: + self.stdout.write(f"{membership.user.email}\t{membership.until}\t{stage}") + if options["dry_run"]: + self.stdout.write(f"Dry run: {len(due)} reminder(s) due on {today}") + return + sent = sum(1 for membership, stage in due if send_reminder(membership.pk, membership.until, stage, today=today)) + self.stdout.write(self.style.SUCCESS(f"Sent {sent} reminder(s) for {today}")) diff --git a/tests/test_send_membership_reminders_command.py b/tests/test_send_membership_reminders_command.py new file mode 100644 index 00000000..1bae6df0 --- /dev/null +++ b/tests/test_send_membership_reminders_command.py @@ -0,0 +1,34 @@ +from datetime import date +from io import StringIO +from unittest import mock + +import pytest +from django.core.management import call_command + +from dds_registration.models import Membership, MembershipReminder + + +@pytest.fixture +def due_member(django_user_model): + user = django_user_model.objects.create_user(username="d@example.com", email="d@example.com", password="x") + return Membership.objects.create(user=user, until=date(2026, 12, 31)) + + +@pytest.mark.django_db +@mock.patch("dds_registration.core.membership.reminders.send_email") +def test_dry_run_lists_without_sending(send_email, due_member): + out = StringIO() + call_command("send_membership_reminders", "--today", "2026-11-01", "--dry-run", stdout=out) + assert "d@example.com" in out.getvalue() and "before_60" in out.getvalue() + send_email.assert_not_called() + assert MembershipReminder.objects.count() == 0 + + +@pytest.mark.django_db +@mock.patch("dds_registration.core.membership.reminders.send_email") +def test_real_run_sends_synchronously(send_email, due_member): + out = StringIO() + call_command("send_membership_reminders", "--today", "2026-12-01", stdout=out) + send_email.assert_called_once() + assert MembershipReminder.objects.get().stage == "before_30" + assert "Sent 1" in out.getvalue() From a91f676e9ee71bf5c891113ea673ce02ee3d9814 Mon Sep 17 00:00:00 2001 From: Laurenz Bougan Date: Mon, 26 Oct 2026 19:14:04 +0100 Subject: [PATCH 10/13] docs: celery deployment, rolling-year membership, changelog --- CHANGES.md | 5 ++++ README.md | 2 +- deployment.md | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 83 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 949dbfb8..8db8fe37 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -9,6 +9,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added +- Membership `started`/`until` are dates; membership runs one year from joining and early renewal extends from the current end date (admins can edit both dates). Existing rows migrate to `until = Dec 31 of the stored year`. +- Membership records `organization` and `organization_type`; existing members are asked to fill them in on their next visit (`/membership/details`). +- Membership admin lists name, last name, first name, email, organization, type and dates; filters, search and the Excel export are extended. +- Renewal reminders (60/30 days before, on expiry, 30/60 days after) sent by a Celery beat task; `manage.py send_membership_reminders --dry-run` previews them. +- `RegistrationOption.membership_until` (date) replaces `membership_end_year`; `Payment.mark_paid` still accepts the legacy key in stored payment data. - Private team calendar at `/team-calendar/`, served behind login (`@login_required`). ## [0.1.0] - 2022-03-22 diff --git a/README.md b/README.md index 5e388a32..7ad17687 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ sequenceDiagram ## Membership -DdS membership runs per calendar year, from January 1st to December 31st. Signing up for DdS membership requires a valid user account. +DdS membership runs for one year from the day of joining; renewing early adds a year to the current end date, and both dates can be adjusted in the admin. Renewal reminders go out automatically 60 and 30 days before the end date, on the day, and 30 and 60 days after (see `deployment.md`, Celery section). Signing up for DdS membership requires a valid user account. ```mermaid sequenceDiagram diff --git a/deployment.md b/deployment.md index 80171590..2e3d381a 100644 --- a/deployment.md +++ b/deployment.md @@ -217,3 +217,80 @@ sudo systemctl start dds-registration ## Configure the Django `site` You **must** login to the admin portal and configure the `Site` or the URLs will break! + +## Celery worker and beat (membership renewal reminders) + +The app sends renewal reminders through Celery. The broker is the Redis instance +already running on the server for Indico; this app uses database index 2 +(`redis://127.0.0.1:6379/2`). Never point it at db0 or db1 (Indico's broker and cache). + +Install the dependency in the app venv (the venv is uv-managed, there is no pip): + +```bash +sudo -u registration bash -c 'cd /home/registration && ~/.local/bin/uv pip install --python venvs/registration/bin/python "celery[redis]>=5.4"' +``` + +Create two units with the same `User` and `Environment=` block as +`dds-registration.service`, plus `Environment=CELERY_BROKER_URL=redis://127.0.0.1:6379/2`: + +``` +# /etc/systemd/system/dds-registration-worker.service +[Unit] +Description=DdS events registration - Celery worker +After=network.target redis-server.service + +[Service] +Type=simple +User=registration +WorkingDirectory=/home/registration/registration +ExecStart=/home/registration/venvs/registration/bin/celery -A dds_registration worker --concurrency 1 --loglevel info +Restart=always +# Environment= lines copied from dds-registration.service +Environment=CELERY_BROKER_URL=redis://127.0.0.1:6379/2 + +[Install] +WantedBy=multi-user.target +``` + +``` +# /etc/systemd/system/dds-registration-beat.service +[Unit] +Description=DdS events registration - Celery beat +After=network.target redis-server.service + +[Service] +Type=simple +User=registration +WorkingDirectory=/home/registration/registration +ExecStart=/home/registration/venvs/registration/bin/celery -A dds_registration beat --schedule /home/registration/celerybeat-schedule --loglevel info +Restart=always +# Environment= lines copied from dds-registration.service +Environment=CELERY_BROKER_URL=redis://127.0.0.1:6379/2 + +[Install] +WantedBy=multi-user.target +``` + +The schedule file lives outside the checkout because `download-latest.sh` deletes +and recreates `registration/` on every deploy. Run exactly one beat instance. The +worker runs with concurrency 1 because it shares the SQLite database with uWSGI. + +```bash +sudo systemctl daemon-reload +sudo systemctl enable --now dds-registration-worker dds-registration-beat +``` + +After every deploy run the migrations and restart all three services: + +```bash +sudo -u registration bash -c 'cd /home/registration/registration && ../venvs/registration/bin/python manage.py migrate' +sudo systemctl restart dds-registration dds-registration-worker dds-registration-beat +``` + +Check what would go out today without sending anything: + +```bash +sudo -u registration bash -c 'cd /home/registration/registration && ../venvs/registration/bin/python manage.py send_membership_reminders --dry-run' +``` + +The sweep runs daily at 06:00 UTC (`CELERY_BEAT_SCHEDULE` in `settings.py`). From 1db436f0a91e72e1694b670402efd61e40c36388 Mon Sep 17 00:00:00 2001 From: Laurenz Bougan Date: Mon, 26 Oct 2026 19:25:33 +0100 Subject: [PATCH 11/13] fix: tolerate year 0 in membership date migration (found rehearsing on prod data) --- .../0025_membership_dates_and_organization.py | 27 +++++++++++++++---- tests/test_membership_migration.py | 7 +++++ 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/dds_registration/migrations/0025_membership_dates_and_organization.py b/dds_registration/migrations/0025_membership_dates_and_organization.py index 9ecb155a..50dcec35 100644 --- a/dds_registration/migrations/0025_membership_dates_and_organization.py +++ b/dds_registration/migrations/0025_membership_dates_and_organization.py @@ -12,15 +12,32 @@ import dds_registration.core.helpers.dates -def year_to_until(year: int) -> date: - return date(int(year), 12, 31) +MIN_PLAUSIBLE_YEAR = 2000 # production has a RegistrationOption with membership_end_year = 0 -def started_from(payment_data, started_year: int) -> date: +def _plausible_year(year) -> int | None: + try: + year = int(year) + except (TypeError, ValueError): + return None + return year if year >= MIN_PLAUSIBLE_YEAR else None + + +def year_to_until(year) -> date: + """Dec 31 of ``year``; a missing or nonsense year (0, None) becomes Dec 31 of the current year.""" + year = _plausible_year(year) or date.today().year + return date(year, 12, 31) + + +def started_from(payment_data, started_year) -> date: paid = (payment_data or {}).get("paid_date") if paid: - return date.fromisoformat(paid) - return date(int(started_year), 1, 1) + try: + return date.fromisoformat(paid) + except ValueError: + pass + year = _plausible_year(started_year) or date.today().year + return date(year, 1, 1) def forwards(apps, schema_editor): diff --git a/tests/test_membership_migration.py b/tests/test_membership_migration.py index e2b93b35..aa57f818 100644 --- a/tests/test_membership_migration.py +++ b/tests/test_membership_migration.py @@ -19,6 +19,13 @@ def test_started_from_paid_date_when_present(): assert migration.started_from({"paid_date": "2025-03-14"}, 2025) == date(2025, 3, 14) +def test_year_zero_or_none_falls_back_to_current_year(): + # production has a RegistrationOption with membership_end_year = 0 + assert migration.year_to_until(0) == date(date.today().year, 12, 31) + assert migration.year_to_until(None) == date(date.today().year, 12, 31) + assert migration.started_from({"paid_date": "garbage"}, 0) == date(date.today().year, 1, 1) + + def test_started_from_falls_back_to_jan_1(): assert migration.started_from({}, 2024) == date(2024, 1, 1) assert migration.started_from(None, 2024) == date(2024, 1, 1) From 82f6107f379b5597ef7c1fe176e4842254e0f354 Mon Sep 17 00:00:00 2001 From: Laurenz Bougan Date: Mon, 26 Oct 2026 19:27:39 +0100 Subject: [PATCH 12/13] fix: migration join date only uses a paid date from the stored start year --- .../0025_membership_dates_and_organization.py | 13 ++++++++++--- tests/test_membership_migration.py | 5 +++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dds_registration/migrations/0025_membership_dates_and_organization.py b/dds_registration/migrations/0025_membership_dates_and_organization.py index 50dcec35..71390470 100644 --- a/dds_registration/migrations/0025_membership_dates_and_organization.py +++ b/dds_registration/migrations/0025_membership_dates_and_organization.py @@ -30,13 +30,20 @@ def year_to_until(year) -> date: def started_from(payment_data, started_year) -> date: + """Join date: the linked payment's paid date when it falls in the stored start year, else Jan 1. + + The linked payment is the *latest* one (renewals replace it), so a paid date from a + later year says nothing about when the member first joined. + """ + year = _plausible_year(started_year) or date.today().year paid = (payment_data or {}).get("paid_date") if paid: try: - return date.fromisoformat(paid) + paid_date = date.fromisoformat(paid) except ValueError: - pass - year = _plausible_year(started_year) or date.today().year + paid_date = None + if paid_date and paid_date.year == year: + return paid_date return date(year, 1, 1) diff --git a/tests/test_membership_migration.py b/tests/test_membership_migration.py index aa57f818..7ef264f2 100644 --- a/tests/test_membership_migration.py +++ b/tests/test_membership_migration.py @@ -26,6 +26,11 @@ def test_year_zero_or_none_falls_back_to_current_year(): assert migration.started_from({"paid_date": "garbage"}, 0) == date(date.today().year, 1, 1) +def test_started_from_ignores_renewal_paid_in_a_later_year(): + # membership.payment points at the latest (renewal) payment, not the first one + assert migration.started_from({"paid_date": "2025-03-14"}, 2024) == date(2024, 1, 1) + + def test_started_from_falls_back_to_jan_1(): assert migration.started_from({}, 2024) == date(2024, 1, 1) assert migration.started_from(None, 2024) == date(2024, 1, 1) From 5ac1b259ab1daaabcb6ea8519968efa324be0393 Mon Sep 17 00:00:00 2001 From: Laurenz Bougan Date: Mon, 26 Oct 2026 19:28:14 +0100 Subject: [PATCH 13/13] docs: deploy and rollback runbook for 1.5.0 with rehearsal record --- deployment.md | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/deployment.md b/deployment.md index 2e3d381a..8ad1e117 100644 --- a/deployment.md +++ b/deployment.md @@ -294,3 +294,91 @@ sudo -u registration bash -c 'cd /home/registration/registration && ../venvs/reg ``` The sweep runs daily at 06:00 UTC (`CELERY_BEAT_SCHEDULE` in `settings.py`). + +## Deploying 1.5.0 (membership dates + Celery) with a rollback path + +The schema change is not backward compatible: the old code reads `started`/`until` +as integers, the new code as dates. Code and database must always move together. +The procedure below keeps a consistent snapshot of both so a rollback is one `mv`. + +### Pre-flight (no downtime) + +```bash +# as a sudoer on hubdds +sudo -u registration bash -c 'cd /home/registration/registration && ../venvs/registration/bin/python manage.py showmigrations dds_registration | tail -2' +# expect: [X] 0024_event_has_invitation... and no 0025 yet + +redis-cli -n 2 dbsize # expect 0: db2 is ours, db0/db1 belong to Indico +df -h /home # a few MB are enough + +# Celery can be installed ahead of time: the running 1.4.x code never imports it. +sudo -u registration bash -c 'cd /home/registration && ~/.local/bin/uv pip install --python venvs/registration/bin/python "celery[redis]>=5.4"' +sudo -u registration bash -c '/home/registration/venvs/registration/bin/python -c "import celery, redis; print(celery.__version__)"' + +# Create the two units from the section above (daemon-reload, enable, but do NOT start yet). +``` + +### Snapshot + +```bash +TS=$(date +%Y%m%dT%H%M%S) +sudo systemctl stop dds-registration # brief downtime: no writes during the snapshot + migration +sudo -u registration cp -a /home/registration/registration /home/registration/registration.pre-1.5.0-$TS +sudo -u registration bash -c "/home/registration/venvs/registration/bin/python -c \"import sqlite3; s=sqlite3.connect('/home/registration/registration/db.sqlite3'); d=sqlite3.connect('/home/registration/registration-backups/db.sqlite3.pre-1.5.0-$TS'); s.backup(d); d.close()\"" +ls -l /home/registration/registration-backups | tail -2 +``` + +The directory copy holds old code **and** the matching old database; that pair is +the rollback target. + +### Deploy + +```bash +sudo -u registration bash -c 'cd /home/registration && ./download-latest.sh' # also copies db.sqlite3 into registration-backups/ +sudo -u registration bash -c 'cd /home/registration/registration && ../venvs/registration/bin/python manage.py migrate' +# expect: Applying dds_registration.0025_membership_dates_and_organization... OK (about 1 s for ~150 rows; it runs inside one transaction and rolls back on any error) +sudo -u registration bash -c 'cd /home/registration/registration && ../venvs/registration/bin/python manage.py send_membership_reminders --dry-run' +# expect before 2026-11-01: "Dry run: 0 reminder(s)"; on/after it: one before_60 line per member ending 2026-12-31 (103 at the time of writing) +sudo systemctl start dds-registration +sudo systemctl start dds-registration-worker dds-registration-beat +# static publish as usual (load the site once, then cp -r .../static /var/www/registration/) +journalctl -u dds-registration-worker -n 5 --no-pager # expect "celery@... ready." +journalctl -u dds-registration-beat -n 5 --no-pager # expect "beat: Starting..." +``` + +Smoke checks: log in to `/admin/dds_registration/membership/?is_active_filter=1` +(new columns, dates as YYYY-MM-DD), open one member, and load `/profile` as a +regular member (expect the one-time redirect to `/membership/details`). + +### Rollback (keeps the snapshot pair consistent) + +```bash +sudo systemctl stop dds-registration dds-registration-worker dds-registration-beat +sudo systemctl disable dds-registration-worker dds-registration-beat +sudo -u registration mv /home/registration/registration /home/registration/registration.failed-$(date +%Y%m%dT%H%M%S) +sudo -u registration mv /home/registration/registration.pre-1.5.0- /home/registration/registration +sudo systemctl start dds-registration +``` + +This restores 1.4.x code and the database as it was at the snapshot. Anything +written after the snapshot (new sign-ups, payments marked paid) is lost from the +live database but still present in the `registration.failed-*` copy for manual +recovery. + +If the new code ran for a while and you want to keep that data, the migration is +reversible instead: `manage.py migrate dds_registration 0024` on the new checkout +converts dates back to years (rehearsed on a production copy on 2026-10-26: all +membership rows came back identical; registration options that had the nonsense +value `membership_end_year = 0` come back as the current year, none of them +include membership). Then swap the code directory as above. + +### Rehearsal record (2026-10-26, production copy, 153 memberships) + +- Forward migration exact for all 153 rows: `until` = Dec 31 of the stored year; + `started` = the linked payment's paid date for 127 rows, Jan 1 of the stored + year for 26 (no payment, or a renewal paid in a later year). Payment, user, + event and registration tables byte-identical before and after. +- Two bugs caught and fixed before release: `membership_end_year = 0` on 17 + options crashed the migration; the join date wrongly took a later renewal's + paid date. +- Backward migration returns every membership row to its original values.