Merge: 내 상품 목록 조회, 상품에 스타일 태그 추가

[Feature/mypage] 내 상품 목록 조회, 상품에 스타일 태그 추가

Author: yyysolhhh

apps/category/admin.py

@@ -1,7 +1,7 @@
 import django_stubs_ext
 from django.contrib import admin
 
-from .models import Category
+from .models import Category, Style
 
 django_stubs_ext.monkeypatch()
 
@@ -10,3 +10,9 @@
 class CategoryAdmin(admin.ModelAdmin[Category]):
     list_display = ("id", "name", "updated_at", "created_at")
     search_fields = ("name",)
+
+
+@admin.register(Style)
+class StyleAdmin(admin.ModelAdmin[Style]):
+    list_display = ("id", "name", "updated_at", "created_at")
+    search_fields = ("name",)

apps/category/models.py

@@ -12,3 +12,10 @@ class Meta:
 
     def __str__(self) -> str:
         return self.name
+
+
+class Style(BaseModel):
+    name = models.CharField(max_length=20, unique=True)
+
+    def __str__(self) -> str:
+        return self.name

apps/category/serializers.py

@@ -1,9 +1,15 @@
 from rest_framework import serializers
 
-from apps.category.models import Category
+from apps.category.models import Category, Style
 
 
 class CategorySerializer(serializers.ModelSerializer[Category]):
     class Meta:
         model = Category
         fields = ("id", "name")
+
+
+class StyleSerializer(serializers.ModelSerializer[Style]):
+    class Meta:
+        model = Style
+        fields = ("id", "name")

apps/category/tests.py

@@ -3,10 +3,10 @@
 from rest_framework import status
 from rest_framework.test import APIClient
 
-from apps.category.models import Category
+from apps.category.models import Category, Style
 
 
-class CategoryModelTest(TestCase):
+class CategoryListTest(TestCase):
     def setUp(self) -> None:
         Category.objects.create(name="test_category1")
         Category.objects.create(name="test_category2")
@@ -21,3 +21,16 @@ def test_get_all_categories(self) -> None:
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         # self.assertEqual(response.data.get("count"), 2)
         self.assertEqual(len(response.data), 2)
+
+
+class StyleListTest(TestCase):
+    def setUp(self) -> None:
+        Style.objects.create(name="test_style1")
+        Style.objects.create(name="test_style2")
+
+    def test_get_all_styles(self) -> None:
+        client = APIClient()
+        url = reverse("style-list")
+        response = client.get(url)
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(len(response.data), 2)

apps/category/urls.py

@@ -1,7 +1,8 @@
 from django.urls import path
 
-from apps.category.views import CategoryListView
+from apps.category.views import CategoryListView, StyleListView
 
 urlpatterns = [
     path("", CategoryListView.as_view(), name="category-list"),
+    path("styles/", StyleListView.as_view(), name="style-list"),
 ]

apps/category/views.py

@@ -1,11 +1,18 @@
 from rest_framework import generics, permissions
 
-from apps.category.models import Category
-from apps.category.serializers import CategorySerializer
+from apps.category.models import Category, Style
+from apps.category.serializers import CategorySerializer, StyleSerializer
 
 
 class CategoryListView(generics.ListAPIView[Category]):
     queryset = Category.objects.all()
     serializer_class = CategorySerializer
     permission_classes = [permissions.AllowAny]
     pagination_class = None
+
+
+class StyleListView(generics.ListAPIView[Style]):
+    queryset = Style.objects.all()
+    serializer_class = StyleSerializer
+    permission_classes = [permissions.AllowAny]
+    pagination_class = None

apps/mypage/__init__.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class MypageConfig(AppConfig):
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "apps.mypage"

apps/mypage/apps.py

@@ -0,0 +1,11 @@
+# from django.db import models
+#
+# from apps.category.models import Style
+# from apps.common.models import BaseModel
+# from apps.user.models import Account
+#
+#
+# class InterestedStyle(BaseModel):
+#     user = models.ForeignKey(Account, on_delete=models.CASCADE, related_name='users')
+#     styles = models.ManyToManyField(Style, related_name="styles")
+#     # styles = models.ForeignKey(Style, on_delete=models.CASCADE, related_name="styles")

apps/mypage/models.py

@@ -0,0 +1,35 @@
+from rest_framework import serializers
+
+from apps.category.models import Style
+from apps.category.serializers import StyleSerializer
+from apps.product.models import Product
+from apps.product.serializers import ProductImageSerializer
+
+
+class MyProductSerializer(serializers.ModelSerializer[Product]):
+    images = ProductImageSerializer(many=True, read_only=True)
+
+    class Meta:
+        model = Product
+        fields = (
+            "url",
+            "uuid",
+            "name",
+            "brand",
+            "condition",
+            "description",
+            "purchase_date",
+            "purchase_price",
+            "rental_fee",
+            "size",
+            "views",
+            "product_category",
+            "styles",
+            "status",
+            "amount",
+            "region",
+            "created_at",
+            "updated_at",
+            "images",
+            "likes",
+        )

