Merge branch 'master' of gitlab.prodcontest.ru:team-15/project

services/backend/apps/competition/models.py

@@ -26,10 +26,10 @@ class Competition(BaseModel):
         upload_to=image_url_upload_to,
     )
     end_date = models.DateTimeField(
-        verbose_name="дедлайн участия", null=True, blank=True
+        verbose_name="окончание соревнования", null=True, blank=True
     )
     start_date = models.DateTimeField(
-        verbose_name="дедлайн участия", null=True, blank=True
+        verbose_name="начало соревнования", null=True, blank=True
     )
     type = models.CharField(
         max_length=11,

services/backend/apps/competition/tests.py

@@ -154,8 +154,12 @@ class CompetitionsEndpointTests(TestCase):
             self.get_url("is_participating=true"), **self.valid_headers
         )
 
-        for item in response.json():
-            self.assertEqual(item["type"], "competitive")
+        for i in range(len(response.json())):
+            item = response.json()[i]
+            if (i + 1) % 2 == 0:
+                self.assertEqual(item["type"], "edu")
+            else:
+                self.assertEqual(item["type"], "competitive")
 
     def test_participation_type_values(self):
         response = self.client.get(