Updated dependencies

[pcdenotes.git] / notes / models.py

diff --git a/notes/models.py b/notes/models.py
index 5541224bbc1f5a39fbd38aca07dd9e2eb434cf81..5453f9b3406292816b48a7e921097784abe819f5 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,23 +18,29 @@ 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(publication_date__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(publication_date__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(published_year=ExtractYear('publication_date')).values_list('published_year', flat=True).distinct().order_by('published_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(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):
 
     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):
 
     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)
 
 class Note(models.Model):
     title = models.CharField(max_length=250)