X-Git-Url: https://git.p6c8.net/pcdenotes.git/blobdiff_plain/218a404a6467fc7acab06efd5f1049acbc174cf2..7e19e83d17bc24e910557b15f80c16d7e8c04102:/notes/models.py

diff --git a/notes/models.py b/notes/models.py
index f5ab091..5453f9b 100644
--- 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.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
@@ -18,23 +18,29 @@ class NoteQuerySet(models.QuerySet):
     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):
-        return super().get_queryset().filter(status=1, created_at__year=year)
+        return self.all_published().filter(publication_date__year=year)
 
     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(publication_date__month=month)
 
     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(published_year=ExtractYear('publication_date')).values_list('published_year', flat=True).distinct().order_by('published_year')
 
     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(published_year=ExtractYear('publication_date')).values('published_year').annotate(total=Count('id')).order_by('published_year').values('published_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')
+        return self.per_year(year).annotate(published_month=ExtractMonth('publication_date')).values_list('published_month', flat=True).distinct().order_by('published_month')
 
     def months_with_total(self, year):
-        return self.per_year(year).annotate(created_month=ExtractMonth('created_at')).values('created_month').annotate(total=Count('id')).order_by('created_month').values('created_month', 'total').distinct()
+        return self.per_year(year).annotate(published_month=ExtractMonth('publication_date')).values('published_month').annotate(total=Count('id')).order_by('published_month').values('published_month', 'total').distinct()
 
 class Note(models.Model):
     title = models.CharField(max_length=250)
@@ -64,12 +70,6 @@ class Note(models.Model):
     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: