Bernard Siebens
f3b1ae7e82
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>
42 lines
1.2 KiB
Python
42 lines
1.2 KiB
Python
import uuid
|
|
|
|
from django.contrib.auth.base_user import AbstractBaseUser
|
|
from django.contrib.auth.models import PermissionsMixin
|
|
from django.db import models
|
|
from django.utils.translation import gettext_lazy as _
|
|
|
|
from .managers import UserManager
|
|
|
|
|
|
class User(AbstractBaseUser, PermissionsMixin):
|
|
id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
|
|
email = models.EmailField(_("email"), unique=True, db_index=True)
|
|
|
|
is_staff = models.BooleanField(_("is staff?"), default=False)
|
|
is_active = models.BooleanField(_("is active?"), default=True)
|
|
|
|
objects = UserManager()
|
|
|
|
USERNAME_FIELD = "email"
|
|
REQUIRED_FIELDS = []
|
|
|
|
class Meta:
|
|
verbose_name = _("user")
|
|
verbose_name_plural = _("users")
|
|
ordering = ["email"]
|
|
|
|
def __str__(self):
|
|
return self.get_full_name()
|
|
|
|
def get_full_name(self):
|
|
member = getattr(self, "member", None)
|
|
if member is not None:
|
|
return member.get_full_name()
|
|
return self.email
|
|
|
|
def get_short_name(self):
|
|
member = getattr(self, "member", None)
|
|
if member is not None:
|
|
return member.get_short_name()
|
|
return self.email
|