Переименованы некоторые поля, вернул admin_user, настроил для коррек…

…тной работы и отображения в админке
Studio-Yandex-Practicum · Sep 14, 2023 · 42f893a · 42f893a
1 parent 9300965
commit 42f893a
Show file tree

Hide file tree

Showing 12 changed files with 115 additions and 15 deletions.
diff --git a/src/admin_user/__init__.py b/src/admin_user/__init__.py
diff --git a/src/admin_user/admin.py b/src/admin_user/admin.py
@@ -0,0 +1,12 @@
+from django.contrib import admin
+from django.contrib.auth import get_user_model
+from django.contrib.auth.admin import UserAdmin
+
+AdminUser = get_user_model()
+
+
+@admin.register(AdminUser)
+class AdminUserAdmin(UserAdmin):
+    """Управление админкой."""
+
+    pass
diff --git a/src/admin_user/apps.py b/src/admin_user/apps.py
@@ -0,0 +1,8 @@
+from django.apps import AppConfig
+
+
+class AdminUserConfig(AppConfig):
+    """Настройка приложения admin_user."""
+
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "admin_user"
diff --git a/src/admin_user/migrations/0001_initial.py b/src/admin_user/migrations/0001_initial.py
@@ -0,0 +1,44 @@
+# Generated by Django 4.2.5 on 2023-09-14 15:19
+
+import django.contrib.auth.models
+import django.contrib.auth.validators
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('auth', '0012_alter_user_first_name_max_length'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='AdminUser',
+            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')),
+                ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')),
+                ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
+                ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
+                ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
+                ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.group', verbose_name='groups')),
+                ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.permission', verbose_name='user permissions')),
+            ],
+            options={
+                'verbose_name': 'Администратор',
+                'verbose_name_plural': 'Администраторы',
+                'ordering': ('id',),
+            },
+            managers=[
+                ('objects', django.contrib.auth.models.UserManager()),
+            ],
+        ),
+    ]
diff --git a/src/admin_user/migrations/__init__.py b/src/admin_user/migrations/__init__.py
diff --git a/src/admin_user/models.py b/src/admin_user/models.py
@@ -0,0 +1,13 @@
+from django.contrib.auth.models import AbstractUser
+
+
+class AdminUser(AbstractUser):
+    """Модель для создания администраторов."""
+
+    class Meta:
+        ordering = ("id",)
+        verbose_name = "Администратор"
+        verbose_name_plural = "Администраторы"
+
+    def __str__(self):
+        return self.username
diff --git a/src/bot/admin.py b/src/bot/admin.py
@@ -1,6 +1,13 @@
 from django.contrib import admin
 
-from src.bot.models import CreatedPair, PassedPair, Recruiter, Student
+from bot.models import CreatedPair, PassedPair, Profession, Recruiter, Student
+
+
+@admin.register(Profession)
+class ProfessionAdmin(admin.ModelAdmin):
+    """Управление профессиями."""
+
+    list_display = ("name",)
 
 
 @admin.register(CreatedPair)

diff --git a/src/bot/apps.py b/src/bot/apps.py
@@ -14,7 +14,7 @@ def stop_bot(self, **kwargs):
 
     def ready(self) -> None:
         """Вызывается при запуске приложения."""
-        from bot.bot import Bot
+        from bot.bot_interface import Bot
 
         self.bot = Bot()
 

