First demo of a separated member proxy model admin

website/events/admin/__init__.py

@@ -1,3 +1,4 @@
 from .event import *
+from .events_user import *
 from .external_event import *
 from .registration import *

website/events/admin/events_user.py

@@ -0,0 +1,27 @@
+from django.contrib import admin
+from django.contrib.admin import register
+
+from events.models import BlacklistedEventsUser, EventRegistration, EventsUser
+
+
+class EventRegistrationUserInline(admin.TabularInline):
+    model = EventRegistration
+
+
+@register(EventsUser)
+class EventsUserAdmin(admin.ModelAdmin):
+    def has_add_permission(self, request):
+        return False
+
+    def has_change_permission(self, request, obj=None):
+        return False
+
+    def has_delete_permission(self, request, obj=None):
+        return False
+
+    inlines = [EventRegistrationUserInline]
+
+
+@register(BlacklistedEventsUser)
+class BlacklistedEventsUserAdmin(admin.ModelAdmin):
+    pass

website/events/migrations/0060_eventsuser.py

@@ -0,0 +1,32 @@
+# Generated by Django 4.1.3 on 2022-11-16 19:43
+
+from django.db import migrations
+import members.models.member
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("members", "0041_alter_profile_photo"),
+        ("events", "0059_multiple_event_organisers"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="EventsUser",
+            fields=[],
+            options={
+                "verbose_name": "Events user",
+                "verbose_name_plural": "Events users",
+                "proxy": True,
+                "indexes": [],
+                "constraints": [],
+            },
+            bases=("members.member",),
+            managers=[
+                ("objects", members.models.member.MemberManager()),
+                ("current_members", members.models.member.CurrentMemberManager()),
+                ("active_members", members.models.member.ActiveMemberManager()),
+            ],
+        ),
+    ]

website/events/migrations/0061_blacklistedeventsuser.py

@@ -0,0 +1,62 @@
+# Generated by Django 4.1.3 on 2022-11-16 19:49
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import members.models.member
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("auth", "0012_alter_user_first_name_max_length"),
+        ("members", "0041_alter_profile_photo"),
+        ("events", "0060_eventsuser"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="BlacklistedEventsUser",
+            fields=[
+                (
+                    "user_ptr",
+                    models.OneToOneField(
+                        auto_created=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        parent_link=True,
+                        primary_key=True,
+                        serialize=False,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+                (
+                    "remarks",
+                    models.TextField(
+                        blank=True,
+                        help_text="Reason for blacklisting",
+                        null=True,
+                        verbose_name="Remarks",
+                    ),
+                ),
+                (
+                    "user",
+                    models.OneToOneField(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="blacklisted_events_user",
+                        to="members.member",
+                        verbose_name="user",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "Blacklisted events user",
+                "verbose_name_plural": "Blacklisted events users",
+            },
+            bases=("members.member",),
+            managers=[
+                ("objects", members.models.member.MemberManager()),
+                ("current_members", members.models.member.CurrentMemberManager()),
+                ("active_members", members.models.member.ActiveMemberManager()),
+            ],
+        ),
+    ]

website/events/models/__init__.py

@@ -2,5 +2,6 @@
 
 from .event import *
 from .event_registration import *
+from .events_user import *
 from .feed_token import *
 from .registration_information_field import *

website/events/models/events_user.py

@@ -0,0 +1,42 @@
+from django.db import models
+from django.contrib.auth import get_user_model
+
+from django.utils.translation import gettext_lazy as _
+
+
+UserModel = get_user_model()
+
+
+class EventsUser(UserModel):
+    class Meta:
+        verbose_name = _("Events user")
+        verbose_name_plural = _("Events users")
+        proxy = True
+
+    def can_attend_events(self):
+        return not self.blacklisted_events_user
+
+
+class BlacklistedEventsUser(Member):
+    class Meta:
+        verbose_name = _("Blacklisted events user")
+        verbose_name_plural = _("Blacklisted events users")
+
+    user = models.OneToOneField(
+        EventsUser,
+        models.CASCADE,
+        verbose_name=_("user"),
+        related_name="blacklisted_events_user",
+        blank=False,
+        null=False,
+    )
+
+    remarks = models.TextField(
+        verbose_name=_("Remarks"),
+        help_text=_("Reason for blacklisting"),
+        blank=True,
+        null=True,
+    )
+
+    def __str__(self):
+        return str(self.user)

website/members/models/member.py

@@ -157,17 +157,6 @@ def all_with_membership(cls, membership_type):
             if x.current_membership and x.current_membership.type == membership_type
         ]
 
-    @property
-    def can_attend_events(self):
-        """May this user attend events."""
-        if not self.profile:
-            return False
-
-        return (
-            self.profile.event_permissions in ("all", "no_drinks")
-            and self.current_membership is not None
-        )
-
     def get_member_groups(self):
         """Get the groups this user is a member of."""
         return MemberGroup.objects.filter(

website/sales/admin/__init__.py

@@ -1,3 +1,4 @@
 from sales.admin.order_admin import *
 from sales.admin.product_admin import *
+from sales.admin.sales_user import *
 from sales.admin.shift_admin import *

website/sales/admin/sales_user.py

@@ -0,0 +1,44 @@
+from django.contrib import admin
+from django.contrib.admin import register
+
+from sales import services
+from sales.models.order import Order
+from sales.models.sales_user import SalesUser
+
+
+class SalesUserOrderInline(admin.TabularInline):
+    model = Order
+
+    def has_change_permission(self, request, obj=None):
+        return False
+
+
+@register(SalesUser)
+class SalesUserAdmin(admin.ModelAdmin):
+    def has_add_permission(self, request):
+        return False
+
+    def has_change_permission(self, request, obj=None):
+        return False
+
+    def has_delete_permission(self, request, obj=None):
+        return False
+
+    list_display = (
+        "__str__",
+        "is_adult",
+    )
+
+    fields = (
+        "__str__",
+        "is_adult",
+    )
+
+    readonly_fields = ("is_adult",)
+
+    def is_adult(self, obj):
+        return services.is_adult(obj)
+
+    is_adult.boolean = True
+
+    inlines = [SalesUserOrderInline]

website/sales/migrations/0007_salesuser.py

@@ -0,0 +1,32 @@
+# Generated by Django 4.1.3 on 2022-11-16 19:43
+
+from django.db import migrations
+import members.models.member
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("members", "0041_alter_profile_photo"),
+        ("sales", "0006_order_is_free_order_total_amount"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="SalesUser",
+            fields=[],
+            options={
+                "verbose_name": "Sales user",
+                "verbose_name_plural": "Sales users",
+                "proxy": True,
+                "indexes": [],
+                "constraints": [],
+            },
+            bases=("members.member",),
+            managers=[
+                ("objects", members.models.member.MemberManager()),
+                ("current_members", members.models.member.CurrentMemberManager()),
+                ("active_members", members.models.member.ActiveMemberManager()),
+            ],
+        ),
+    ]

website/sales/models/sales_user.py

@@ -0,0 +1,10 @@
+from django.utils.translation import gettext_lazy as _
+
+from members.models import Member
+
+
+class SalesUser(Member):
+    class Meta:
+        verbose_name = _("Sales user")
+        verbose_name_plural = _("Sales users")
+        proxy = True