Merge: RentalHistory View 생성, 시리얼라이저 생성, 테스트코드 작성

[Feature/rental] RentalHistory View 생성, 시리얼라이저 생성, 테스트코드 작성

Author: yyysolhhh

apps/chat/views.py

@@ -45,7 +45,9 @@ def get(self, request: Request) -> Response:
     def post(self, request: Request) -> Response:
         product_uuid = request.data.get("product")
         lender_id = request.data.get("lender")
-        if Chatroom.objects.filter(product=product_uuid, lender_id=lender_id).exists():
+        if Chatroom.objects.filter(
+            product=product_uuid, lender_id=lender_id, lender_status=True, borrower_status=True
+        ).exists():
             return Response({"msg": "이미 개설된 채팅방 내역이 존재합니다."}, status=status.HTTP_400_BAD_REQUEST)
         serializer = serializers.CreateChatroomSerializer(data=request.data)
         if serializer.is_valid():

apps/product/admin.py

@@ -42,7 +42,9 @@ class ProductAdmin(admin.ModelAdmin[Product]):
 @admin.register(RentalHistory)
 class RentalHistoryAdmin(admin.ModelAdmin[RentalHistory]):
     list_display = [
+        "id",
         "product",
+        "status",
         # "product_lender",
         "rental_date",
         "return_date",

apps/product/serializers.py

@@ -12,12 +12,6 @@
 logger = logging.getLogger(__name__)
 
 
-class RentalHistorySerializer(serializers.ModelSerializer[RentalHistory]):
-    class Meta:
-        model = RentalHistory
-        fields = "__all__"
-
-
 class ProductImageSerializer(serializers.ModelSerializer[ProductImage]):
     image = serializers.ImageField(use_url=True)
 
@@ -132,3 +126,60 @@ def update(self, instance: Product, validated_data: Any) -> Product:
         styles = self.set_styles(styles_data)
         instance.styles.set(styles)
         return instance
+
+
+class ProductInfoSerializer(serializers.ModelSerializer[Product]):
+    style = serializers.SerializerMethodField()  # type: ignore
+    category = serializers.SerializerMethodField()
+    images = ProductImageSerializer(many=True, read_only=True)
+
+    class Meta:
+        model = Product
+        fields = [
+            "uuid",
+            "name",
+            "brand",
+            "size",
+            "purchase_price",
+            "rental_fee",
+            "category",
+            "style",
+            "images",
+            "description",
+        ]
+
+    def get_style(self, obj: Product) -> list[str]:
+        return [style.name for style in obj.styles.all()]
+
+    def get_category(self, obj: Product) -> str:
+        return obj.product_category.name
+
+
+class RentalHistorySerializer(serializers.ModelSerializer[RentalHistory]):
+    product_info = ProductInfoSerializer(read_only=True, source="product")
+    lender_nickname = serializers.SerializerMethodField()
+    borrower_nickname = serializers.SerializerMethodField()
+    borrower_id = serializers.IntegerField(write_only=True)
+
+    class Meta:
+        model = RentalHistory
+        exclude = ("borrower",)
+        read_only_fields = ("created_at", "updated_at", "rental_date")
+
+    def get_lender_nickname(self, obj: RentalHistory) -> str:
+        return obj.product.lender.nickname
+
+    def get_borrower_nickname(self, obj: RentalHistory) -> str:
+        return obj.borrower.nickname
+
+    def to_representation(self, instance: RentalHistory) -> dict[str, Any]:
+        data = super().to_representation(instance)
+        if instance.status == "REQUEST":
+            data["status"] = "대여 요청"
+        elif instance.status == "ACCEPT":
+            data["status"] = "대여 요청 수락"
+        elif instance.status == "RETURNED":
+            data["status"] = "반납 완료"
+        elif instance.status == "BORROWING":
+            data["status"] = "대여 진행중"
+        return data

apps/product/tests.py

@@ -6,6 +6,17 @@
 # from rest_framework.test import APIClient
 #
 # from apps.product.models import Product
+from datetime import timedelta
+
+from django.urls import reverse
+from django.utils import timezone
+from rest_framework import status
+from rest_framework.test import APITestCase
+from rest_framework_simplejwt.tokens import AccessToken
+
+from apps.category.models import Category, Style
+from apps.product.models import Product, RentalHistory
+from apps.user.models import Account
 
 # class ProductListAPITest(TestCase):
 #     def setUp(self):
@@ -88,3 +99,174 @@
 #     self.assertEqual(response.status_code, status.HTTP_200_OK)
 #     #내가 셋업에 만든 상품이랑 이 뷰에서 조회 하고자 하는 상품의 데이터가 일치 하는 지를 확인해야함
 #
+
+
+class RentalHistoryTestBase(APITestCase):
+    def setUp(self) -> None:
+        self.borrower = Account.objects.create_user(
+            email="[email protected]", nickname="test_borrower", password="password1234@", phone="010-2211-1111"
+        )
+        self.lender = Account.objects.create_user(
+            email="[email protected]", nickname="test_lender", password="password1234@", phone="010-2211-1112"
+        )
+        self.category = Category.objects.create(name="test_category")
+        self.styles = Style.objects.create(name="test_style_tag")
+        self.product = Product.objects.create(
+            name="testproduct",
+            lender=self.lender,
+            condition="testcondition",
+            purchase_date=timezone.now(),
+            purchase_price=50000,
+            rental_fee=5000,
+            size="XL",
+            product_category=self.category,
+        )
+        self.product.styles.add(self.styles)
+        self.token = AccessToken.for_user(self.borrower)
+
+
+class RentalHistoryBorrowerViewTests(RentalHistoryTestBase):
+    def setUp(self) -> None:
+        super().setUp()
+        self.url = reverse("borrowed_rental_history")
+
+    def test_대여자가_정상적인_물품_대여신청을_했을때(self) -> None:
+        data = {
+            "product": self.product.uuid,
+            "rental_date": timezone.now(),
+            "return_date": timezone.now() + timedelta(days=3),
+        }
+        response = self.client.post(self.url, data, headers={"Authorization": f"Bearer {self.token}"})
+        self.assertEqual(response.status_code, status.HTTP_201_CREATED)
+        self.assertEqual(RentalHistory.objects.count(), 1)
+        self.assertEqual(response.data.get("product_info")["uuid"], str(self.product.uuid))
+        self.assertEqual(response.data.get("borrower_nickname"), self.borrower.nickname)
+        self.assertEqual(response.data.get("status"), "대여 요청")
+
+    def test_이미_대여중인_상품을_대여하려고_시도하는경우_테스트(self) -> None:
+        history = RentalHistory.objects.create(
+            product=self.product,
+            borrower=self.borrower,
+            rental_date=timezone.now(),
+            return_date=timezone.now() + timedelta(days=3),
+        )
+        self.assertEqual(RentalHistory.objects.count(), 1)
+        data = {
+            "product": history.product.uuid,
+            "rental_date": history.rental_date.isoformat(),
+            "return_date": history.return_date.isoformat(),  # type: ignore
+        }
+        response = self.client.post(self.url, data, headers={"Authorization": f"Bearer {self.token}"})
+        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+
+    def test_생성된_대여내역_정상적인_조회_테스트(self) -> None:
+        # given
+        lender2 = Account.objects.create_user(
+            email="[email protected]", nickname="test_lender2", password="password1234@", phone="010-2211-1113"
+        )
+        product2 = Product.objects.create(
+            name="testproduct2",
+            lender=lender2,
+            condition="testcondition",
+            purchase_date=timezone.now(),
+            purchase_price=40000,
+            rental_fee=3000,
+            size="M",
+            product_category=self.category,
+        )
+        RentalHistory.objects.create(
+            product=self.product,
+            borrower=self.borrower,
+            rental_date=timezone.now(),
+            return_date=timezone.now() + timedelta(days=3),
+        )
+        RentalHistory.objects.create(
+            product=product2,
+            borrower=self.borrower,
+            rental_date=timezone.now(),
+            return_date=timezone.now() + timedelta(days=3),
+        )
+
+        response = self.client.get(self.url, headers={"Authorization": f"Bearer {self.token}"})
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(len(response.data), RentalHistory.objects.count())
+        self.assertEqual(response.data[0]["product_info"]["uuid"], str(self.product.uuid))
+        self.assertEqual(response.data[1]["product_info"]["uuid"], str(product2.uuid))
+        self.assertEqual(response.data[0]["borrower_nickname"], self.borrower.nickname)
+        self.assertEqual(response.data[1]["borrower_nickname"], self.borrower.nickname)
+
+
+class RentalHistoryLenderViewTests(RentalHistoryTestBase):
+    def setUp(self) -> None:
+        super().setUp()
+        self.url = reverse("lending_rental_history")
+        self.lender2 = Account.objects.create_user(
+            email="[email protected]", nickname="test_lender2", password="password1234@", phone="010-2211-1113"
+        )
+        self.product2 = Product.objects.create(
+            name="testproduct2",
+            lender=self.lender2,
+            condition="testcondition",
+            purchase_date=timezone.now(),
+            purchase_price=40000,
+            rental_fee=3000,
+            size="M",
+            product_category=self.category,
+        )
+        self.history1 = RentalHistory.objects.create(
+            product=self.product,
+            borrower=self.borrower,
+            rental_date=timezone.now(),
+            return_date=timezone.now() + timedelta(days=3),
+        )
+        self.history2 = RentalHistory.objects.create(
+            product=self.product2,
+            borrower=self.borrower,
+            rental_date=timezone.now(),
+            return_date=timezone.now() + timedelta(days=3),
+        )
+
+    def test_lender의_판매내역_조회_테스트(self) -> None:
+        self.token = AccessToken.for_user(self.lender)
+
+        response = self.client.get(self.url, headers={"Authorization": f"Bearer {self.token}"})
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(response.data[0]["product_info"]["uuid"], str(self.product.uuid))
+        self.assertEqual(response.data[0]["borrower_nickname"], self.borrower.nickname)
+        self.assertEqual(response.data[0]["lender_nickname"], self.lender.nickname)
+
+    def test_lender2의_판매내역_조회_테스트(self) -> None:
+        self.token = AccessToken.for_user(self.lender2)
+
+        response = self.client.get(self.url, headers={"Authorization": f"Bearer {self.token}"})
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(response.data[0]["product_info"]["uuid"], str(self.product2.uuid))
+        self.assertEqual(response.data[0]["borrower_nickname"], self.borrower.nickname)
+        self.assertEqual(response.data[0]["lender_nickname"], self.lender2.nickname)
+
+
+class RentalHistoryUpdateViewTests(RentalHistoryTestBase):
+    def setUp(self) -> None:
+        super().setUp()
+        self.history = RentalHistory.objects.create(
+            product=self.product,
+            borrower=self.borrower,
+            rental_date=timezone.now(),
+            return_date=timezone.now() + timedelta(days=3),
+        )
+        self.url = reverse("rental_history_update", kwargs={"pk": self.history.pk})
+
+    def test_대여요청에서_상태_업데이트_테스트(self) -> None:
+        data = {"status": "ACCEPT"}
+        response = self.client.patch(self.url, data=data, headers={"Authorization": f"Bearer {self.token}"})
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(response.data.get("status"), "대여 요청 수락")
+
+    def test_대여날짜_변경_테스트(self) -> None:
+        data = {"return_date": timezone.now() + timedelta(days=4)}
+
+        response = self.client.patch(self.url, data=data, headers={"Authorization": f"Bearer {self.token}"})
+        print(response.data)
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(response.data.get("return_date").split("T")[0], data["return_date"].date().isoformat())

apps/product/urls.py

@@ -1,13 +1,20 @@
 from django.urls import include, path
 from rest_framework.routers import DefaultRouter
 
-from apps.product.views import ProductViewSet, RentalHistoryViewSet
+from apps.product.views import (
+    ProductViewSet,
+    RentalHistoryBorrowerView,
+    RentalHistoryLenderView,
+    RentalHistoryUpdateView,
+)
 
 router = DefaultRouter()
 router.register(r"", ProductViewSet, basename="product")
-router.register(r"rental-records", RentalHistoryViewSet, basename="rental-history")
 
 urlpatterns = [
     path("", include(router.urls)),
+    path("rental_history/borrow", RentalHistoryBorrowerView.as_view(), name="borrowed_rental_history"),
+    path("rental_history/lending", RentalHistoryLenderView.as_view(), name="lending_rental_history"),
+    path("rental_history/<int:pk>/", RentalHistoryUpdateView.as_view(), name="rental_history_update"),
     # path('api-auth/', include('rest_framework.urls', namespace='rest_framework'))
 ]