Add ClubMembership enhancements, CSV import command, and related tests

- Extend the ClubMembership model with `club`, `member`, and optional `license` fields, along with relevant constraints and ordering. - Implement verbose names for Club and ClubMembership models and update admin configurations for better display and filtering. - Add a `import_members_csv` management command for batch importing members, clubs, and memberships from a CSV file. - Include extensive tests for the `import_members_csv` command, ClubMembership model, and Club model. - Refactor related migrations, services, and test structure.
2026-07-05 23:51:35 +02:00
parent 44fe658efa
commit 89c12c12b1
12 changed files with 753 additions and 2 deletions
--- a/club/admin.py
+++ b/club/admin.py
@@ -1,3 +1,24 @@
 from django.contrib import admin
+from django.utils.translation import gettext_lazy as _
+
+from .models import Club, ClubMembership
+

 # Register your models here.
+@admin.register(Club)
+class ClubAdmin(admin.ModelAdmin):
+    list_display = ["name"]
+    search_fields = ["name"]
+    ordering = ["name"]
+
+
+@admin.register(ClubMembership)
+class ClubMembershipAdmin(admin.ModelAdmin):
+    list_display = ["club__name", "member__last_name", "member__first_name", "license"]
+    search_fields = ["club__name", "member__last_name", "member__first_name"]
+    list_filter = ["club"]
+    raw_id_fields = ["member"]
+    fieldsets = [
+        [None, {"fields": ["club", "member"]}],
+        [_("Member informaton"), {"fields": ["license"]}],
+    ]
--- a/club/migrations/0002_clubmembership_club_clubmembership_license_and_more.py
+++ b/club/migrations/0002_clubmembership_club_clubmembership_license_and_more.py
@@ -0,0 +1,33 @@
+# Generated by Django 6.0.6 on 2026-07-05 13:50
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('authentication', '0003_alter_family_name_alter_familymembership_family_and_more'),
+        ('club', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='clubmembership',
+            name='club',
+            field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, related_name='members', to='club.club'),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='clubmembership',
+            name='license',
+            field=models.CharField(default=1, max_length=250),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='clubmembership',
+            name='member',
+            field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, related_name='member_of', to='authentication.member'),
+            preserve_default=False,
+        ),
+    ]
--- a/club/migrations/0003_alter_clubmembership_options_alter_club_name_and_more.py
+++ b/club/migrations/0003_alter_clubmembership_options_alter_club_name_and_more.py
@@ -0,0 +1,43 @@
+# Generated by Django 6.0.6 on 2026-07-05 20:51
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('authentication', '0003_alter_family_name_alter_familymembership_family_and_more'),
+        ('club', '0002_clubmembership_club_clubmembership_license_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='clubmembership',
+            options={'ordering': ['club', 'member__last_name', 'member__first_name'], 'verbose_name': 'club membership', 'verbose_name_plural': 'club memberships'},
+        ),
+        migrations.AlterField(
+            model_name='club',
+            name='name',
+            field=models.CharField(max_length=255, verbose_name='name'),
+        ),
+        migrations.AlterField(
+            model_name='clubmembership',
+            name='club',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='members', to='club.club', verbose_name='club'),
+        ),
+        migrations.AlterField(
+            model_name='clubmembership',
+            name='license',
+            field=models.CharField(max_length=250, verbose_name='license'),
+        ),
+        migrations.AlterField(
+            model_name='clubmembership',
+            name='member',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='member_of', to='authentication.member', verbose_name='member'),
+        ),
+        migrations.AlterUniqueTogether(
+            name='clubmembership',
+            unique_together={('club', 'member')},
+        ),
+    ]
--- a/club/migrations/0004_alter_clubmembership_license.py
+++ b/club/migrations/0004_alter_clubmembership_license.py
@@ -0,0 +1,18 @@
+# Generated by Django 6.0.6 on 2026-07-05 20:54
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('club', '0003_alter_clubmembership_options_alter_club_name_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='clubmembership',
+            name='license',
+            field=models.CharField(blank=True, max_length=250, verbose_name='license'),
+        ),
+    ]
--- a/club/models.py
+++ b/club/models.py
@@ -2,11 +2,12 @@ from django.contrib.auth.base_user import AbstractBaseUser
 from django.db import models
 from django.utils.translation import gettext_lazy as _

+from authentication.models import Member
 from clubmanager.base import ClubScopedModel, UUIDModel


 class Club(UUIDModel):
-    name = models.CharField(max_length=255)
+    name = models.CharField(_("name"), max_length=255)

    class Meta:
        verbose_name = _("club")
@@ -17,4 +18,17 @@ class Club(UUIDModel):
        return self.name


-class ClubMembership(UUIDModel): ...
+class ClubMembership(UUIDModel):
+    member = models.ForeignKey(Member, on_delete=models.CASCADE, related_name="member_of", verbose_name=_("member"))
+    club = models.ForeignKey(Club, on_delete=models.CASCADE, related_name="members", verbose_name=_("club"))
+
+    license = models.CharField(_("license"), max_length=250, blank=True)
+
+    class Meta:
+        verbose_name = _("club membership")
+        verbose_name_plural = _("club memberships")
+        ordering = ["club", "member__last_name", "member__first_name"]
+        unique_together = ("club", "member")
+
+    def __str__(self):
+        return f"{self.club} - {self.member}"
--- a/club/tests.py
+++ b/club/tests.py
@@ -1,3 +1,165 @@
+import uuid
+
+from django.db import IntegrityError
 from django.test import TestCase

