Add admin action to send account invite mail to individual members

Author: ertgl

djangoproject/settings/common.py

@@ -53,6 +53,8 @@
 
 DEFAULT_FROM_EMAIL = "noreply@djangoproject.com"
 FUNDRAISING_DEFAULT_FROM_EMAIL = "fundraising@djangoproject.com"
+# TODO(ertgl): Update `settings.INDIVIDUAL_MEMBER_ACCOUNT_INVITE_DEFAULT_FROM_EMAIL`.
+INDIVIDUAL_MEMBER_ACCOUNT_INVITE_DEFAULT_FROM_EMAIL = DEFAULT_FROM_EMAIL
 
 FIXTURE_DIRS = [str(PROJECT_PACKAGE.joinpath("fixtures"))]
 

djangoproject/templates/members/email/account_invite.txt

@@ -0,0 +1,17 @@
+{% spaceless %}
+Hello {{ name }},
+
+We're updating the Django Individual Members list so each member's name can link to their djangoproject.com profile. On your profile, you can share a short bio, highlight your contributions to Django or the community, and provide ways for others to get in touch.
+
+To have your name linked, please create an account (if you don't already have one) at:
+
+{% url 'registration_register' %}
+
+Once your account is ready, let us know your username so we can connect it to the members list.
+
+This small step helps the community grow more connected and makes it easier for everyone to explore and engage with it.
+
+Thank you for being part of the Django community.
+
+Django Software Foundation
+{% endspaceless %}

members/admin.py

@@ -1,12 +1,20 @@
 from datetime import date, timedelta
 
-from django.contrib import admin
+from django.contrib import admin, messages
+from django.contrib.auth import get_permission_codename
+from django.db import transaction
 from django.templatetags.static import static
 from django.utils.formats import localize
 from django.utils.html import format_html
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext_lazy as _, ngettext
 
-from members.models import CorporateMember, IndividualMember, Invoice, Team
+from members.models import (
+    CorporateMember,
+    IndividualMember,
+    IndividualMemberAccountInviteSendMailStatus,
+    Invoice,
+    Team,
+)
 
 
 @admin.register(IndividualMember)
@@ -17,9 +25,69 @@ class IndividualMemberAdmin(admin.ModelAdmin):
         "is_active",
         "member_since",
         "member_until",
+        "account_invite_mail_sent_at",
     ]
     search_fields = ["name"]
+    list_filter = ["member_until", "account_invite_mail_sent_at"]
     autocomplete_fields = ["user"]
+    actions = ["send_account_invite_mail"]
+
+    @admin.action(
+        description=_("Send account invite mail to selected individual members"),
+        permissions=["send_account_invite_mail"],
+    )
+    def send_account_invite_mail(self, request, queryset):
+        with transaction.atomic():
+            results = IndividualMember.send_account_invite_mails(queryset)
+        sent_count = results.get(
+            IndividualMemberAccountInviteSendMailStatus.SENT,
+            0,
+        )
+        failed_count = results.get(
+            IndividualMemberAccountInviteSendMailStatus.FAILED,
+            0,
+        )
+        skipped_count = results.get(
+            IndividualMemberAccountInviteSendMailStatus.SKIPPED,
+            0,
+        )
+        if sent_count > 0:
+            self.message_user(
+                request,
+                ngettext(
+                    "Sent account invite mail to 1 individual member.",
+                    "Sent account invite mail to %(count)d individual members.",
+                    sent_count,
+                )
+                % {"count": sent_count},
+                messages.SUCCESS,
+            )
+        if failed_count > 0:
+            self.message_user(
+                request,
+                ngettext(
+                    "Failed to send account invite mail to 1 individual member.",
+                    "Failed to send account invite mail to %(count)d individual members.",
+                    failed_count,
+                )
+                % {"count": failed_count},
+                messages.ERROR,
+            )
+        if skipped_count > 0:
+            self.message_user(
+                request,
+                ngettext(
+                    "Skipped sending account invite mail to 1 individual member (already has an account linked or an invite mail has been sent).",
+                    "Skipped sending account invite mail to %(count)d individual members (already have accounts linked or invite mails have been sent).",
+                    skipped_count,
+                )
+                % {"count": skipped_count},
+                messages.INFO,
+            )
+
+    def has_send_account_invite_mail_permission(self, request):
+        codename = get_permission_codename("send_account_invite_mail", self.opts)
+        return request.user.has_perm("%s.%s" % (self.opts.app_label, codename))
 
 
 class InvoiceInline(admin.TabularInline):

