Merge pull request #541 from PROCOLLAB-github/feature/update_program_model

Toksi86 · web-flow · commit 44b2d84eee73 · 2025-09-03T13:05:57.000+05:00
Feature/update program model
diff --git a/invites/tests.py b/invites/tests.py
@@ -36,7 +36,6 @@ def setUp(self) -> None:
             "name": "Test",
             "description": "Test",
             "industry": Industry.objects.create(name="Test").id,
-            "step": 1,
             "draft": False,
         }
 
diff --git a/projects/admin.py b/projects/admin.py
@@ -18,22 +18,21 @@ class ProjectAdmin(admin.ModelAdmin):
         "name",
         "draft",
         "is_company",
-        "track",
-        "direction",
+        "trl",
+        "target_audience",
+        "implementation_deadline",
     )
     list_display_links = (
         "id",
         "name",
     )
     search_fields = (
         "name",
-        "track",
     )
     list_filter = (
         "draft",
         "is_company",
-        "track",
-        "direction",
+        "trl",
     )
 
     fieldsets = (
@@ -46,7 +45,6 @@ class ProjectAdmin(admin.ModelAdmin):
                     "leader",
                     "industry",
                     "region",
-                    "step",
                     "draft",
                     "is_company",
                 )
@@ -56,10 +54,7 @@ class ProjectAdmin(admin.ModelAdmin):
             "Для проектов ПД МосПолитеха",
             {
                 "fields": (
-                    "track",
-                    "direction",
                     "actuality",
-                    "goal",
                     "problem",
                 )
             },
diff --git a/projects/constants.py b/projects/constants.py
diff --git a/projects/filters.py b/projects/filters.py
@@ -13,9 +13,9 @@ class ProjectFilter(filters.FilterSet):
     Adds filtering to DRF list retrieve views
 
     Parameters to filter by:
-        industry (int), step (int), region (str), name__contains (str),
+        industry (int), region (str), name__contains (str),
          description__contains (str), collaborator__user__in (List[int]),
-         datetime_created__gt (datetime.datetime), step (int), any_vacancies (bool),
+         datetime_created__gt (datetime.datetime), any_vacancies (bool),
          member_count__gt (int), member_count__lt (int), leader (int), partner_program (int),
          is_company (bool).
 
@@ -25,7 +25,6 @@ class ProjectFilter(filters.FilterSet):
         ?datetime_created__gt=25.10.2022
             equals to .filter(datetime_created__gt=datetime.datetime(...))
         ?collaborator__user__in=1,2 equals to .filter(collaborator__user__in=[1, 2])
-        ?step=1 equals to .filter(step=1)
         ?any_vacancies=true equals to .filter(any_vacancies=True)
         ?collaborator__count__gt=1 equals to .filter(collaborator__count__gt=1)
         ?is_company=0/?is_company=false equals .filter(is_company=False)
@@ -113,7 +112,6 @@ def filter_by_have_expert_rates(self, queryset, name, value):
     collaborator__count__lte = filters.NumberFilter(
         field_name="collaborator", method="filter_collaborator_count_lte"
     )
-    step = filters.NumberFilter(field_name="step")
     partner_program = filters.NumberFilter(
         field_name="partner_program", method="filter_by_partner_program"
     )
@@ -128,10 +126,8 @@ class Meta:
         model = Project
         fields = (
             "industry",
-            "step",
             "region",
             "leader",
-            "step",
             "partner_program",
             "is_company",
         )
diff --git a/projects/helpers.py b/projects/helpers.py
@@ -7,7 +7,6 @@
 from rest_framework.exceptions import ValidationError
 
 from partner_programs.models import PartnerProgram, PartnerProgramUserProfile
-from projects.constants import RECOMMENDATIONS_COUNT
 from projects.models import Project, ProjectLink, Achievement
 from users.models import CustomUser
 
@@ -18,7 +17,7 @@ def get_recommended_users(project: Project) -> list[User]:
     """
     Searches for users by matching their skills and vacancies required_skills
     """
-
+    RECOMMENDATIONS_COUNT = 5
     all_needed_skills = set()
     for vacancy in project.vacancies.all():
         all_needed_skills.update(set(vacancy.get_required_skills()))
