Changed NewLabelMixin for PublishedDateMixin, to use published_date i…

…nstead of newly_published_at
nationalarchives · Dec 19, 2024 · bd1d5b6 · bd1d5b6
1 parent eab37e1
commit bd1d5b6
Show file tree

Hide file tree

Showing 7 changed files with 160 additions and 107 deletions.
diff --git a/etna/api/tests/test_pages.py b/etna/api/tests/test_pages.py
@@ -146,7 +146,7 @@ def setUpTestData(cls):
                 PageTimePeriod(time_period=cls.postwar),
             ],
             first_published_at=DATE_1,
-            newly_published_at=DATE_1,
+            published_date=DATE_1,
             mark_new_on_next_publish=False,
         )
 

diff --git a/etna/articles/migrations/0113_remove_articlepage_mark_new_on_next_publish_and_more.py b/etna/articles/migrations/0113_remove_articlepage_mark_new_on_next_publish_and_more.py
@@ -0,0 +1,65 @@
+# Generated by Django 5.1.2 on 2024-12-19 16:48
+
+import django.utils.timezone
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("articles", "0112_alter_articlepage_body_alter_focusedarticlepage_body"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="articlepage",
+            name="mark_new_on_next_publish",
+        ),
+        migrations.RemoveField(
+            model_name="articlepage",
+            name="newly_published_at",
+        ),
+        migrations.RemoveField(
+            model_name="focusedarticlepage",
+            name="mark_new_on_next_publish",
+        ),
+        migrations.RemoveField(
+            model_name="focusedarticlepage",
+            name="newly_published_at",
+        ),
+        migrations.RemoveField(
+            model_name="recordarticlepage",
+            name="mark_new_on_next_publish",
+        ),
+        migrations.RemoveField(
+            model_name="recordarticlepage",
+            name="newly_published_at",
+        ),
+        migrations.AddField(
+            model_name="articlepage",
+            name="published_date",
+            field=models.DateTimeField(
+                default=django.utils.timezone.now,
+                help_text="The date the page was published to the public.",
+                verbose_name="Published date",
+            ),
+        ),
+        migrations.AddField(
+            model_name="focusedarticlepage",
+            name="published_date",
+            field=models.DateTimeField(
+                default=django.utils.timezone.now,
+                help_text="The date the page was published to the public.",
+                verbose_name="Published date",
+            ),
+        ),
+        migrations.AddField(
+            model_name="recordarticlepage",
+            name="published_date",
+            field=models.DateTimeField(
+                default=django.utils.timezone.now,
+                help_text="The date the page was published to the public.",
+                verbose_name="Published date",
+            ),
+        ),
+    ]
diff --git a/etna/articles/models.py b/etna/articles/models.py
@@ -32,7 +32,7 @@
     BasePageWithRequiredIntro,
     ContentWarningMixin,
     HeroImageMixin,
