fix: 충돌 수정

friends/serializers.py

@@ -133,9 +133,125 @@ def get_rating_average(self, obj):
 
 
 class FriendRequestSerializer(serializers.ModelSerializer):
+    id = serializers.IntegerField(source="from_user.id")
+    name = serializers.CharField(source="from_user.name")
+    profile_img = serializers.URLField(source="from_user.profile_img.url")
+    reliability = serializers.IntegerField(source="from_user.reliability")
+    common_restaurant_count = serializers.SerializerMethodField()
+
+    class Meta:
+        model = FriendRequest
+        fields = [
+            "id",
+            "name",
+            "profile_img",
+            "reliability",
+            "common_restaurant_count",
+        ]
+
+    def get_common_restaurant_count(self, obj):
+        try:
+            user = obj.from_user
+            # friend_user = self.context.get('request').user
+            friend_user = User.objects.get(id=21)
+
+            user_restaurants = set(
+                UserRestaurantsList.objects.filter(user=user).values_list(
+                    "restaurant_id", flat=True
+                )
+            )
+            friend_restaurants = set(
+                UserRestaurantsList.objects.filter(user=friend_user).values_list(
+                    "restaurant_id", flat=True
+                )
+            )
+            return len(user_restaurants.intersection(friend_restaurants))
+        except User.DoesNotExist:
+            return 0
+
+
+class FriendRecommendSerializer(serializers.ModelSerializer):
+    common_restaurant_count = serializers.SerializerMethodField()
+    common_restaurants = serializers.SerializerMethodField()
+
+    class Meta:
+        model = User
+        fields = [
+            "id",
+            "name",
+            "profile_img",
+            "reliability",
+            "common_restaurant_count",
+            "common_restaurants",
+        ]
+
+    def get_common_restaurant_count(self, obj):
+        user = self.context.get("user")
+        user_restaurants = set(
+            UserRestaurantsList.objects.filter(user=user).values_list(
+                "restaurant_id", flat=True
+            )
+        )
+        friend_restaurants = set(
+            UserRestaurantsList.objects.filter(user=obj).values_list(
+                "restaurant_id", flat=True
+            )
+        )
+        return len(user_restaurants.intersection(friend_restaurants))
+
+    def get_common_restaurants(self, obj):
+        user = self.context.get("user")
+        user_restaurants = set(
+            UserRestaurantsList.objects.filter(user=user).values_list(
+                "restaurant_id", flat=True
+            )
+        )
+        friend_restaurants = UserRestaurantsList.objects.filter(
+            user=obj, restaurant_id__in=user_restaurants
+        ).values("restaurant__name", "restaurant__image_url")[:2]
+        return friend_restaurants
+
+    def to_representation(self, instance):
+        representation = super().to_representation(instance)
+        include_restaurants = self.context.get("include_restaurants", False)
+        if not include_restaurants:
+            representation.pop("common_restaurants")
+        return representation
+
+
+class FriendSerializer(serializers.ModelSerializer):
+    id = serializers.IntegerField(source="friend.id")
+    name = serializers.CharField(source="friend.name")
+    profile_img = serializers.URLField(source="friend.profile_img.url")
+    reliability = serializers.IntegerField(source="friend.reliability")
+
     class Meta:
         model = Friend
-        fields = "__all__"
+        fields = [
+            "id",
+            "name",
+            "profile_img",
+            "reliability",
+        ]
+
+
+class RestaurantlistSerializer(serializers.ModelSerializer):
+    rating_average = serializers.SerializerMethodField()
+
+    class Meta:
+        model = Restaurant
+        fields = [
+            "id",
+            "name",
+            "food_type",
+            "rating_average",
+            "latitude",
+            "longitude",
+            "image_url",
+        ]
+
+    def get_rating_average(self, obj):
+        return obj.rating_average()
 
 
 class RestaurantSerializer(serializers.ModelSerializer):