diff --git a/src/bot/bot.py → src/bot/bot_interface.py b/src/bot/bot.py → src/bot/bot_interface.py
diff --git a/src/bot/migrations/0001_initial.py b/src/bot/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.5 on 2023-09-14 00:13
+# Generated by Django 4.2.5 on 2023-09-14 15:09
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -12,16 +12,23 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
+        migrations.CreateModel(
+            name='Profession',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=128, unique=True, verbose_name='Название профессии')),
+            ],
+        ),
         migrations.CreateModel(
             name='Recruiter',
             fields=[
-                ('user_id', models.IntegerField(primary_key=True, serialize=False, verbose_name='Telegram id')),
+                ('telegram_id', models.IntegerField(primary_key=True, serialize=False, verbose_name='Telegram User ID')),
                 ('name', models.CharField(max_length=255, verbose_name='Имя')),
                 ('surname', models.CharField(max_length=255, verbose_name='Фамилия')),
-                ('tg_username', models.CharField(max_length=255, verbose_name='Ник в телеграмме')),
+                ('telegram_username', models.CharField(max_length=255, unique=True, verbose_name='Ник в телеграмме')),
                 ('registration_date', models.DateField(auto_now_add=True, verbose_name='Дата регистрации')),
                 ('last_login_date', models.DateField(auto_now=True, verbose_name='Заходил в последний раз')),
-                ('is_vacant', models.BooleanField(default=False, verbose_name='Есть пара')),
+                ('has_pair', models.BooleanField(default=False, verbose_name='Есть пара')),
             ],
             options={
                 'verbose_name': 'Рекрутер',
@@ -31,14 +38,14 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Student',
             fields=[
-                ('user_id', models.IntegerField(primary_key=True, serialize=False, verbose_name='Telegram id')),
+                ('telegram_id', models.IntegerField(primary_key=True, serialize=False, verbose_name='Telegram User ID')),
                 ('name', models.CharField(max_length=255, verbose_name='Имя')),
                 ('surname', models.CharField(max_length=255, verbose_name='Фамилия')),
-                ('tg_username', models.CharField(max_length=255, verbose_name='Ник в телеграмме')),
+                ('telegram_username', models.CharField(max_length=255, unique=True, verbose_name='Ник в телеграмме')),
                 ('registration_date', models.DateField(auto_now_add=True, verbose_name='Дата регистрации')),
                 ('last_login_date', models.DateField(auto_now=True, verbose_name='Заходил в последний раз')),
-                ('is_vacant', models.BooleanField(default=False, verbose_name='Есть пара')),
-                ('profession', models.CharField(choices=[('AN', 'Аналитик'), ('BA', 'Бэкенд-разработчик'), ('FR', 'Фронтенд-разработчик'), ('TE', 'Тестировщик')], default='AN', max_length=2, verbose_name='Профессия')),
+                ('has_pair', models.BooleanField(default=False, verbose_name='Есть пара')),
+                ('profession', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='students', to='bot.profession', verbose_name='Профессия')),
             ],
             options={
                 'verbose_name': 'Студент',
@@ -50,7 +57,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('date', models.DateField(auto_now_add=True)),
-                ('is_interview_successful', models.BooleanField(default=False, verbose_name='Встреча прошла успешно')),
+                ('interview_successful', models.BooleanField(default=False, verbose_name='Встреча прошла успешно')),
                 ('recruiter', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='bot.recruiter', verbose_name='Рекрутер')),
                 ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='bot.student', verbose_name='Студент')),
             ],
@@ -68,8 +75,8 @@ class Migration(migrations.Migration):
                 ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='bot.student', verbose_name='Студент')),
             ],
             options={
-                'verbose_name': 'Текущая пара',
-                'verbose_name_plural': 'Текущие пары',
+                'verbose_name': 'Активная пара',
+                'verbose_name_plural': 'Активные пары',
             },
         ),
         migrations.AddConstraint(

diff --git a/src/bot/models.py b/src/bot/models.py
@@ -8,6 +8,13 @@ class Profession(models.Model):
         max_length=128, unique=True, verbose_name="Название профессии"
     )
 
+    class Meta:
+        verbose_name = "Профессия"
+        verbose_name_plural = "Профессии"
+
+    def __str__(self):
+        return self.name
+
 
 class PracticumUser(models.Model):
     """Базовая модель для пользователей."""

diff --git a/src/core/settings.py b/src/core/settings.py
@@ -3,10 +3,12 @@
 BASE_DIR = Path(__file__).resolve().parent.parent
 
 
-SECRET_KEY = ""
+SECRET_KEY = " "
 
 DEBUG = True
 
+AUTH_USER_MODEL = "admin_user.AdminUser"
+
 ALLOWED_HOSTS = []
 
 
@@ -19,7 +21,7 @@
     "django.contrib.staticfiles",
 ]
 
-LOCAL_APPS = ["bot",]
+LOCAL_APPS = ["bot", "admin_user"]
 
 EXTERNAL_APPS = []