fix: ingredients mess on recipe editing

Author: ClaireMaud

backend/foodgram/foodapp/serializers.py

@@ -3,6 +3,7 @@
 
 from django.contrib.auth import get_user_model
 from django.core.files.base import ContentFile
+from django.shortcuts import get_object_or_404
 from rest_framework import serializers
 
 from .constants import (DEFAULT_RECIPES_AMOUNT_AT_SUBSCRIPTIONS_PAGE,
@@ -267,22 +268,40 @@ def create(self, validated_data):
         return recipe
 
     def update(self, instance, validated_data):
+        print("Входящие данные: ", validated_data)
+        print("Ингредиенты: ", validated_data.get('recipe_ingredients'))
         if 'tags' not in validated_data:
             raise serializers.ValidationError({'tags': 'Обязательное поле.'})
-        else:
-            instance.tags.set(validated_data.pop('tags'))
         if 'recipe_ingredients' not in validated_data:
-            raise serializers.ValidationError({'tags': 'Обязательное поле.'})
-        else:
-            ingredients = validated_data.pop('recipe_ingredients')
-            instance.recipe_ingredients.all().delete()
-            for ingredient in ingredients:
-                ingredient_instance = Ingredient.objects.get(
-                    id=ingredient['id'])
-                RecipeIngredient.objects.create(recipe=instance,
-                                                ingredient=ingredient_instance,
-                                                amount=ingredient['amount'])
-        return super().update(instance, validated_data)
+            raise serializers.ValidationError(
+                {'ingredients': 'Обязательное поле.'})
+        instance.name = validated_data.get('name', instance.name)
+        instance.image = validated_data.get('image', instance.image)
+        instance.text = validated_data.get('text', instance.text)
+        instance.cooking_time = validated_data.get('cooking_time',
+                                                   instance.cooking_time)
+        instance.tags.clear()
+        instance.tags.set(validated_data.pop('tags'))
+        recipe_ingredients = validated_data.pop('recipe_ingredients')
+        instance.recipe_ingredients.all().delete()
+        # RecipeIngredient.objects.bulk_create([
+        #     RecipeIngredient(
+        #         recipe=instance,
+        #         ingredient=get_object_or_404(Ingredient,
+        #                                      id=ingredient['id']),
+        #         amount=ingredient['amount']
+        #     ) for ingredient in recipe_ingredients])
+        for ingredient in recipe_ingredients:
+            print(f"Создаю связь: Рецепт={instance.name}, "
+                  f"Ингредиент={ingredient.name}, "
+                  f"Количество={ingredient['amount']}")
+
+            RecipeIngredient.objects.create(
+                recipe=instance,
+                ingredient=get_object_or_404(Ingredient, id=ingredient['id']),
+                amount=ingredient['amount'])
+        instance.save()
+        return instance
 
 
 class RecipeShortSerializer(serializers.ModelSerializer):

backend/foodgram/foodgram/asgi.py

@@ -1,12 +1,3 @@
-"""
-ASGI config for foodgram project.
-
-It exposes the ASGI callable as a module-level variable named ``application``.
-
-For more information on this file, see
-https://docs.djangoproject.com/en/4.2/howto/deployment/asgi/
-"""
-
 import os
 
 from django.core.asgi import get_asgi_application