forbid users with a ban or no birthdate to be barmen

This commit is contained in:
imperosol committed 2026-11-10 13:27:06 +01:00
1 parent bfa5fa45b8
commit 079ec8a8e5
4 files changed
+106 -6

No files matched your search

+37 -2
View File
@@ -3,7 +3,7 @@ import math
import uuid
from collections import defaultdict
from datetime import date, datetime, timezone
from typing import TYPE_CHECKING, ClassVar
from typing import TYPE_CHECKING, ClassVar, LiteralString
from dateutil.relativedelta import relativedelta
from django import forms
@@ -19,7 +19,7 @@ from phonenumber_field.widgets import RegionalPhoneNumberWidget
from club.models import Club
from club.widgets.ajax_select import AutoCompleteSelectClub
from core.models import User, UserQuerySet
from core.models import User, UserBan, UserQuerySet
from core.views import LoginForm
from core.views.forms import (
FutureDateTimeField,
@@ -257,6 +257,41 @@ class CounterEditForm(forms.ModelForm):
countersellers__is_regular=False
).all()
def clean_sellers(self, field: LiteralString):
sellers = self.cleaned_data[field]
bans = [
settings.SITH_GROUP_BANNED_COUNTER_ID,
settings.SITH_GROUP_BANNED_SUBSCRIPTION_ID,
]
invalid_sellers = sellers.annotate(
is_banned=Exists(
UserBan.objects.filter(user=OuterRef("pk"), ban_group__in=bans)
)
).filter(Q(is_banned=True) | Q(date_of_birth=None))
for seller in invalid_sellers:
if seller.is_banned:
self.add_error(
field,
ValidationError(
_("%(user)s is banned.") % {"user": seller.get_full_name()}
),
)
if not seller.date_of_birth:
self.add_error(
field,
ValidationError(
_("%(user)s has not filled its birthdate.")
% {"user": seller.get_full_name()}
),
)
return sellers
def clean_sellers_regular(self):
return self.clean_sellers("sellers_regular")
def clean_sellers_temporary(self):
return self.clean_sellers("sellers_temporary")
def clean(self):
regular: UserQuerySet = self.cleaned_data["sellers_regular"]
temporary: UserQuerySet = self.cleaned_data["sellers_temporary"]