members/migrations/0011_alter_individualmember_options_and_more.py

@@ -0,0 +1,35 @@
+# Generated by Django 5.2.7 on 2025-10-20 19:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("members", "0010_individualmember_user"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="individualmember",
+            options={
+                "ordering": ["name"],
+                "permissions": [
+                    (
+                        "send_account_invite_mail",
+                        "Can send account invite mail to an individual member",
+                    )
+                ],
+            },
+        ),
+        migrations.AddField(
+            model_name="individualmember",
+            name="account_invite_mail_sent_at",
+            field=models.DateTimeField(blank=True, db_index=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name="individualmember",
+            name="member_until",
+            field=models.DateField(blank=True, db_index=True, null=True),
+        ),
+    ]

members/models.py

@@ -1,11 +1,15 @@
 from collections import defaultdict
+from enum import StrEnum
 
 from django.conf import settings
 from django.core import signing
-from django.db import models
+from django.core.mail import send_mail
+from django.db import models, transaction
 from django.db.models.signals import post_save
 from django.dispatch import receiver
+from django.template.loader import render_to_string
 from django.utils.safestring import mark_safe
+from django.utils.timezone import now as timezone_now
 from django.utils.translation import gettext_lazy as _
 from django.views.generic.dates import timezone_today
 from django_hosts import reverse
@@ -38,6 +42,12 @@
 MEMBERSHIP_TO_KEY = {k: v.lower() for k, v in MEMBERSHIP_LEVELS}
 
 
+class IndividualMemberAccountInviteSendMailStatus(StrEnum):
+    SENT = "SENT"
+    FAILED = "FAILED"
+    SKIPPED = "SKIPPED"
+
+
 class IndividualMember(models.Model):
     user = models.OneToOneField(
         settings.AUTH_USER_MODEL,
@@ -48,7 +58,7 @@ class IndividualMember(models.Model):
     name = models.CharField(max_length=250)
     email = models.EmailField(unique=True)
     member_since = models.DateField(default=timezone_today)
-    member_until = models.DateField(null=True, blank=True)
+    member_until = models.DateField(null=True, blank=True, db_index=True)
     reason_for_leaving = models.TextField(
         blank=True,
         help_text=mark_safe(
@@ -58,9 +68,33 @@ class IndividualMember(models.Model):
             )
         ),
     )
+    account_invite_mail_sent_at = models.DateTimeField(
+        blank=True,
+        null=True,
+        db_index=True,
+    )
 
     class Meta:
         ordering = ["name"]
+        permissions = [
+            (
+                "send_account_invite_mail",
+                _("Can send account invite mail to an individual member"),
+            ),
+        ]
+
+    @classmethod
+    def send_account_invite_mails(cls, queryset):
+        results = {}
+        # Wait for other active transactions to prevent race conditions.
+        queryset = queryset.select_for_update(nowait=False)
+        for individual_member in queryset.iterator():
+            status = individual_member.send_account_invite_mail()
+            if status not in results:
+                results[status] = 1
+            else:
+                results[status] += 1
+        return results
 
     def __str__(self):
         return self.name
@@ -69,6 +103,33 @@ def __str__(self):
     def is_active(self):
         return self.member_until is None
 
+    def send_account_invite_mail(self):
+        if self.user_id or self.account_invite_mail_sent_at:
+            return IndividualMemberAccountInviteSendMailStatus.SKIPPED
+        mail_subject = "Make your Django Individual Membership profile visible"
+        mail_content = render_to_string(
+            "members/email/account_invite.txt",
+            {
+                "name": self.name,
+            },
+        )
+        # Create an inner savepoint to prevent any outer successful operation to be rolled back in case of failure here.
+        with transaction.atomic():
+            sent = send_mail(
+                mail_subject,
+                mail_content,
+                settings.INDIVIDUAL_MEMBER_ACCOUNT_INVITE_DEFAULT_FROM_EMAIL,
+                [
+                    settings.INDIVIDUAL_MEMBER_ACCOUNT_INVITE_DEFAULT_FROM_EMAIL,
+                    self.email,
+                ],
+            )
+            if sent:
+                self.account_invite_mail_sent_at = timezone_now()
+                self.save()
+                return IndividualMemberAccountInviteSendMailStatus.SENT
+        return IndividualMemberAccountInviteSendMailStatus.FAILED
+
 
 class Team(models.Model):
     name = models.CharField(max_length=250)