chore: 수정 심사 반영 데이터를 계산하는 방식 변경

MU-Software · MU-Software · commit c9d93ae82f21 · 2025-07-05T01:08:04.000+09:00
diff --git a/app/admin_api/serializers/modification_audit.py b/app/admin_api/serializers/modification_audit.py
@@ -49,7 +49,8 @@ def validate(self, attrs: dict) -> dict:
     def save(self, **kwargs: dict) -> ModificationAudit:
         instance: ModificationAudit = self.instance
         instance.status = ModificationAudit.Status.APPROVED
-        instance.apply_modification(save=True)
+        instance.apply_modification()
+        instance.save()
 
         return instance
 
diff --git a/app/admin_api/views/event/presentation.py b/app/admin_api/views/event/presentation.py
@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-import typing
-
 from admin_api.filtersets.event.presentation import (
     PresentationAdminFilterSet,
     PresentationCategoryAdminFilterSet,
@@ -65,7 +63,7 @@ def preview_modification_audit(self, audit_id: str, *args: tuple, **kwargs: dict
         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)
+        return response.Response(mod_audit.join_modification_data(data=self.get_serializer(presentation).data))
 
 
 @extend_schema_view(**{m: extend_schema(tags=[OpenAPITag.ADMIN_EVENT_PRESENTATION]) for m in ADMIN_METHODS})
@@ -79,11 +77,8 @@ class PresentationSpeakerAdminViewSet(JsonSchemaViewSet, viewsets.ModelViewSet):
     @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()
-            )
-        ):
+        speaker = self.get_object()
+        if not (mod_audit := ModificationAudit.objects.filter_requested(self.get_object()).first()):
             return response.Response(status=status.HTTP_404_NOT_FOUND)
 
-        return response.Response(data=self.get_serializer(mod_audit.apply_modification(save=False)).data)
+        return response.Response(data=mod_audit.join_modification_data(data=self.get_serializer(speaker).data))
diff --git a/app/admin_api/views/user.py b/app/admin_api/views/user.py
@@ -86,11 +86,11 @@ def preview_modification_audit(self, audit_id: str, *args: tuple, **kwargs: dict
         if not UUID_V4_REGEX.match(audit_id):
             return response.Response(status=status.HTTP_404_NOT_FOUND)
 
-        user: UserExt = self.get_object()
+        user = 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)
+        return response.Response(data=mod_audit.join_modification_data(self.get_serializer(user).data))
 
 
 @extend_schema_view(**{m: extend_schema(tags=[OpenAPITag.ADMIN_USER]) for m in ADMIN_METHODS})
diff --git a/app/participant_portal_api/models.py b/app/participant_portal_api/models.py
@@ -1,3 +1,4 @@
+import copy
 import typing
 
 from core.models import BaseAbstractModel, BaseAbstractModelQuerySet
@@ -58,21 +59,38 @@ class Meta:
     def __str__(self) -> str:
         return str(self.instance)
 
-    def apply_modification(self, save: bool = False) -> models.Model:
+    def join_modification_data(self, data: dict) -> dict:
+        new_data: dict[str, typing.Any] = copy.deepcopy(self.modification_data)
+        for field, orig_value in data.items():
+            if not (mod_data := self.modification_data.get(field)):
+                continue
+
+            if isinstance(orig_value, list):
+                sub_mod_value_map: dict[str, typing.Any] = {v["id"]: v for v in mod_data}
+                new_value = []
+                for orig_sub_value in orig_value[field]:
+                    if not isinstance(orig_sub_value, dict) or not (sub_value_id := orig_sub_value.get("id")):
+                        continue
+
+                    new_value.append(orig_sub_value | sub_mod_value_map.get(sub_value_id, {}))
+
+                new_data[field] = new_value
+            elif isinstance(orig_value, dict):
+                # One to One case
+                new_data[field] = orig_value | mod_data
+            else:
+                # 일반 필드 업데이트
+                new_data[field] = mod_data
+
+        return new_data
+
+    def apply_modification(self) -> models.Model:
         for field, value in self.modification_data.items():
             if isinstance(value, list):
                 # One to Many case
-                sub_value_map = {sub_value["id"]: sub_value for sub_value in value}
-                if not (sub_instances := list(getattr(self.instance, field).filter(pk__in=sub_value_map))):
-                    continue
-
-                for sub_instance in sub_instances:
-                    sub_data = sub_value_map[str(sub_instance.pk)]
-                    for sub_field, sub_value in sub_data.items():
-                        setattr(sub_instance, sub_field, sub_value)
+                for sub_value in value:
+                    getattr(self.instance, field).filter(pk=sub_value.pop("id")).update(**sub_value)
 
