From 612946253445a196945302a2a054ba2c01a45562 Mon Sep 17 00:00:00 2001
From: Richard <richard@op3n.link>
Date: Fri, 31 Jul 2026 11:26:26 +0200
Subject: [PATCH] fix: Guarantee admin user creation with fallback credentials
 admin / adminpassword during production docker startup

---
 .../__pycache__/create_admin.cpython-314.pyc  | Bin 3153 -> 4786 bytes
 .../users/management/commands/create_admin.py |  74 ++++++++++++------
 2 files changed, 52 insertions(+), 22 deletions(-)

diff --git a/backend/apps/users/management/commands/__pycache__/create_admin.cpython-314.pyc b/backend/apps/users/management/commands/__pycache__/create_admin.cpython-314.pyc
index 9d7d1b7b5011e1026684428b0f124f1454ab8757..aa75b579adc861afdcf071988caacb0e8ebe1c8b 100644
GIT binary patch
literal 4786
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
B9bo_f

delta 1482
zcmbtU-EZ4e6u)-t*!gbKtx1}sxm9Q(>lWA;R7_LpSi6DB+ThT%zz}kpyUeNMRM!q+
z-ADR@lu4DQ;+G;JctPSFB%b&qQng!+(Ih~iNjz1o8n0Zt@v>-7i1ToN=lt&Zy2sb|
z`>~x^a3UD+0wQ}K%T?3875tN$**cv3;WG6jHMkxY%QZ=vE+I)>laQP%BR%ALlLGox
z*I(2f{WA0RF|_-}wF3YY>I&WA6NdnJ=4t(1Cf53J_xwkl(oI4>;BP&)N~}=U+7%DM
z5CHt+Z)pHFK#>-}$zf*`fHfCks6K`v4Bf}DMfSyRNM#a$Bq)NslcMD)1oN(EjIK&t
zndjL&_dF-K&UPDjFbxDI1FrIpZ{D7uV;v!#4}9T1K1LOpmnngrB!{%5Nf1|-E-6pz
z6y5o-KIKj?xr=Va8j3A~Wj)PmTfV+Mf1efTvx1IAa;NpL`BaN@##El_jtM$GJ^T+-
z%JiZfP2h?yKM?pLLsrij)|r)s_P0118W}ruLVEZ=OM9Ow?dvaX)kwGO@0InNd_zT8
z5o^d~QB9O&lV1~6wOPmIb@39qE+c#nz9nfIf)%L*k)*)<(Y^+2k_Jzma@?V)z<L>B
zs3L70!3#52-kJX-f1yxVS`cQSD64R>RzanPQc*t@u}>09GRn<oX`IjtzTD|l7B(BW
zj3C0->T(4mY2`Z6RSn6qHrgO}8T|g$=e^?N`ggvG*SbLp6j!x|C`+n@ur`{Fm~K@g
zy<n4VVo4)sQ?(m1fmuOV5Oh8;!r~;!sE-Hgb6jEZ;>FoQA<N@qgfkftS5%X$uW3?U
zQE`HBwlhxIyVkr+ZUrMzLuJ*v@Z%>=LQC+FJ{g3|<S`(BuQ52heeV9?c$+r{qTAg4
z0oZ1H+@ny`@DJRZyF0h<Pwn_q+vRVnUsm@=ayuhA@^rjXpvm))exD|fM_`fu*&q2M
zmehX=W)=>-U?{QaHF*C%AK&5Q+b`|$86yeX%pM;%V#zkM88A|#mN{%B(iX;y(J>20
zjChJ{2TANb&t1=^?~yN}XG0Ud8=ceZyCXLr_;3BHp9l@-s-0D}Q`I_Jv-8>QPV)|F
zs6{Q(1kM!gzLw}Gq_1Tf$I0pSx$v|*Y7ObEz7?LOhV=b#D)ZjP%-@WQy-oe&O|Z)(
z)>>_U>?Xch4oCE8WcmZ^x3L-gx}{kO@eo-|{(P-oZpdf~PZQI6ZPXXYa^RvU>KEX7
d2wr^%a=&rMce&^WbI4?<WxBok1XyTi`4{f-D?9)I

diff --git a/backend/apps/users/management/commands/create_admin.py b/backend/apps/users/management/commands/create_admin.py
index 52d14d9..77c729a 100644
--- a/backend/apps/users/management/commands/create_admin.py
+++ b/backend/apps/users/management/commands/create_admin.py
@@ -5,38 +5,68 @@ from django.contrib.auth import get_user_model
 User = get_user_model()
 
 class Command(BaseCommand):
-    help = "Erstellt einen initialen Admin-Benutzer (Superuser) für das Portal."
+    help = "Erstellt einen initialen Admin-Benutzer (Superuser) sowie Basis-Qualifikationen für das Portal."
 
     def add_arguments(self, parser):
         parser.add_argument('--username', type=str, default=os.getenv('ADMIN_USERNAME', 'admin'), help='Benutzername für den Admin')
-        parser.add_argument('--email', type=str, default=os.getenv('ADMIN_EMAIL', 'admin@beispiel.de'), help='E-Mail-Adresse für den Admin')
-        parser.add_argument('--password', type=str, default=os.getenv('ADMIN_PASSWORD', ''), help='Passwort für den Admin')
+        parser.add_argument('--email', type=str, default=os.getenv('ADMIN_EMAIL', 'admin@local.host'), help='E-Mail-Adresse für den Admin')
+        parser.add_argument('--password', type=str, default=os.getenv('ADMIN_PASSWORD', 'adminpassword'), help='Passwort für den Admin')
 
     def handle(self, *args, **options):
-        username = options['username']
-        email = options['email']
-        password = options['password']
-
-        if not password:
-            self.stderr.write(self.style.ERROR("Fehler: Bitte gib ein Passwort mit --password an oder setze ADMIN_PASSWORD als Umgebungsvariable."))
-            return
+        username = options['username'] or os.getenv('ADMIN_USERNAME', 'admin')
+        email = options['email'] or os.getenv('ADMIN_EMAIL', 'admin@local.host')
+        password = options['password'] or os.getenv('ADMIN_PASSWORD', 'adminpassword')
 
+        # 1. Admin User
         user, created = User.objects.get_or_create(
             username=username,
             defaults={'email': email}
         )
 
-        user.email = email
-        user.set_password(password)
-        user.is_superuser = True
-        user.is_staff = True
-        user.is_admin_user = True
-        user.is_approved = True
-        user.is_email_verified = True
-        user.is_active = True
-        user.save()
-
         if created:
-            self.stdout.write(self.style.SUCCESS(f"✅ Initialer Admin '{username}' ({email}) wurde erfolgreich erstellt!"))
+            user.set_password(password)
+            user.is_superuser = True
+            user.is_staff = True
+            user.is_admin_user = True
+            user.is_approved = True
+            user.is_email_verified = True
+            user.is_active = True
+            user.save()
+            self.stdout.write(self.style.SUCCESS(f"✅ Initialer Admin '{username}' ({email}) wurde erstellt! Passwort: {password}"))
         else:
-            self.stdout.write(self.style.SUCCESS(f"✅ Passwort & Admin-Rechte für bestehenden Benutzer '{username}' ({email}) wurden aktualisiert!"))
+            changed = False
+            if not user.is_superuser or not user.is_admin_user or not user.is_approved or not user.is_active:
+                user.is_superuser = True
+                user.is_staff = True
+                user.is_admin_user = True
+                user.is_approved = True
+                user.is_active = True
+                changed = True
+            
+            if os.getenv('ADMIN_PASSWORD'):
+                user.set_password(password)
+                changed = True
+
+            if changed:
+                user.save()
+                self.stdout.write(self.style.SUCCESS(f"✅ Admin-Rechte für bestehenden Benutzer '{username}' wurden aktualisiert."))
+            else:
+                self.stdout.write(self.style.SUCCESS(f"ℹ️ Admin-Benutzer '{username}' existiert bereits."))
+
+        # 2. Initial Base Skills
+        try:
+            from apps.events.models import Skill
+            Skill.objects.get_or_create(
+                name="Ersthelfer",
+                defaults={'description': 'Gültiger Erste-Hilfe-Schein', 'color': '#ef4444'}
+            )
+            Skill.objects.get_or_create(
+                name="Bar-Erfahrung",
+                defaults={'description': 'Erfahrung an der Zapfanlage', 'color': '#3b82f6'}
+            )
+            Skill.objects.get_or_create(
+                name="Führerschein B",
+                defaults={'description': 'PKW / Transporter fahren', 'color': '#10b981'}
+            )
+        except Exception as e:
+            self.stderr.write(self.style.WARNING(f"Hinweis zu Skills: {e}"))