diff --git a/projects/migrations/0028_remove_project_direction_remove_project_goal_and_more.py b/projects/migrations/0028_remove_project_direction_remove_project_goal_and_more.py
@@ -0,0 +1,65 @@
+# Generated by Django 4.2.11 on 2025-09-02 07:59
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("projects", "0027_alter_defaultprojectcover_datetime_created_and_more"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="project",
+            name="direction",
+        ),
+        migrations.RemoveField(
+            model_name="project",
+            name="goal",
+        ),
+        migrations.RemoveField(
+            model_name="project",
+            name="step",
+        ),
+        migrations.RemoveField(
+            model_name="project",
+            name="track",
+        ),
+        migrations.AddField(
+            model_name="project",
+            name="implementation_deadline",
+            field=models.DateField(
+                blank=True,
+                help_text="Дата, до которой планируется реализовать проект",
+                null=True,
+                verbose_name="Общий срок реализации проекта",
+            ),
+        ),
+        migrations.AddField(
+            model_name="project",
+            name="target_audience",
+            field=models.CharField(
+                blank=True,
+                help_text="Описание целевой аудитории проекта (до 500 симв.)",
+                max_length=500,
+                null=True,
+                verbose_name="Целевая аудитория",
+            ),
+        ),
+        migrations.AddField(
+            model_name="project",
+            name="trl",
+            field=models.PositiveSmallIntegerField(
+                blank=True,
+                help_text="Technology Readiness Level (от 1 до 9)",
+                null=True,
+                validators=[
+                    django.core.validators.MinValueValidator(1),
+                    django.core.validators.MaxValueValidator(9),
+                ],
+                verbose_name="TRL",
+            ),
+        ),
+    ]
diff --git a/projects/models.py b/projects/models.py
@@ -2,14 +2,17 @@
 
 from django.contrib.auth import get_user_model
 from django.contrib.contenttypes.fields import GenericRelation
-from django.core.validators import MaxLengthValidator
+from django.core.validators import (
+    MaxLengthValidator,
+    MaxValueValidator,
+    MinValueValidator,
+)
 from django.db import models
 from django.db.models import UniqueConstraint
 
 from core.models import Like, View
 from files.models import UserFile
 from industries.models import Industry
-from projects.constants import VERBOSE_STEPS
 from projects.managers import AchievementManager, CollaboratorManager, ProjectManager
 from users.models import CustomUser
 
@@ -60,61 +63,62 @@ class Meta:
 
 class Project(models.Model):
     """
-    Project model
-
-     Attributes:
-        name: A CharField name of the project.
-        description: A TextField description of the project.
-        region: A CharField region of the project.
-        step: A PositiveSmallIntegerField which indicates status of the project
-            according to VERBOSE_STEPS.
-        industry: A ForeignKey referring to the Industry model.
-        presentation_address: A URLField presentation URL address.
-        image_address: A URLField image URL address.
-        leader: A ForeignKey referring to the User model.
-        draft: A boolean indicating if Project is a draft.
-        is_company: A boolean indicating if Project is a company.
-        cover_image_address: A URLField cover image URL address.
-        cover: A ForeignKey referring to the UserFile model, which is the image cover of the project.
-        datetime_created: A DateTimeField indicating date of creation.
-        datetime_updated: A DateTimeField indicating date of update.
+    Модель проекта.
+
+    Атрибуты:
+        name (CharField): Название проекта.
+        description (TextField): Подробное описание проекта.
+        region (CharField): Регион, в котором реализуется проект.
+        hidden_score (PositiveSmallIntegerField): Скрытый рейтинг проекта,
+            используется для внутренней сортировки.
+        actuality (TextField): Актуальность проекта (почему он важен).
+        target_audience (CharField): Описание целевой аудитории проекта.
+        implementation_deadline (DateField): Общий срок реализации проекта (дата завершения).
+        problem (TextField): Проблема, которую решает проект.
+        trl (PositiveSmallIntegerField): Уровень технологической готовности (Technology Readiness Level) от 1 до 9.
+        industry (ForeignKey): Ссылка на отрасль (модель Industry).
+        presentation_address (URLField): Ссылка на презентацию проекта.
+        image_address (URLField): Ссылка на изображение (аватар проекта).
+        leader (ForeignKey): Руководитель проекта (пользователь).
+        draft (BooleanField): Флаг, указывающий, является ли проект черновиком.
+        is_company (BooleanField): Признак того, что проект представляет компанию.
+        cover_image_address (URLField): Ссылка на обложку проекта.
+        cover (ForeignKey): Файл-обложка проекта (устаревшее поле).
+        subscribers (ManyToManyField): Подписчики проекта.
+        datetime_created (DateTimeField): Дата создания проекта.
+        datetime_updated (DateTimeField): Дата последнего изменения проекта.
     """
 
     name = models.CharField(max_length=256, null=True, blank=True)
     description = models.TextField(null=True, blank=True)
     region = models.CharField(max_length=256, null=True, blank=True)
-    step = models.PositiveSmallIntegerField(
-        choices=VERBOSE_STEPS, null=True, blank=True
-    )
     hidden_score = models.PositiveSmallIntegerField(default=100)
-
-    track = models.CharField(
-        max_length=256,
-        blank=True,
-        null=True,
-        verbose_name="Трек",
-        help_text="Направление/курс, в рамках которого реализуется проект",
-    )
-    direction = models.CharField(
-        max_length=256,
-        blank=True,
-        null=True,
-        verbose_name="Направление",
-        help_text="Более общее направление деятельности проекта",
-    )
     actuality = models.TextField(
         blank=True,
         null=True,
         validators=[MaxLengthValidator(1000)],
         verbose_name="Актуальность",
         help_text="Почему проект важен (до 1000 симв.)",
     )
