Добавлены даты окончания подачи и оценки проектов в модель программы

Author: Toksi86

partner_programs/admin.py

@@ -84,6 +84,8 @@ class Meta:
                     (
                         "datetime_started",
                         "datetime_registration_ends",
+                        "datetime_project_submission_ends",
+                        "datetime_evaluation_ends",
                         "datetime_finished",
                     ),
                     (

partner_programs/migrations/0014_partnerprogram_datetime_evaluation_ends_and_more.py

@@ -0,0 +1,30 @@
+# Generated by Django 4.2.11 on 2025-12-19 06:26
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("partner_programs", "0013_partnerprogram_max_project_rates"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="partnerprogram",
+            name="datetime_evaluation_ends",
+            field=models.DateTimeField(
+                blank=True, null=True, verbose_name="Дата окончания оценки проектов"
+            ),
+        ),
+        migrations.AddField(
+            model_name="partnerprogram",
+            name="datetime_project_submission_ends",
+            field=models.DateTimeField(
+                blank=True,
+                help_text="Если не указано, используется дата окончания регистрации",
+                null=True,
+                verbose_name="Дата окончания подачи проектов",
+            ),
+        ),
+    ]

partner_programs/models.py

@@ -1,6 +1,7 @@
 from django.contrib.auth import get_user_model
 from django.core.exceptions import ValidationError
 from django.db import models
+from django.utils import timezone
 
 from files.models import UserFile
 from partner_programs.constants import get_default_data_schema
@@ -115,6 +116,17 @@ class PartnerProgram(models.Model):
     datetime_registration_ends = models.DateTimeField(
         verbose_name="Дата окончания регистрации",
     )
+    datetime_project_submission_ends = models.DateTimeField(
+        null=True,
+        blank=True,
+        verbose_name="Дата окончания подачи проектов",
+        help_text="Если не указано, используется дата окончания регистрации",
+    )
+    datetime_evaluation_ends = models.DateTimeField(
+        null=True,
+        blank=True,
+        verbose_name="Дата окончания оценки проектов",
+    )
     datetime_started = models.DateTimeField(
         verbose_name="Дата начала",
     )
@@ -143,6 +155,14 @@ class Meta:
     def __str__(self):
         return f"PartnerProgram<{self.pk}> - {self.name}"
 
+    def get_project_submission_deadline(self):
+        """Возвращает дедлайн подачи проектов: отдельное поле или дата окончания регистрации."""
+        return self.datetime_project_submission_ends or self.datetime_registration_ends
+
+    def is_project_submission_open(self) -> bool:
+        deadline = self.get_project_submission_deadline()
+        return deadline is None or deadline >= timezone.now()
+
 
 class PartnerProgramUserProfile(models.Model):
     """

partner_programs/serializers.py

@@ -49,6 +49,8 @@ class Meta:
             "short_description",
             "registration_link",
             "datetime_registration_ends",
+            "datetime_project_submission_ends",
+            "datetime_evaluation_ends",
             "datetime_started",
             "datetime_finished",
             "views_count",
@@ -116,6 +118,8 @@ class Meta:
             "registration_link",
             "views_count",
             "datetime_registration_ends",
+            "datetime_project_submission_ends",
+            "datetime_evaluation_ends",
             "is_user_manager",
         )
 
@@ -137,6 +141,8 @@ class Meta:
             "presentation_address",
             "registration_link",
             "datetime_registration_ends",
+            "datetime_project_submission_ends",
+            "datetime_evaluation_ends",
             "is_user_manager",
         )
 

projects/helpers.py

@@ -109,14 +109,28 @@ def update_partner_program(
             clear_project_existing_from_profile(user, instance)
         else:
             partner_program = PartnerProgram.objects.get(pk=program_id)
-            existing_program_id: int | None = clear_project_existing_from_profile(user, instance)
+            existing_program_profile = (
+                PartnerProgramUserProfile.objects.select_related("partner_program")
+                .filter(user=user, project=instance)
+                .first()
+            )
+            existing_program_id: int | None = (
+                existing_program_profile.partner_program_id
+                if existing_program_profile
+                else None
+            )
+
+            submission_deadline = partner_program.get_project_submission_deadline()
+            if submission_deadline and submission_deadline < timezone.now():
+                raise ValidationError({"error": "Срок подачи проектов в программу завершён."})
 
             if (
                 partner_program.datetime_finished < timezone.now()
                 and (existing_program_id != program_id)
             ):
                 raise ValidationError({"error": "Cannot select a completed program."})
 
+            clear_project_existing_from_profile(user, instance)
             partner_program_profile = PartnerProgramUserProfile.objects.get(
                 user=user,
                 partner_program=partner_program,

projects/permissions.py

@@ -204,6 +204,10 @@ def has_permission(self, request, view):
         except PartnerProgram.DoesNotExist:
             raise ValidationError({"partner_program_id": "Программа не найдена."})
 
+        submission_deadline = program.get_project_submission_deadline()
+        if submission_deadline and submission_deadline < timezone.now():
+            raise ValidationError({"partner_program_id": "Срок подачи проектов в программу завершён."})
+
         if program.is_manager(request.user):
             return True