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

Author: MU-Software

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
 

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,
@@ -25,7 +23,7 @@
     PresentationType,
 )
 from participant_portal_api.models import ModificationAudit
-from rest_framework import decorators, request, response, status, viewsets
+from rest_framework import decorators, response, status, viewsets
 
 ADMIN_METHODS = ["list", "retrieve", "create", "update", "partial_update", "destroy"]
 
@@ -58,14 +56,13 @@ class PresentationAdminViewSet(JsonSchemaViewSet, viewsets.ModelViewSet):
     @extend_schema(tags=[OpenAPITag.ADMIN_EVENT_PRESENTATION])
     @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", "")):
+        if not UUID_V4_REGEX.match(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()):
+        if not (audit := ModificationAudit.objects.filter_by_instance(self.get_object()).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=audit.get_applied_data(serializer_class=self.get_serializer()))
 
 
 @extend_schema_view(**{m: extend_schema(tags=[OpenAPITag.ADMIN_EVENT_PRESENTATION]) for m in ADMIN_METHODS})
@@ -77,13 +74,12 @@ class PresentationSpeakerAdminViewSet(JsonSchemaViewSet, viewsets.ModelViewSet):
     queryset = PresentationSpeaker.objects.filter_active().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(audit_id):
+            return response.Response(status=status.HTTP_404_NOT_FOUND)
+
+        if not (audit := ModificationAudit.objects.filter_by_instance(self.get_object()).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=audit.get_applied_data(serializer_class=self.get_serializer()))

app/admin_api/views/user.py

@@ -86,11 +86,10 @@ 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()
-        if not (mod_audit := ModificationAudit.objects.filter_requested(user).filter(id=audit_id).first()):
+        if not (audit := ModificationAudit.objects.filter_by_instance(self.get_object()).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=audit.get_applied_data(serializer_class=self.get_serializer()))
 
 
 @extend_schema_view(**{m: extend_schema(tags=[OpenAPITag.ADMIN_USER]) for m in ADMIN_METHODS})

app/participant_portal_api/models.py

@@ -1,22 +1,62 @@
+import contextlib
 import typing
 
 from core.models import BaseAbstractModel, BaseAbstractModelQuerySet
 from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
+from django.core.exceptions import FieldDoesNotExist
 from django.db import models
 from event.presentation.models import Presentation, PresentationSpeaker
+from rest_framework import serializers
 from user.models import UserExt
 
+T = typing.TypeVar("T", bound=models.Model)
+
+
+def _apply_dict_to_model(instance: T, data: dict, save: bool = False) -> T:
+    model_class = type(instance)
+
+    for field_name, value in data.items():
+        with contextlib.suppress(FieldDoesNotExist):
+            field = model_class._meta.get_field(field_name)
+
+            if isinstance(field, models.ForeignKey):
+                # One to One or One to Many case
+                if isinstance(value, dict):
+                    if not (sub_instance := field.related_model.objects.filter(pk=value.get("id")).first()):
+                        continue
+                    setattr(instance, field_name, _apply_dict_to_model(sub_instance, value), save)
+                elif isinstance(value, (int, str)):
+                    if not (sub_instance := field.related_model.objects.filter(pk=value).first()):
+                        continue
+                    setattr(instance, field_name, sub_instance.pk if field_name.endswith("_id") else sub_instance)
+            elif isinstance(field, models.ManyToOneRel):
+                if save:
+                    if not all(isinstance(v, dict) and "id" in v for v in value):
+                        continue
+                    for sub_value in value:
+                        getattr(instance, field).filter(pk=sub_value.pop("id")).update(**sub_value)
+            else:
+                # 일반 필드 업데이트
+                setattr(instance, field_name, value)
+
+    if save:
+        instance.save()
+
+    return instance
+
 
 class ModificationAuditQuerySet(BaseAbstractModelQuerySet):
-    def filter_requested(self, instance: models.Model) -> typing.Self:
+    def filter_by_instance(self, instance: models.Model) -> typing.Self:
         return self.filter_active().filter(
             instance_type__app_label=instance._meta.app_label,
             instance_type__model=instance._meta.model_name,
             instance_id=str(instance.pk),
-            status=ModificationAudit.Status.REQUESTED,
         )
 
+    def filter_requested(self, instance: models.Model) -> typing.Self:
+        return self.filter_active().filter_by_instance(instance).filter(status=ModificationAudit.Status.REQUESTED)
+
 
 class ModificationAudit(BaseAbstractModel):
     class Action(models.TextChoices):
@@ -58,41 +98,32 @@ class Meta:
     def __str__(self) -> str:
         return str(self.instance)
 
-    def apply_modification(self, save: bool = False) -> 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
+    def get_applied_data(self, serializer_class: type[serializers.ModelSerializer]) -> dict:
+        one_to_many: dict[str, dict[str, dict[str, typing.Any]]] = {
+            k: {sv["id"]: sv for sv in v}
+            for k, v in self.modification_data.items()
+            if isinstance(v, list) and all(isinstance(i, dict) and "id" in i for i in v)
+        }
 
-                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)
+        modified_instance = _apply_dict_to_model(instance=self.instance, data=self.modification_data, save=False)
+        modified_data = serializer_class(instance=modified_instance).data
 
-                    if save:
-                        sub_instance.save()
-            elif isinstance(value, dict):
-                # One to One case
-                if not (sub_instance := getattr(self.instance, field, None)):
-                    continue
+        for field_name, mod_values in one_to_many.items():
+            if field_name not in modified_data:
+                continue
 
-                for sub_field, sub_value in value.items():
-                    setattr(sub_instance, sub_field, sub_value)
+            for field_value in modified_data[field_name]:
+                if not (isinstance(field_value, dict) and (value_id := field_value.get("id"))):
+                    continue
 
-                if save:
-                    sub_instance.save()
-                else:
-                    setattr(self.instance, field, sub_instance)
-            else:
-                # 일반 필드 업데이트
-                setattr(self.instance, field, value)
+                if value_id in mod_values:
+                    # 기존 값에 수정된 값을 병합합니다.
+                    field_value.update(mod_values[value_id])
 
-        if save:
-            self.instance.save()
+        return modified_data
 
-        return self.instance
+    def apply_modification(self) -> models.Model:
+        return _apply_dict_to_model(instance=self.instance, data=self.modification_data, save=True)
 
 
 class ModificationAuditComment(BaseAbstractModel):

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):

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,14 @@ 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, *args, **kwargs):
+        """발표 조회 시, 수정 요청이 있는 경우 해당 요청의 ID를 포함하여 응답"""
+        instance = self.get_object()
+        serializer_class = self.get_serializer()
 
-        return presentation
+        if audit := ModificationAudit.objects.filter_requested(instance).first():
+            data = audit.get_applied_data(serializer_class=serializer_class)
+        else:
+            data = serializer_class(instance).data
+
+        return response.Response(data=data)

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,14 @@ def retrieve_profile(self, request: request.Request, *args: tuple, **kwargs: dic
             return response.Response(status=status.HTTP_401_UNAUTHORIZED)
 
         user = request.user
+        serializer_class = self.get_serializer()
+
         if mod_audit := ModificationAudit.objects.filter_requested(user).first():
-            user = mod_audit.apply_modification(save=False)
+            data = mod_audit.get_applied_data(serializer_class=serializer_class)
+        else:
+            data = serializer_class(user).data
 
-        return response.Response(data=self.get_serializer(user).data)
+        return response.Response(data=data)
 
     @extend_schema(
         tags=[OpenAPITag.PARTICIPANT_PORTAL_USER],
@@ -49,18 +51,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,