Some refactoring of the model manager methods

diff --git a/notes/models.py b/notes/models.py
index f5ab091af915b954d113b7e0fdebd3f58b9642d0..c38e3d50ae85d41986298f39ad5331c5744c09b7 100644 (file)
--- a/notes/models.py
+++ b/notes/models.py
@@ -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)
+
+    def all_with_unpublished(self):
+        return super().all()
+

     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')

diff --git a/notes/views.py b/notes/views.py
index 62a51e88fe7b45d4093d46062909eaeacaad2339..19ace1323137b0fd9856cc1bbedeb664bfa9cdb7 100644 (file)
--- a/notes/views.py
+++ b/notes/views.py
@@ -8,7 +8,7 @@ from .models import Note
 # Create your views here.
 
 def note_list(request):
 # Create your views here.
 
 def note_list(request):

-    notes = Note.objects.all() if request.user.is_staff else Note.objects.filter(status=1)
+    notes = Note.objects.all() if request.user.is_staff else Note.objects.all_published()

 
     notes_count = notes.count()
     paginator = Paginator(notes, NOTES_PER_PAGE)
 
     notes_count = notes.count()
     paginator = Paginator(notes, NOTES_PER_PAGE)