-    goal = models.CharField(
+    target_audience = models.CharField(
         max_length=500,
         blank=True,
         null=True,
-        verbose_name="Цель",
-        help_text="Главная цель проекта (до 500 симв.)",
+        verbose_name="Целевая аудитория",
+        help_text="Описание целевой аудитории проекта (до 500 симв.)",
+    )
+    trl = models.PositiveSmallIntegerField(
+        verbose_name="TRL",
+        help_text="Technology Readiness Level (от 1 до 9)",
+        validators=[MinValueValidator(1), MaxValueValidator(9)],
+        null=True,
+        blank=True,
+    )
+    implementation_deadline = models.DateField(
+        verbose_name="Общий срок реализации проекта",
+        help_text="Дата, до которой планируется реализовать проект",
+        null=True,
+        blank=True,
     )
     problem = models.TextField(
         blank=True,
diff --git a/projects/serializers.py b/projects/serializers.py
@@ -122,11 +122,13 @@ class ProjectDetailSerializer(serializers.ModelSerializer):
     links = serializers.SerializerMethodField()
     partner_program = serializers.SerializerMethodField()
     partner_program_tags = serializers.SerializerMethodField()
-    track = serializers.CharField(required=False, allow_null=True, allow_blank=True)
-    direction = serializers.CharField(required=False, allow_null=True, allow_blank=True)
     actuality = serializers.CharField(required=False, allow_null=True, allow_blank=True)
-    goal = serializers.CharField(required=False, allow_null=True, allow_blank=True)
     problem = serializers.CharField(required=False, allow_null=True, allow_blank=True)
+    target_audience = serializers.CharField(
+        required=False, allow_blank=True, allow_null=True
+    )
+    implementation_deadline = serializers.DateField(required=False, allow_null=True)
+    trl = serializers.IntegerField(required=False, allow_null=True)
 
     def get_partner_program(self, project):
         try:
@@ -172,7 +174,6 @@ class Meta:
             "achievements",
             "links",
             "region",
-            "step",
             "industry",
             "industry_id",
             "presentation_address",
@@ -187,11 +188,11 @@ class Meta:
             "views_count",
             "cover",
             "cover_image_address",
-            "track",
-            "direction",
             "actuality",
-            "goal",
             "problem",
+            "target_audience",
+            "implementation_deadline",
+            "trl",
             "partner_program_tags",
             "partner_program",
         ]
diff --git a/projects/tests.py b/projects/tests.py
@@ -19,7 +19,6 @@ def setUp(self):
             "name": "Test",
             "description": "Test",
             "industry": Industry.objects.create(name="Test").id,
-            "step": 1,
         }
 
     def test_project_creation(self):
@@ -42,7 +41,6 @@ def test_project_creation_with_wrong_data(self):
                 "name": "T" * 257,
                 "description": "Test",
                 "industry": Industry.objects.create(name="Test").id,
-                "step": 1,
             },
         )
         force_authenticate(request, user=user)
diff --git a/projects/urls.py b/projects/urls.py
@@ -12,7 +12,6 @@
     ProjectDetail,
     ProjectList,
     ProjectRecommendedUsers,
-    ProjectSteps,
     ProjectSubscribe,
     ProjectSubscribers,
     ProjectUnsubscribe,
@@ -50,7 +49,6 @@
         name="update_program_fields",
     ),
     path("count/", ProjectCountView.as_view()),
-    path("steps/", ProjectSteps.as_view()),
     path("achievements/", AchievementList.as_view()),
     path("achievements/<int:pk>/", AchievementDetail.as_view()),
     path("<int:id>/responses/", ProjectVacancyResponses.as_view()),
diff --git a/projects/views.py b/projects/views.py
diff --git a/users/migrations/0055_alter_customuser_avatar_alter_customuser_email.py b/users/migrations/0055_alter_customuser_avatar_alter_customuser_email.py
diff --git a/vacancy/tests.py b/vacancy/tests.py

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@ def setUp(self) -> None:`
`36`	`36`	`"name": "Test",`
`37`	`37`	`"description": "Test",`
`38`	`38`	`"industry": Industry.objects.create(name="Test").id,`
`39`		`- "step": 1,`
`40`	`39`	`"draft": False,`
`41`	`40`	`}`
`42`	`41`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ def setUp(self):`
`19`	`19`	`"name": "Test",`
`20`	`20`	`"description": "Test",`
`21`	`21`	`"industry": Industry.objects.create(name="Test").id,`
`22`		`- "step": 1,`
`23`	`22`	`}`
`24`	`23`
`25`	`24`	`def test_project_creation(self):`
`@@ -42,7 +41,6 @@ def test_project_creation_with_wrong_data(self):`
`42`	`41`	`"name": "T" * 257,`
`43`	`42`	`"description": "Test",`
`44`	`43`	`"industry": Industry.objects.create(name="Test").id,`
`45`		`- "step": 1,`
`46`	`44`	`},`
`47`	`45`	`)`
`48`	`46`	`force_authenticate(request, user=user)`