fix: API가 정상 응답을 할 수 있도록 수정

MU-Software · MU-Software · commit c1f331100f8c · 2025-07-11T22:13:56.000+09:00
diff --git a/app/admin_api/serializers/event/presentation.py b/app/admin_api/serializers/event/presentation.py
@@ -1,8 +1,10 @@
+from admin_api.serializers.modification_audit import ModificationAuditResponseAdminSerializer
 from core.const.serializer import COMMON_ADMIN_FIELDS
 from core.serializer.base_abstract_serializer import BaseAbstractSerializer
 from core.serializer.json_schema_serializer import JsonSchemaSerializer
 from event.presentation.models import Presentation, PresentationCategory, PresentationSpeaker, PresentationType
 from file.models import PublicFile
+from participant_portal_api.models import ModificationAudit
 from rest_framework import serializers
 from user.models import UserExt
 
@@ -61,3 +63,49 @@ class PresentationSpeakerAdminSerializer(BaseAbstractSerializer, JsonSchemaSeria
     class Meta:
         model = PresentationSpeaker
         fields = COMMON_ADMIN_FIELDS + ("presentation", "user", "image", "biography_ko", "biography_en")
+
+
+class PresentationModificationAuditPreviewAdminSerializer(serializers.ModelSerializer):
+    class PresentationSerializer(serializers.ModelSerializer):
+        class PresentationSpeakerSerializer(serializers.ModelSerializer):
+            class UserSerializer(serializers.ModelSerializer):
+                class Meta:
+                    model = UserExt
+                    fields = ("id", "nickname_ko", "nickname_en")
+
+            user = UserSerializer(read_only=True)
+            image = serializers.FileField(read_only=True, allow_null=True, source="image.file")
+
+            class Meta:
+                model = PresentationSpeaker
+                fields = ("id", "user", "image", "biography_ko", "biography_en")
+
+        type = serializers.CharField(read_only=True, source="type.name_ko")
+        categories = serializers.SerializerMethodField(read_only=True)
+        speakers = PresentationSpeakerSerializer(read_only=True, many=True)
+
+        class Meta:
+            model = Presentation
+            fields = (
+                "type",
+                "categories",
+                "image",
+                "title_ko",
+                "title_en",
+                "summary_ko",
+                "summary_en",
+                "description_ko",
+                "description_en",
+                "speakers",
+            )
+
+        def get_categories(self, obj: Presentation) -> list[str]:
+            return [cat.name_ko for cat in obj.categories]
+
+    modification_audit = ModificationAuditResponseAdminSerializer(source="*")
+    original = PresentationSerializer(source="fake_original_instance")
+    modified = PresentationSerializer(source="fake_modified_instance")
+
+    class Meta:
+        model = ModificationAudit
+        fields = ("modification_audit", "original", "modified")
diff --git a/app/admin_api/serializers/user.py b/app/admin_api/serializers/user.py
@@ -1,10 +1,12 @@
 import functools
 import typing
 
+from admin_api.serializers.modification_audit import ModificationAuditResponseAdminSerializer
 from core.const.serializer import COMMON_ADMIN_FIELDS
 from core.serializer.base_abstract_serializer import BaseAbstractSerializer
 from core.serializer.json_schema_serializer import JsonSchemaSerializer
 from core.serializer.read_only_serializer import ReadOnlyModelSerializer
+from participant_portal_api.models import ModificationAudit
 from rest_framework import serializers
 from user.models import UserExt
 from user.models.organization import Organization
@@ -35,6 +37,27 @@ class Meta:
         }
 
 
+class UserModificationAuditPreviewAdminSerializer(serializers.ModelSerializer):
+    class UserSerializer(serializers.ModelSerializer):
+        image = serializers.SerializerMethodField()
+
+        class Meta:
+            model = UserExt
+            fields = ("id", "image", "email", "nickname_ko", "nickname_en")
+
+        def get_image(self, obj: UserExt) -> str | None:
+            # I don't know why, but serializers.FileField(source="image.file") does not work here.
+            return obj.image.file if obj.image else None
+
+    modification_audit = ModificationAuditResponseAdminSerializer(source="*")
+    original = UserSerializer(source="fake_original_instance")
+    modified = UserSerializer(source="fake_modified_instance")
+
+    class Meta:
+        model = ModificationAudit
+        fields = ("modification_audit", "original", "modified")
+
+
 class UserAdminSignInSerializerData(typing.TypedDict):
     identity: str
     password: str
diff --git a/app/admin_api/views/event/presentation.py b/app/admin_api/views/event/presentation.py
@@ -8,6 +8,7 @@
 from admin_api.serializers.event.presentation import (
     PresentationAdminSerializer,
     PresentationCategoryAdminSerializer,
+    PresentationModificationAuditPreviewAdminSerializer,
     PresentationSpeakerAdminSerializer,
     PresentationTypeAdminSerializer,
 )