apps/mypage/serializers.py

@@ -0,0 +1,38 @@
+from django.test import TestCase
+from django.urls import reverse
+from rest_framework import status
+from rest_framework.test import APIClient, APITestCase
+
+from apps.category.models import Category
+from apps.product.models import Product
+from apps.user.models import Account
+
+
+class MyProductTest(APITestCase):
+    def setUp(self) -> None:
+        self.client = APIClient()
+        self.url = reverse("my-products")
+        data = {
+            "email": "[email protected]",
+            "password": "fels3570",
+            "nickname": "nick",
+            "phone": "1234",
+        }
+        self.user = Account.objects.create_user(**data)
+        self.category = Category.objects.create(name="test category")
+        self.product = Product.objects.create(
+            name="test product",
+            lender=self.user,
+            brand="test brand",
+            condition="good",
+            purchase_date="2024-01-01",
+            purchase_price=10000,
+            rental_fee=1000,
+            size="xs",
+            product_category=self.category,
+        )
+
+    def test_get_my_products(self) -> None:
+        self.client.force_authenticate(user=self.user)
+        res = self.client.get(self.url)
+        self.assertEqual(res.status_code, status.HTTP_200_OK)

apps/mypage/tests.py

@@ -0,0 +1,7 @@
+from django.urls import path
+
+from apps.mypage import views
+
+urlpatterns = [
+    path("products/", views.MyProductListView.as_view(), name="my-products"),
+]

apps/mypage/urls.py

@@ -0,0 +1,20 @@
+from django.db.models import QuerySet
+from django.shortcuts import render
+from rest_framework import generics, permissions
+from rest_framework.exceptions import PermissionDenied
+
+from apps.mypage.serializers import MyProductSerializer
+from apps.product.models import Product
+from apps.product.serializers import ProductSerializer
+from apps.user.models import Account
+
+
+class MyProductListView(generics.ListAPIView[Product]):
+    serializer_class = MyProductSerializer
+    permission_classes = [permissions.IsAuthenticated]
+
+    def get_queryset(self) -> QuerySet[Product]:
+        lender = self.request.user
+        if not isinstance(lender, Account):
+            raise PermissionDenied("You must be logged in to view your likes.")
+        return Product.objects.filter(lender=lender).order_by("-created_at")

apps/mypage/views.py

@@ -3,6 +3,7 @@
 
 from django.db import models
 
+from apps.category.models import Style
 from apps.common.models import BaseModel
 from apps.common.utils import uuid4_generator
 from apps.user.models import Account
@@ -22,7 +23,7 @@ class Product(BaseModel):
     size = models.CharField(max_length=10)  # 사이즈
     views = models.IntegerField(default=0)  # 조회수
     product_category = models.ForeignKey("category.Category", on_delete=models.CASCADE, related_name="products")
-    # style_category = models.ManyToManyField(StyleCategory)
+    styles = models.ManyToManyField(Style, blank=True, related_name="products")
     status = models.BooleanField(default=True)  # 대여 가능 여부
     amount = models.IntegerField(default=1)
     region = models.CharField(max_length=30, default="None")

apps/product/models.py

@@ -9,6 +9,8 @@
 from rest_framework.fields import ReadOnlyField
 from rest_framework.utils.serializer_helpers import ReturnDict
 
+from apps.category.models import Style
+from apps.like.models import Like
 from apps.product.models import Product, ProductImage, RentalHistory
 from apps.user.serializers import UserInfoSerializer
 
@@ -35,6 +37,7 @@ class ProductSerializer(serializers.ModelSerializer[Product]):
     # rental_history = RentalHistorySerializer(many=True, read_only=True)
     # images = serializers.SerializerMethodField()
     images = ProductImageSerializer(many=True, read_only=True)
+    is_liked = serializers.SerializerMethodField()
 
     class Meta:
         model = Product
@@ -52,21 +55,42 @@ class Meta:
             "size",
             "views",
             "product_category",
+            "styles",
             "status",
             "amount",
             "region",
             "created_at",
             "updated_at",
             "images",
             "likes",
+            "is_liked",
             # "rental_history",
         )
