Updated dependencies

[pcdenotes.git] / notes / models.py

diff --git a/notes/models.py b/notes/models.py
index f5ab091af915b954d113b7e0fdebd3f58b9642d0..0056f0e706d29990ba4f5721cc0fc9dbdbf51375 100644 (file)
--- a/notes/models.py
+++ b/notes/models.py
@@ -1,6 +1,6 @@
 from django.db import models
 from django.db.models import Count
 from django.db import models
 from django.db.models import Count

-from django.db.models.functions import ExtractYear, ExtractMonth
+from django.db.models.functions import ExtractYear, ExtractMonth, Coalesce

 from django.db.models.signals import pre_save
 
 from django.dispatch import receiver
 from django.db.models.signals import pre_save
 
 from django.dispatch import receiver


@@ -18,17 +18,23 @@ class NoteQuerySet(models.QuerySet):
     pass
 
 class NoteManager(models.Manager):
     pass
 
 class NoteManager(models.Manager):

+    def all_published(self):
+        return super().get_queryset().filter(status=1).annotate(publication_date=Coalesce('published_at', 'created_at')).order_by('-publication_date')
+
+    def all(self):
+        return super().all().annotate(publication_date=Coalesce('published_at', 'created_at')).order_by('-publication_date')
+

     def per_year(self, year):
     def per_year(self, year):

-        return super().get_queryset().filter(status=1, created_at__year=year)
+        return self.all_published().filter(created_at__year=year)

 
     def per_month(self, year, month):
 
     def per_month(self, year, month):

-        return super().get_queryset().filter(status=1, created_at__year=year, created_at__month=month)
+        return self.per_year(year).filter(created_at__month=month)

 
     def years(self):
 
     def years(self):

-        return super().get_queryset().filter(status=1).annotate(created_year=ExtractYear('created_at')).values_list('created_year', flat=True).distinct().order_by('created_year')
+        return self.all_published().annotate(created_year=ExtractYear('created_at')).values_list('created_year', flat=True).distinct().order_by('created_year')

 
     def years_with_total(self):
 
     def years_with_total(self):

-        return super().get_queryset().filter(status=1).annotate(created_year=ExtractYear('created_at')).values('created_year').annotate(total=Count('id')).order_by('created_year').values('created_year', 'total').distinct()
+        return self.all_published().annotate(created_year=ExtractYear('created_at')).values('created_year').annotate(total=Count('id')).order_by('created_year').values('created_year', 'total').distinct()

 
     def months(self, year):
         return self.per_year(year).annotate(created_month=ExtractMonth('created_at')).values_list('created_month', flat=True).distinct().order_by('created_month')
 
     def months(self, year):
         return self.per_year(year).annotate(created_month=ExtractMonth('created_at')).values_list('created_month', flat=True).distinct().order_by('created_month')


@@ -64,12 +70,6 @@ class Note(models.Model):
     def is_published(self):
         return self.status == 1
 
     def is_published(self):
         return self.status == 1
 

-    def publication_date(self):
-        if self.published_at is None:
-            return self.created_at
-        else:
-            return self.published_at
-

 @receiver(pre_save, sender=Note)
 def note_pre_save(sender, instance, **kwargs):
     if instance.pk is None:
 @receiver(pre_save, sender=Note)
 def note_pre_save(sender, instance, **kwargs):
     if instance.pk is None: