add post status and delete is_hidden

fet2020/posts/managers.py

@@ -1,20 +1,26 @@
 from django.db import models
-from django.db.models import Q
+from django.db.models import Q, Manager
 from django.utils import timezone
 
 from datetime import timedelta
 
 
-class PostManager(models.Manager):
+class PublishedManager(Manager):
+    def published(self, public=True):
+        if public:
+            qs = self.get_queryset().filter(status="20")
+        else:
+            qs = self.get_queryset()
+        return qs
+
+
+class PostManager(PublishedManager, Manager):
     def get_queryset(self):
         return super().get_queryset().order_by("-public_date")
 
-    def get_visible_articles(self):
-        return self.get_queryset().filter(is_hidden=False)
-
-    def get_date_sorted_list(self):
+    def date_sorted_list(self, public=True):
         post_list = []
-        for post in self.get_visible_articles():
+        for post in self.published(public):
             if post.post_type != "N":
                 post_list.append((post, post.event_start.date()))
             else:
@@ -25,13 +31,20 @@ class PostManager(models.Manager):
 
         return posts
 
-    def get_date_filtered_list(self, year=None, month=None, fet_meeting_only=None):
+    def date_filtered_list(
+        self,
+        public=True,
+        year=None,
+        month=None,
+        fet_meeting_only=None,
+    ):
         post_list = []
+        qs = self.published(public)
 
         if not fet_meeting_only:
-            posts = self.get_visible_articles().filter(~Q(post_type="N"))
+            posts = qs.filter(~Q(post_type="N"))
         else:
-            posts = self.get_visible_articles().filter(post_type="F")
+            posts = qs.filter(post_type="F")
 
         if year:
             posts = posts.filter(event_start__year=year)
@@ -42,7 +55,7 @@ class PostManager(models.Manager):
             post_list.append((post, post.event_start.date()))
 
         if not fet_meeting_only:
-            posts = self.get_visible_articles().filter(post_type="N")
+            posts = qs.filter(post_type="N")
 
             if year:
                 posts = posts.filter(public_date__year=year)
@@ -57,40 +70,27 @@ class PostManager(models.Manager):
 
         return posts
 
-    def get_last_months_posts(self):
+    # use for finding tags at homepage - TODO: delete when new design published
+    def get_last_months_posts(self, public=True):
         date_today = timezone.now().date()
-        return self.get_visible_articles().filter(
+        return self.published(public).filter(
             public_date__gt=date_today - timedelta(days=365)
         )
 
-    def get_all_posts_with_date(self):
-        return (
-            self.get_queryset()
-            .filter(Q(event_start__isnull=False) & Q(event_end__isnull=False))
-            .order_by("-event_start")
-        )
 
-
-class ArticleManager(models.Manager):
+class ArticleManager(PublishedManager, Manager):
     """
     Provide a query set only for "Article"
     regular fet meetings should not be contained in the news stream
     """
 
     def get_queryset(self):
-        return (
-            super()
-            .get_queryset()
-            .filter(Q(post_type="E") | Q(post_type="N"))
-            .order_by("-public_date")
-        )
+        qs = super().get_queryset().filter(Q(post_type="E") | Q(post_type="N"))
+        return qs.order_by("-public_date")
 
-    def get_visible_articles(self):
-        return self.get_queryset().filter(is_hidden=False)
-
-    def get_date_sorted_list(self):
+    def date_sorted_list(self, public=True):
         post_list = []
-        for post in self.get_visible_articles():
+        for post in self.published(public):
             if post.post_type != "N":
                 post_list.append((post, post.event_start.date()))
             else:
@@ -101,11 +101,11 @@ class ArticleManager(models.Manager):
 
         return posts
 
-    def get_pinned_article(self):
-        return self.get_visible_articles().filter(is_pinned=True).first()
+    def pinned(self, public=True):
+        return self.published(public).filter(is_pinned=True).first()
 
 
-class NewsManager(models.Manager):
+class NewsManager(PublishedManager, Manager):
     """
     Provide a query set only for "News"
     """
@@ -113,79 +113,60 @@ class NewsManager(models.Manager):
     def get_queryset(self):
         return super().get_queryset().filter(post_type="N").order_by("-public_date")
 
-    def get_visible_articles(self):
-        return self.get_queryset().filter(is_hidden=False)
 
-
-class AllEventManager(models.Manager):
+class AllEventManager(PublishedManager, Manager):
     """
     Provide a query set for all events ("Event" and "Fet Meeting")
     """
 
     def get_queryset(self):
-        return super().get_queryset().filter(Q(post_type="E") | Q(post_type="F"))
-
-    def get_five_events(self):
-        date_today = timezone.now()
         return (
-            self.get_queryset()
-            .filter(event_start__gt=date_today)
-            .order_by("event_start")[:5]
+            super()
+            .get_queryset()
+            .filter(Q(post_type="E") | Q(post_type="F"))
+            .order_by("-event_start")
         )
 
+    def future_events(self, public=True):
+        date_today = timezone.now()
+        qs = self.published(public).filter(event_start__gt=date_today)
+        return qs.reverse()
 
-class EventManager(models.Manager):
+
+class EventManager(PublishedManager, Manager):
     """
     Provide a query set only for "Events"
     regular fet meetings should not be contained in the news stream
     """
 
     def get_queryset(self):
-        return super().get_queryset().filter(post_type="E")
+        return super().get_queryset().filter(post_type="E").order_by("-event_start")
 
-    def get_future_events(self):
+    def future_events(self, public=True):
         date_today = timezone.now()
-        return (
-            self.get_queryset()
-            .filter(event_start__gt=date_today)
-            .order_by("event_start")
-        )
+        qs = self.published(public).filter(event_start__gt=date_today)
+        return qs.reverse()
 
-    def get_past_events(self):
+    def past_events(self, public=True):
         date_today = timezone.now()
-        return (
-            self.get_queryset()
-            .filter(event_start__lt=date_today)
-            .order_by("-event_start")
-        )
+        qs = self.published(public).filter(event_start__lt=date_today)
+        return qs
 
 
-class FetMeetingManager(models.Manager):
+class FetMeetingManager(PublishedManager, Manager):
     """
     Provide a query set only for "Fet Meeting"
     """
 
     def get_queryset(self):
-        return super().get_queryset().filter(post_type="F")
+        return super().get_queryset().filter(post_type="F").order_by("-event_start")
 
-    def _get_future_events(self):
+    def future_events(self):
         date_today = timezone.now()
-        return (
-            self.get_queryset()
-            .filter(event_start__gt=date_today)
-            .order_by("event_start")
-        )
+        qs = self.published().filter(event_start__gt=date_today)
+        return qs.reverse()
 
-    def _get_past_events(self):
+    def past_events(self):
         date_today = timezone.now()
-        return (
-            self.get_queryset()
-            .filter(event_start__lt=date_today)
-            .order_by("-event_start")
-        )
-
-    def get_meetings(self):
-        meetings = []
-        meetings.append(self._get_future_events().first())
-        meetings.append(self._get_past_events().first())
-        return meetings
+        qs = self.published().filter(event_start__lt=date_today)
+        return qs