Complete people-domain move into members app; keep names on Member
Finish relocating Member/Family/FamilyMembership from authentication into a dedicated members app, and revert the half-applied move of member names onto the global User. - members: add first_name/last_name back to Member (the whole codebase — tests, CSV importer, club app, admin — assumes them, and login-less children in families need a name); restore local ordering/index and the member__last_name lookups in Family.__str__ and FamilyMembership. - authentication: drop first_name/last_name from User; get_full_name/ get_short_name delegate to the linked member, else fall back to email. - migrations: create members.0001_initial, repoint club.ClubMembership FK (club.0005), delete the models from authentication (0004, rewritten to plain DeleteModel ops in child-first order to avoid a SQLite table-remake crash). - fix stale imports across apps (authentication/club tests, CSV importer) and missing imports/URLs in members tests; add missing _ import in members/admin.py; export MemberCsvImporter from members.services. Full suite green (64 tests), ruff clean. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
0
members/__init__.py
Normal file
0
members/__init__.py
Normal file
62
members/admin.py
Normal file
62
members/admin.py
Normal file
@@ -0,0 +1,62 @@
|
||||
from django.contrib import admin
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
|
||||
from .models import Family, FamilyMembership, Member
|
||||
|
||||
|
||||
# Register your models here.
|
||||
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")
|
||||
5
members/apps.py
Normal file
5
members/apps.py
Normal file
@@ -0,0 +1,5 @@
|
||||
from django.apps import AppConfig
|
||||
|
||||
|
||||
class MembersConfig(AppConfig):
|
||||
name = "members"
|
||||
0
members/management/__init__.py
Normal file
0
members/management/__init__.py
Normal file
0
members/management/commands/__init__.py
Normal file
0
members/management/commands/__init__.py
Normal file
43
members/management/commands/import_members_csv.py
Normal file
43
members/management/commands/import_members_csv.py
Normal file
@@ -0,0 +1,43 @@
|
||||
from django.core.management.base import BaseCommand, CommandError
|
||||
|
||||
from members.services import MemberCsvImporter
|
||||
|
||||
|
||||
class Command(BaseCommand):
|
||||
help = "Import club members from a CSV file."
|
||||
|
||||
def add_arguments(self, parser) -> None:
|
||||
parser.add_argument(
|
||||
"csv_file",
|
||||
type=str,
|
||||
help="Path to the CSV file to import.",
|
||||
)
|
||||
parser.add_argument(
|
||||
"--date-format",
|
||||
default="%Y-%m-%d",
|
||||
help="Date format for date_of_birth. Default: %%Y-%%m-%%d",
|
||||
)
|
||||
|
||||
def handle(self, *args, **options) -> str | None:
|
||||
importer = MemberCsvImporter(date_format=options["date_format"])
|
||||
|
||||
try:
|
||||
result = importer.import_path(options["csv_file"])
|
||||
except Exception as exc:
|
||||
raise CommandError(str(exc)) from exc
|
||||
|
||||
for error in result.errors:
|
||||
self.stderr.write(self.style.ERROR(f"Row {error.row_number} skipped: {error.message}"))
|
||||
|
||||
self.stdout.write(
|
||||
self.style.SUCCESS(
|
||||
"Import complete. "
|
||||
f"Members created: {result.created_members}. "
|
||||
f"Members updated: {result.updated_members}. "
|
||||
f"Users created: {result.created_users}. "
|
||||
f"Clubs created: {result.created_clubs}. "
|
||||
f"Memberships created: {result.created_memberships}. "
|
||||
f"Memberships updated: {result.updated_memberships}. "
|
||||
f"Rows skipped: {result.skipped_rows}."
|
||||
)
|
||||
)
|
||||
71
members/migrations/0001_initial.py
Normal file
71
members/migrations/0001_initial.py
Normal file
@@ -0,0 +1,71 @@
|
||||
# Generated by Django 6.0.6 on 2026-07-11 22:09
|
||||
|
||||
import django.db.models.deletion
|
||||
import phonenumber_field.modelfields
|
||||
import uuid
|
||||
from django.conf import settings
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
initial = True
|
||||
|
||||
dependencies = [
|
||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='Family',
|
||||
fields=[
|
||||
('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
|
||||
('name', models.CharField(blank=True, max_length=255, verbose_name='name')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'family',
|
||||
'verbose_name_plural': 'families',
|
||||
'ordering': ['name'],
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='Member',
|
||||
fields=[
|
||||
('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
|
||||
('first_name', models.CharField(max_length=150, verbose_name='first name')),
|
||||
('last_name', models.CharField(max_length=150, verbose_name='last name')),
|
||||
('date_of_birth', models.DateField(blank=True, null=True, verbose_name='date of birth')),
|
||||
('email', models.EmailField(blank=True, max_length=254, verbose_name='email')),
|
||||
('phone', phonenumber_field.modelfields.PhoneNumberField(blank=True, max_length=128, null=True, region=None, verbose_name='phone number')),
|
||||
('emergency_phone', phonenumber_field.modelfields.PhoneNumberField(blank=True, max_length=128, null=True, region=None, verbose_name='emergency phone number')),
|
||||
('user', models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='member', to=settings.AUTH_USER_MODEL, verbose_name='user')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'member',
|
||||
'verbose_name_plural': 'members',
|
||||
'ordering': ['last_name', 'first_name'],
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='FamilyMembership',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('role', models.CharField(choices=[('parent', 'parent'), ('child', 'child'), ('guardian', 'guardian'), ('other', 'other')], default='parent', max_length=255, verbose_name='role')),
|
||||
('family', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='memberships', to='members.family', verbose_name='family')),
|
||||
('member', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='family_memberships', to='members.member', verbose_name='member')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'family membership',
|
||||
'verbose_name_plural': 'family memberships',
|
||||
'ordering': ['family', 'role', 'member__last_name', 'member__first_name'],
|
||||
},
|
||||
),
|
||||
migrations.AddIndex(
|
||||
model_name='member',
|
||||
index=models.Index(fields=['last_name', 'first_name'], name='members_mem_last_na_92a910_idx'),
|
||||
),
|
||||
migrations.AlterUniqueTogether(
|
||||
name='familymembership',
|
||||
unique_together={('family', 'member')},
|
||||
),
|
||||
]
|
||||
0
members/migrations/__init__.py
Normal file
0
members/migrations/__init__.py
Normal file
99
members/models.py
Normal file
99
members/models.py
Normal file
@@ -0,0 +1,99 @@
|
||||
from django.conf import settings
|
||||
from django.db import models
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
from phonenumber_field.modelfields import PhoneNumberField
|
||||
|
||||
from clubmanager.base import UUIDModel
|
||||
|
||||
|
||||
class Family(UUIDModel):
|
||||
name = models.CharField(_("name"), max_length=255, blank=True)
|
||||
|
||||
class Meta:
|
||||
verbose_name = _("family")
|
||||
verbose_name_plural = _("families")
|
||||
ordering = ["name"]
|
||||
|
||||
def __str__(self):
|
||||
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):
|
||||
return Member.objects.filter(
|
||||
family_memberships__family=self,
|
||||
family_memberships__role__in=[FamilyMembership.FamilyRole.PARENT, FamilyMembership.FamilyRole.GUARDIAN],
|
||||
)
|
||||
|
||||
@property
|
||||
def children(self):
|
||||
return Member.objects.filter(
|
||||
family_memberships__family=self,
|
||||
family_memberships__role=FamilyMembership.FamilyRole.CHILD,
|
||||
)
|
||||
|
||||
|
||||
class Member(UUIDModel):
|
||||
user = models.OneToOneField(settings.AUTH_USER_MODEL, on_delete=models.SET_NULL, related_name="member", null=True, blank=True, verbose_name=_("user"))
|
||||
|
||||
first_name = models.CharField(_("first name"), max_length=150)
|
||||
last_name = models.CharField(_("last name"), max_length=150)
|
||||
|
||||
date_of_birth = models.DateField(_("date of birth"), null=True, blank=True)
|
||||
|
||||
email = models.EmailField(_("email"), blank=True)
|
||||
phone = PhoneNumberField(_("phone number"), null=True, blank=True)
|
||||
emergency_phone = PhoneNumberField(_("emergency phone number"), null=True, blank=True)
|
||||
|
||||
class Meta:
|
||||
verbose_name = _("member")
|
||||
verbose_name_plural = _("members")
|
||||
ordering = ["last_name", "first_name"]
|
||||
indexes = [models.Index(fields=["last_name", "first_name"])]
|
||||
|
||||
def __str__(self):
|
||||
return self.get_full_name()
|
||||
|
||||
def get_full_name(self):
|
||||
return f"{self.first_name} {self.last_name}".strip()
|
||||
|
||||
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(
|
||||
family_memberships__role__in=[FamilyMembership.FamilyRole.PARENT, FamilyMembership.FamilyRole.GUARDIAN],
|
||||
family_memberships__family__memberships__member=self,
|
||||
family_memberships__family__memberships__role=FamilyMembership.FamilyRole.CHILD,
|
||||
).distinct()
|
||||
|
||||
|
||||
class FamilyMembership(models.Model):
|
||||
class FamilyRole(models.TextChoices):
|
||||
PARENT = "parent", _("parent")
|
||||
CHILD = "child", _("child")
|
||||
GUARDIAN = "guardian", _("guardian")
|
||||
OTHER = "other", _("other")
|
||||
|
||||
family = models.ForeignKey(Family, on_delete=models.CASCADE, related_name="memberships", verbose_name=_("family"))
|
||||
member = models.ForeignKey(Member, on_delete=models.CASCADE, related_name="family_memberships", verbose_name=_("member"))
|
||||
role = models.CharField(_("role"), max_length=255, choices=FamilyRole.choices, default=FamilyRole.PARENT)
|
||||
|
||||
class Meta:
|
||||
verbose_name = _("family membership")
|
||||
verbose_name_plural = _("family memberships")
|
||||
ordering = ["family", "role", "member__last_name", "member__first_name"]
|
||||
unique_together = ("family", "member")
|
||||
|
||||
def __str__(self):
|
||||
return f"{self.family} - {self.member} ({self.get_role_display()})"
|
||||
13
members/services/__init__.py
Normal file
13
members/services/__init__.py
Normal file
@@ -0,0 +1,13 @@
|
||||
from members.services.member_csv_importer import (
|
||||
ImportedMemberRowResult,
|
||||
MemberCsvImporter,
|
||||
MemberImportResult,
|
||||
MemberImportRowError,
|
||||
)
|
||||
|
||||
__all__ = [
|
||||
"ImportedMemberRowResult",
|
||||
"MemberCsvImporter",
|
||||
"MemberImportResult",
|
||||
"MemberImportRowError",
|
||||
]
|
||||
180
members/services/member_csv_importer.py
Normal file
180
members/services/member_csv_importer.py
Normal file
@@ -0,0 +1,180 @@
|
||||
import csv
|
||||
from dataclasses import dataclass, field
|
||||
from datetime import date, datetime
|
||||
from pathlib import Path
|
||||
from typing import IO, Any
|
||||
|
||||
from django.contrib.auth import get_user_model
|
||||
from django.db import transaction
|
||||
|
||||
from club.models import Club, ClubMembership
|
||||
from members.models import Member
|
||||
|
||||
REQUIRED_COLUMNS = {"first_name", "last_name", "email", "date_of_birth", "create_account", "club_name", "license_number"}
|
||||
TRUE_VALUES = {"1", "true", "yes", "y", "on"}
|
||||
|
||||
User = get_user_model()
|
||||
|
||||
|
||||
@dataclass
|
||||
class MemberImportRowError:
|
||||
row_number: int
|
||||
message: str
|
||||
|
||||
|
||||
@dataclass
|
||||
class MemberImportResult:
|
||||
created_members: int = 0
|
||||
updated_members: int = 0
|
||||
created_users: int = 0
|
||||
created_clubs: int = 0
|
||||
created_memberships: int = 0
|
||||
updated_memberships: int = 0
|
||||
skipped_rows: int = 0
|
||||
errors: list[MemberImportRowError] = field(default_factory=list)
|
||||
|
||||
@property
|
||||
def successful_rows(self):
|
||||
return self.created_members + self.updated_members
|
||||
|
||||
|
||||
@dataclass
|
||||
class ImportedMemberRowResult:
|
||||
member_created: bool
|
||||
user_created: bool
|
||||
club_created: bool
|
||||
membership_created: bool
|
||||
|
||||
|
||||
class MemberCsvImporter:
|
||||
def __init__(self, *, date_format="%Y-%m-%d") -> None:
|
||||
self.date_format = date_format
|
||||
|
||||
def import_path(self, csv_path) -> MemberImportResult:
|
||||
path = Path(csv_path)
|
||||
|
||||
if not path.exists():
|
||||
raise FileNotFoundError(f"CSV file does not exist: {path}")
|
||||
|
||||
with path.open(newline="", encoding="utf-8-sig") as csv_file:
|
||||
return self.import_file(csv_file)
|
||||
|
||||
def import_file(self, csv_file: IO[str]) -> MemberImportResult:
|
||||
result = MemberImportResult()
|
||||
reader = csv.DictReader(csv_file)
|
||||
|
||||
if reader.fieldnames is None:
|
||||
raise ValueError("CSV file is empty or missing a header row.")
|
||||
|
||||
missing_columns = REQUIRED_COLUMNS - set(reader.fieldnames)
|
||||
if missing_columns:
|
||||
raise ValueError("CSV file is missing required columns: " + ", ".join(sorted(missing_columns)))
|
||||
|
||||
for row_number, row in enumerate(reader, start=2):
|
||||
try:
|
||||
row_result = self.import_row(row)
|
||||
except Exception as exc:
|
||||
result.skipped_rows += 1
|
||||
result.errors.append(
|
||||
MemberImportRowError(
|
||||
row_number=row_number,
|
||||
message=str(exc),
|
||||
)
|
||||
)
|
||||
continue
|
||||
|
||||
if row_result.member_created:
|
||||
result.created_members += 1
|
||||
else:
|
||||
result.updated_members += 1
|
||||
|
||||
if row_result.user_created:
|
||||
result.created_users += 1
|
||||
|
||||
if row_result.club_created:
|
||||
result.created_clubs += 1
|
||||
|
||||
if row_result.membership_created:
|
||||
result.created_memberships += 1
|
||||
else:
|
||||
result.updated_memberships += 1
|
||||
|
||||
return result
|
||||
|
||||
@transaction.atomic
|
||||
def import_row(self, row) -> ImportedMemberRowResult:
|
||||
first_name = self.clean_required(row, "first_name")
|
||||
last_name = self.clean_required(row, "last_name")
|
||||
email = self.clean_required(row, "email").lower()
|
||||
date_of_birth = self.parse_date(self.clean_required(row, "date_of_birth"))
|
||||
create_account = self.as_bool(row.get("create_account", ""))
|
||||
club_name = self.clean_required(row, "club_name")
|
||||
license_number = row.get("license_number", "").strip()
|
||||
|
||||
user = None
|
||||
user_created = False
|
||||
|
||||
if create_account:
|
||||
user, user_created = self.get_or_create_user(email)
|
||||
|
||||
member, member_created = Member.objects.update_or_create(
|
||||
email=email,
|
||||
defaults={
|
||||
"first_name": first_name,
|
||||
"last_name": last_name,
|
||||
"date_of_birth": date_of_birth,
|
||||
"user": user,
|
||||
},
|
||||
)
|
||||
|
||||
if create_account and member.user_id is None:
|
||||
member.user = user
|
||||
member.save(update_fields=["user"])
|
||||
|
||||
club, club_created = Club.objects.get_or_create(name=club_name)
|
||||
|
||||
_, membership_created = ClubMembership.objects.update_or_create(
|
||||
club=club,
|
||||
member=member,
|
||||
defaults={
|
||||
"license": license_number,
|
||||
},
|
||||
)
|
||||
|
||||
return ImportedMemberRowResult(
|
||||
member_created=member_created,
|
||||
user_created=user_created,
|
||||
club_created=club_created,
|
||||
membership_created=membership_created,
|
||||
)
|
||||
|
||||
def get_or_create_user(self, email) -> tuple[User, bool]:
|
||||
user, created = User.objects.get_or_create(
|
||||
email=email,
|
||||
defaults={
|
||||
"is_active": True,
|
||||
},
|
||||
)
|
||||
|
||||
if created:
|
||||
user.set_unusable_password()
|
||||
user.save(update_fields=["password"])
|
||||
|
||||
return user, created
|
||||
|
||||
def clean_required(self, row, field_name) -> Any:
|
||||
value = row.get(field_name, "").strip()
|
||||
|
||||
if not value:
|
||||
raise ValueError(f"{field_name} is required.")
|
||||
|
||||
return value
|
||||
|
||||
def parse_date(self, value) -> date:
|
||||
try:
|
||||
return datetime.strptime(value, self.date_format).date()
|
||||
except ValueError as exc:
|
||||
raise ValueError(f"Invalid date_of_birth '{value}'. Expected format: {self.date_format}.") from exc
|
||||
|
||||
def as_bool(self, value) -> bool:
|
||||
return value.strip().lower() in TRUE_VALUES
|
||||
495
members/tests.py
Normal file
495
members/tests.py
Normal file
@@ -0,0 +1,495 @@
|
||||
import tempfile
|
||||
from datetime import date
|
||||
from io import StringIO
|
||||
from pathlib import Path
|
||||
|
||||
from django.core.management import call_command
|
||||
from django.core.management.base import CommandError
|
||||
from django.db import IntegrityError
|
||||
from django.db.models import SET_NULL
|
||||
from django.test import TestCase
|
||||
|
||||
from authentication.models import User
|
||||
from club.models import Club, ClubMembership
|
||||
from members.models import Family, FamilyMembership, Member
|
||||
|
||||
|
||||
# Create your tests here.
|
||||
class MemberModelTests(TestCase):
|
||||
def test_str_and_name_helpers(self):
|
||||
member = Member.objects.create(first_name="John", last_name="Smith")
|
||||
|
||||
self.assertEqual(str(member), "John Smith")
|
||||
self.assertEqual(member.get_full_name(), "John Smith")
|
||||
self.assertEqual(member.get_short_name(), "John")
|
||||
|
||||
def test_get_full_name_strips_when_partial(self):
|
||||
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)
|
||||
|
||||
def test_deleting_user_nulls_member_but_keeps_it(self):
|
||||
user = User.objects.create_user(email="temp@example.com", password="x")
|
||||
member = Member.objects.create(user=user, first_name="Keep", last_name="Me")
|
||||
|
||||
# OneToOneField uses on_delete=SET_NULL.
|
||||
field = Member._meta.get_field("user")
|
||||
self.assertIs(field.remote_field.on_delete, SET_NULL)
|
||||
|
||||
user.delete()
|
||||
member.refresh_from_db()
|
||||
self.assertIsNone(member.user)
|
||||
self.assertTrue(Member.objects.filter(pk=member.pk).exists())
|
||||
|
||||
def test_user_member_is_one_to_one(self):
|
||||
user = User.objects.create_user(email="once@example.com", password="x")
|
||||
Member.objects.create(user=user, first_name="First", last_name="Member")
|
||||
|
||||
with self.assertRaises(IntegrityError):
|
||||
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")
|
||||
self.parent = Member.objects.create(first_name="Pat", last_name="Smith")
|
||||
self.guardian = Member.objects.create(first_name="Gale", last_name="Smith")
|
||||
self.child = Member.objects.create(first_name="Kim", last_name="Smith")
|
||||
self.other = Member.objects.create(first_name="Ola", last_name="Smith")
|
||||
|
||||
FamilyMembership.objects.create(family=self.family, member=self.parent, role=FamilyMembership.FamilyRole.PARENT)
|
||||
FamilyMembership.objects.create(family=self.family, member=self.guardian, role=FamilyMembership.FamilyRole.GUARDIAN)
|
||||
FamilyMembership.objects.create(family=self.family, member=self.child, role=FamilyMembership.FamilyRole.CHILD)
|
||||
FamilyMembership.objects.create(family=self.family, member=self.other, role=FamilyMembership.FamilyRole.OTHER)
|
||||
|
||||
def test_str(self):
|
||||
self.assertEqual(str(self.family), "The Smiths")
|
||||
|
||||
def test_guardians_include_parents_and_guardians_only(self):
|
||||
guardians = set(self.family.guardians)
|
||||
self.assertEqual(guardians, {self.parent, self.guardian})
|
||||
|
||||
def test_children_include_children_only(self):
|
||||
children = list(self.family.children)
|
||||
self.assertEqual(children, [self.child])
|
||||
|
||||
def test_guardians_are_scoped_to_the_family(self):
|
||||
other_family = Family.objects.create(name="The Joneses")
|
||||
outsider = Member.objects.create(first_name="Out", last_name="Sider")
|
||||
FamilyMembership.objects.create(family=other_family, member=outsider, role=FamilyMembership.FamilyRole.PARENT)
|
||||
|
||||
self.assertNotIn(outsider, set(self.family.guardians))
|
||||
|
||||
|
||||
class MemberGuardiansTests(TestCase):
|
||||
def test_guardians_of_a_child_are_family_parents_and_guardians(self):
|
||||
family = Family.objects.create(name="The Does")
|
||||
mum = Member.objects.create(first_name="Mary", last_name="Doe")
|
||||
legal = Member.objects.create(first_name="Lee", last_name="Doe")
|
||||
kid = Member.objects.create(first_name="Kit", last_name="Doe")
|
||||
|
||||
FamilyMembership.objects.create(family=family, member=mum, role=FamilyMembership.FamilyRole.PARENT)
|
||||
FamilyMembership.objects.create(family=family, member=legal, role=FamilyMembership.FamilyRole.GUARDIAN)
|
||||
FamilyMembership.objects.create(family=family, member=kid, role=FamilyMembership.FamilyRole.CHILD)
|
||||
|
||||
self.assertEqual(set(kid.guardians), {mum, legal})
|
||||
|
||||
def test_guardians_empty_for_a_parent(self):
|
||||
family = Family.objects.create(name="The Roes")
|
||||
parent = Member.objects.create(first_name="Ray", last_name="Roe")
|
||||
kid = Member.objects.create(first_name="Ren", last_name="Roe")
|
||||
|
||||
FamilyMembership.objects.create(family=family, member=parent, role=FamilyMembership.FamilyRole.PARENT)
|
||||
FamilyMembership.objects.create(family=family, member=kid, role=FamilyMembership.FamilyRole.CHILD)
|
||||
|
||||
self.assertEqual(list(parent.guardians), [])
|
||||
|
||||
def test_guardians_do_not_leak_across_families(self):
|
||||
family_a = Family.objects.create(name="Family A")
|
||||
family_b = Family.objects.create(name="Family B")
|
||||
parent_a = Member.objects.create(first_name="Ann", last_name="A")
|
||||
parent_b = Member.objects.create(first_name="Ben", last_name="B")
|
||||
kid = Member.objects.create(first_name="Cody", last_name="A")
|
||||
|
||||
FamilyMembership.objects.create(family=family_a, member=parent_a, role=FamilyMembership.FamilyRole.PARENT)
|
||||
FamilyMembership.objects.create(family=family_a, member=kid, role=FamilyMembership.FamilyRole.CHILD)
|
||||
# parent_b belongs to a different family and must not appear as kid's guardian.
|
||||
FamilyMembership.objects.create(family=family_b, member=parent_b, role=FamilyMembership.FamilyRole.PARENT)
|
||||
|
||||
self.assertEqual(set(kid.guardians), {parent_a})
|
||||
|
||||
|
||||
class FamilyMembershipModelTests(TestCase):
|
||||
def test_default_role_is_parent(self):
|
||||
family = Family.objects.create(name="Fam")
|
||||
member = Member.objects.create(first_name="D", last_name="Efault")
|
||||
membership = FamilyMembership.objects.create(family=family, member=member)
|
||||
|
||||
self.assertEqual(membership.role, FamilyMembership.FamilyRole.PARENT)
|
||||
|
||||
def test_member_unique_per_family(self):
|
||||
family = Family.objects.create(name="Fam")
|
||||
member = Member.objects.create(first_name="Solo", last_name="Once")
|
||||
FamilyMembership.objects.create(family=family, member=member, role=FamilyMembership.FamilyRole.PARENT)
|
||||
|
||||
with self.assertRaises(IntegrityError):
|
||||
FamilyMembership.objects.create(family=family, member=member, role=FamilyMembership.FamilyRole.CHILD)
|
||||
|
||||
def test_same_member_can_join_multiple_families(self):
|
||||
member = Member.objects.create(first_name="Multi", last_name="Fam")
|
||||
family_a = Family.objects.create(name="A")
|
||||
family_b = Family.objects.create(name="B")
|
||||
|
||||
FamilyMembership.objects.create(family=family_a, member=member, role=FamilyMembership.FamilyRole.CHILD)
|
||||
FamilyMembership.objects.create(family=family_b, member=member, role=FamilyMembership.FamilyRole.PARENT)
|
||||
|
||||
self.assertEqual(member.family_memberships.count(), 2)
|
||||
|
||||
def test_deleting_family_cascades_to_memberships(self):
|
||||
family = Family.objects.create(name="Doomed")
|
||||
member = Member.objects.create(first_name="Cas", last_name="Cade")
|
||||
FamilyMembership.objects.create(family=family, member=member)
|
||||
|
||||
family.delete()
|
||||
|
||||
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 app_label, model in (
|
||||
("authentication", "user"),
|
||||
("members", "member"),
|
||||
("members", "family"),
|
||||
("members", "familymembership"),
|
||||
):
|
||||
with self.subTest(model=model):
|
||||
response = self.client.get(f"/admin/{app_label}/{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/members/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": "members", "model_name": "member", "field_name": "user", "term": "root"},
|
||||
)
|
||||
self.assertEqual(response.status_code, 200)
|
||||
|
||||
|
||||
class ImportMembersCsvCommandTests(TestCase):
|
||||
def write_csv(self, content):
|
||||
temp_file = tempfile.NamedTemporaryFile(mode="w", suffix=".csv", delete=False, encoding="utf-8")
|
||||
temp_file.write(content)
|
||||
temp_file.close()
|
||||
self.addCleanup(lambda: Path(temp_file.name).unlink(missing_ok=True))
|
||||
return temp_file.name
|
||||
|
||||
def call_import_command(self, csv_path, **options):
|
||||
stdout = StringIO()
|
||||
stderr = StringIO()
|
||||
|
||||
call_command(
|
||||
"import_members_csv",
|
||||
csv_path,
|
||||
stdout=stdout,
|
||||
stderr=stderr,
|
||||
**options,
|
||||
)
|
||||
|
||||
return stdout.getvalue(), stderr.getvalue()
|
||||
|
||||
def test_import_creates_member_club_membership_and_user_when_requested(self):
|
||||
csv_path = self.write_csv(
|
||||
"\n".join(
|
||||
[
|
||||
"first_name,last_name,email,date_of_birth,create_account,club_name,license_number",
|
||||
"Jane,Doe,jane@example.com,2010-04-12,true,City Swim Club,LIC-001",
|
||||
]
|
||||
)
|
||||
)
|
||||
|
||||
stdout, stderr = self.call_import_command(csv_path)
|
||||
|
||||
self.assertEqual(stderr, "")
|
||||
self.assertIn("Import complete.", stdout)
|
||||
self.assertIn("Members created: 1.", stdout)
|
||||
self.assertIn("Users created: 1.", stdout)
|
||||
self.assertIn("Clubs created: 1.", stdout)
|
||||
self.assertIn("Memberships created: 1.", stdout)
|
||||
self.assertIn("Rows skipped: 0.", stdout)
|
||||
|
||||
member = Member.objects.get(email="jane@example.com")
|
||||
self.assertEqual(member.first_name, "Jane")
|
||||
self.assertEqual(member.last_name, "Doe")
|
||||
self.assertEqual(member.date_of_birth, date(2010, 4, 12))
|
||||
self.assertIsNotNone(member.user)
|
||||
self.assertEqual(member.user.email, "jane@example.com")
|
||||
self.assertFalse(member.user.has_usable_password())
|
||||
|
||||
club = Club.objects.get(name="City Swim Club")
|
||||
membership = ClubMembership.objects.get(club=club, member=member)
|
||||
self.assertEqual(membership.license, "LIC-001")
|
||||
|
||||
def test_import_creates_member_without_user_when_create_account_is_false(self):
|
||||
csv_path = self.write_csv(
|
||||
"\n".join(
|
||||
[
|
||||
"first_name,last_name,email,date_of_birth,create_account,club_name,license_number",
|
||||
"John,Smith,john@example.com,2009-11-03,false,City Swim Club,LIC-002",
|
||||
]
|
||||
)
|
||||
)
|
||||
|
||||
stdout, stderr = self.call_import_command(csv_path)
|
||||
|
||||
self.assertEqual(stderr, "")
|
||||
self.assertIn("Members created: 1.", stdout)
|
||||
self.assertIn("Users created: 0.", stdout)
|
||||
|
||||
member = Member.objects.get(email="john@example.com")
|
||||
self.assertIsNone(member.user)
|
||||
self.assertFalse(User.objects.filter(email="john@example.com").exists())
|
||||
|
||||
def test_import_updates_existing_member_and_membership(self):
|
||||
club = Club.objects.create(name="City Swim Club")
|
||||
member = Member.objects.create(
|
||||
first_name="Old",
|
||||
last_name="Name",
|
||||
email="jane@example.com",
|
||||
date_of_birth=date(2010, 1, 1),
|
||||
)
|
||||
ClubMembership.objects.create(
|
||||
club=club,
|
||||
member=member,
|
||||
license="OLD-LIC",
|
||||
)
|
||||
|
||||
csv_path = self.write_csv(
|
||||
"\n".join(
|
||||
[
|
||||
"first_name,last_name,email,date_of_birth,create_account,club_name,license_number",
|
||||
"Jane,Doe,jane@example.com,2010-04-12,false,City Swim Club,LIC-NEW",
|
||||
]
|
||||
)
|
||||
)
|
||||
|
||||
stdout, stderr = self.call_import_command(csv_path)
|
||||
|
||||
self.assertEqual(stderr, "")
|
||||
self.assertIn("Members created: 0.", stdout)
|
||||
self.assertIn("Members updated: 1.", stdout)
|
||||
self.assertIn("Memberships created: 0.", stdout)
|
||||
self.assertIn("Memberships updated: 1.", stdout)
|
||||
|
||||
member.refresh_from_db()
|
||||
self.assertEqual(member.first_name, "Jane")
|
||||
self.assertEqual(member.last_name, "Doe")
|
||||
self.assertEqual(member.date_of_birth, date(2010, 4, 12))
|
||||
|
||||
membership = ClubMembership.objects.get(club=club, member=member)
|
||||
self.assertEqual(membership.license, "LIC-NEW")
|
||||
|
||||
def test_import_links_existing_user_when_create_account_is_true(self):
|
||||
user = User.objects.create_user(email="jane@example.com", password="secret123")
|
||||
|
||||
csv_path = self.write_csv(
|
||||
"\n".join(
|
||||
[
|
||||
"first_name,last_name,email,date_of_birth,create_account,club_name,license_number",
|
||||
"Jane,Doe,jane@example.com,2010-04-12,true,City Swim Club,LIC-001",
|
||||
]
|
||||
)
|
||||
)
|
||||
|
||||
stdout, stderr = self.call_import_command(csv_path)
|
||||
|
||||
self.assertEqual(stderr, "")
|
||||
self.assertIn("Users created: 0.", stdout)
|
||||
|
||||
member = Member.objects.get(email="jane@example.com")
|
||||
self.assertEqual(member.user, user)
|
||||
self.assertTrue(user.check_password("secret123"))
|
||||
|
||||
def test_import_supports_custom_date_format(self):
|
||||
csv_path = self.write_csv(
|
||||
"\n".join(
|
||||
[
|
||||
"first_name,last_name,email,date_of_birth,create_account,club_name,license_number",
|
||||
"Jane,Doe,jane@example.com,12/04/2010,false,City Swim Club,LIC-001",
|
||||
]
|
||||
)
|
||||
)
|
||||
|
||||
stdout, stderr = self.call_import_command(csv_path, date_format="%d/%m/%Y")
|
||||
|
||||
self.assertEqual(stderr, "")
|
||||
self.assertIn("Members created: 1.", stdout)
|
||||
|
||||
member = Member.objects.get(email="jane@example.com")
|
||||
self.assertEqual(member.date_of_birth, date(2010, 4, 12))
|
||||
|
||||
def test_import_skips_invalid_row_and_imports_valid_rows(self):
|
||||
csv_path = self.write_csv(
|
||||
"\n".join(
|
||||
[
|
||||
"first_name,last_name,email,date_of_birth,create_account,club_name,license_number",
|
||||
"Jane,Doe,jane@example.com,2010-04-12,false,City Swim Club,LIC-001",
|
||||
"Broken,Date,broken@example.com,not-a-date,false,City Swim Club,LIC-002",
|
||||
]
|
||||
)
|
||||
)
|
||||
|
||||
stdout, stderr = self.call_import_command(csv_path)
|
||||
|
||||
self.assertIn("Row 3 skipped:", stderr)
|
||||
self.assertIn("Invalid date_of_birth 'not-a-date'.", stderr)
|
||||
self.assertIn("Members created: 1.", stdout)
|
||||
self.assertIn("Rows skipped: 1.", stdout)
|
||||
|
||||
self.assertTrue(Member.objects.filter(email="jane@example.com").exists())
|
||||
self.assertFalse(Member.objects.filter(email="broken@example.com").exists())
|
||||
|
||||
def test_import_fails_for_missing_file(self):
|
||||
stdout = StringIO()
|
||||
stderr = StringIO()
|
||||
|
||||
with self.assertRaises(CommandError) as context:
|
||||
call_command(
|
||||
"import_members_csv",
|
||||
"does-not-exist.csv",
|
||||
stdout=stdout,
|
||||
stderr=stderr,
|
||||
)
|
||||
|
||||
self.assertIn("CSV file does not exist", str(context.exception))
|
||||
|
||||
def test_import_fails_for_missing_required_columns(self):
|
||||
csv_path = self.write_csv(
|
||||
"\n".join(
|
||||
[
|
||||
"first_name,last_name,email",
|
||||
"Jane,Doe,jane@example.com",
|
||||
]
|
||||
)
|
||||
)
|
||||
|
||||
stdout = StringIO()
|
||||
stderr = StringIO()
|
||||
|
||||
with self.assertRaises(CommandError) as context:
|
||||
call_command(
|
||||
"import_members_csv",
|
||||
csv_path,
|
||||
stdout=stdout,
|
||||
stderr=stderr,
|
||||
)
|
||||
|
||||
self.assertIn("CSV file is missing required columns:", str(context.exception))
|
||||
self.assertIn("club_name", str(context.exception))
|
||||
self.assertIn("date_of_birth", str(context.exception))
|
||||
self.assertIn("license_number", str(context.exception))
|
||||
|
||||
def test_import_fails_for_empty_csv_file(self):
|
||||
csv_path = self.write_csv("")
|
||||
|
||||
stdout = StringIO()
|
||||
stderr = StringIO()
|
||||
|
||||
with self.assertRaises(CommandError) as context:
|
||||
call_command(
|
||||
"import_members_csv",
|
||||
csv_path,
|
||||
stdout=stdout,
|
||||
stderr=stderr,
|
||||
)
|
||||
|
||||
self.assertIn("CSV file is empty or missing a header row.", str(context.exception))
|
||||
2
members/views.py
Normal file
2
members/views.py
Normal file
@@ -0,0 +1,2 @@
|
||||
|
||||
# Create your views here.
|
||||
Reference in New Issue
Block a user