Added AUTH_USER_MODEL in settings and few naming fixes (#32)

Co-authored-by: Anton Braun <[email protected]>

pyproject.toml

@@ -13,7 +13,7 @@ python-telegram-bot = "^21.1.1"
 poetry-plugin-export = "^1.7.1"
 django-environ= "^0.11.2"
 django-asgi-lifespan = "^0.3.1"
-django-phonenumber-field = "^7.3.0"
+django-phonenumber-field = {extras = ["phonenumbers"], version = "^7.3.0"}
 
 [tool.poetry.group.dev.dependencies]
 ruff = "^0.4.2"

src/admin_user/admin.py

@@ -1,11 +1,11 @@
 from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin
 
-from admin_user.models import Administator
+from admin_user.models import Administrator
 
 
-@admin.register(Administator)
-class AdministatorAdmin(UserAdmin):
+@admin.register(Administrator)
+class AdministratorAdmin(UserAdmin):
     """Admin panel for the Admin model in the Django admin area.
 
     Changes made:
@@ -17,8 +17,8 @@ class AdministatorAdmin(UserAdmin):
     add_fieldsets = (
         (None, {
             "fields": (
-                Administator.USERNAME_FIELD,
-                *Administator.REQUIRED_FIELDS,
+                Administrator.USERNAME_FIELD,
+                *Administrator.REQUIRED_FIELDS,
                 "password1",
                 "password2",
                 "is_staff",

src/admin_user/models.py

@@ -6,8 +6,8 @@
 EMAIL_LENGTH = 254
 
 
-class Administator(AbstractUser):
-    """Custom administator model."""
+class Administrator(AbstractUser):
+    """Custom Administrator model."""
 
     first_name = models.CharField("Имя", max_length=DEFAULT_NAME_LENGTH)
     last_name = models.CharField("Фамилия", max_length=DEFAULT_NAME_LENGTH)

src/bot/apps.py

@@ -15,12 +15,14 @@ def stop_bot(self, **kwargs):
     def ready(self) -> None:
         """Perform actions when the application is ready."""
         import os
+
+        # TODO: временное решение, необходимо продумать улучшение.
+        if os.environ.get("DJANGO_MIGRATE", False):
+            if os.environ.get("RUN_MAIN", None) != "true":
+                from bot.bot_interface import Bot
 
-        if os.environ.get("RUN_MAIN", None) != "true":
-            from bot.bot_interface import Bot
+                self.bot = Bot()
 
-            self.bot = Bot()
+                asgi_shutdown.connect(self.stop_bot)
 
-            asgi_shutdown.connect(self.stop_bot)
-
-            self.bot.start()
+                self.bot.start()

src/core/config/settings_base.py

@@ -37,7 +37,7 @@
     "schooling.apps.SchoolingConfig",
 ]
 
-EXTERNAL_APPS = []
+EXTERNAL_APPS = ["phonenumber_field",]
 
 INSTALLED_APPS = DEFAULT_APPS + EXTERNAL_APPS + LOCAL_APPS
 
@@ -71,6 +71,8 @@
 
 WSGI_APPLICATION = "core.wsgi.application"
 
+AUTH_USER_MODEL = "admin_user.Administrator"
+
 AUTH_PASSWORD_VALIDATORS = [
     {
         "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",

src/potential_user/models.py

@@ -11,7 +11,7 @@ class ApplicationForm(models.Model):
     )
 
     telegram_id = models.IntegerField("Telegram ID", unique=True)
-    role = models.CharField(choices=ROLE_CHOICES)
+    role = models.CharField(choices=ROLE_CHOICES, max_length=20)
     name = models.CharField(max_length=20)
     surname = models.CharField(max_length=20)
     city = models.CharField(max_length=20)