models

users/models.py

@@ -1,48 +1,54 @@
 from django.contrib.auth.models import AbstractBaseUser, BaseUserManager, PermissionsMixin
 from django.db import models
 
-from core.mixins import ContactMixin
+from core.models import ContactMixin
 
 
+## Пользователи
+
 class Role(models.Model):
-    name = models.CharField(max_length=20, unique=True, verbose_name='Название роли')
+    name = models.CharField(max_length=100, verbose_name="Название роли")
 
     def __str__(self):
         return self.name
 
     class Meta:
-        verbose_name = 'Роль'
-        verbose_name_plural = 'Роли'
+        verbose_name = "Роль пользователя"
+        verbose_name_plural = "Роли пользователей"
 
-class UserAccountManager(BaseUserManager):
-    def create_user(self, username, password=None, role=None, **extra_fields):
-        if not username:
-            raise ValueError('Имя пользователя должно быть указано')
-        user = self.model(username=username, role=role, **extra_fields)
+
+class AccountManager(BaseUserManager):
+    def create_user(self, login, password=None, **extra_fields):
+        if not login:
+            raise ValueError("Login must be set")
+        user = self.model(login=login, **extra_fields)
         user.set_password(password)
         user.save(using=self._db)
         return user
 
-    def create_superuser(self, username, password=None, **extra_fields):
-        admin_role, _ = Role.objects.get_or_create(name='admin')
-        extra_fields.setdefault('is_staff', True)
-        extra_fields.setdefault('is_superuser', True)
-        return self.create_user(username, password, role=admin_role, **extra_fields)
+    def create_superuser(self, login, password=None, **extra_fields):
+        extra_fields.setdefault("is_staff", True)
+        extra_fields.setdefault("is_superuser", True)
+        return self.create_user(login, password, **extra_fields)
 
-class UserAccount(ContactMixin, AbstractBaseUser, PermissionsMixin):
-    username = models.CharField(max_length=150, unique=True, verbose_name='Имя пользователя')
-    role = models.ForeignKey(Role, on_delete=models.SET_NULL, null=True, blank=True, verbose_name='Роль')
-    is_active = models.BooleanField(default=True, verbose_name='Активен')
-    is_staff = models.BooleanField(default=False, verbose_name='Сотрудник')
 
-    objects = UserAccountManager()
+class Account(ContactMixin, AbstractBaseUser, PermissionsMixin):
+    login = models.CharField(max_length=150, unique=True, verbose_name="Логин")
+    role = models.ForeignKey(
+        Role, on_delete=models.SET_NULL, null=True, blank=True, verbose_name="Роль пользователя"
+    )
+    is_staff = models.BooleanField(default=False, verbose_name="Сотрудник")
+    is_active = models.BooleanField(default=True, verbose_name="Активен")
 
-    USERNAME_FIELD = 'username'
+    USERNAME_FIELD = "login"
     REQUIRED_FIELDS = []
 
+    objects = AccountManager()
+
     def __str__(self):
-        return self.username+" ("+ContactMixin.__str__(self)+")"
+        return self.login
 
     class Meta:
-        verbose_name = 'Пользователь'
-        verbose_name_plural = 'Пользователи'
+        verbose_name = "Аккаунт"
+        verbose_name_plural = "Аккаунты"
+