X-Git-Url: https://git.p6c8.net/pcdenotes.git/blobdiff_plain/218a404a6467fc7acab06efd5f1049acbc174cf2..9de0dae172be3d7bc2526d39637d95c23a685aa1:/notes/models.py diff --git a/notes/models.py b/notes/models.py index f5ab091..c38e3d5 100644 --- a/notes/models.py +++ b/notes/models.py @@ -18,17 +18,23 @@ class NoteQuerySet(models.QuerySet): 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): - 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')