Skip to content

Commit

Permalink
PEP8
Browse files Browse the repository at this point in the history
  • Loading branch information
eugemos committed Sep 3, 2023
1 parent abe700a commit fc85f18
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 15 deletions.
21 changes: 9 additions & 12 deletions backend/api/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import re

from django.core.files.base import ContentFile
from django.shortcuts import get_object_or_404
from djoser.serializers import (
UserSerializer as DjoserUserSerializer,
UserCreateSerializer as DjoserUserCreateSerializer,
Expand All @@ -14,7 +13,6 @@
from recipes.models import Tag, Ingredient, Recipe, IngredientOccurence
import recipes.serializers
from users.constants import MAX_PASSWORD_LENGTH
from users.models import User


IngredientSerializer = recipes.serializers.IngredientSerializer
Expand Down Expand Up @@ -164,7 +162,7 @@ class ReducedRecipeSerializer(serializers.ModelSerializer):
class Meta:
model = Recipe
fields = ('id', 'name', 'cooking_time', 'image')
read_only_fields = ('name', 'cooking_time', 'image')
read_only_fields = ('name', 'cooking_time', 'image')


class RecipeUserSetSerializer(ReducedRecipeSerializer):
Expand All @@ -181,13 +179,13 @@ def validate(self, data):
raise serializers.ValidationError(
dict(errors='Этот рецепт уже есть в этом списке.'),
)

else:
if not recipe_in_set:
raise serializers.ValidationError(
dict(errors='Этого рецепта нет в этом списке.'),
)

return data

def update(self, instance, validated_data):
Expand All @@ -196,8 +194,8 @@ def update(self, instance, validated_data):
getattr(user, self.set_name).add(instance)
else:
getattr(user, self.set_name).remove(instance)
return instance

return instance


class RecipeShoppingCartSerializer(RecipeUserSetSerializer):
Expand All @@ -208,7 +206,7 @@ class RecipeShoppingCartSerializer(RecipeUserSetSerializer):


class RecipeFavoritesSerializer(RecipeUserSetSerializer):
"""Сериализатор для использования при включении рецепта в
"""Сериализатор для использования при включении рецепта в
избранные рецепты пользователя и исключении из них.
"""
set_name = 'favorites'
Expand Down Expand Up @@ -272,7 +270,7 @@ def validate(self, data):
raise serializers.ValidationError(
dict(errors='Вы не подписаны на этого автора.'),
)

return data

def update(self, instance, validated_data):
Expand All @@ -281,6 +279,5 @@ def update(self, instance, validated_data):
user.subscribe_to(instance)
else:
user.unsubscribe_from(instance)

return instance


return instance
6 changes: 3 additions & 3 deletions backend/api/views.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""Содержит обработчики для эндпойнтов API."""
from django.db.models import Value, OuterRef, Exists, Model
from django.db.models import Value, OuterRef, Exists
from django.http import HttpResponse
from django.shortcuts import get_object_or_404
from django.urls import reverse
Expand All @@ -16,7 +16,7 @@
from users.models import User
from .serializers import (
TagSerializer, IngredientSerializer,
RecipeSerializer, ReducedRecipeSerializer,
RecipeSerializer,
RecipeShoppingCartSerializer, RecipeFavoritesSerializer,
ExtendedUserSerializer, UserSubscribeSerializer
)
Expand Down Expand Up @@ -56,7 +56,7 @@ def add_remove(self, request, pk):
status=status.HTTP_201_CREATED,
headers=self.get_success_headers(serializer.data)
)

return Response(
status=status.HTTP_204_NO_CONTENT
)
Expand Down

0 comments on commit fc85f18

Please sign in to comment.