v2 search filtering

cookbook/helper/recipe_search.py

@@ -0,0 +1,56 @@
+from functools import reduce
+
+from django.contrib.postgres.search import TrigramSimilarity
+from django.db.models import Q
+
+from recipes import settings
+
+
+def search_recipes(queryset, params):
+    search_string = params.get('query', '')
+    search_keywords = params.getlist('keywords', [])
+    search_foods = params.getlist('foods', [])
+    search_books = params.getlist('books', [])
+
+    search_keywords_or = params.get('keywords_or', True)
+    search_foods_or = params.get('foods_or', True)
+    search_books_or = params.get('books_or', True)
+
+    search_internal = params.get('internal', None)
+    search_limit = params.get('limit', None)
+
+    if settings.DATABASES['default']['ENGINE'] in ['django.db.backends.postgresql_psycopg2', 'django.db.backends.postgresql']:
+        queryset = queryset.annotate(similarity=TrigramSimilarity('name', search_string), ).filter(Q(similarity__gt=0.1) | Q(name__unaccent__icontains=search_string)).order_by('-similarity')
+    else:
+        queryset = queryset.filter(name__icontains=search_string)
+
+    if len(search_keywords) > 0:
+        if search_keywords_or == 'true':
+            queryset = queryset.filter(keywords__id__in=search_keywords)
+        else:
+            for k in search_keywords:
+                queryset = queryset.filter(keywords__id=k)
+
+    if len(search_foods) > 0:
+        if search_foods_or == 'true':
+            queryset = queryset.filter(keywords__id__in=search_foods)
+        else:
+            for k in search_foods:
+                queryset = queryset.filter(keywords__id=k)
+
+    if len(search_books) > 0:
+        if search_books_or == 'true':
+            queryset = queryset.filter(keywords__id__in=search_books)
+        else:
+            for k in search_books:
+                queryset = queryset.filter(keywords__id=k)
+
+    queryset = queryset.distinct()
+
+    if search_internal == 'true':
+        queryset = queryset.filter(internal=True)
+
+    if search_limit:
+        queryset = queryset[:int(search_limit)]
+
+    return queryset

cookbook/views/api.py

@@ -28,6 +28,7 @@ from cookbook.helper.permission_helper import (CustomIsAdmin, CustomIsGuest,
                                                CustomIsOwner, CustomIsShare,
                                                CustomIsShared, CustomIsUser,
                                                group_required, share_link_valid)
+from cookbook.helper.recipe_search import search_recipes
 from cookbook.helper.recipe_url_import import get_from_html, get_from_scraper, find_recipe_json
 from cookbook.models import (CookLog, Food, Ingredient, Keyword, MealPlan,
                              MealType, Recipe, RecipeBook, ShoppingList,
@@ -269,7 +270,7 @@ class StepViewSet(viewsets.ModelViewSet):
         return self.queryset.filter(recipe__space=self.request.space)
 
 
-class RecipeViewSet(viewsets.ModelViewSet, StandardFilterMixin):
+class RecipeViewSet(viewsets.ModelViewSet):
     """
     list:
     optional parameters
@@ -288,11 +289,7 @@ class RecipeViewSet(viewsets.ModelViewSet, StandardFilterMixin):
         if not (share and self.detail):
             self.queryset = self.queryset.filter(space=self.request.space)
 
-        internal = self.request.query_params.get('internal', None)
-        if internal:
-            self.queryset = self.queryset.filter(internal=True)
-
-        return super().get_queryset()
+        return search_recipes(self.queryset, self.request.GET)
 
     # TODO write extensive tests for permissions