feat: created_by / updated_by 추가

Author: MU-Software

app/admin_api/test/shop/categories_api_test.py

@@ -74,6 +74,26 @@ def test_category_json_schema_exposes_choice_meta_schema(api_client, category_fi
     assert "choiceMetaSchema" not in ui_schema.get("group", {}).get("ui:options", {})
 
 
+@pytest.mark.django_db
+def test_category_choices_include_audit_meta_for_event(api_client, category_fixtures):
+    # BaseAbstractModel 의 audit 메타(created_by/updated_by/created_at/updated_at)가 자동으로 붙어야 한다.
+    response = api_client.get(CHOICES_URL)
+    assert response.status_code == HTTP_200_OK
+    event_choices = {c["const"]: c for c in response.json()["event"] if c["const"] is not None}
+    event_meta = event_choices[str(category_fixtures["event"].id)]["meta"]
+    assert {"created_by", "updated_by", "created_at", "updated_at"} <= set(event_meta)
+    assert event_meta["created_at"] is not None
+
+
+@pytest.mark.django_db
+def test_category_json_schema_exposes_audit_meta_schema(api_client, category_fixtures):
+    response = api_client.get(JSON_SCHEMA_URL)
+    assert response.status_code == HTTP_200_OK
+    meta_schema = response.json()["ui_schema"]["event"]["ui:options"]["choiceMetaSchema"]
+    assert meta_schema["created_by"]["label"] == "생성자"
+    assert {"created_by", "updated_by", "created_at", "updated_at"} <= set(meta_schema)
+
+
 @pytest.mark.django_db
 def test_category_filter_by_group(api_client, category_fixtures):
     response = api_client.get(LIST_URL, {"group": str(category_fixtures["g2026"].id)})

app/admin_api/test/shop/products_api_test.py

@@ -458,11 +458,11 @@ def test_admin_product_choices_include_category_meta(api_client, ticket_product)
 
     # event 가 있는 카테고리 — str(event) 분기.
     evented_meta = category_choices[str(evented.id)]["meta"]
-    assert evented_meta == {"group": "2026", "is_ticket": True, "event": str(event)}
+    assert evented_meta.items() >= {"group": "2026", "is_ticket": True, "event": str(event)}.items()
 
     # event 가 없는 카테고리(fixture) — None 분기.
     plain_meta = category_choices[str(ticket_product.category.id)]["meta"]
-    assert plain_meta == {"group": "기본", "is_ticket": True, "event": None}
+    assert plain_meta.items() >= {"group": "기본", "is_ticket": True, "event": None}.items()
 
 
 @pytest.mark.django_db
@@ -471,9 +471,12 @@ def test_admin_option_group_choices_include_product_meta(api_client, ticket_prod
     response = api_client.get(OPTION_GROUP_CHOICES_URL)
     assert response.status_code == HTTP_200_OK
     product_choices = {c["const"]: c for c in response.json()["product"]}
-    assert product_choices[str(ticket_product.id)]["meta"] == {
-        "category": str(ticket_product.category),
-        "price": ticket_product.price,
-        "stock": ticket_product.stock,
-        "status": Product.CurrentStatus.ACTIVE.label,
-    }
+    assert (
+        product_choices[str(ticket_product.id)]["meta"].items()
+        >= {
+            "category": str(ticket_product.category),
+            "price": ticket_product.price,
+            "stock": ticket_product.stock,
+            "status": Product.CurrentStatus.ACTIVE.label,
+        }.items()
+    )

app/core/models.py

@@ -6,12 +6,20 @@
 from django.contrib.auth import get_user_model
 from django.db import models
 from django.db.models.functions import Now
+from django.utils import timezone
 
 if typing.TYPE_CHECKING:
     from user.models import UserExt  # noqa: F401
 
 User = get_user_model()
 
+AUDIT_CHOICE_META_SCHEMA: dict[str, dict[str, str]] = {
+    "created_by": {"label": "생성자", "type": "string", "filter": "select"},
+    "updated_by": {"label": "수정자", "type": "string", "filter": "select"},
+    "created_at": {"label": "생성일시", "type": "string", "filter": "search"},
+    "updated_at": {"label": "수정일시", "type": "string", "filter": "search"},
+}
+
 
 class BaseAbstractModelQuerySet(models.QuerySet):
     def create(self, **kwargs: dict) -> models.Model:
@@ -37,7 +45,9 @@ def select_related_with_user(self, *fields) -> typing.Self:
         return self.select_related(*_fields)
 
     def get_choices_queryset(self) -> typing.Self:
-        fields = self.model.choices_select_related
+        fields = set(self.model.choices_select_related)
+        if self.model.choices_meta_schema:
+            fields |= {"created_by", "updated_by"}  # audit 메타 출력을 위한 join
         return self.select_related(*fields) if fields else self.all()
 
 
@@ -66,6 +76,22 @@ class BaseAbstractModel(models.Model):
     class Meta:
         abstract = True
 
+    def get_choice_meta(self) -> dict:
+        if not self.choices_meta_schema:
+            return {}
+        return self._choice_meta_fields() | self.get_audit_choice_meta()
+
+    def _choice_meta_fields(self) -> dict:
+        return {}
+
+    def get_audit_choice_meta(self) -> dict:
+        return {
+            "created_by": self.created_by_id and str(self.created_by),
+            "updated_by": self.updated_by_id and str(self.updated_by),
+            "created_at": self.created_at and timezone.localtime(self.created_at).isoformat(),
+            "updated_at": self.updated_at and timezone.localtime(self.updated_at).isoformat(),
+        }
+
     def save(  # type: ignore[override]
         self,
         *,

app/core/openapi/ui_hints.py

@@ -1,4 +1,4 @@
-from core.models import MarkdownField
+from core.models import AUDIT_CHOICE_META_SCHEMA, MarkdownField
 from django.db.models.fields import TextField
 from django.db.models.fields.files import FileField
 from django.db.models.fields.related import ForeignKey, ManyToManyField
@@ -10,6 +10,8 @@ def ui_hints_for_model_field(model_field: object) -> dict:
 
     if isinstance(model_field, (ForeignKey, ManyToManyField)):
         if meta_schema := getattr(model_field.related_model, "choices_meta_schema", None):
+            if hasattr(model_field.related_model, "get_audit_choice_meta"):
+                meta_schema = meta_schema | AUDIT_CHOICE_META_SCHEMA
             hints["ui:options"] = {"choiceMetaSchema": meta_schema}
 
     if isinstance(model_field, ManyToManyField):

app/event/models.py

@@ -37,7 +37,7 @@ class Meta:
     def __str__(self):
         return f"{self.name} by {self.organization}"
 
-    def get_choice_meta(self) -> dict:
+    def _choice_meta_fields(self) -> dict:
         return {
             "organization": str(self.organization),
             "started_at": timezone.localtime(self.event_start_at).date().isoformat() if self.event_start_at else None,

app/event/presentation/models.py

@@ -108,7 +108,7 @@ class Presentation(BaseAbstractModel):
     def __str__(self) -> str:
         return f"[{self.type.name}] {self.title}"
 
-    def get_choice_meta(self) -> dict:
+    def _choice_meta_fields(self) -> dict:
         return {
             "type": self.type.name,
             "event": self.type.event.name,

app/file/models.py

@@ -26,7 +26,7 @@ class Meta:
     def __str__(self) -> str:
         return self.file.name
 
-    def get_choice_meta(self) -> dict:
+    def _choice_meta_fields(self) -> dict:
         return {
             "preview": self.file.url if self.file else None,
             "mimetype": self.mimetype,

app/shop/product/models.py

@@ -56,7 +56,7 @@ class Meta:
     def __str__(self) -> str:  # pragma: no cover
         return f"{self.group.name} > {self.name}"
 
-    def get_choice_meta(self) -> dict:
+    def _choice_meta_fields(self) -> dict:
         return {
             "group": self.group.name,
             "is_ticket": self.is_ticket,
@@ -191,7 +191,7 @@ class Meta:
     def __str__(self) -> str:  # pragma: no cover
         return f"{self.category} > {self.name} ({self.price}원)"
 
-    def get_choice_meta(self) -> dict:
+    def _choice_meta_fields(self) -> dict:
         return {
             "category": str(self.category),
             "price": self.price,