add new unit/food from shopping list

cookbook/helper/permission_helper.py

@@ -79,9 +79,6 @@ def is_object_shared(user, obj):
     #      share checks for relevant objects
     if not user.is_authenticated:
         return False
-    if obj.__class__.__name__ == 'ShoppingListEntry':
-        # shopping lists are shared all or none and stored in user preferences
-        return obj.created_by in user.get_shopping_share()
     else:
         return user in obj.get_shared()
 

cookbook/helper/recipe_search.py

@@ -30,7 +30,6 @@ def search_recipes(request, queryset, params):
     search_steps = params.getlist('steps', [])
     search_units = params.get('units', None)
 
-    # TODO I think default behavior should be 'AND' which is how most sites operate with facet/filters based on results
     search_keywords_or = str2bool(params.get('keywords_or', True))
     search_foods_or = str2bool(params.get('foods_or', True))
     search_books_or = str2bool(params.get('books_or', True))
@@ -202,20 +201,13 @@ def get_facet(qs=None, request=None, use_cache=True, hash_key=None):
     """
     Gets an annotated list from a queryset.
     :param qs:
-
         recipe queryset to build facets from
-
     :param request:
-
         the web request that contains the necessary query parameters
-
     :param use_cache:
-
         will find results in cache, if any, and return them or empty list.
         will save the list of recipes IDs in the cache for future processing
-
     :param hash_key:
-
         the cache key of the recipe list to process
         only evaluated if the use_cache parameter is false
     """
@@ -290,7 +282,6 @@ def get_facet(qs=None, request=None, use_cache=True, hash_key=None):
         foods = Food.objects.filter(ingredient__step__recipe__in=recipe_list, space=request.space).annotate(recipe_count=Count('ingredient'))
     food_a = annotated_qs(foods, root=True, fill=True)
 
-    # TODO add rating facet
     facets['Keywords'] = fill_annotated_parents(kw_a, keyword_list)
     facets['Foods'] = fill_annotated_parents(food_a, food_list)
     # TODO add book facet
@@ -363,8 +354,6 @@ def annotated_qs(qs, root=False, fill=False):
             dirty = False
             current_node = node_queue[-1]
             depth = current_node.get_depth()
-            # TODO if node is at the wrong depth for some reason this fails
-            # either create a 'fix node' page, or automatically move the node to the root
             parent_id = current_node.parent
             if root and depth > 1 and parent_id not in nodes_list:
                 parent_id = current_node.parent

cookbook/helper/shopping_helper.py

@@ -15,14 +15,12 @@ from recipes import settings
 def shopping_helper(qs, request):
     supermarket = request.query_params.get('supermarket', None)
     checked = request.query_params.get('checked', 'recent')
+    user = request.user
 
     supermarket_order = ['food__supermarket_category__name', 'food__name']
 
     # TODO created either scheduled task or startup task to delete very old shopping list entries
     # TODO create user preference to define 'very old'
-
-    # qs = qs.annotate(supermarket_category=Coalesce(F('food__supermarket_category__name'), Value(_('Undefined'))))
-    # TODO add supermarket to API - order by category order
     if supermarket:
         supermarket_categories = SupermarketCategoryRelation.objects.filter(supermarket=supermarket, category=OuterRef('food__supermarket_category'))
         qs = qs.annotate(supermarket_order=Coalesce(Subquery(supermarket_categories.values('order')), Value(9999)))
@@ -33,8 +31,7 @@ def shopping_helper(qs, request):
         qs = qs.filter(checked=True)
     elif checked in ['recent']:
         today_start = timezone.now().replace(hour=0, minute=0, second=0)
-        # TODO make recent a user setting
-        week_ago = today_start - timedelta(days=7)
+        week_ago = today_start - timedelta(days=user.userpreference.shopping_recent_days)
         qs = qs.filter(Q(checked=False) | Q(completed_at__gte=week_ago))
         supermarket_order = ['checked'] + supermarket_order
 
@@ -51,7 +48,6 @@ def list_from_recipe(list_recipe=None, recipe=None, mealplan=None, servings=None
     :param ingredients: Ingredients, list of ingredient IDs to include on the shopping list.  When not provided all ingredients will be used
     :param append: If False will remove any entries not included with ingredients, when True will append ingredients to the shopping list
     """
-    # TODO cascade to related recipes
     r = recipe or getattr(mealplan, 'recipe', None) or getattr(list_recipe, 'recipe', None)
     if not r:
         raise ValueError(_("You must supply a recipe or mealplan"))