refactor: assert_self_mergeable을 assert_emails_mergeable로 리네이밍

Author: MU-Software

app/admin_api/serializers/merge.py

@@ -30,7 +30,7 @@ def validate(self, attrs: dict) -> dict:
         if attrs["source"] == attrs["target"]:
             raise serializers.ValidationError({"target": MergeError("same_account").localized(en=False)})
         try:
-            UserMergeHistory.assert_self_mergeable(attrs["source"], attrs["target"])
+            UserMergeHistory.assert_emails_mergeable(attrs["source"], attrs["target"])
         except MergeError as e:
             raise serializers.ValidationError({"detail": e.localized(en=False)}) from e
         return attrs

app/admin_api/test/user_merge_test.py

@@ -132,8 +132,8 @@ def test_create_into_already_merged_target_rejected(api_client, source_user, tar
 
 
 @pytest.mark.django_db
-def test_create_enforces_self_mergeable(api_client, source_user, target_user):
-    # 운영자 병합도 assert_self_mergeable 적용 — target 에 인증 이메일이 없으면 거부(운영자가 보고 설정 가능).
+def test_create_enforces_emails_mergeable(api_client, source_user, target_user):
+    # 운영자 병합도 assert_emails_mergeable 적용 — target 에 인증 이메일이 없으면 거부(운영자가 보고 설정 가능).
     EmailAddress.objects.filter(user=target_user).delete()
     response = api_client.post(reverse(LIST), {"source": source_user.id, "target": target_user.id}, format="json")
     assert response.status_code == http.HTTPStatus.BAD_REQUEST

app/user/account_views/merge.py

@@ -69,7 +69,7 @@ def merge_confirm(request: HttpRequest) -> HttpResponse:
 
     try:
         with atomic():
-            UserMergeHistory.assert_self_mergeable(source, request.user)
+            UserMergeHistory.assert_emails_mergeable(source, request.user)
             UserMergeHistory.objects.create(source=source, target=request.user).merge()
     except MergeError as e:
         context = _confirm_context(source, request.user, error=e.localized(en=is_english()))
@@ -96,7 +96,7 @@ def _merge_source(request: HttpRequest) -> User:
 def _confirm_context(source: User, target: User, *, error: str | None = None) -> dict:
     if error is None:
         try:
-            UserMergeHistory.assert_self_mergeable(source, target)
+            UserMergeHistory.assert_emails_mergeable(source, target)
         except MergeError as e:
             error = e.localized(en=is_english())
     return {"source": source, "target": target, "error": error}

app/user/models/merge.py

@@ -76,7 +76,7 @@ def is_self_merge(self) -> bool:
         return self.created_by_id is not None and self.created_by_id == self.target_id
 
     @staticmethod
-    def assert_self_mergeable(source: UserExt, target: UserExt) -> None:
+    def assert_emails_mergeable(source: UserExt, target: UserExt) -> None:
         if not EmailAddress.objects.filter(user=target).exists():
             raise MergeError("target_no_verified_email")
         if EmailAddress.objects.filter(user=target, verified=False).exists():

app/user/test/merge_test.py

@@ -294,35 +294,37 @@ def test_double_unmerge_rejected(source_user, target_user):
         merge.unmerge()
 
 
-# ---- assert_self_mergeable (본인 병합 사전검증) --------------------------------
+# ---- assert_emails_mergeable (이메일 병합 사전검증 — self/admin 공통) -----------------
 
 
-def test_self_mergeable_passes_when_both_verified(source_user, target_user):
-    UserMergeHistory.assert_self_mergeable(source_user, target_user)  # 둘 다 fixture 로 verified 이메일 보유 → no raise
+def test_emails_mergeable_passes_when_both_verified(source_user, target_user):
+    UserMergeHistory.assert_emails_mergeable(
+        source_user, target_user
+    )  # 둘 다 fixture 로 verified 이메일 보유 → no raise
 
 
-def test_self_mergeable_allows_email_less_source(source_user, target_user):
+def test_emails_mergeable_allows_email_less_source(source_user, target_user):
     EmailAddress.objects.filter(user=source_user).delete()  # source 는 이메일 없음 → 허용
 
-    UserMergeHistory.assert_self_mergeable(source_user, target_user)  # no raise
+    UserMergeHistory.assert_emails_mergeable(source_user, target_user)  # no raise
 
 
-def test_self_mergeable_rejects_email_less_target(source_user, target_user):
+def test_emails_mergeable_rejects_email_less_target(source_user, target_user):
     EmailAddress.objects.filter(user=target_user).delete()  # target 에 인증 이메일 없음 → 거부
 
     with pytest.raises(ValueError):
-        UserMergeHistory.assert_self_mergeable(source_user, target_user)
+        UserMergeHistory.assert_emails_mergeable(source_user, target_user)
 
 
-def test_self_mergeable_rejects_unverified_target_email(source_user, target_user):
+def test_emails_mergeable_rejects_unverified_target_email(source_user, target_user):
     EmailAddress.objects.create(user=target_user, email="extra@example.com", verified=False)
 
     with pytest.raises(ValueError):
-        UserMergeHistory.assert_self_mergeable(source_user, target_user)
+        UserMergeHistory.assert_emails_mergeable(source_user, target_user)
 
 
-def test_self_mergeable_rejects_unverified_source_email(source_user, target_user):
+def test_emails_mergeable_rejects_unverified_source_email(source_user, target_user):
     EmailAddress.objects.create(user=source_user, email="extra@example.com", verified=False)
 
     with pytest.raises(ValueError):
-        UserMergeHistory.assert_self_mergeable(source_user, target_user)
+        UserMergeHistory.assert_emails_mergeable(source_user, target_user)