From b30522d3d07d3c48abb0368b16aeab892e377554 Mon Sep 17 00:00:00 2001 From: Bernard Siebens Date: Thu, 2 Jul 2026 16:37:56 +0200 Subject: [PATCH] Extend admin, migrations, and tests for authentication and club apps - Implement admin configurations for User, Member, Family, and FamilyMembership, with specialized inlines and filtered displays. - Introduce `UserCreationForm` and `UserChangeForm` for streamlined user management. - Enhance Family model with improved string representation and made name optional. - Add `Member.contact_email` property for prioritized email retrieval. - Include tests for the updated Family string logic, contact email functionality, and admin integration. - Add initial migration for club models (Club, ClubMembership) and updated migration for Family in the authentication app. - Configure IntelliJ IDEA for local SQLite database access. --- .idea/dataSources.xml | 12 +++ authentication/admin.py | 98 ++++++++++++++++- authentication/forms.py | 20 ++++ .../migrations/0002_alter_family_name.py | 18 ++++ authentication/models.py | 14 ++- authentication/tests.py | 100 ++++++++++++++++++ authentication/views.py | 3 - club/migrations/0001_initial.py | 36 +++++++ club/views.py | 3 - 9 files changed, 295 insertions(+), 9 deletions(-) create mode 100644 .idea/dataSources.xml create mode 100644 authentication/forms.py create mode 100644 authentication/migrations/0002_alter_family_name.py delete mode 100644 authentication/views.py create mode 100644 club/migrations/0001_initial.py delete mode 100644 club/views.py diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml new file mode 100644 index 0000000..e3a051f --- /dev/null +++ b/.idea/dataSources.xml @@ -0,0 +1,12 @@ + + + + + sqlite.xerial + true + org.sqlite.JDBC + jdbc:sqlite:$PROJECT_DIR$/db.sqlite3 + $ProjectFileDir$ + + + \ No newline at end of file diff --git a/authentication/admin.py b/authentication/admin.py index 8c38f3f..d663cc6 100644 --- a/authentication/admin.py +++ b/authentication/admin.py @@ -1,3 +1,99 @@ from django.contrib import admin +from django.contrib.auth.admin import UserAdmin as BaseUserAdmin +from django.utils.translation import gettext_lazy as _ -# Register your models here. +from .forms import UserChangeForm, UserCreationForm +from .models import Family, FamilyMembership, Member, User + + +class MemberInline(admin.StackedInline): + """Edit the member profile attached to a login from the User page.""" + + model = Member + can_delete = False + extra = 0 + max_num = 1 + verbose_name_plural = _("member profile") + fields = ("first_name", "last_name", "date_of_birth", "email", "phone", "emergency_phone") + + +@admin.register(User) +class UserAdmin(BaseUserAdmin): + add_form = UserCreationForm + form = UserChangeForm + model = User + inlines = [MemberInline] + + list_display = ("email", "full_name", "is_staff", "is_active") + list_filter = ("is_staff", "is_superuser", "is_active", "groups") + search_fields = ("email", "member__first_name", "member__last_name") + ordering = ("email",) + readonly_fields = ("last_login",) + + fieldsets = ( + (None, {"fields": ("email", "password")}), + (_("Permissions"), {"fields": ("is_active", "is_staff", "is_superuser", "groups", "user_permissions")}), + (_("Important dates"), {"fields": ("last_login",)}), + ) + add_fieldsets = ((None, {"classes": ("wide",), "fields": ("email", "password1", "password2")}),) + + @admin.display(description=_("name")) + def full_name(self, obj): + return obj.get_full_name() + + +class MemberFamilyInline(admin.TabularInline): + """Family memberships shown on the Member page.""" + + model = FamilyMembership + extra = 1 + autocomplete_fields = ("family",) + + +@admin.register(Member) +class MemberAdmin(admin.ModelAdmin): + list_display = ("last_name", "first_name", "contact_email", "phone_display", "emergency_phone_display", "user") + list_select_related = ("user",) + search_fields = ("first_name", "last_name", "email") + autocomplete_fields = ("user",) + inlines = [MemberFamilyInline] + fields = ("user", "first_name", "last_name", "date_of_birth", "email", "phone", "emergency_phone") + + @admin.display(description=_("email"), ordering="email") + def contact_email(self, obj): + return obj.contact_email + + @admin.display(description=_("phone"), ordering="phone") + def phone_display(self, obj): + return obj.phone.as_international if obj.phone else "" + + @admin.display(description=_("emergency phone"), ordering="emergency_phone") + def emergency_phone_display(self, obj): + return obj.emergency_phone.as_international if obj.emergency_phone else "" + + +class FamilyMemberInline(admin.TabularInline): + """Members shown on the Family page.""" + + model = FamilyMembership + extra = 1 + autocomplete_fields = ("member",) + + +@admin.register(Family) +class FamilyAdmin(admin.ModelAdmin): + list_display = ("__str__", "member_count") + search_fields = ("name", "memberships__member__first_name", "memberships__member__last_name") + inlines = [FamilyMemberInline] + + @admin.display(description=_("members")) + def member_count(self, obj): + return obj.memberships.count() + + +@admin.register(FamilyMembership) +class FamilyMembershipAdmin(admin.ModelAdmin): + list_display = ("family", "member", "role") + list_filter = ("role",) + autocomplete_fields = ("family", "member") + search_fields = ("family__name", "member__first_name", "member__last_name") diff --git a/authentication/forms.py b/authentication/forms.py new file mode 100644 index 0000000..b922d84 --- /dev/null +++ b/authentication/forms.py @@ -0,0 +1,20 @@ +from django.contrib.auth.forms import BaseUserCreationForm +from django.contrib.auth.forms import UserChangeForm as DjangoUserChangeForm + +from .models import User + + +class UserCreationForm(BaseUserCreationForm): + """Add-user form for the email-based custom User (no ``username`` field).""" + + class Meta: + model = User + fields = ("email",) + + +class UserChangeForm(DjangoUserChangeForm): + """Change-user form; keeps the read-only password hash widget.""" + + class Meta: + model = User + fields = "__all__" diff --git a/authentication/migrations/0002_alter_family_name.py b/authentication/migrations/0002_alter_family_name.py new file mode 100644 index 0000000..ea2c70a --- /dev/null +++ b/authentication/migrations/0002_alter_family_name.py @@ -0,0 +1,18 @@ +# Generated by Django 6.0.6 on 2026-07-02 14:33 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('authentication', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='family', + name='name', + field=models.CharField(blank=True, max_length=255), + ), + ] diff --git a/authentication/models.py b/authentication/models.py index 29c9fab..0d30574 100644 --- a/authentication/models.py +++ b/authentication/models.py @@ -46,7 +46,7 @@ class User(AbstractBaseUser, PermissionsMixin): class Family(UUIDModel): - name = models.CharField(max_length=255) + name = models.CharField(max_length=255, blank=True) class Meta: verbose_name = _("family") @@ -54,7 +54,12 @@ class Family(UUIDModel): ordering = ["name"] def __str__(self): - return self.name + if self.name: + return self.name + surnames = sorted({last_name for last_name in self.memberships.values_list("member__last_name", flat=True) if last_name}) + if surnames: + return _("%(surnames)s family") % {"surnames": " / ".join(surnames)} + return _("Family %(id)s") % {"id": str(self.pk)[:8]} @property def guardians(self): @@ -98,6 +103,11 @@ class Member(UUIDModel): def get_short_name(self): return self.first_name + @property + def contact_email(self): + """Best email to reach this member: own contact email, else login email.""" + return self.email or (self.user.email if self.user_id else "") + @property def guardians(self): return Member.objects.filter( diff --git a/authentication/tests.py b/authentication/tests.py index 431dd9f..2cdd8e5 100644 --- a/authentication/tests.py +++ b/authentication/tests.py @@ -101,6 +101,20 @@ class MemberModelTests(TestCase): member = Member.objects.create(first_name="Cher", last_name="") self.assertEqual(member.get_full_name(), "Cher") + def test_contact_email_prefers_own_email(self): + user = User.objects.create_user(email="login@example.com", password="x") + member = Member.objects.create(user=user, first_name="Own", last_name="Email", email="own@example.com") + self.assertEqual(member.contact_email, "own@example.com") + + def test_contact_email_falls_back_to_login_email(self): + user = User.objects.create_user(email="login@example.com", password="x") + member = Member.objects.create(user=user, first_name="No", last_name="Email") + self.assertEqual(member.contact_email, "login@example.com") + + def test_contact_email_empty_without_email_or_user(self): + member = Member.objects.create(first_name="Zero", last_name="Contact") + self.assertEqual(member.contact_email, "") + def test_member_can_exist_without_user(self): member = Member.objects.create(first_name="No", last_name="Login") self.assertIsNone(member.user) @@ -126,6 +140,29 @@ class MemberModelTests(TestCase): Member.objects.create(user=user, first_name="Second", last_name="Member") +class FamilyNameOptionalTests(TestCase): + def test_family_can_be_created_without_a_name(self): + family = Family.objects.create() + self.assertEqual(family.name, "") + + def test_str_uses_name_when_present(self): + self.assertEqual(str(Family.objects.create(name="The Smiths")), "The Smiths") + + def test_str_falls_back_to_member_surnames(self): + family = Family.objects.create() + smith = Member.objects.create(first_name="Pat", last_name="Smith") + jones = Member.objects.create(first_name="Kim", last_name="Jones") + FamilyMembership.objects.create(family=family, member=smith, role=FamilyMembership.FamilyRole.PARENT) + FamilyMembership.objects.create(family=family, member=jones, role=FamilyMembership.FamilyRole.CHILD) + + # Distinct surnames, alphabetically ordered. + self.assertEqual(str(family), "Jones / Smith family") + + def test_str_falls_back_to_short_id_when_empty(self): + family = Family.objects.create() + self.assertEqual(str(family), f"Family {str(family.pk)[:8]}") + + class FamilyModelTests(TestCase): def setUp(self): self.family = Family.objects.create(name="The Smiths") @@ -232,3 +269,66 @@ class FamilyMembershipModelTests(TestCase): self.assertFalse(FamilyMembership.objects.exists()) # The member itself survives; only the membership is removed. self.assertTrue(Member.objects.filter(pk=member.pk).exists()) + + +class AdminSmokeTests(TestCase): + """Exercise the admin config end-to-end to catch misregistration + (bad search_fields, autocomplete targets, fieldsets, custom forms).""" + + def setUp(self): + self.admin = User.objects.create_superuser(email="root@example.com", password="pw-secret-123") + self.client.force_login(self.admin) + + def test_changelists_load(self): + for model in ("user", "member", "family", "familymembership"): + with self.subTest(model=model): + response = self.client.get(f"/admin/authentication/{model}/") + self.assertEqual(response.status_code, 200) + + def test_user_add_page_loads(self): + response = self.client.get("/admin/authentication/user/add/") + self.assertEqual(response.status_code, 200) + + def test_member_changelist_shows_grouped_numbers_and_fallback_email(self): + user = User.objects.create_user(email="fallback@example.com", password="pw") + Member.objects.create( + user=user, + first_name="Grouped", + last_name="Numbers", + phone="+32470123456", + emergency_phone="+3221234567", + ) + response = self.client.get("/admin/authentication/member/") + content = response.content.decode() + + # Numbers rendered in grouped international format, not raw E.164. + self.assertIn("+32 470 12 34 56", content) + self.assertIn("+32 2 123 45 67", content) + # Email column falls back to the linked login email. + self.assertIn("fallback@example.com", content) + + def test_create_user_through_admin_hashes_password(self): + response = self.client.post( + "/admin/authentication/user/add/", + { + "email": "new@example.com", + "password1": "a-good-password-42", + "password2": "a-good-password-42", + # Empty MemberInline management form — no profile created. + "member-TOTAL_FORMS": "0", + "member-INITIAL_FORMS": "0", + "member-MIN_NUM_FORMS": "0", + "member-MAX_NUM_FORMS": "1", + }, + ) + self.assertEqual(response.status_code, 302) + created = User.objects.get(email="new@example.com") + self.assertTrue(created.check_password("a-good-password-42")) + + def test_autocomplete_endpoints_respond(self): + # Member.user autocomplete resolves against UserAdmin.search_fields. + response = self.client.get( + "/admin/autocomplete/", + {"app_label": "authentication", "model_name": "member", "field_name": "user", "term": "root"}, + ) + self.assertEqual(response.status_code, 200) diff --git a/authentication/views.py b/authentication/views.py deleted file mode 100644 index 91ea44a..0000000 --- a/authentication/views.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.shortcuts import render - -# Create your views here. diff --git a/club/migrations/0001_initial.py b/club/migrations/0001_initial.py new file mode 100644 index 0000000..139ad1e --- /dev/null +++ b/club/migrations/0001_initial.py @@ -0,0 +1,36 @@ +# Generated by Django 6.0.6 on 2026-07-02 14:24 + +import uuid +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Club', + fields=[ + ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)), + ('name', models.CharField(max_length=255)), + ], + options={ + 'verbose_name': 'club', + 'verbose_name_plural': 'clubs', + 'ordering': ['name'], + }, + ), + migrations.CreateModel( + name='ClubMembership', + fields=[ + ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)), + ], + options={ + 'abstract': False, + }, + ), + ] diff --git a/club/views.py b/club/views.py deleted file mode 100644 index 91ea44a..0000000 --- a/club/views.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.shortcuts import render - -# Create your views here.