11

backend/api/filters.py

@@ -4,7 +4,6 @@
 
 
 class IngredientFilter(filters.FilterSet):
- """Filtering ingredients by name."""
 
  name = filters.CharFilter(
  field_name='name',
@@ -17,7 +16,6 @@ class Meta:
 
 
 class RecipeFilter(filters.FilterSet):
- """Filter by author, favorites, shopping list and tags."""
 
  tags = filters.AllValuesMultipleFilter(field_name='tags__slug')
  is_favorited = filters.BooleanFilter(method='filter_is_favorited')

backend/api/views.py

@@ -129,12 +129,12 @@ def download_shopping_cart(self, request):
  if not user.shoppingcart.exists():
  return Response(status=status.HTTP_400_BAD_REQUEST)
 
- ingredients = (IngredientAmount.objects.filter(
- recipe__shoppingcart__user=request.user
- ).values(
- 'ingredients__name',
- 'ingredients__measurement_unit'
- ).annotate(amount=Sum('recipe__amount')).order_by())
+ shopping_cart = (
+ request.user.shoppingcart.recipe.
+  values(
+  'ingredients__name',
+  'ingredients__measurement_unit'
+  ).annotate(amount=Sum('recipe__amount')).order_by())
 
  today = datetime.today()
  shopping_list = (
@@ -144,7 +144,7 @@ def download_shopping_cart(self, request):
  f'- {ingredient["ingredient__name"]} '
  f'({ingredient["ingredient__measurement_unit"]})'
  f' - {ingredient["cart_amount"]}'
- for ingredient in ingredients
+ for ingredient in shopping_cart
  ])
  shopping_list += f'\n\nFoodgram ({today:%Y})'