Fix after rebase

cookbook/helper/HelperFunctions.py

@@ -0,0 +1,13 @@
+from django.db.models import Func
+
+
+class Round(Func):
+    function = 'ROUND'
+    template = '%(function)s(%(expressions)s, 0)'
+
+
+def str2bool(v):
+    if type(v) == bool:
+        return v
+    else:
+        return v.lower() in ("yes", "true", "1")

cookbook/helper/permission_helper.py

@@ -2,11 +2,9 @@
 Source: https://djangosnippets.org/snippets/1703/
 """
 from django.conf import settings
-from django.core.cache import caches
-
-from cookbook.models import ShareLink
 from django.contrib import messages
 from django.contrib.auth.decorators import user_passes_test
+from django.core.cache import caches
 from django.core.exceptions import ValidationError
 from django.http import HttpResponseRedirect
 from django.urls import reverse, reverse_lazy
@@ -14,6 +12,8 @@ from django.utils.translation import gettext as _
 from rest_framework import permissions
 from rest_framework.permissions import SAFE_METHODS
 
+from cookbook.models import ShareLink
+
 
 def get_allowed_groups(groups_required):
     """
@@ -79,7 +79,11 @@ def is_object_shared(user, obj):
     #      share checks for relevant objects
     if not user.is_authenticated:
         return False
-    return user in obj.get_shared()
+    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()
 
 
 def share_link_valid(recipe, share):

cookbook/helper/recipe_search.py

@@ -8,24 +8,13 @@ from django.db.models.functions import Coalesce
 from django.utils import timezone, translation
 
 from cookbook.filters import RecipeFilter
+from cookbook.helper.HelperFunctions import Round, str2bool
 from cookbook.helper.permission_helper import has_group_permission
 from cookbook.managers import DICTIONARY
 from cookbook.models import Food, Keyword, Recipe, SearchPreference, ViewLog
 from recipes import settings
 
 
-class Round(Func):
-    function = 'ROUND'
-    template = '%(function)s(%(expressions)s, 0)'
-
-
-def str2bool(v):
-    if type(v) == bool:
-        return v
-    else:
-        return v.lower() in ("yes", "true", "1")
-
-
 # TODO create extensive tests to make sure ORs ANDs and various filters, sorting, etc work as expected
 # TODO consider creating a simpleListRecipe API that only includes minimum of recipe info and minimal filtering
 def search_recipes(request, queryset, params):
@@ -49,7 +38,7 @@ def search_recipes(request, queryset, params):
     search_internal = str2bool(params.get('internal', False))
     search_random = str2bool(params.get('random', False))
     search_new = str2bool(params.get('new', False))
-    search_last_viewed = int(params.get('last_viewed', 0))
+    search_last_viewed = int(params.get('last_viewed', 0))  # not included in schema currently?
     orderby = []
 
     # only sort by recent not otherwise filtering/sorting
@@ -208,6 +197,7 @@ def search_recipes(request, queryset, params):
     return queryset
 
 
+# TODO:  This might be faster https://github.com/django-treebeard/django-treebeard/issues/115
 def get_facet(qs=None, request=None, use_cache=True, hash_key=None):
     """
     Gets an annotated list from a queryset.

cookbook/helper/shopping_helper.py

@@ -0,0 +1,40 @@
+from datetime import timedelta
+
+from django.contrib.postgres.aggregates import ArrayAgg
+from django.db.models import F, OuterRef, Q, Subquery, Value
+from django.db.models.functions import Coalesce
+from django.utils import timezone
+from django.utils.translation import gettext as _
+
+from cookbook.helper.HelperFunctions import Round, str2bool
+from cookbook.models import SupermarketCategoryRelation
+from recipes import settings
+
+
+def shopping_helper(qs, request):
+    supermarket = request.query_params.get('supermarket', None)
+    checked = request.query_params.get('checked', 'recent')
+
+    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)))
+        supermarket_order = ['supermarket_order'] + supermarket_order
+    if checked in ['false', 0, '0']:
+        qs = qs.filter(checked=False)
+    elif checked in ['true', 1, '1']:
+        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)
+        qs = qs.filter(Q(checked=False) | Q(completed_at__gte=week_ago))
+        supermarket_order = ['checked'] + supermarket_order
+
+    return qs.order_by(*supermarket_order).select_related('unit', 'food', 'ingredient', 'created_by', 'list_recipe', 'list_recipe__mealplan', 'list_recipe__recipe')