Merge: 대여기록 생성 버그 수정, 테스트 코드 수정, 코드 포매터 적용

[Hotfix/inspection] 대여기록 생성 버그 수정, 테스트 코드 수정, 코드 포매터 적용

Author: yyysolhhh

apps/chat/serializers.py

@@ -85,7 +85,12 @@ class EnterChatroomSerializer(serializers.ModelSerializer[Chatroom]):
     class Meta:
         model = Chatroom
         fields = [
-            "product", "product_image", "product_name", "product_rental_fee", "product_condition", "rental_history"
+            "product",
+            "product_image",
+            "product_name",
+            "product_rental_fee",
+            "product_condition",
+            "rental_history",
         ]
 
     def to_representation(self, instance: Chatroom) -> Dict[str, Any]:

apps/chat/views.py

@@ -11,13 +11,13 @@
 from rest_framework.views import APIView
 
 from apps.chat import serializers
-from apps.chat.models import Chatroom, Message
+from apps.chat.models import Chatroom
 from apps.chat.utils import (
     change_entered_status,
     check_entered_chatroom,
     delete_chatroom,
 )
-from apps.product.serializers import RentalHistorySerializer, RentalHistoryStatusSerializer
+from apps.product.serializers import RentalHistoryStatusSerializer
 from apps.user.api_schema import UserInfoSerializer
 
 
@@ -86,7 +86,7 @@ class ChatDetailView(APIView):
                 "product_rental_fee": serializer.CharField(),
                 "product_condition": serializer.CharField(),
                 "messages": serializers.MessageSerializer(many=True),
-                "rental_history": RentalHistoryStatusSerializer()
+                "rental_history": RentalHistoryStatusSerializer(),
             },
         ),
         description="""

apps/product/models.py

@@ -60,8 +60,8 @@ class RentalHistory(BaseModel):
     ]
     product = models.ForeignKey(Product, on_delete=models.CASCADE)
     borrower = models.ForeignKey(Account, on_delete=models.CASCADE)
-    rental_date = models.DateTimeField(auto_now_add=True)
-    return_date = models.DateTimeField(null=True, blank=True)  # 대여 반납일
+    rental_date = models.DateTimeField()
+    return_date = models.DateTimeField()  # 대여 반납일
     status = models.CharField(choices=STATUS_CHOICE, default="REQUEST", max_length=10)
 
     def __str__(self) -> str:

apps/product/serializers.py

@@ -164,7 +164,7 @@ class RentalHistorySerializer(serializers.ModelSerializer[RentalHistory]):
     class Meta:
         model = RentalHistory
         exclude = ("borrower",)
-        read_only_fields = ("created_at", "updated_at", "rental_date")
+        read_only_fields = ("created_at", "updated_at")
 
     def get_lender_nickname(self, obj: RentalHistory) -> str:
         return obj.product.lender.nickname

apps/product/tests.py

@@ -53,9 +53,11 @@ def setUp(self) -> None:
 
     def test_대여자가_정상적인_물품_대여신청을_했을때(self) -> None:
         data = {
+            "borrower_id": self.borrower.id,
             "product": self.product.uuid,
             "rental_date": timezone.now(),
             "return_date": timezone.now() + timedelta(days=3),
+            "status": "REQUEST",
         }
         response = self.client.post(self.url, data, headers={"Authorization": f"Bearer {self.token}"})
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
@@ -73,9 +75,11 @@ def test_이미_대여중인_상품을_대여하려고_시도하는경우_테스
         )
         self.assertEqual(RentalHistory.objects.count(), 1)
         data = {
-            "product": history.product.uuid,
+            "borrower_id": int(self.borrower.id),
+            "product": str(history.product.uuid),
             "rental_date": history.rental_date.isoformat(),
-            "return_date": history.return_date.isoformat(),  # type: ignore
+            "return_date": history.rental_date.isoformat(),
+            "status": history.status,
         }
         response = self.client.post(self.url, data, headers={"Authorization": f"Bearer {self.token}"})
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
@@ -188,7 +192,6 @@ 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/views.py

@@ -63,10 +63,15 @@ def list(self, request: Request, *args: Any, **kwargs: Any) -> Response:
         return Response(serializer.data)
 
     def create(self, request: Request, *args: Any, **kwargs: Any) -> Response:
-        data = request.data.dict()  # type: ignore
-        data["borrower_id"] = self.request.user.id
+        data = {
+            "borrower_id": request.data.get("borrower_id"),
+            "product": request.data.get("product"),
+            "status": request.data.get("status"),
+        }
         if RentalHistory.objects.filter(**data).exists():
-            return Response({"msg": "이미 대여 신청중인 내역이 있습니다."}, status=status.HTTP_400_BAD_REQUEST)
+            return Response({"msg": "이미 상품에 대한 대여 내역이 있습니다."}, status=status.HTTP_400_BAD_REQUEST)
+        data["rental_date"] = request.data.get("rental_date")
+        data["return_date"] = request.data.get("return_date")
         serializer = self.get_serializer(data=data)
         serializer.is_valid(raise_exception=True)
         self.perform_create(serializer)

apps/user/views.py

@@ -263,7 +263,7 @@ def login_process_user(
             domain=settings.CSRF_COOKIE_DOMAIN,
             samesite=None,
             secure=settings.CSRF_COOKIE_SECURE,
-            httponly=settings.CSRF_COOKIE_HTTPONLY
+            httponly=settings.CSRF_COOKIE_HTTPONLY,
         )
         return response