Fix/report

core/exceptions.py

@@ -4,7 +4,7 @@
 from django.core.exceptions import ObjectDoesNotExist
 from django.db import IntegrityError
 from rest_framework import status
-from rest_framework.exceptions import ValidationError
+from rest_framework.exceptions import NotFound, ValidationError
 from rest_framework.response import Response
 
 
@@ -36,6 +36,14 @@ def wrapper(*args, **kwargs):
                 },
                 status=status.HTTP_400_BAD_REQUEST,
             )
+        except NotFound as e:
+            return Response(
+                data={
+                    "error": "Not Found",
+                    "error_message": str(e),
+                },
+                status=status.HTTP_404_NOT_FOUND,
+            )
         except ObjectDoesNotExist as e:
             return Response(
                 data={

market/models.py

@@ -1,12 +1,9 @@
 import uuid
 
-from django.conf import settings
-from django.contrib.auth.models import User
 from django.db import models
 
 from core.models import TimeStampedModel
 from market.managers import MarketManager, ServiceManager, ServiceMaterialManager
-from users.models.reformer import Reformer
 
 
 def get_market_thumbnail_upload_path(instance, filename):
@@ -158,23 +155,16 @@ class Meta:
         db_table = "market_service_option_image"
 
 
-import uuid
-
-from django.db import models
-
-
 class Report(models.Model):
     reported_user = models.ForeignKey(
         "users.User",
         related_name="reports_received",
         on_delete=models.CASCADE,
-        to_field="id",  # UUID 필드 참조
     )
     reporter_user = models.ForeignKey(
         "users.User",
         related_name="reports_made",
         on_delete=models.CASCADE,
-        to_field="id",  # UUID 필드 참조
     )
     reason = models.CharField(max_length=255)
     details = models.TextField(blank=True, null=True)

market/serializers/report_serializer/reporter_serializer.py

@@ -1,9 +1,19 @@
 from rest_framework import serializers
 
 from market.models import Report
+from users.models import User
 
 
 class ReportSerializer(serializers.ModelSerializer):
     class Meta:
         model = Report
-        fields = ["reported_user", "reporter_user", "reason", "details"]
+        fields = ["reason", "details"]
+
+    def create(self, validated_data):
+        reporter: User = self.context.get("reporter")
+        reported_user: User = self.context.get("reported_user")
+        report: Report = Report.objects.create(
+            reporter_user=reporter, reported_user=reported_user, **validated_data
+        )
+        reported_user.update_report_count()
+        return report

market/tests.py

@@ -284,17 +284,35 @@ def test_delete_market_info(self, mock_boto3_client: MagicMock):
         self.assertEqual(Market.objects.filter(market_uuid=market_uuid).count(), 0)
 
     def test_report_market(self):
-        # 마켓 신고가 정상적으로 작동하는 것
-        response = self.client.post(
-            path="/api/market/report",
-            data={
-                "reported_user_id": self.test_user.id,
-                "reason": "허위 정보 게시",
-                "details": "잘못된 정보를 포함한 마켓 설명",
-            },
-        )
-        self.assertEqual(response.data["reported_user"], self.test_user.id)
-        self.assertEqual(response.data["reason"], "허위 정보 게시")
+        # 마켓 신고가 정상적으로 작동하는지 확인
+        for i in range(3):
+            response = self.customer_client.post(
+                path="/api/market/report",
+                data={
+                    "reported_user_id": self.test_user.id,
+                    "reason": "허위 정보 게시",
+                    "details": "잘못된 정보를 포함한 마켓 설명",
+                },
+            )
+            self.assertEqual(response.status_code, 201)
+        self.test_user.refresh_from_db()
+        self.assertEqual(self.test_user.report_count, 3)
+
+    def test_report_market_if_exceed_threshold(self):
+        for i in range(5):
+            response = self.customer_client.post(
+                path="/api/market/report",
+                data={
+                    "reported_user_id": self.test_user.id,
+                    "reason": "허위 정보 게시",
+                    "details": "잘못된 정보를 포함한 마켓 설명",
+                },
+            )
+            self.assertEqual(response.status_code, 201)
+
+        self.test_user.refresh_from_db()
+        self.assertEqual(self.test_user.report_count, 5)
+        self.assertEqual(self.test_user.is_active, False)
 
     def test_get_service_list(self):
         # 서비스 리스트 가져오기 테스트

market/views/report_views.py

@@ -1,47 +1,37 @@
 # market/views/report_views.py
-
 from rest_framework import status
+from rest_framework.exceptions import NotFound
 from rest_framework.response import Response
+from rest_framework.serializers import ValidationError
 from rest_framework.views import APIView
 
-from market.models import Report
+from core.exceptions import view_exception_handler
 from market.serializers.report_serializer.reporter_serializer import ReportSerializer
 from users.models.user import User
 
 
 class ReportUserView(APIView):
-    def post(self, request):
-        data = request.data
-        try:
-            reported_user = User.objects.get(id=data["reported_user_id"])
-            reporter_user = User.objects.get(id=request.user.id)
-
-            report: Report = Report.objects.create(
-                reported_user=reported_user,
-                reporter_user=reporter_user,
-                reason=data["reason"],
-                details=data.get("details", ""),
-            )
-            serializer = ReportSerializer(instance=report)
-
-            report_count = Report.objects.filter(reported_user=reported_user).count()
-            serializer.data["report_count"] = report_count
 
-            if report_count >= 5:
-                reported_user.is_active = False
-                reported_user.save()
-
-                return Response(data=serializer.data, status=status.HTTP_200_OK)
-
-            return Response(data=serializer.data, status=status.HTTP_201_CREATED)
-
-        except User.DoesNotExist:
-            return Response(
-                {"status": "error", "message": "사용자를 찾을 수 없습니다."},
-                status=status.HTTP_404_NOT_FOUND,
-            )
-        except Exception as e:
-            return Response(
-                data={"status": "error", "details": str(e)},
-                status=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            )
+    @view_exception_handler
+    def post(self, request):
+        # 신고대상
+        reported_user_id: str = request.data.get("reported_user_id")
+        if not reported_user_id:
+            raise ValidationError("reported_user_id is required")
+        reported_user: User = User.objects.filter(id=reported_user_id).first()
+        if not reported_user:
+            raise NotFound("reported_user does not exist")
+
+        # 신고자
+        reporter: User = request.user
+
+        # 신고 인스턴스 생성 및 신고 횟수 누적
+        data = request.data.copy()
+        data.pop("reported_user_id", None)
+        serializer = ReportSerializer(
+            data=request.data,
+            context={"reporter": reporter, "reported_user": reported_user},
+        )
+        serializer.is_valid(raise_exception=True)
+        serializer.save()
+        return Response(status=status.HTTP_201_CREATED)