fix: 리스트 응답 구조 변경

friends/serializers.py

@@ -52,7 +52,15 @@ class RestaurantlistSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Restaurant
-        fields = ["id", "name", "food_type", "rating_average", "latitude", "longitude"]
+        fields = [
+            "id",
+            "name",
+            "food_type",
+            "rating_average",
+            "latitude",
+            "longitude",
+            "image_url",
+        ]
 
     def get_rating_average(self, obj):
         return obj.rating_average()

friends/views.py

@@ -4,11 +4,11 @@
 from rest_framework import status
 
 # from django.contrib.auth.decorators import login_required
-from restaurants.models import UserRestaurantsList
+from restaurants.models import UserRestaurantsList, Restaurant
 from .serializers import (
     FriendSerializer,
     FriendRequestSerializer,
-    FriendRestaurantSerializer,
+    RestaurantlistSerializer,
 )
 from accounts.models import User
 from .models import Friend
@@ -24,9 +24,12 @@ def friend_restaurant_list(request, id):
 
         # 친구의 맛집 리스트를 가져옴
         friend_restaurants = UserRestaurantsList.objects.filter(user=friend)
-        serializer = FriendRestaurantSerializer(friend_restaurants, many=True)
+        restaurant_ids = friend_restaurants.values_list("restaurant_id", flat=True)
+        restaurants = Restaurant.objects.filter(id__in=restaurant_ids)
 
-        return Response({"restaurants": serializer.data}, status=status.HTTP_200_OK)
+        serializer = RestaurantlistSerializer(restaurants, many=True)
+
+        return Response({"results": serializer.data}, status=status.HTTP_200_OK)
     except User.DoesNotExist:
         return Response(
             {"message": "Friend not found"}, status=status.HTTP_404_NOT_FOUND

restaurants/migrations/0006_restaurant_image_url.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.14 on 2024-08-04 08:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("restaurants", "0005_restaurant_food_type"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="restaurant",
+            name="image_url",
+            field=models.URLField(blank=True, max_length=500, null=True),
+        ),
+    ]

restaurants/models.py

@@ -19,6 +19,7 @@ class Restaurant(models.Model):
     address = models.CharField(max_length=255)
     latitude = models.DecimalField(max_digits=11, decimal_places=8)
     longitude = models.DecimalField(max_digits=11, decimal_places=8)
+    image_url = models.URLField(max_length=500, null=True, blank=True)
 
     def rating_average(self):
         ratings = [self.rating_naver, self.rating_kakao, self.rating_google]

restaurants/serializers.py

@@ -43,7 +43,15 @@ class RestaurantlistSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Restaurant
-        fields = ["id", "name", "food_type", "rating_average", "latitude", "longitude"]
+        fields = [
+            "id",
+            "name",
+            "food_type",
+            "rating_average",
+            "latitude",
+            "longitude",
+            "image_url",
+        ]
 
     def get_rating_average(self, obj):
         return obj.rating_average()

restaurants/views.py

@@ -7,7 +7,7 @@
     RestaurantSerializer,
     RestaurantListSerializer,
     SearchHistorySerializer,
-    UserRestaurantListSerializer,
+    RestaurantlistSerializer,
     RestaurantDetailSerializer,
 )
 
@@ -70,11 +70,18 @@ def search(request):
 @api_view(["GET"])
 # @login_required
 def user_restaurant_list(request):
-    user = User.objects.get(id=21)  # 임시 유저 지정, 추후 삭제
-    user_restaurants = UserRestaurantsList.objects.filter(user=user)  # 추후 삭제
-    # user_restaurants = UserRestaurantsList.objects.filter(user=request.user)
-    serializer = UserRestaurantListSerializer(user_restaurants, many=True)
-    return Response(serializer.data, status=status.HTTP_200_OK)
+    try:
+        user = User.objects.get(id=21)  # 임시 유저 지정, 추후 삭제
+        user_restaurants = UserRestaurantsList.objects.filter(user=user)  # 추후 삭제
+        # user_restaurants = UserRestaurantsList.objects.filter(user=request.user)
+        restaurant_ids = user_restaurants.values_list("restaurant_id", flat=True)
+        restaurants = Restaurant.objects.filter(id__in=restaurant_ids)
+        serializer = RestaurantlistSerializer(restaurants, many=True)
+        return Response({"results": serializer.data}, status=status.HTTP_200_OK)
+    except User.DoesNotExist:
+        return Response(
+            {"message": "Default user not found"}, status=status.HTTP_404_NOT_FOUND
+        )
 
 
 @csrf_exempt