-        read_only_fields = ("created_at", "updated_at", "views", "lender", "status", "likes")
+        read_only_fields = ("created_at", "updated_at", "views", "lender", "status", "likes", "is_liked")
+
+    def get_is_liked(self, obj: Product) -> bool:
+        user = self.context["request"].user
+        if user.is_authenticated:
+            return Like.objects.filter(user=user, product=obj).exists()
+        return False
+
+    def set_styles(self, styles_data: list[Style]) -> list[Style]:
+        styles = []
+        for style in styles_data:
+            style_name = style.name
+            style_item, _ = Style.objects.get_or_create(name=style_name)
+            styles.append(style)
+        return styles
 
     @transaction.atomic
     def create(self, validated_data: Any) -> Product:
         image_set = self.context["request"].FILES.getlist("image")
+        styles_data = validated_data.pop("styles", [])
         product = Product.objects.create(**validated_data)
+
+        styles = self.set_styles(styles_data)
+        product.styles.set(styles)
+
         if image_set:
             product_images = [ProductImage(product=product, image=image) for image in image_set]
             ProductImage.objects.bulk_create(product_images)
@@ -77,6 +101,7 @@ def update(self, instance: Product, validated_data: Any) -> Product:
         request = self.context["request"]
         received_new_images = request.FILES.getlist("image")
         received_existing_images = request.POST.getlist("image")
+        styles_data = validated_data.pop("styles", [])
 
         # 기존 이미지와 받은 이미지 id 비교해서 다시 안 온 이미지 삭제
         existing_images = {img.get_image_url(): img.id for img in instance.images.all()}
@@ -95,4 +120,8 @@ def update(self, instance: Product, validated_data: Any) -> Product:
         for attr, value in validated_data.items():
             setattr(instance, attr, value)
         instance.save()
+
+        # styles 태그 등록
+        styles = self.set_styles(styles_data)
+        instance.styles.set(styles)
         return instance

apps/product/serializers.py

@@ -26,9 +26,9 @@ class ProductViewSet(viewsets.ModelViewSet[Product]):
     serializer_class = ProductSerializer
     permission_classes = [permissions.IsAuthenticatedOrReadOnly, IsLenderOrReadOnly]
     filter_backends = [DjangoFilterBackend, SearchFilter, OrderingFilter]
-    filterset_fields = ["status", "product_category", "condition", "size"]
+    filterset_fields = ["status", "product_category", "condition", "size", "styles"]
     search_fields = ["name", "lender__nickname"]
-    ordering_fields = ["created_at", "rental_fee", "views"]
+    ordering_fields = ["created_at", "rental_fee", "views", "likes"]
     parser_classes = [MultiPartParser, FormParser]
 
     def perform_create(self, serializer: BaseSerializer[Product]) -> None:

apps/product/views.py

@@ -4,7 +4,7 @@
 from django.contrib.auth.models import AbstractUser, PermissionsMixin
 from django.db import models
 
-from apps.category.models import Category
+from apps.category.models import Category, Style
 from apps.common.models import BaseModel
 from apps.common.utils import uuid4_generator
 
@@ -44,7 +44,7 @@ class Account(AbstractBaseUser, PermissionsMixin, BaseModel):
     region = models.CharField(max_length=30, null=True, blank=True)
     phone = models.CharField(max_length=15)
     grade = models.CharField(max_length=10, null=True, blank=True)
-    # interest_cate = models.ManyToManyField(Category, blank=True)
+    # styles = models.ManyToManyField(Style, blank=True)
     profile_img = models.ImageField(upload_to=upload_to_s3_account, null=True, blank=True)
     is_staff = models.BooleanField(default=False)
     is_active = models.BooleanField(default=True)

apps/user/models.py

@@ -6,6 +6,8 @@
 from django.db.models import Model
 from rest_framework import exceptions, serializers
 
+from apps.category.models import Style
+from apps.category.serializers import StyleSerializer
 from apps.user.models import Account
 
 
@@ -34,6 +36,7 @@ class UserInfoSerializer(UserDetailsSerializer):  # type: ignore
     region = serializers.CharField(required=False, allow_blank=True)
     grade = serializers.CharField(required=False, allow_blank=True)
     profile_img = serializers.ImageField(required=False, use_url=True, allow_empty_file=True, allow_null=True)
+    # styles = StyleSerializer(many=True, required=False, allow_null=True)
 
     class Meta:
         model = Account
@@ -49,6 +52,7 @@ class Meta:
             "region",
             "grade",
             "profile_img",
+            # "styles",
         )
 
     def validate_nickname(self, nickname: str) -> str:

apps/user/serializers.py

@@ -68,6 +68,7 @@
     "apps.chat",
     "apps.notification",
     "apps.like",
+    "apps.mypage",
 ]
 
 INSTALLED_APPS = DJANGO_SYSTEM_APPS + CUSTOM_USER_APPS