X-Git-Url: https://git.p6c8.net/pcdenotes.git/blobdiff_plain/41cbbf03fd231637646702e6445eaf9ebfa2c770..818b32455bad7a84a693e342be35e2cb22de04ce:/notes/models.py

diff --git a/notes/models.py b/notes/models.py
index a3fe24e..0056f0e 100644
--- a/notes/models.py
+++ b/notes/models.py
@@ -1,9 +1,14 @@
 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.contrib.auth.models import User
 from django.urls import reverse
 
+from datetime import datetime
+
 # Create your models here.
 
 NOTE_STATUS = ((0, "Draft"),
@@ -13,17 +18,23 @@ 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(created_at__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(created_at__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(created_year=ExtractYear('created_at')).values_list('created_year', flat=True).distinct().order_by('created_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(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')
@@ -40,6 +51,7 @@ class Note(models.Model):
     
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
+    published_at = models.DateTimeField(null=True, editable=False)
 
     objects = NoteManager()
 
@@ -56,4 +68,15 @@ class Note(models.Model):
         return self.status == 0
 
     def is_published(self):
-        return self.status == 1
\ No newline at end of file
+        return self.status == 1
+
+@receiver(pre_save, sender=Note)
+def note_pre_save(sender, instance, **kwargs):
+    if instance.pk is None:
+        if instance.status == 1:
+            instance.published_at = datetime.now()
+    else:
+        old_instance = Note.objects.get(pk=instance.pk)
+        
+        if old_instance.status == 0 and instance.status == 1:
+            instance.published_at = datetime.now()
\ No newline at end of file