Merge pull request #800 from Studio-Yandex-Practicum/bugfix/hide_unpu…

…blished_plays_in-plays_block

Do not serialize unpublished plays

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):

apps/content_pages/models/content_blocks.py

@@ -216,6 +216,13 @@ class Meta:
         verbose_name = "Блок пьес"
         verbose_name_plural = "Блоки пьес"
 
+    def published_ordered_plays(self):
+        """Filter published plays.
+
+        ordered_plays attribute is a related name added from OrderedPlay model
+        """
+        return self.ordered_plays.filter(item__published=True)
+
 
 class VideosBlock(AbstractItemWithTitle):
     """Model to store and organize OrderedVideos objects."""

apps/content_pages/serializers/content_blocks.py

@@ -90,7 +90,7 @@ class Meta:
 
 class PlaysBlockSerializer(serializers.ModelSerializer):
     items = OrderedPlaySerializer(
-        source="ordered_plays",
+        source="published_ordered_plays",
         many=True,
     )
 

apps/main/tests/conftest.py

@@ -62,7 +62,7 @@ def play_in_short_list(authors, festival):
 
 @pytest.fixture
 def plays(authors, festival):
-    return PlayFactory.create_batch(4, year=festival.year)
+    return PlayFactory.create_batch(10, year=festival.year)
 
 
 @pytest.fixture

pyproject.toml

@@ -58,7 +58,7 @@ pip = "^24.0"
 werkzeug = "^3.0.4"
 urllib3 = "^2.2.2"
 requests = "^2.32.3"
-cryptography = "^42.0.5"
+cryptography = "^43.0.1"
 sqlparse = "^0.5.0"
 easy-thumbnails = "^2.8.5"
 idna = "^3.7"

requirements/dev.txt

@@ -12,7 +12,7 @@ charset-normalizer==3.3.2 ; python_version >= "3.9" and python_version < "4.0"
 click==8.1.7 ; python_version >= "3.9" and python_version < "4.0"
 colorama==0.4.6 ; python_version >= "3.9" and python_version < "4.0" and (sys_platform == "win32" or platform_system == "Windows")
 coverage==5.5 ; python_version >= "3.9" and python_version < "4"
-cryptography==42.0.5 ; python_version >= "3.9" and python_version < "4.0"
+cryptography==43.0.1 ; python_version >= "3.9" and python_version < "4.0"
 cssselect2==0.7.0 ; python_version >= "3.9" and python_version < "4.0"
 decorator==5.1.1 ; python_version >= "3.9" and python_version < "4.0"
 distlib==0.3.7 ; python_version >= "3.9" and python_version < "4.0"

requirements/prod.txt

@@ -9,7 +9,7 @@ cffi==1.16.0 ; python_version >= "3.9" and python_version < "4.0" and platform_p
 charset-normalizer==3.3.2 ; python_version >= "3.9" and python_version < "4.0"
 click==8.1.7 ; python_version >= "3.9" and python_version < "4.0"
 colorama==0.4.6 ; python_version >= "3.9" and python_version < "4.0" and (sys_platform == "win32" or platform_system == "Windows")
-cryptography==42.0.5 ; python_version >= "3.9" and python_version < "4.0"
+cryptography==43.0.1 ; python_version >= "3.9" and python_version < "4.0"
 cssselect2==0.7.0 ; python_version >= "3.9" and python_version < "4.0"
 django-admin-sortable2==1.0.4 ; python_version >= "3.9" and python_version < "4.0"
 django-anymail[mailjet]==8.6 ; python_version >= "3.9" and python_version < "4.0"