-                    if save:
-                        sub_instance.save()
             elif isinstance(value, dict):
                 # One to One case
                 if not (sub_instance := getattr(self.instance, field, None)):
@@ -81,16 +99,12 @@ def apply_modification(self, save: bool = False) -> models.Model:
                 for sub_field, sub_value in value.items():
                     setattr(sub_instance, sub_field, sub_value)
 
-                if save:
-                    sub_instance.save()
-                else:
-                    setattr(self.instance, field, sub_instance)
+                sub_instance.save()
             else:
                 # 일반 필드 업데이트
                 setattr(self.instance, field, value)
 
-        if save:
-            self.instance.save()
+        self.instance.save()
 
         return self.instance
 
diff --git a/app/participant_portal_api/serializers/modification_audit.py b/app/participant_portal_api/serializers/modification_audit.py
@@ -128,9 +128,8 @@ def validate(self, attrs: dict) -> dict:
 
     def save(self, **kwargs: dict) -> models.Model:
         """instance.save()를 호출하는 대신, 변경된 데이터를 추출하여 ModificationAudit 인스턴스를 생성합니다."""
-        return ModificationAudit.objects.create(
-            instance=self.instance, modification_data=self.validated_data
-        ).apply_modification(save=False)
+        ModificationAudit.objects.create(instance=self.instance, modification_data=self.validated_data)
+        return self.instance
 
 
 class ModificationAuditCancelPortalSerializer(serializers.ModelSerializer):
diff --git a/app/participant_portal_api/views/presentation.py b/app/participant_portal_api/views/presentation.py
@@ -4,7 +4,7 @@
 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 mixins, viewsets
+from rest_framework import mixins, response, viewsets
 
 
 @utils.extend_schema_view(
@@ -39,9 +39,12 @@ def get_queryset(self):
             )
         )
 
-    def get_object(self):
-        presentation = super().get_object()
-        if mod_audit := ModificationAudit.objects.filter_requested(presentation).first():
-            presentation = mod_audit.apply_modification(save=False)
+    def retrieve(self, request, *args, **kwargs):
+        """발표 조회 시, 수정 요청이 있는 경우 해당 요청의 ID를 포함하여 응답"""
 
-        return presentation
+        instance = self.get_object()
+        data = self.get_serializer(instance).data
+        if mod_audit := ModificationAudit.objects.filter_requested(instance).first():
+            data = mod_audit.join_modification_data(data)
+
+        return response.Response(data)
diff --git a/app/participant_portal_api/views/user.py b/app/participant_portal_api/views/user.py
@@ -1,5 +1,3 @@
-import typing
-
 from core.const.tag import OpenAPITag
 from django.contrib.auth import login, logout
 from drf_spectacular.utils import extend_schema
@@ -29,10 +27,11 @@ def retrieve_profile(self, request: request.Request, *args: tuple, **kwargs: dic
             return response.Response(status=status.HTTP_401_UNAUTHORIZED)
 
         user = request.user
+        data = self.get_serializer(user).data
         if mod_audit := ModificationAudit.objects.filter_requested(user).first():
-            user = mod_audit.apply_modification(save=False)
+            data = mod_audit.join_modification_data(data)
 
-        return response.Response(data=self.get_serializer(user).data)
+        return response.Response(data)
 
     @extend_schema(
         tags=[OpenAPITag.PARTICIPANT_PORTAL_USER],
@@ -49,18 +48,6 @@ def patch_profile(self, request: request.Request, *args: tuple, **kwargs: dict)
 
         return response.Response(data=UserPortalSerializer(instance).data)
 
-    @extend_schema(tags=[OpenAPITag.PARTICIPANT_PORTAL_PRESENTATION])
-    @decorators.action(detail=False, methods=["get"], url_path="me/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(request.user).first()
-            )
-        ):
-            return response.Response(status=status.HTTP_404_NOT_FOUND)
-
-        return response.Response(data=self.get_serializer(mod_audit.apply_modification(save=False)).data)
-
     @extend_schema(
         tags=[OpenAPITag.PARTICIPANT_PORTAL_USER],
         request=UserPortalSignInSerializer,
