fix: API 스펙을 좀 더 말이 되도록 수정

Author: MU-Software

app/admin_api/views/event/presentation.py

@@ -13,6 +13,7 @@
     PresentationSpeakerAdminSerializer,
     PresentationTypeAdminSerializer,
 )
+from core.const.regex import UUID_V4_REGEX
 from core.const.tag import OpenAPITag
 from core.permissions import IsSuperUser
 from core.viewset.json_schema_viewset import JsonSchemaViewSet
@@ -55,13 +56,13 @@ class PresentationAdminViewSet(JsonSchemaViewSet, viewsets.ModelViewSet):
     queryset = Presentation.objects.get_all_nested_data().select_related("created_by", "updated_by", "deleted_by")
 
     @extend_schema(tags=[OpenAPITag.ADMIN_EVENT_PRESENTATION])
-    @decorators.action(detail=True, methods=["get"], url_path="preview")
-    def preview_modification_audit(self, request: request.Request, *args: tuple, **kwargs: dict) -> response.Response:
-        if not (
-            mod_audit := typing.cast(
-                ModificationAudit | None, ModificationAudit.objects.filter_requested(self.get_object()).first()
-            )
-        ):
+    @decorators.action(detail=True, methods=["get"], url_path=r"preview/(?P<audit_id>[\w-]+)")
+    def preview_modification_audit(self, audit_id: str, *args: tuple, **kwargs: dict) -> response.Response:
+        if not UUID_V4_REGEX.match(kwargs.get("audit_id", "")):
+            return response.Response(status=status.HTTP_404_NOT_FOUND)
+
+        presentation: Presentation = self.get_object()
+        if not (mod_audit := ModificationAudit.objects.filter_requested(presentation).filter(id=audit_id).first()):
             return response.Response(status=status.HTTP_404_NOT_FOUND)
 
         return response.Response(data=self.get_serializer(mod_audit.apply_modification(save=False)).data)

app/admin_api/views/user.py

@@ -1,12 +1,11 @@
-import typing
-
 from admin_api.serializers.user import (
     OrganizationAdminSerializer,
     UserAdminPasswordChangeSerializer,
     UserAdminSerializer,
     UserAdminSignInSerializer,
 )
 from core.const.account import INITIAL_ADMIN_PASSWORD
+from core.const.regex import UUID_V4_REGEX
 from core.const.tag import OpenAPITag
 from core.permissions import IsSuperUser
 from core.viewset.json_schema_viewset import JsonSchemaViewSet
@@ -82,13 +81,13 @@ def change_password(self, request: request.Request, *args: tuple, **kwargs: dict
         return response.Response(data=UserAdminSerializer(serializer.instance).data)
 
     @extend_schema(tags=[OpenAPITag.ADMIN_USER])
-    @decorators.action(detail=True, methods=["get"], url_path="preview")
-    def preview_modification_audit(self, request: request.Request, *args: tuple, **kwargs: dict) -> response.Response:
-        if not (
-            mod_audit := typing.cast(
-                ModificationAudit | None, ModificationAudit.objects.filter_requested(self.get_object()).first()
-            )
-        ):
+    @decorators.action(detail=True, methods=["get"], url_path=r"preview/(?P<audit_id>[\w-]+)")
+    def preview_modification_audit(self, audit_id: str, *args: tuple, **kwargs: dict) -> response.Response:
+        if not UUID_V4_REGEX.match(audit_id):
+            return response.Response(status=status.HTTP_404_NOT_FOUND)
+
+        user: UserExt = self.get_object()
+        if not (mod_audit := ModificationAudit.objects.filter_requested(user).filter(id=audit_id).first()):
             return response.Response(status=status.HTTP_404_NOT_FOUND)
 
         return response.Response(data=self.get_serializer(mod_audit.apply_modification(save=False)).data)

app/participant_portal_api/views/presentation.py

@@ -1,12 +1,10 @@
-import typing
-
 from core.const.tag import OpenAPITag
 from drf_spectacular import utils
 from event.presentation.models import Presentation, PresentationSpeaker
 from participant_portal_api.models import ModificationAudit
 from participant_portal_api.permissions import IsSessionSpeaker
 from participant_portal_api.serializers.presentation import PresentationPortalSerializer
-from rest_framework import decorators, mixins, request, response, status, viewsets
+from rest_framework import mixins, viewsets
 
 
 @utils.extend_schema_view(
@@ -41,14 +39,9 @@ def get_queryset(self):
             )
         )
 
-    @utils.extend_schema(tags=[OpenAPITag.PARTICIPANT_PORTAL_PRESENTATION])
-    @decorators.action(detail=True, methods=["get"], url_path="preview")
-    def preview_modification_audit(self, request: request.Request, *args: tuple, **kwargs: dict) -> response.Response:
-        if not (
-            mod_audit := typing.cast(
-                ModificationAudit | None, ModificationAudit.objects.filter_requested(self.get_object()).first()
-            )
-        ):
-            return response.Response(status=status.HTTP_404_NOT_FOUND)
+    def get_object(self):
+        presentation = super().get_object()
+        if mod_audit := ModificationAudit.objects.filter_requested(presentation).first():
+            presentation = mod_audit.apply_modification(save=False)
 
-        return response.Response(data=self.get_serializer(mod_audit.apply_modification(save=False)).data)
+        return presentation

app/participant_portal_api/views/user.py

@@ -28,7 +28,11 @@ def retrieve_profile(self, request: request.Request, *args: tuple, **kwargs: dic
         if not request.user.is_authenticated:
             return response.Response(status=status.HTTP_401_UNAUTHORIZED)
 
-        return response.Response(data=UserPortalSerializer(request.user).data)
+        user = request.user
+        if mod_audit := ModificationAudit.objects.filter_requested(user).first():
+            user = mod_audit.apply_modification(save=False)
+
+        return response.Response(data=self.get_serializer(user).data)
 
     @extend_schema(
         tags=[OpenAPITag.PARTICIPANT_PORTAL_USER],