introduce Fellow model that is more extensible

Author: JacobCoffee

nominations/admin.py

@@ -4,6 +4,7 @@
 
 from nominations.models import (
     Election,
+    Fellow,
     FellowNomination,
     FellowNominationRound,
     FellowNominationVote,
@@ -38,6 +39,14 @@ def get_ordering(self, request):
         return ['election', Lower('nominee__user__last_name')]
 
 
+@admin.register(Fellow)
+class FellowAdmin(admin.ModelAdmin):
+    list_display = ("name", "year_elected", "status", "emeritus_year")
+    list_filter = ("status", "year_elected")
+    search_fields = ("name",)
+    raw_id_fields = ("user",)
+
+
 @admin.register(FellowNominationRound)
 class FellowNominationRoundAdmin(admin.ModelAdmin):
     list_display = ("__str__", "quarter_start", "quarter_end", "nominations_cutoff", "is_open")

nominations/migrations/0004_fellow.py

@@ -0,0 +1,31 @@
+# Generated by Django 4.2.28 on 2026-02-06 03:34
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('nominations', '0003_fellow_nominations'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Fellow',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255)),
+                ('year_elected', models.PositiveIntegerField()),
+                ('status', models.CharField(choices=[('active', 'Active'), ('emeritus', 'Emeritus'), ('deceased', 'Deceased')], db_index=True, default='active', max_length=10)),
+                ('emeritus_year', models.PositiveIntegerField(blank=True, null=True)),
+                ('notes', models.TextField(blank=True)),
+                ('user', models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='fellow', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'ordering': ['name'],
+            },
+        ),
+    ]

nominations/models.py

@@ -1,6 +1,7 @@
 import datetime
 
 from django.conf import settings
+from django.core.exceptions import ObjectDoesNotExist
 from django.db import models
 from django.db.models.signals import post_save
 from django.dispatch import receiver
@@ -12,7 +13,7 @@
 from markupfield.fields import MarkupField
 
 from cms.models import ContentManageable
-from users.models import Membership, User
+from users.models import User
 
 from .managers import FellowNominationQuerySet
 
@@ -278,6 +279,43 @@ def purge_nomination_pages(sender, instance, created, **kwargs):
         )
 
 
+class Fellow(models.Model):
+    """A PSF Fellow — reference data managed via Django admin."""
+
+    ACTIVE = "active"
+    EMERITUS = "emeritus"
+    DECEASED = "deceased"
+    STATUS_CHOICES = (
+        (ACTIVE, "Active"),
+        (EMERITUS, "Emeritus"),
+        (DECEASED, "Deceased"),
+    )
+
+    name = models.CharField(max_length=255)
+    year_elected = models.PositiveIntegerField()
+    status = models.CharField(
+        max_length=10,
+        choices=STATUS_CHOICES,
+        default=ACTIVE,
+        db_index=True,
+    )
+    emeritus_year = models.PositiveIntegerField(null=True, blank=True)
+    notes = models.TextField(blank=True)
+    user = models.OneToOneField(
+        User,
+        on_delete=models.SET_NULL,
+        null=True,
+        blank=True,
+        related_name="fellow",
+    )
+
+    class Meta:
+        ordering = ["name"]
+
+    def __str__(self):
+        return self.name
+
+
 class FellowNominationRound(models.Model):
     """Quarterly round for PSF Fellow Work Group consideration."""
 
@@ -413,8 +451,8 @@ def is_active(self):
     def nominee_is_already_fellow(self):
         if self.nominee_user:
             try:
-                return self.nominee_user.membership.membership_type == Membership.FELLOW
-            except Membership.DoesNotExist:
+                return self.nominee_user.fellow is not None
+            except Fellow.DoesNotExist:
                 return False
         return False
 

nominations/views.py

@@ -17,8 +17,6 @@
 
 from pydotorg.mixins import GroupRequiredMixin, LoginRequiredMixin
 
-from users.models import Membership
-
 from .forms import (
     FellowNominationForm,
     FellowNominationManageForm,
@@ -31,6 +29,7 @@
 )
 from .models import (
     Election,
+    Fellow,
     FellowNomination,
     FellowNominationRound,
     FellowNominationVote,
@@ -294,14 +293,14 @@ def form_valid(self, form):
             form.instance.nominee_user = nominee_user
             # Check if nominee is already a Fellow
             try:
-                if nominee_user.membership.membership_type == Membership.FELLOW:
+                if nominee_user.fellow is not None:
                     form.instance.nominee_is_fellow_at_submission = True
                     messages.warning(
                         self.request,
                         f"{form.cleaned_data['nominee_name']} is already a PSF Fellow. "
                         "The nomination has been saved but may not need further action.",
                     )
-            except Membership.DoesNotExist:
+            except Fellow.DoesNotExist:
                 pass
         except User.DoesNotExist:
             pass
@@ -638,13 +637,16 @@ class FellowsRoster(ListView):
     context_object_name = "fellows"
 
     def get_queryset(self):
-        return Membership.objects.filter(
-            membership_type=Membership.FELLOW,
-        ).select_related("creator").order_by(
-            "creator__last_name", "creator__first_name"
-        )
+        return Fellow.objects.all()
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context["total_count"] = context["fellows"].count()
+        qs = context["fellows"]
+        context["active_fellows"] = qs.filter(status=Fellow.ACTIVE)
+        context["emeritus_fellows"] = qs.filter(status=Fellow.EMERITUS)
+        context["deceased_fellows"] = qs.filter(status=Fellow.DECEASED)
+        context["active_count"] = context["active_fellows"].count()
+        context["emeritus_count"] = context["emeritus_fellows"].count()
+        context["deceased_count"] = context["deceased_fellows"].count()
+        context["total_count"] = qs.count()
         return context