Merge pull request #597 from PROCOLLAB-github/fix/project-submit-deadline

Сдача проекта блокируется после дедлайну, изменения учтены в can_submit

Author: Toksi86

partner_programs/tests.py

@@ -1,6 +1,7 @@
 from django.contrib.auth import get_user_model
 from django.test import TestCase
 from django.utils import timezone
+from rest_framework.test import APIRequestFactory, force_authenticate
 
 from partner_programs.models import (
     PartnerProgram,
@@ -10,6 +11,7 @@
 )
 from partner_programs.serializers import PartnerProgramFieldValueUpdateSerializer
 from partner_programs.services import publish_finished_program_projects
+from partner_programs.views import PartnerProgramProjectSubmitView
 from projects.models import Project
 
 
@@ -237,6 +239,86 @@ def test_publish_after_flag_enabled_post_finish(self):
         self.assertTrue(project.is_public)
 
 
+class PartnerProgramProjectSubmitViewTests(TestCase):
+    def setUp(self):
+        self.factory = APIRequestFactory()
+        self.view = PartnerProgramProjectSubmitView.as_view()
+        self.now = timezone.now()
+        self.user = get_user_model().objects.create_user(
+            email="leader@example.com",
+            password="pass",
+            first_name="Leader",
+            last_name="User",
+            birthday="1990-01-01",
+        )
+
+    def create_program(self, **overrides):
+        defaults = {
+            "name": "Program",
+            "tag": "program_tag",
+            "description": "Program description",
+            "city": "Moscow",
+            "data_schema": {},
+            "draft": False,
+            "projects_availability": "all_users",
+            "datetime_registration_ends": self.now + timezone.timedelta(days=10),
+            "datetime_started": self.now - timezone.timedelta(days=1),
+            "datetime_finished": self.now + timezone.timedelta(days=30),
+            "is_competitive": True,
+        }
+        defaults.update(overrides)
+        return PartnerProgram.objects.create(**defaults)
+
+    def create_project_link(self, program):
+        project = Project.objects.create(
+            leader=self.user,
+            draft=False,
+            is_public=False,
+            name="Project",
+        )
+        return PartnerProgramProject.objects.create(
+            partner_program=program,
+            project=project,
+        )
+
+    def test_submit_blocked_after_deadline(self):
+        program = self.create_program(
+            datetime_project_submission_ends=self.now - timezone.timedelta(days=1)
+        )
+        link = self.create_project_link(program)
+
+        request = self.factory.post(
+            f"partner-program-projects/{link.pk}/submit/"
+        )
+        force_authenticate(request, user=self.user)
+        response = self.view(request, pk=link.pk)
+
+        self.assertEqual(response.status_code, 400)
+        self.assertEqual(
+            response.data.get("detail"),
+            "Срок подачи проектов в программу завершён.",
+        )
+        link.refresh_from_db()
+        self.assertFalse(link.submitted)
+
+    def test_submit_allowed_before_deadline(self):
+        program = self.create_program(
+            datetime_project_submission_ends=self.now + timezone.timedelta(days=1)
+        )
+        link = self.create_project_link(program)
+
+        request = self.factory.post(
+            f"partner-program-projects/{link.pk}/submit/"
+        )
+        force_authenticate(request, user=self.user)
+        response = self.view(request, pk=link.pk)
+
+        self.assertEqual(response.status_code, 200)
+        link.refresh_from_db()
+        self.assertTrue(link.submitted)
+        self.assertIsNotNone(link.datetime_submitted)
+
+
 class PartnerProgramFieldValueUpdateSerializerValidTests(TestCase):
     def setUp(self):
         now = timezone.now()

partner_programs/views.py

@@ -514,6 +514,12 @@ def post(self, request, pk, *args, **kwargs):
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
+        if not program_project.partner_program.is_project_submission_open():
+            return Response(
+                {"detail": "Срок подачи проектов в программу завершён."},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
         program_project.submitted = True
         program_project.datetime_submitted = now()
         program_project.save()

projects/serializers.py

@@ -107,7 +107,11 @@ class Meta:
         ]
 
     def get_can_submit(self, obj):
-        return obj.partner_program.is_competitive and not obj.submitted
+        return (
+            obj.partner_program.is_competitive
+            and not obj.submitted
+            and obj.partner_program.is_project_submission_open()
+        )
 
     def get_program_fields(self, obj):
         fields_qs = obj.partner_program.fields.all()