11

backend/api/permissions.py

@@ -1,11 +1,11 @@
-from rest_framework import permissions
-from rest_framework.permissions import SAFE_METHODS
+from rest_framework.permissions import SAFE_METHODS, BasePermission
 
 
-class OwnerUserOrReadOnly(permissions.BasePermission):
+class IsAuthorOrReadOnly(BasePermission):
 
- def has_object_permission(self, request, view, obj):
- if request.method in SAFE_METHODS:
- return True
+ def has_permission(self, request, view):
+ return (request.method in SAFE_METHODS
+  or request.user.is_authenticated)
 
- return obj.user == request.user
+ def has_object_permission(self, request, view, obj):
+ return obj.author == request.user

backend/api/views.py

@@ -11,7 +11,7 @@
 from .filters import IngredientFilter, RecipeFilter
 from recipes.models import (Favorite, Ingredient, IngredientAmount,
  Recipe, ShoppingCart, Tag)
-from .permissions import OwnerUserOrReadOnly
+from .permissions import IsAuthorOrReadOnly
 
 from .serializers import (
  FavoriteSerializer,
@@ -56,7 +56,7 @@ def get_permissions(self):
 
  permissions_dict = {
  'create': [permissions.IsAuthenticated()],
- 'partial_update': [OwnerUserOrReadOnly],
+ 'partial_update': [IsAuthorOrReadOnly()],
  'favorite': [permissions.IsAuthenticated()],
  'shopping_cart': [permissions.IsAuthenticated()],
  'download_shopping_cart': [permissions.IsAuthenticated()],
@@ -134,7 +134,7 @@ def download_shopping_cart(self, request):
  ).values(
  'ingredient__name',
  'ingredient__measurement_unit'
- ).annotate(cart_amount=Sum('amount'))
+ ).annotate(amount=Sum('amount'))
 
  today = datetime.today()
  shopping_list = (
@@ -143,7 +143,7 @@ def download_shopping_cart(self, request):
  shopping_list += '\n'.join([
  f'- {ingredient["ingredient__name"]} '
  f'({ingredient["ingredient__measurement_unit"]})'
- f' - {ingredient["cart_amount"]}'
+ f' - {ingredient["amount"]}'
  for ingredient in ingredients
  ])
  shopping_list += f'\n\nFoodgram ({today:%Y})'