11

fabilya · Oct 1, 2023 · 5a5fcc3 · 5a5fcc3
1 parent a949fd2
commit 5a5fcc3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/backend/api/permissions.py b/backend/api/permissions.py
@@ -11,4 +11,4 @@ def has_object_permission(self, request, view, obj):
             and request.user.is_active
             and request.user == obj.author
             or request.user.is_staff
-        )
+        )
diff --git a/backend/api/views.py b/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(
+        ingredients = (IngredientAmount.objects.filter(
             recipe__shoppingcart__user=request.user
         ).values(
-            'ingredient__name',
-            'ingredient__measurement_unit'
-        ).annotate(cart_amount=Sum('amount'))
+                'ingredients__name',
+                'ingredients__measurement_unit'
+                ).annotate(amount=Sum('recipe__amount')).order_by())
 
         today = datetime.today()
         shopping_list = (