Merge pull request #1572 from smilerz/export_from_filter

Export from filter

cookbook/forms.py

@@ -179,6 +179,7 @@ class ImportForm(ImportExportBase):
 class ExportForm(ImportExportBase):
     recipes = forms.ModelMultipleChoiceField(widget=MultiSelectWidget, queryset=Recipe.objects.none(), required=False)
     all = forms.BooleanField(required=False)
+    filter = forms.IntegerField(required=False)
 
     def __init__(self, *args, **kwargs):
         space = kwargs.pop('space')

cookbook/helper/recipe_search.py

@@ -40,7 +40,7 @@ class RecipeSearch():
             self._search_prefs = request.user.searchpreference
         else:
             self._search_prefs = SearchPreference()
-        self._string = params.get('query').strip() if params.get('query', None) else None
+        self._string = self._params.get('query').strip() if self._params.get('query', None) else None
         self._rating = self._params.get('rating', None)
         self._keywords = {
             'or': self._params.get('keywords_or', None) or self._params.get('keywords', None),

cookbook/serializer.py

@@ -421,9 +421,11 @@ class FoodSerializer(UniqueFieldsMixin, WritableNestedModelSerializer, ExtendedR
         space = validated_data.pop('space', self.context['request'].space)
         # supermarket category needs to be handled manually as food.get or create does not create nested serializers unlike a super.create of serializer
         if 'supermarket_category' in validated_data and validated_data['supermarket_category']:
+            sm_category = validated_data['supermarket_category']
+            sc_name = sm_category.pop('name', None)
             validated_data['supermarket_category'], sc_created = SupermarketCategory.objects.get_or_create(
-                name__iexact=validated_data.pop('supermarket_category')['name'],
-                space=self.context['request'].space)
+                name=name,
+                space=space, defaults=sm_category)
         onhand = validated_data.pop('food_onhand', None)
 
         # assuming if on hand for user also onhand for shopping_share users
@@ -678,7 +680,7 @@ class RecipeBookEntrySerializer(serializers.ModelSerializer):
     def create(self, validated_data):
         book = validated_data['book']
         recipe = validated_data['recipe']
-        if not book.get_owner() == self.context['request'].user and not  self.context['request'].user in book.get_shared():
+        if not book.get_owner() == self.context['request'].user and not self.context['request'].user in book.get_shared():
             raise NotFound(detail=None, code=None)
         obj, created = RecipeBookEntry.objects.get_or_create(book=book, recipe=recipe)
         return obj
@@ -733,11 +735,11 @@ class ShoppingListRecipeSerializer(serializers.ModelSerializer):
             value = Decimal(value)
         value = value.quantize(Decimal(1)) if value == value.to_integral() else value.normalize()  # strips trailing zero
         return (
-                       obj.name
-                       or getattr(obj.mealplan, 'title', None)
-                       or (d := getattr(obj.mealplan, 'date', None)) and ': '.join([obj.mealplan.recipe.name, str(d)])
-                       or obj.recipe.name
-               ) + f' ({value:.2g})'
+            obj.name
+            or getattr(obj.mealplan, 'title', None)
+            or (d := getattr(obj.mealplan, 'date', None)) and ': '.join([obj.mealplan.recipe.name, str(d)])
+            or obj.recipe.name
+        ) + f' ({value:.2g})'
 
     def update(self, instance, validated_data):
         # TODO remove once old shopping list

cookbook/views/import_export.py

@@ -11,6 +11,7 @@ from django.utils.translation import gettext as _
 
 from cookbook.forms import ExportForm, ImportExportBase, ImportForm
 from cookbook.helper.permission_helper import group_required
+from cookbook.helper.recipe_search import RecipeSearch
 from cookbook.integration.cheftap import ChefTap
 from cookbook.integration.chowdown import Chowdown
 from cookbook.integration.cookbookapp import CookBookApp
@@ -123,6 +124,9 @@ def export_recipe(request):
                 recipes = form.cleaned_data['recipes']
                 if form.cleaned_data['all']:
                     recipes = Recipe.objects.filter(space=request.space, internal=True).all()
+                elif filter := form.cleaned_data['filter']:
+                    search = RecipeSearch(request, filter=filter)
+                    recipes = search.get_queryset(Recipe.objects.filter(space=request.space, internal=True))
 
                 integration = get_integration(request, form.cleaned_data['type'])