mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-04 05:39:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

update MealPlan queryset filtering to use dates instead of datetime

Browse Source
This commit is contained in:
smilerz
2024-05-01 12:03:10 -05:00
parent 9df03a73d9
commit 5f4283ca3f
3 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cookbook/views/api.py
View File

@@ -141,8 +141,8 @@ class ExtendedRecipeMixin():
@classmethod
def annotate_recipe(self, queryset=None, request=None, serializer=None, tree=False):
extended = str2bool(request.query_params.get('extended', None))
if extended:
recipe_filter = serializer.recipe_filter
recipe_filter = getattr(serializer, 'recipe_filter', None)
if extended and recipe_filter:
images = serializer.images
space = request.space
@@ -772,11 +772,11 @@ class MealPlanViewSet(viewsets.ModelViewSet):
from_date = self.request.query_params.get('from_date', None)
if from_date is not None:
queryset = queryset.filter(to_date__gte=from_date)
queryset = queryset.filter(to_date__date__gte=from_date)
to_date = self.request.query_params.get('to_date', None)
if to_date is not None:
queryset = queryset.filter(to_date__lte=to_date)
queryset = queryset.filter(to_date__date__lte=to_date)
meal_type = self.request.query_params.getlist('meal_type', [])
if meal_type: