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

shopping supermarket quick edit

Browse Source
This commit is contained in:
vabene1111
2024-12-01 14:27:08 +01:00
parent fa8cd4a2f0
commit 4149549c88
37 changed files with 116 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -176,29 +176,6 @@ def test_sharing(request, shared, count, sle_2, sle, u1_s1):
assert [x['checked'] for x in r['results']].count(False) == count
def test_completed(sle, u1_s1):
# check 1 entry
u1_s1.patch(reverse(DETAIL_URL, args={sle[0].id}), {'checked': True}, content_type='application/json')
r = json.loads(u1_s1.get(reverse(LIST_URL)).content)
assert r['count'] == 10
# count unchecked entries
assert [x['checked'] for x in r['results']].count(False) == 9
# confirm completed_at is populated
assert [(x['completed_at'] is not None) for x in r['results']
if x['checked']].count(True) == 1
assert json.loads(u1_s1.get(f'{reverse(LIST_URL)}?checked=0').content)['count'] == 9
assert json.loads(u1_s1.get(f'{reverse(LIST_URL)}?checked=1').content)['count'] == 1
# uncheck entry
u1_s1.patch(reverse(DETAIL_URL, args={sle[0].id}), {'checked': False}, content_type='application/json')
r = json.loads(u1_s1.get(reverse(LIST_URL)).content)
assert [x['checked'] for x in r['results']].count(False) == 10
# confirm completed_at value cleared
assert [(x['completed_at'] is not None) for x in r['results']
if x['checked']].count(True) == 0
def test_recent(sle, u1_s1):
user = auth.get_user(u1_s1)
user.userpreference.shopping_recent_days = 7 # hardcoded API limit 14 days

2
cookbook/views/api.py
View File

@@ -1445,7 +1445,7 @@ class ShoppingListEntryViewSet(LoggingMixin, viewsets.ModelViewSet):
if checked:
bulk_entries.update(checked=checked, updated_at=update_timestamp, completed_at=update_timestamp)
else:
bulk_entries.update(checked=checked, updated_at=update_timestamp, completed_at=False)
bulk_entries.update(checked=checked, updated_at=update_timestamp, completed_at=None)
serializer.validated_data['timestamp'] = update_timestamp
# update the onhand for food if shopping_add_onhand is True