From e397a37b055027d6ca9c842a78b5c361111b9443 Mon Sep 17 00:00:00 2001
From: Raz <razmig@staxriver.com>
Date: Thu, 3 Apr 2025 14:22:52 +0200
Subject: [PATCH] fix licence-id and add it to admin

---
 tournaments/admin.py                              |  2 +-
 tournaments/services/tournament_unregistration.py | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/tournaments/admin.py b/tournaments/admin.py
index 3e6e65a..6163a1a 100644
--- a/tournaments/admin.py
+++ b/tournaments/admin.py
@@ -13,7 +13,7 @@ class CustomUserAdmin(UserAdmin):
     form = CustomUserChangeForm
     add_form = CustomUserCreationForm
     model = CustomUser
-    list_display = ['email', 'first_name', 'last_name', 'username', 'date_joined', 'latest_event_club_name', 'is_active', 'event_count', 'origin']
+    list_display = ['email', 'first_name', 'last_name', 'username', 'licence_id', 'date_joined', 'latest_event_club_name', 'is_active', 'event_count', 'origin']
     list_filter = ['is_active', 'origin']
     ordering = ['-date_joined']
     fieldsets = [
diff --git a/tournaments/services/tournament_unregistration.py b/tournaments/services/tournament_unregistration.py
index 35d2caf..4586b36 100644
--- a/tournaments/services/tournament_unregistration.py
+++ b/tournaments/services/tournament_unregistration.py
@@ -1,8 +1,7 @@
 from django.contrib import messages
 from django.utils import timezone
 from ..models import PlayerRegistration, UnregisteredTeam, UnregisteredPlayer
-from ..models.player_enums import PlayerDataSource
-from ..services.email_service import TournamentEmailService
+from ..utils.licence_validator import LicenseValidator
 
 class TournamentUnregistrationService:
     def __init__(self, request, tournament):
@@ -52,8 +51,16 @@ class TournamentUnregistrationService:
             )
 
     def _find_player_registration(self):
+        if not self.request.user.licence_id:
+            return False
+        validator = LicenseValidator(self.request.user.licence_id)
+        is_license_valid = validator.validate_license()
+
+        if not is_license_valid:
+            return False
+
         self.player_registration = PlayerRegistration.objects.filter(
-            licence_id__icontains=self.request.user.licence_id,
+            licence_id__icontains=validator.stripped_license,
             team_registration__tournament_id=self.tournament.id,
         ).first()