@@ -53,7 +54,10 @@ class PresentationAdminViewSet(JsonSchemaViewSet, viewsets.ModelViewSet):
     filterset_class = PresentationAdminFilterSet
     queryset = Presentation.objects.get_all_nested_data().select_related("created_by", "updated_by", "deleted_by")
 
-    @extend_schema(tags=[OpenAPITag.ADMIN_EVENT_PRESENTATION])
+    @extend_schema(
+        tags=[OpenAPITag.ADMIN_EVENT_PRESENTATION],
+        responses={status.HTTP_200_OK: PresentationModificationAuditPreviewAdminSerializer},
+    )
     @decorators.action(detail=True, methods=["get"], url_path=r"preview/(?P<audit_id>[\w-]+)")
     def preview_modification_audit(
         self, request: request.Request, audit_id: str, *args: tuple, **kwargs: dict
@@ -64,7 +68,7 @@ def preview_modification_audit(
         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=audit.get_applied_data(serializer_class=self.get_serializer_class()))
+        return response.Response(data=PresentationModificationAuditPreviewAdminSerializer(instance=audit).data)
 
 
 @extend_schema_view(**{m: extend_schema(tags=[OpenAPITag.ADMIN_EVENT_PRESENTATION]) for m in ADMIN_METHODS})
@@ -74,16 +78,3 @@ class PresentationSpeakerAdminViewSet(JsonSchemaViewSet, viewsets.ModelViewSet):
     permission_classes = [IsSuperUser]
     filterset_class = PresentationSpeakerAdminFilterSet
     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=r"preview/(?P<audit_id>[\w-]+)")
-    def preview_modification_audit(
-        self, request: request.Request, 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=audit.get_applied_data(serializer_class=self.get_serializer_class()))
diff --git a/app/admin_api/views/user.py b/app/admin_api/views/user.py
@@ -3,6 +3,7 @@
     UserAdminPasswordChangeSerializer,
     UserAdminSerializer,
     UserAdminSignInSerializer,
+    UserModificationAuditPreviewAdminSerializer,
 )
 from core.const.account import INITIAL_ADMIN_PASSWORD
 from core.const.regex import UUID_V4_REGEX
@@ -80,7 +81,10 @@ def change_password(self, request: request.Request, *args: tuple, **kwargs: dict
         serializer.save()
         return response.Response(data=UserAdminSerializer(serializer.instance).data)
 
-    @extend_schema(tags=[OpenAPITag.ADMIN_USER])
+    @extend_schema(
+        tags=[OpenAPITag.ADMIN_USER],
+        responses={status.HTTP_200_OK: UserModificationAuditPreviewAdminSerializer},
+    )
     @decorators.action(detail=True, methods=["get"], url_path=r"preview/(?P<audit_id>[\w-]+)")
     def preview_modification_audit(
         self, request: request.Request, audit_id: str, *args: tuple, **kwargs: dict
@@ -91,7 +95,7 @@ def preview_modification_audit(
         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=audit.get_applied_data(serializer_class=self.get_serializer_class()))
+        return response.Response(data=UserModificationAuditPreviewAdminSerializer(instance=audit).data)
 
 
 @extend_schema_view(**{m: extend_schema(tags=[OpenAPITag.ADMIN_USER]) for m in ADMIN_METHODS})
diff --git a/app/core/util/django_orm.py b/app/core/util/django_orm.py
@@ -228,14 +228,21 @@ def json_to_simplenamespace(model_data: dict[str, dict[str, typing.Any]], key: s
             if is_identifier(attr_value):
                 if not (resolved_instance := resolved_models.get(attr_value)):
                     resolved_instance = identifier_to_model(attr_value)
+                if not resolved_instance:
+                    raise ValueError(f"Foreign model not found for identifier: {attr_value}")
                 setattr(resolved_model, attr_name, resolved_instance)
-            elif isinstance(attr_value, list) and all(is_identifier(item) for item in attr_value):
+            elif (
+                isinstance(attr_value, collections.abc.Iterable)
+                and attr_value
+                and all(is_identifier(item) for item in attr_value)
+            ):
                 resolved_many_rel_models = []
                 for item in attr_value:
                     if not (resolved_instance := resolved_models.get(item)):
                         resolved_instance = identifier_to_model(item)
                     if not resolved_instance:
                         raise ValueError(f"Related model not found for identifier: {item}")
+                    resolved_many_rel_models.append(resolved_instance)
 
                 setattr(resolved_model, attr_name, resolved_many_rel_models)
 
@@ -256,7 +263,7 @@ def apply_diff_to_model(models_data: dict[str, dict[str, typing.Any]]) -> list[m
                 if not (related_model_instance := identifier_to_model(value)):
                     raise ValueError(f"Related model not found for identifier: {value}")
                 setattr(model_instance, field_name, related_model_instance)
-            elif isinstance(value, list) and all(is_identifier(item) for item in value):
+            elif isinstance(value, collections.abc.Iterable) and value and all(is_identifier(item) for item in value):
                 # If the value is a list of model identifiers, resolve them to model instances
                 related_model_instances = [identifier_to_model(item) for item in value]
                 if None in related_model_instances:
