Revert "Внесла правки согласно ТЗ." (#251)

Studio-Yandex-Practicum · Aug 31, 2023 · 56afc22 · 56afc22
1 parent ab3eaa2
commit 56afc22
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 77 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/requirements/develop.txt b/requirements/develop.txt
@@ -18,8 +18,8 @@ django==4.2.4 ; python_full_version >= "3.11.1" and python_version < "4.0"
 dnspython==2.4.2 ; python_full_version >= "3.11.1" and python_version < "4.0"
 email-validator==2.0.0.post2 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0"
 factory-boy==3.3.0 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0"
-faker==19.3.1 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0"
-filelock==3.12.3 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0"
+faker==19.3.0 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0"
+filelock==3.12.2 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0"
 flake8-docstrings==1.7.0 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0"
 flake8==6.1.0 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0"
 h11==0.14.0 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0"
@@ -35,7 +35,7 @@ nodeenv==1.8.0 ; python_full_version >= "3.11.1" and python_full_version < "4.0.
 packaging==23.1 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0"
 pathspec==0.11.2 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0"
 platformdirs==3.10.0 ; python_full_version >= "3.11.1" and python_version < "4.0"
-pluggy==1.3.0 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0"
+pluggy==1.2.0 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0"
 pre-commit==3.3.3 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0"
 psycopg2-binary==2.9.7 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0"
 pycodestyle==2.11.0 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0"
@@ -66,4 +66,4 @@ tzdata==2023.3 ; python_full_version >= "3.11.1" and python_version < "4.0" and
 url-normalize==1.4.3 ; python_full_version >= "3.11.1" and python_version < "4.0"
 urllib3==2.0.4 ; python_full_version >= "3.11.1" and python_version < "4.0"
 uvicorn==0.23.2 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0"
-virtualenv==20.24.4 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0"
+virtualenv==20.24.3 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0"
diff --git a/requirements/production.txt b/requirements/production.txt
@@ -24,7 +24,7 @@ iniconfig==2.0.0 ; python_full_version >= "3.11.1" and python_full_version < "4.
 mccabe==0.7.0 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0"
 packaging==23.1 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0"
 platformdirs==3.10.0 ; python_full_version >= "3.11.1" and python_version < "4.0"
-pluggy==1.3.0 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0"
+pluggy==1.2.0 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0"
 psycopg2-binary==2.9.7 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0"
 pycodestyle==2.11.0 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0"
 pydantic[email]==1.10.12 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0"

diff --git a/src/bot/admin.py b/src/bot/admin.py
@@ -41,7 +41,7 @@ def get_question(self, obj):
         """Display questions in admin panel."""
         return obj.question[:100]
 
-    @admin.display(description="Текст на кнопке")
+    @admin.display(description="Короткое описание")
     def get_short_description(self, obj):
         """Display short_descriptions in admin panel."""
         return obj.short_description[:100]
@@ -95,7 +95,7 @@ def get_title(self, obj):
         """Display title in admin panel."""
         return obj.title[:100]
 
-    @admin.display(description="Текст на кнопке ")
+    @admin.display(description="Короткое описание")
     def get_short_description(self, obj):
         """Display short_description in admin panel."""
         return obj.short_description[:100]

diff --git a/src/bot/migrations/0005_alter_fundprogram_short_description_and_more.py b/src/bot/migrations/0005_alter_fundprogram_short_description_and_more.py
diff --git a/src/bot/models.py b/src/bot/models.py
@@ -90,11 +90,12 @@ class Meta:  # noqa
 class HelpTypes(models.TextChoices):
     """Supporting model to make choices field."""
 
-    LEGAL_ASSISTANCE = "Юридическая помощь", _("Юридическая помощь")
-    SOCIAL_ASSISTANCE = "Социальная помощь", _("Социальная помощь")
-    PSYCHOLOGICAL_ASSISTANCE = "Психологическая помощь", _(
+    LEGAL_ASSISTANCE = "LEGAL_ASSISTANCE", _("Юридическая помощь")
+    SOCIAL_ASSISTANCE = "SOCIAL_ASSISTANCE", _("Социальная помощь")
+    PSYCHOLOGICAL_ASSISTANCE = "PSYCHOLOGICAL_ASSISTANCE", _(
         "Психологическая помощь"
     )
+    COMMON_QUESTION = "COMMON_QUESTION", _("Общий вопрос")
 
 
 class Question(BaseModel):
@@ -152,7 +153,7 @@ class FundProgram(BaseModel):
     )
     short_description = models.CharField(
         max_length=20,
-        verbose_name="Текст на кнопке",
+        verbose_name="Короткое описание",
         help_text="Введите название кнопки в боте для данной программы",
     )
     regions = models.ManyToManyField(