-    NewLabelMixin,
+    PublishedDateMixin,
     RequiredHeroImageMixin,
 )
 from etna.core.serializers import (
@@ -171,9 +171,9 @@ def article_pages(self):
             .live()
             .order_by(
                 Coalesce(
-                    "recordarticlepage__newly_published_at",
-                    "focusedarticlepage__newly_published_at",
-                    "articlepage__newly_published_at",
+                    "recordarticlepage__published_date",
+                    "focusedarticlepage__published_date",
+                    "articlepage__published_date",
                 )
             )
             .reverse()
@@ -205,7 +205,7 @@ class ArticlePage(
     TopicalPageMixin,
     RequiredHeroImageMixin,
     ContentWarningMixin,
-    NewLabelMixin,
+    PublishedDateMixin,
     ArticleTagMixin,
     BasePageWithRequiredIntro,
 ):
@@ -236,7 +236,7 @@ class Meta:
     )
 
     promote_panels = (
-        NewLabelMixin.promote_panels
+        PublishedDateMixin.promote_panels
         + BasePageWithRequiredIntro.promote_panels
         + ArticleTagMixin.promote_panels
         + [
@@ -259,16 +259,17 @@ class Meta:
     )
 
     default_api_fields = BasePageWithRequiredIntro.default_api_fields + [
-        APIField("is_newly_published"),
+        PublishedDateMixin.get_is_newly_published_apifield(),
     ]
 
     api_fields = (
         BasePageWithRequiredIntro.api_fields
         + RequiredHeroImageMixin.api_fields
         + ContentWarningMixin.api_fields
-        + NewLabelMixin.api_fields
         + ArticleTagMixin.api_fields
         + [
+            PublishedDateMixin.get_published_date_apifield(),
+            PublishedDateMixin.get_is_newly_published_apifield(),
             APIField("body"),
             APIField(
                 "similar_items",
@@ -358,17 +359,17 @@ def latest_items(
                 .prefetch_related("teaser_image__renditions")
             )
 
-        return sorted(
-            latest_query_set, key=lambda x: x.newly_published_at, reverse=True
-        )[:3]
+        return sorted(latest_query_set, key=lambda x: x.published_date, reverse=True)[
+            :3
+        ]
 
 
 class FocusedArticlePage(
     TopicalPageMixin,
     AuthorPageMixin,
     HeroImageMixin,
     ContentWarningMixin,
-    NewLabelMixin,
+    PublishedDateMixin,
     ArticleTagMixin,
     BasePageWithRequiredIntro,
 ):
@@ -399,7 +400,7 @@ class Meta:
     )
 
     promote_panels = (
-        NewLabelMixin.promote_panels
+        PublishedDateMixin.promote_panels
         + BasePageWithRequiredIntro.promote_panels
         + ArticleTagMixin.promote_panels
         + [
@@ -424,16 +425,17 @@ class Meta:
     )
 
     default_api_fields = BasePageWithRequiredIntro.default_api_fields + [
-        APIField("is_newly_published"),
+        PublishedDateMixin.get_is_newly_published_apifield(),
     ]
 
     api_fields = (
         BasePageWithRequiredIntro.api_fields
         + HeroImageMixin.api_fields
         + ContentWarningMixin.api_fields
-        + NewLabelMixin.api_fields
         + ArticleTagMixin.api_fields
         + [
+            PublishedDateMixin.get_is_newly_published_apifield(),
+            PublishedDateMixin.get_published_date_apifield(),
             APIField("type_label"),
             APIField("body"),
             APIField(
@@ -525,9 +527,9 @@ def latest_items(
                 .prefetch_related("teaser_image__renditions")
             )
 
-        return sorted(
-            latest_query_set, key=lambda x: x.newly_published_at, reverse=True
-        )[:3]
+        return sorted(latest_query_set, key=lambda x: x.published_date, reverse=True)[
+            :3
+        ]
 
 
 class PageGalleryImage(Orderable):
@@ -577,7 +579,7 @@ class Meta:
 class RecordArticlePage(
     TopicalPageMixin,
     ContentWarningMixin,
-    NewLabelMixin,
+    PublishedDateMixin,
     ArticleTagMixin,
     BasePageWithRequiredIntro,
 ):
@@ -709,7 +711,7 @@ class Meta:
     )
 
     promote_panels = (
-        NewLabelMixin.promote_panels
+        PublishedDateMixin.promote_panels
         + BasePageWithRequiredIntro.promote_panels
         + ArticleTagMixin.promote_panels
         + [
@@ -731,15 +733,16 @@ class Meta:
     )
 
     default_api_fields = BasePageWithRequiredIntro.default_api_fields + [
-        APIField("is_newly_published"),
+        PublishedDateMixin.get_is_newly_published_apifield(),
     ]
 
     api_fields = (
         BasePageWithRequiredIntro.api_fields
         + ContentWarningMixin.api_fields
-        + NewLabelMixin.api_fields
         + ArticleTagMixin.api_fields
         + [
+            PublishedDateMixin.get_is_newly_published_apifield(),
+            PublishedDateMixin.get_published_date_apifield(),
             APIField("type_label"),
             APIField("date_text"),
             APIField("about", serializer=RichTextSerializer()),

diff --git a/etna/blog/migrations/0007_remove_blogindexpage_hero_image_and_more.py b/etna/blog/migrations/0007_remove_blogindexpage_hero_image_and_more.py
@@ -0,0 +1,31 @@
+# Generated by Django 5.1.2 on 2024-12-19 16:48
+
+import django.utils.timezone
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("blog", "0006_alter_blogpostpage_body"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="blogindexpage",
+            name="hero_image",
+        ),
+        migrations.RemoveField(
+            model_name="blogindexpage",
+            name="hero_image_caption",
+        ),
+        migrations.AlterField(
+            model_name="blogpostpage",
+            name="published_date",
+            field=models.DateTimeField(
+                default=django.utils.timezone.now,
+                help_text="The date the page was published to the public.",
+                verbose_name="Published date",
+            ),
+        ),
+    ]
diff --git a/etna/blog/models.py b/etna/blog/models.py
@@ -1,7 +1,3 @@
-from django.db import models
-from django.utils import timezone
-from django.utils.functional import cached_property
-
 from wagtail.admin.panels import FieldPanel
 from wagtail.api import APIField
 from wagtail.fields import StreamField
@@ -10,8 +6,8 @@
     BasePageWithRequiredIntro,
     ContentWarningMixin,
     HeroImageMixin,
+    PublishedDateMixin,
 )
-from etna.core.serializers import DateTimeSerializer, DefaultPageSerializer
 from etna.people.models import AuthorPageMixin, ExternalAuthorMixin
 
 from .blocks import BlogPostPageStreamBlock
@@ -55,16 +51,14 @@ class BlogPage(HeroImageMixin, BasePageWithRequiredIntro):
 
     promote_panels = BasePageWithRequiredIntro.promote_panels
 
-    api_fields = (
-        BasePageWithRequiredIntro.api_fields
-        + HeroImageMixin.api_fields
-    )
+    api_fields = BasePageWithRequiredIntro.api_fields + HeroImageMixin.api_fields
 
 
 class BlogPostPage(
     AuthorPageMixin,
     ExternalAuthorMixin,
     ContentWarningMixin,
+    PublishedDateMixin,
     HeroImageMixin,
     BasePageWithRequiredIntro,
 ):
@@ -79,12 +73,6 @@ class BlogPostPage(
         BlogPostPageStreamBlock(),
     )
 
-    published_date = models.DateTimeField(
-        verbose_name="Published date",
-        help_text="The date the blog post was published.",
-        default=timezone.now,
-    )
-
     content_panels = (
         BasePageWithRequiredIntro.content_panels
         + HeroImageMixin.content_panels
@@ -93,17 +81,21 @@ class BlogPostPage(
         ]
     )
 
-    promote_panels = BasePageWithRequiredIntro.promote_panels + [
-        FieldPanel("published_date"),
-        AuthorPageMixin.get_authors_inlinepanel(),
-        ExternalAuthorMixin.get_authors_inlinepanel(),
-    ]
+    promote_panels = (
+        BasePageWithRequiredIntro.promote_panels
+        + PublishedDateMixin.promote_panels
+        + [
+            AuthorPageMixin.get_authors_inlinepanel(),
+            ExternalAuthorMixin.get_authors_inlinepanel(),
+        ]
+    )
 
     default_api_fields = (
         BasePageWithRequiredIntro.default_api_fields
         + AuthorPageMixin.default_api_fields
         + [
-            APIField("published_date", serializer=DateTimeSerializer()),
+            PublishedDateMixin.get_published_date_apifield(),
+            PublishedDateMixin.get_is_newly_published_apifield(),
             APIField("last_published_at"),
         ]
     )
@@ -115,7 +107,8 @@ class BlogPostPage(
         + AuthorPageMixin.api_fields
         + ExternalAuthorMixin.api_fields
         + [
-            APIField("published_date", serializer=DateTimeSerializer()),
+            PublishedDateMixin.get_published_date_apifield(),
+            PublishedDateMixin.get_is_newly_published_apifield(),
             APIField("body"),
         ]
     )

diff --git a/etna/collections/models.py b/etna/collections/models.py
@@ -377,7 +377,7 @@ def related_articles(self):
                 .prefetch_related("teaser_image__renditions")
             )
 
-        return sorted(page_list, key=lambda x: x.newly_published_at, reverse=True)
+        return sorted(page_list, key=lambda x: x.published_date, reverse=True)
 
     @cached_property
     def related_highlight_gallery_pages(self):
@@ -583,7 +583,7 @@ def related_articles(self):
                 .prefetch_related("teaser_image__renditions")
             )
 
-        return sorted(page_list, key=lambda x: x.newly_published_at, reverse=True)
+        return sorted(page_list, key=lambda x: x.published_date, reverse=True)
 
     @cached_property
     def related_highlight_gallery_pages(self):