xonecas.io
3517
Mt

meal_tracker / commit 8c4ba3a

Fix sorting and filtering.

It is now possible to sort by date and time idividually.  This allows
for querying all lunches, or all snacks.

xonecas2020-07-27 8c4ba3ad18490be257866256f13ad807644d5ceb parent af5cf71

2 files changed

bmi_api/serializers.py+0−1
@@ -59,7 +59,6 @@ class MealSerializer(serializers.ModelSerializer):
5959 class Meta:
6060 model = Meal
6161 fields = '__all__'
62- ordering = ['created']
6362 extra_kwargs = {
6463 'date': {'required': False},
6564 'time': {'required': False},
bmi_api/views.py+6−2
@@ -1,3 +1,5 @@
1+from datetime import datetime
2+
13 from django.contrib.auth import authenticate
24 from django.contrib.auth.models import User
35 from django.utils.dateparse import parse_time
@@ -64,14 +66,16 @@ class MealViewSet(viewsets.ModelViewSet):
6466 to_time = query_params.get('time_to', None)
6567
6668 if from_date is not None and to_date is not None:
67- queryset = queryset.filter(date__lte=from_date, date__gte=to_date)
69+ from_date = datetime.date(datetime.strptime(from_date, '%Y-%m-%d'))
70+ to_date = datetime.date(datetime.strptime(to_date, '%Y-%m-%d'))
71+ queryset = queryset.filter(date__gte=from_date, date__lte=to_date)
6872
6973 if from_time is not None and to_time is not None:
7074 from_time = parse_time(from_time)
7175 to_time = parse_time(to_time)
7276 queryset = queryset.filter(time__gte=from_time, time__lte=to_time)
7377
74- return queryset
78+ return queryset.order_by('time', 'date')
7579
7680 def perform_create(self, serializer):
7781 serializer.save(owner=self.request.user)