+from authentication.models import Member
+
+from .models import Club, ClubMembership
+
+
+class ClubModelTests(TestCase):
+    def test_str_returns_name(self):
+        club = Club.objects.create(name="City Swim Club")
+
+        self.assertEqual(str(club), "City Swim Club")
+
+    def test_pk_is_uuid(self):
+        club = Club.objects.create(name="City Swim Club")
+
+        self.assertIsInstance(club.pk, uuid.UUID)
+
+    def test_clubs_are_ordered_by_name(self):
+        Club.objects.create(name="Zulu Club")
+        Club.objects.create(name="Alpha Club")
+        Club.objects.create(name="Middle Club")
+
+        self.assertEqual(
+            list(Club.objects.values_list("name", flat=True)),
+            ["Alpha Club", "Middle Club", "Zulu Club"],
+        )
+
+    def test_verbose_names(self):
+        self.assertEqual(Club._meta.verbose_name, "club")
+        self.assertEqual(Club._meta.verbose_name_plural, "clubs")
+
+
+class ClubMembershipModelTests(TestCase):
+    def setUp(self):
+        self.club = Club.objects.create(name="City Swim Club")
+        self.member = Member.objects.create(
+            first_name="Jane",
+            last_name="Doe",
+            email="jane@example.com",
+        )
+
+    def test_str_returns_club_and_member(self):
+        membership = ClubMembership.objects.create(
+            club=self.club,
+            member=self.member,
+            license="LIC-001",
+        )
+
+        self.assertEqual(str(membership), "City Swim Club - Jane Doe")
+
+    def test_license_is_optional(self):
+        membership = ClubMembership.objects.create(
+            club=self.club,
+            member=self.member,
+        )
+
+        self.assertEqual(membership.license, "")
+
+    def test_pk_is_uuid(self):
+        membership = ClubMembership.objects.create(
+            club=self.club,
+            member=self.member,
+        )
+
+        self.assertIsInstance(membership.pk, uuid.UUID)
+
+    def test_same_member_can_join_different_clubs(self):
+        other_club = Club.objects.create(name="Other Swim Club")
+
+        first_membership = ClubMembership.objects.create(
+            club=self.club,
+            member=self.member,
+            license="LIC-001",
+        )
+        second_membership = ClubMembership.objects.create(
+            club=other_club,
+            member=self.member,
+            license="LIC-002",
+        )
+
+        self.assertEqual(first_membership.member, self.member)
+        self.assertEqual(second_membership.member, self.member)
+        self.assertEqual(self.member.member_of.count(), 2)
+
+    def test_member_is_unique_per_club(self):
+        ClubMembership.objects.create(
+            club=self.club,
+            member=self.member,
+            license="LIC-001",
+        )
+
+        with self.assertRaises(IntegrityError):
+            ClubMembership.objects.create(
+                club=self.club,
+                member=self.member,
+                license="LIC-002",
+            )
+
+    def test_deleting_club_deletes_membership_but_keeps_member(self):
+        ClubMembership.objects.create(
+            club=self.club,
+            member=self.member,
+            license="LIC-001",
+        )
+
+        self.club.delete()
+
+        self.assertFalse(ClubMembership.objects.exists())
+        self.assertTrue(Member.objects.filter(pk=self.member.pk).exists())
+
+    def test_deleting_member_deletes_membership_but_keeps_club(self):
+        ClubMembership.objects.create(
+            club=self.club,
+            member=self.member,
+            license="LIC-001",
+        )
+
+        self.member.delete()
+
+        self.assertFalse(ClubMembership.objects.exists())
+        self.assertTrue(Club.objects.filter(pk=self.club.pk).exists())
+
+    def test_memberships_are_ordered_by_club_then_member_name(self):
+        alpha_club = Club.objects.create(name="Alpha Club")
+        zulu_club = Club.objects.create(name="Zulu Club")
+
+        jane = Member.objects.create(first_name="Jane", last_name="Doe")
+        alice = Member.objects.create(first_name="Alice", last_name="Smith")
+        bob = Member.objects.create(first_name="Bob", last_name="Smith")
+
+        ClubMembership.objects.create(club=zulu_club, member=bob)
+        ClubMembership.objects.create(club=alpha_club, member=bob)
+        ClubMembership.objects.create(club=alpha_club, member=alice)
+        ClubMembership.objects.create(club=alpha_club, member=jane)
+
+        self.assertEqual(
+            [(membership.club.name, membership.member.last_name, membership.member.first_name) for membership in ClubMembership.objects.all()],
+            [
+                ("Alpha Club", "Doe", "Jane"),
+                ("Alpha Club", "Smith", "Alice"),
+                ("Alpha Club", "Smith", "Bob"),
+                ("Zulu Club", "Smith", "Bob"),
+            ],
+        )
+
+    def test_reverse_relations(self):
+        membership = ClubMembership.objects.create(
+            club=self.club,
+            member=self.member,
+            license="LIC-001",
+        )
+
+        self.assertEqual(list(self.club.members.all()), [membership])
+        self.assertEqual(list(self.member.member_of.all()), [membership])
+
+    def test_verbose_names(self):
+        self.assertEqual(ClubMembership._meta.verbose_name, "club membership")
+        self.assertEqual(ClubMembership._meta.verbose_name_plural, "club memberships")
+
+
 # Create your tests here.