Модель Profession, измененно поле user_id на telegram_id, небольшие п…

…равки по коду.
Studio-Yandex-Practicum · Sep 14, 2023 · f4b713a · f4b713a
1 parent 667b9ac
commit f4b713a
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 25 deletions.
diff --git a/src/bot/admin.py b/src/bot/admin.py
@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from .models import CreatedPair, PassedPair, Recruiter, Student
+from bot.models import CreatedPair, PassedPair, Recruiter, Student
 
 
 @admin.register(CreatedPair)
@@ -10,8 +10,8 @@ class CreatedPairAdmin(admin.ModelAdmin):
     list_display = ("id", "student", "recruiter", "date")
     list_filter = ("date",)
     search_fields = (
-        "student__user_id",
-        "recruiter__user_id",
+        "student__telegram_id",
+        "recruiter__telegram_id",
         "student__tg_username",
         "recruiter__tg_username",
     )
@@ -30,8 +30,8 @@ class PassedPairAdmin(admin.ModelAdmin):
     )
     list_filter = ("date", "is_interview_successful")
     search_fields = (
-        "student__user_id",
-        "recruiter__user_id",
+        "student__telegram_id",
+        "recruiter__telegram_id",
         "student__tg_username",
         "recruiter__tg_username",
     )
@@ -42,7 +42,7 @@ class StudentAdmin(admin.ModelAdmin):
     """Управление моделью студента."""
 
     list_display = (
-        "user_id",
+        "telegram_id",
         "name",
         "surname",
         "tg_username",
@@ -51,15 +51,15 @@ class StudentAdmin(admin.ModelAdmin):
         "is_vacant",
     )
     list_filter = ("registration_date", "last_login_date", "is_vacant")
-    search_fields = ("user_id", "tg_username")
+    search_fields = ("telegram_id", "tg_username")
 
 
 @admin.register(Recruiter)
 class RecruiterAdmin(admin.ModelAdmin):
     """Управление моделью рекрутера."""
 
     list_display = (
-        "user_id",
+        "telegram_id",
         "name",
         "surname",
         "tg_username",
@@ -68,4 +68,4 @@ class RecruiterAdmin(admin.ModelAdmin):
         "is_vacant",
     )
     list_filter = ("registration_date", "last_login_date", "is_vacant")
-    search_fields = ("user_id", "tg_username")
+    search_fields = ("telegram_id", "tg_username")
diff --git a/src/bot/models.py b/src/bot/models.py
@@ -1,19 +1,20 @@
 from django.db import models
 
 
-class ProfessionChoice(models.TextChoices):
-    """Класс для выбора профессий."""
+class Profession(models.Model):
+    """Модель для хранения профессий."""
 
-    ANALYST = "AN", "Аналитик"
-    BACKEND = "BA", "Бэкенд-разработчик"
-    FRONTEND = "FR", "Фронтенд-разработчик"
-    TESTER = "TE", "Тестировщик"
+    name = models.CharField(
+        max_length=128, unique=True, verbose_name="Название профессии"
+    )
 
 
 class PracticumUser(models.Model):
     """Базовая модель для пользователей."""
 
-    user_id = models.IntegerField(primary_key=True, verbose_name="Telegram id")
+    telegram_id = models.IntegerField(
+        primary_key=True, 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(
@@ -31,16 +32,17 @@ class Meta:
         abstract = True
 
     def __str__(self):
-        return f"{self.tg_username} | id: {self.user_id}"
+        return f"{self.tg_username} | id: {self.telegram_id}"
 
 
 class Student(PracticumUser):
     """Модель для студентов."""
 
-    profession = models.CharField(
-        max_length=2,
-        choices=ProfessionChoice.choices,
-        default=ProfessionChoice.ANALYST,
+    profession = models.ForeignKey(
+        Profession,
+        related_name="students",
+        on_delete=models.SET_NULL,
+        null=True,
         verbose_name="Профессия",
     )
 

diff --git a/src/core/settings.py b/src/core/settings.py
@@ -3,9 +3,7 @@
 BASE_DIR = Path(__file__).resolve().parent.parent
 
 
-SECRET_KEY = (
-    "django-insecure-&@jyyt-zi283urxz6+2^a+f0x!qb#69^zbe=*n4mblnm0-q2s6"
-)
+SECRET_KEY = ""
 
 DEBUG = True
 
@@ -82,7 +80,7 @@
 ]
 
 
-LANGUAGE_CODE = "en-us"
+LANGUAGE_CODE = "ru-RU"
 
 TIME_ZONE = "UTC"