okay

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)