Add tests for filtering unpublished plays in API

apps/articles/tests/blog_items/tests_views/test_blog_item_detail.py

@@ -95,7 +95,7 @@ def test_blog_item_detail_plays_block_content_fields(client, complex_blog_item):
 
     assert playsblock_content_item.get("title"), "У блока с пьесами должен быть заголовок."
     assert playsblock_content_item.get("items"), "У блока с пьесами должен быть массив элементов (пьес)."
-    assert len(playsblock_content_item.get("items")) == 3, "Ожидалось 3 пьесы в блоке с пьесами."
+    assert len(playsblock_content_item.get("items")) == 3, "Ожидалось 3 опубликованные пьесы в блоке с пьесами."
 
     first_play = playsblock_content_item.get("items")[0]
     expected_play_fields_in_order = (

apps/content_pages/factories/__init__.py

@@ -1,10 +1,11 @@
 from apps.content_pages.factories.content_array_items import (
     ContentPersonRoleFactory,
     ExtendedPersonFactory,
+    NonpublishedOrderedPlayFactory,
     OrderedEventFactory,
     OrderedImageFactory,
-    OrderedPlayFactory,
     OrderedVideoFactory,
+    PublishedOrderedPlayFactory,
 )
 from apps.content_pages.factories.content_arrays import (
     EventsBlockFactory,

apps/content_pages/factories/content_array_items.py

@@ -113,7 +113,7 @@ def item(self):
 
 
 @restrict_factory(general=(Play,))
-class OrderedPlayFactory(factory.django.DjangoModelFactory):
+class PublishedOrderedPlayFactory(factory.django.DjangoModelFactory):
     """Create Play with order for block.
 
     Order in factory assume that there are not more than 3 ordered plays in a block.
@@ -126,7 +126,24 @@ class Meta:
 
     @factory.lazy_attribute
     def item(self):
-        return get_random_objects_by_queryset(Play.objects.filter(other_play=False))
+        return get_random_objects_by_queryset(Play.objects.filter(other_play=False, published=True))
+
+
+@restrict_factory(general=(Play,))
+class NonpublishedOrderedPlayFactory(factory.django.DjangoModelFactory):
+    """Create Play with order for block.
+
+    Order in factory assume that there are not more than 3 ordered plays in a block.
+    """
+
+    class Meta:
+        model = OrderedPlay
+
+    order = factory.Sequence(lambda n: (n % 3 + 1))
+
+    @factory.lazy_attribute
+    def item(self):
+        return get_random_objects_by_queryset(Play.objects.filter(other_play=False, published=False))
 
 
 class OrderedVideoFactory(factory.django.DjangoModelFactory):

apps/content_pages/factories/content_arrays.py

@@ -2,10 +2,11 @@
 
 from apps.content_pages.factories import (
     ExtendedPersonFactory,
+    NonpublishedOrderedPlayFactory,
     OrderedEventFactory,
     OrderedImageFactory,
-    OrderedPlayFactory,
     OrderedVideoFactory,
+    PublishedOrderedPlayFactory,
 )
 from apps.content_pages.models import EventsBlock, ImagesBlock, PersonsBlock, PlaysBlock, VideosBlock
 
@@ -64,7 +65,7 @@ def add_person(self, created, extracted, **kwargs):
 class PlaysBlockFactory(factory.django.DjangoModelFactory):
     """Create content block Play for blog, news or projects.
 
-    Block creates with 3 ordered plays.
+    Block creates with 5 ordered plays.
     """
 
     class Meta:
@@ -75,7 +76,8 @@ class Meta:
     @factory.post_generation
     def add_play(self, created, extracted, **kwargs):
         if created:
-            OrderedPlayFactory.create_batch(3, block=self)
+            PublishedOrderedPlayFactory.create_batch(3, block=self)
+            NonpublishedOrderedPlayFactory.create_batch(2, block=self)
 
 
 class VideosBlockFactory(factory.django.DjangoModelFactory):