okay

backend/account/migrations/0001_initial.py

@@ -0,0 +1,54 @@
+# Generated by Django 5.2.7 on 2025-10-28 22:28
+
+import account.models
+import django.contrib.auth.validators
+import django.core.validators
+import django.utils.timezone
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('auth', '0012_alter_user_first_name_max_length'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='CustomUser',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('password', models.CharField(max_length=128, verbose_name='password')),
+                ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
+                ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
+                ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')),
+                ('first_name', models.CharField(blank=True, max_length=150, verbose_name='first name')),
+                ('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')),
+                ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
+                ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
+                ('is_deleted', models.BooleanField(default=False)),
+                ('deleted_at', models.DateTimeField(blank=True, null=True)),
+                ('role', models.CharField(choices=[('admin', 'Admin'), ('mod', 'Moderator'), ('regular', 'Regular')], default='regular', max_length=20)),
+                ('phone_number', models.CharField(blank=True, max_length=16, null=True, unique=True, validators=[django.core.validators.RegexValidator('^\\+?\\d{9,15}$', message='Zadejte platné telefonní číslo.')])),
+                ('email_verified', models.BooleanField(default=False)),
+                ('email', models.EmailField(db_index=True, max_length=254, unique=True)),
+                ('gdpr', models.BooleanField(default=False)),
+                ('is_active', models.BooleanField(default=False)),
+                ('create_time', models.DateTimeField(auto_now_add=True)),
+                ('city', models.CharField(blank=True, max_length=100, null=True)),
+                ('street', models.CharField(blank=True, max_length=200, null=True)),
+                ('postal_code', models.CharField(blank=True, max_length=5, null=True, validators=[django.core.validators.RegexValidator(code='invalid_postal_code', message='Postal code must contain exactly 5 digits.', regex='^\\d{5}$')])),
+                ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to.', related_name='customuser_set', related_query_name='customuser', to='auth.group')),
+                ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='customuser_set', related_query_name='customuser', to='auth.permission')),
+            ],
+            options={
+                'abstract': False,
+            },
+            managers=[
+                ('objects', account.models.CustomUserManager()),
+                ('active', account.models.ActiveUserManager()),
+            ],
+        ),
+    ]

backend/account/models.py

@@ -1,6 +1,6 @@
 import uuid
 from django.db import models
-from django.contrib.auth.models import AbstractUser, Group, Permission
+from django.contrib.auth.models import AbstractUser, UserManager, Group, Permission
 from django.core.validators import RegexValidator, MinLengthValidator, MaxValueValidator, MinValueValidator
 
 from django.conf import settings
@@ -16,7 +16,13 @@ import logging
 
 logger = logging.getLogger(__name__)
 
+class CustomUserManager(UserManager):
+    # Inherit get_by_natural_key and all auth behaviors
+    use_in_migrations = True
 
+class ActiveUserManager(CustomUserManager):
+    def get_queryset(self):
+        return super().get_queryset().filter(is_active=True)
 
 class CustomUser(SoftDeleteModel, AbstractUser):
     groups = models.ManyToManyField(
@@ -83,9 +89,10 @@ class CustomUser(SoftDeleteModel, AbstractUser):
         "email"
     ]
 
-
-    def __str__(self):
-        return f"{self.email} at {self.create_time.strftime('%d-%m-%Y %H:%M:%S')}"
+    # Ensure default manager has get_by_natural_key
+    objects = CustomUserManager()
+    # Optional convenience manager for active users only
+    active = ActiveUserManager()
     
     def delete(self, *args, **kwargs):
         self.is_active = False
@@ -93,25 +100,29 @@ class CustomUser(SoftDeleteModel, AbstractUser):
         return super().delete(*args, **kwargs)
     
     def save(self, *args, **kwargs):
-        if self.pk is None: # if newely created user
-
-            from django.contrib.auth.models import Group
-            group, _ = Group.objects.get_or_create(name=self.role)
-            self.groups.set([group])
+        is_new = self._state.adding  # True if object hasn't been saved yet
 
+        # Pre-save flags for new users
+        if is_new:
             if self.is_superuser or self.role == "admin":
+                # ensure admin flags are consistent
                 self.is_active = True
-
-                if self.role == 'admin':
-                    self.is_staff = True
-                    self.is_superuser = True
-
-                if self.is_superuser:
-                    self.role = 'admin'
-
+                self.is_staff = True
+                self.is_superuser = True
+                self.role = "admin"
             else:
                 self.is_staff = False
-        
+
+        # First save to obtain a primary key
+        super().save(*args, **kwargs)
+
+        # Assign group after we have a PK
+        if is_new:
+            from django.contrib.auth.models import Group
+            group, _ = Group.objects.get_or_create(name=self.role)
+            # Use add/set now that PK exists
+            self.groups.set([group])
+
         return super().save(*args, **kwargs)
 
 

backend/account/serializers.py

@@ -27,21 +27,16 @@ class CustomUserSerializer(serializers.ModelSerializer):
             "last_name",
             "email",
             "role",
-            "account_type",
             "email_verified",
             "phone_number",
             "create_time",
-            "var_symbol",
-            "bank_account",
-            "ICO",
-            "RC",
             "city",
             "street",
-            "PSC",
-            "GDPR",
+            "postal_code",
+            "gdpr",
             "is_active",
         ]
-        read_only_fields = ["id", "create_time", "GDPR", "username"]  # <-- removed "account_type"
+        read_only_fields = ["id", "create_time", "gdpr", "username"]  # <-- removed "account_type"
 
         def update(self, instance, validated_data):
             user = self.context["request"].user