cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed test

Browse Source
This commit is contained in:
vabene1111 2024-02-06 14:42:14 +01:00
parent 08a2b4d0b2
commit dffb2d4eae
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cookbook/tests/api/test_api_shopping_list_entryv2.py
View File

@ -214,6 +214,9 @@ def test_completed(sle, u1_s1):
def test_recent(sle, u1_s1): def test_recent(sle, u1_s1):
user = auth.get_user(u1_s1) user = auth.get_user(u1_s1)
user.userpreference.shopping_recent_days = 7 # hardcoded API limit 14 days
user.userpreference.save()
today_start = timezone.now().replace(hour=0, minute=0, second=0) today_start = timezone.now().replace(hour=0, minute=0, second=0)
# past_date within recent_days threshold # past_date within recent_days threshold

4
cookbook/views/api.py
View File

@ -1163,11 +1163,11 @@ class ShoppingListEntryViewSet(viewsets.ModelViewSet):
if pk := self.request.query_params.getlist('id', []): if pk := self.request.query_params.getlist('id', []):
self.queryset = self.queryset.filter(food__id__in=[int(i) for i in pk]) self.queryset = self.queryset.filter(food__id__in=[int(i) for i in pk])
if 'checked' in self.request.query_params or 'recent' in self.request.query_params: if 'checked' in self.request.query_params:
return shopping_helper(self.queryset, self.request) return shopping_helper(self.queryset, self.request)
elif not self.detail: elif not self.detail:
today_start = timezone.now().replace(hour=0, minute=0, second=0) today_start = timezone.now().replace(hour=0, minute=0, second=0)
week_ago = today_start - datetime.timedelta(days=max(self.request.user.userpreference.shopping_recent_days, 14)) week_ago = today_start - datetime.timedelta(days=min(self.request.user.userpreference.shopping_recent_days, 14))
self.queryset = self.queryset.filter(Q(checked=False) | Q(completed_at__gte=week_ago)) self.queryset = self.queryset.filter(Q(checked=False) | Q(completed_at__gte=week_ago))
try: try: