Skip to content

Commit

Permalink
feat: add today_tracked field to Habit Serializer
Browse files Browse the repository at this point in the history
  • Loading branch information
dragonee committed Sep 29, 2024
1 parent 3ff126f commit f8341ef
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
3 changes: 2 additions & 1 deletion tasks/apps/tree/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ class Meta:
fields = ['id', 'name']

class HabitSerializer(serializers.HyperlinkedModelSerializer):
today_tracked = serializers.IntegerField(read_only=True)
class Meta:
model = Habit
fields = ['id', 'name', 'description', 'slug', 'tagname']
fields = ['id', 'name', 'description', 'slug', 'tagname', 'today_tracked']

class PlanSerializer(serializers.HyperlinkedModelSerializer):
class Meta:
Expand Down
8 changes: 7 additions & 1 deletion tasks/apps/tree/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
from .commit import merge, calculate_changes_per_board
from .habits import habits_line_to_habits_tracked

from django.db.models import Count, Q
from datetime import date, timedelta

from django.http import HttpResponse
Expand Down Expand Up @@ -67,7 +68,12 @@ def get_queryset(self):
serializer_class = BoardSerializer

class HabitViewSet(viewsets.ModelViewSet):
queryset = Habit.objects.all()
queryset = Habit.objects.all().annotate(
today_tracked=Count(
'habittracked',
filter=Q(habittracked__published__date=date.today())
),
)
serializer_class = HabitSerializer

class PlanViewSet(viewsets.ModelViewSet):
Expand Down

0 comments on commit f8341ef

Please sign in to comment.