feat: 개별 재발송도 가능하게 수정

Author: MU-Software

app/admin_api/serializers/notification.py

@@ -14,7 +14,12 @@
     NHNCloudSMSNotificationHistorySentTo,
     NHNCloudSMSNotificationTemplate,
 )
-from notification.models.base import NotificationHistoryBase, NotificationTemplateBase, UnhandledVariableHandling
+from notification.models.base import (
+    NotificationHistoryBase,
+    NotificationStatus,
+    NotificationTemplateBase,
+    UnhandledVariableHandling,
+)
 from rest_framework import serializers
 
 # ---- SentTo nested ----------------------------------------------------------
@@ -79,11 +84,11 @@ def create(self, validated_data: dict[str, Any]) -> NotificationHistoryBase:
         history.refresh_from_db()
         return history
 
-    def retry(self) -> None:
+    def retry(self, statuses: list[NotificationStatus], sent_to_id: str | None = None) -> None:
         if not (self.instance and self.instance.pk):
             raise ValueError("인스턴스가 저장된 후에만 retry할 수 있습니다.")
 
-        self.instance.retry()
+        self.instance.retry(sent_to_id=sent_to_id, statuses=statuses)
         self.instance.refresh_from_db()
 
 
@@ -169,3 +174,14 @@ class Meta(_NotiTemplateAdminSerializerBase.Meta):
 
 class NotificationTemplateRenderRequestAdminSerializer(serializers.Serializer):
     context = serializers.JSONField(required=False, default=dict)
+
+
+# ---- Query params -----------------------------------------------------------
+
+
+class NotificationHistoryRetryRequestAdminSerializer(serializers.Serializer):
+    status = serializers.ListField(
+        child=serializers.ChoiceField(choices=NotificationStatus.choices),
+        required=False,
+        default=[NotificationStatus.FAILED],
+    )

app/admin_api/test/notification_test.py

@@ -427,6 +427,139 @@ def test_retry_noop_when_no_failed_sent_to(api_client, email_history):
     mock_client.send_message.assert_not_called()
 
 
+# ---- History Retry SentTo ---------------------------------------------------
+
+
+@pytest.mark.django_db(transaction=True)
+def test_retry_sent_to_only_resends_specified_sent_to(api_client, email_history, email_template):
+    # 같은 history에 FAILED sent_to가 여러 개 있어도 retry_sent_to는 지정된 1건만 재시도.
+    extra = EmailNotificationHistory.objects.create_for_recipients(
+        template=email_template,
+        recipients=[
+            {"recipient": "a@example.com", "context": {"name": "a", "recipient": "x"}},
+            {"recipient": "b@example.com", "context": {"name": "b", "recipient": "x"}},
+        ],
+    )
+    extra.sent_to_list.update(status=NotificationStatus.FAILED)
+    target = extra.sent_to_list.order_by("recipient").first()
+
+    with patch("notification.models.email.EmailNotificationHistory.client") as mock_client:
+        response = api_client.post(
+            reverse(
+                "v1:admin-notification-email-history-retry-sent-to",
+                kwargs={"pk": extra.id, "sent_to_id": target.id},
+            )
+        )
+    assert response.status_code == http.HTTPStatus.OK
+    assert mock_client.send_message.call_count == 1
+    target.refresh_from_db()
+    assert target.status == NotificationStatus.SENT
+    other = extra.sent_to_list.exclude(pk=target.pk).get()
+    assert other.status == NotificationStatus.FAILED
+
+
+@pytest.mark.django_db(transaction=True)
+def test_retry_sent_to_404_when_status_not_in_filter(api_client, email_history):
+    # 지정된 sent_to의 status가 요청 status에 포함되지 않으면 404.
+    sent_to = email_history.sent_to_list.get()  # 기본 status는 CREATED, default 필터는 [FAILED].
+    with patch("notification.models.email.EmailNotificationHistory.client") as mock_client:
+        response = api_client.post(
+            reverse(
+                "v1:admin-notification-email-history-retry-sent-to",
+                kwargs={"pk": email_history.id, "sent_to_id": sent_to.id},
+            )
+        )
+    assert response.status_code == http.HTTPStatus.NOT_FOUND
+    mock_client.send_message.assert_not_called()
+
+
+@pytest.mark.django_db(transaction=True)
+def test_retry_with_status_query_resends_matching_statuses(api_client, email_template):
+    # ?status=CREATED&status=FAILED → 둘 다 재발송, SENT는 제외.
+    history = EmailNotificationHistory.objects.create_for_recipients(
+        template=email_template,
+        recipients=[
+            {"recipient": "a@example.com", "context": {"name": "a", "recipient": "x"}},
+            {"recipient": "b@example.com", "context": {"name": "b", "recipient": "x"}},
+            {"recipient": "c@example.com", "context": {"name": "c", "recipient": "x"}},
+        ],
+    )
+    by_recipient = {s.recipient: s for s in history.sent_to_list.all()}
+    history.sent_to_list.filter(pk=by_recipient["a@example.com"].pk).update(status=NotificationStatus.SENT)
+    history.sent_to_list.filter(pk=by_recipient["b@example.com"].pk).update(status=NotificationStatus.FAILED)
+    # c@는 CREATED 그대로
+
+    with patch("notification.models.email.EmailNotificationHistory.client") as mock_client:
+        response = api_client.post(
+            reverse("v1:admin-notification-email-history-retry", kwargs={"pk": history.id})
+            + "?status=CREATED&status=FAILED"
+        )
+    assert response.status_code == http.HTTPStatus.OK
+    assert mock_client.send_message.call_count == 2
+    assert history.sent_to_list.get(pk=by_recipient["a@example.com"].pk).status == NotificationStatus.SENT
+
+
+@pytest.mark.django_db(transaction=True)
+def test_retry_with_status_query_force_resends_sent(api_client, email_template):
+    # ?status=SENT → admin retry 경로는 task 가드를 우회해 실제 재발송이 일어남.
+    history = EmailNotificationHistory.objects.create_for_recipients(
+        template=email_template,
+        recipients=[{"recipient": "a@example.com", "context": {"name": "a", "recipient": "x"}}],
+    )
+    history.sent_to_list.update(status=NotificationStatus.SENT)
+
+    with patch("notification.models.email.EmailNotificationHistory.client") as mock_client:
+        response = api_client.post(
+            reverse("v1:admin-notification-email-history-retry", kwargs={"pk": history.id}) + "?status=SENT"
+        )
+    assert response.status_code == http.HTTPStatus.OK
+    assert mock_client.send_message.call_count == 1
+
+
+@pytest.mark.django_db
+def test_retry_with_invalid_status_query_returns_400(api_client, email_history):
+    response = api_client.post(
+        reverse("v1:admin-notification-email-history-retry", kwargs={"pk": email_history.id}) + "?status=BOGUS"
+    )
+    assert response.status_code == http.HTTPStatus.BAD_REQUEST
+
+
+@pytest.mark.django_db(transaction=True)
+def test_retry_sent_to_with_status_query_respects_filter(api_client, email_history):
+    # sent_to_id 대상의 status가 query에 포함되면 재시도, 아니면 404.
+    sent_to = email_history.sent_to_list.get()  # 기본 status는 CREATED.
+    url = reverse(
+        "v1:admin-notification-email-history-retry-sent-to",
+        kwargs={"pk": email_history.id, "sent_to_id": sent_to.id},
+    )
+
+    with patch("notification.models.email.EmailNotificationHistory.client") as mock_client:
+        # CREATED가 query에 없으면 404
+        response = api_client.post(url + "?status=FAILED")
+        assert response.status_code == http.HTTPStatus.NOT_FOUND
+        assert mock_client.send_message.call_count == 0
+        # CREATED 포함하면 발송 O
+        response = api_client.post(url + "?status=CREATED&status=FAILED")
+        assert response.status_code == http.HTTPStatus.OK
+        assert mock_client.send_message.call_count == 1
+
+
+@pytest.mark.django_db
+def test_retry_sent_to_404_when_sent_to_belongs_to_other_history(api_client, email_history, email_template):
+    other = EmailNotificationHistory.objects.create_for_recipients(
+        template=email_template,
+        recipients=[{"recipient": "other@example.com", "context": {"name": "다른", "recipient": "y"}}],
+    )
+    other_sent_to = other.sent_to_list.get()
+    response = api_client.post(
+        reverse(
+            "v1:admin-notification-email-history-retry-sent-to",
+            kwargs={"pk": email_history.id, "sent_to_id": other_sent_to.id},
+        )
+    )
+    assert response.status_code == http.HTTPStatus.NOT_FOUND
+
+
 # ---- History Render SentTo As HTML -----------------------------------------
 
 

app/admin_api/views/notification.py

@@ -8,6 +8,7 @@
     NHNCloudKakaoAlimTalkNotificationTemplateAdminSerializer,
     NHNCloudSMSNotificationHistoryAdminSerializer,
     NHNCloudSMSNotificationTemplateAdminSerializer,
+    NotificationHistoryRetryRequestAdminSerializer,
     NotificationTemplateRenderRequestAdminSerializer,
 )
 from core.const.tag import OpenAPITag
@@ -33,7 +34,7 @@
 
 TEMPLATE_READ_METHODS = ["list", "retrieve", "render_preview"]
 TEMPLATE_CRUD_METHODS = TEMPLATE_READ_METHODS + ["create", "update", "partial_update", "destroy"]
-HISTORY_METHODS = ["list", "retrieve", "create", "retry", "render_sent_to_as_html"]
+HISTORY_METHODS = ["list", "retrieve", "create", "retry", "retry_sent_to", "render_sent_to_as_html"]
 
 
 # ---- Template -----------------------------------------------------------
@@ -91,9 +92,23 @@ class _NotiHistoryAdminViewSetBase(CreateModelMixin, ListModelMixin, RetrieveMod
     filterset_class = NotificationHistoryAdminFilterSet
 
     @action(detail=True, methods=["post"], url_path="retry")
-    def retry(self, *args: tuple, **kwargs: dict) -> Response:
+    def retry(self, request: Request, *args: tuple, **kwargs: dict) -> Response:
+        query = NotificationHistoryRetryRequestAdminSerializer(data=request.query_params)
+        query.is_valid(raise_exception=True)
+
         serializer = self.get_serializer(instance=self.get_object())
-        serializer.retry()
+        serializer.retry(statuses=query.validated_data["status"])
+        return Response(data=serializer.data)
+
+    @action(detail=True, methods=["post"], url_path=r"sent-to/(?P<sent_to_id>[^/.]+)/retry")
+    def retry_sent_to(self, request: Request, sent_to_id: str, *args: tuple, **kwargs: dict) -> Response:
+        query = NotificationHistoryRetryRequestAdminSerializer(data=request.query_params)
+        query.is_valid(raise_exception=True)
+
+        history = self.get_object()
+        get_object_or_404(history.sent_to_list.all(), pk=sent_to_id, status__in=query.validated_data["status"])
+        serializer = self.get_serializer(instance=history)
+        serializer.retry(statuses=query.validated_data["status"], sent_to_id=sent_to_id)
         return Response(data=serializer.data)
 
     @extend_schema(responses=build_html_responses(names=["Notification History SentTo Render As HTML"]))

app/notification/models/base.py

@@ -171,19 +171,22 @@ def sent_to_status_summary(self) -> dict[str, int]:
         return {status.value.lower(): counts.get(status.value, 0) for status in NotificationStatus}
 
     @transaction.atomic
-    def _dispatch(self, sent_to_qs: "models.QuerySet[NotificationHistorySentToBase]") -> None:
+    def _dispatch(self, sent_to_qs: "models.QuerySet[NotificationHistorySentToBase]", *, force: bool = False) -> None:
         from notification.tasks import send_notification_to_recipient
 
-        if not (sent_to_ids := list(sent_to_qs.values_list("id", flat=True))):
+        if not (ids := list(sent_to_qs.values_list("id", flat=True))):
             return
         label = type(self).sent_to_class._meta.label_lower
-        transaction.on_commit(lambda: [send_notification_to_recipient.delay(label, sid) for sid in sent_to_ids])
+        transaction.on_commit(lambda: [send_notification_to_recipient.delay(label, sid, force=force) for sid in ids])
 
     def send(self) -> None:
         self._dispatch(self.sent_to_list.all())
 
-    def retry(self) -> None:
-        self._dispatch(self.sent_to_list.filter(status=NotificationStatus.FAILED))
+    def retry(self, statuses: list[NotificationStatus], sent_to_id: str | None = None) -> None:
+        qs = self.sent_to_list.filter(status__in=statuses)
+        if sent_to_id is not None:
+            qs = qs.filter(pk=sent_to_id)
+        self._dispatch(qs, force=True)
 
 
 class NotificationHistorySentToBase(BaseAbstractModel):

app/notification/tasks.py

@@ -6,10 +6,10 @@
 
 
 @shared_task(ignore_result=True)
-def send_notification_to_recipient(model_label: str, sent_to_id: str) -> None:
+def send_notification_to_recipient(model_label: str, sent_to_id: str, force: bool = False) -> None:
     sent_to_class = apps.get_model(model_label)
     sent_to = sent_to_class.objects.select_related("history").get(pk=sent_to_id)
-    if sent_to.status not in (NotificationStatus.CREATED, NotificationStatus.FAILED):
+    if not force and sent_to.status not in (NotificationStatus.CREATED, NotificationStatus.FAILED):
         return
 
     try:

app/notification/test/history_send_test.py

@@ -201,21 +201,21 @@ def test_history_send_logs_unexpected_errors_outside_inner_try(email_template, c
 
 
 @pytest.mark.django_db(transaction=True)
-def test_history_retry_skips_non_failed_sent_to(email_template):
-    # FAILED 상태가 아닌 sent_to는 재시도 대상에서 제외 — 외부 호출이 발생하지 않음.
-    history = _create_history(email_template)
+def test_history_retry_skips_non_matching_status(email_template):
+    # statuses에 포함되지 않는 status의 sent_to는 재시도 대상에서 제외 — 외부 호출이 발생하지 않음.
+    history = _create_history(email_template)  # 기본 status는 CREATED.
     with patch.object(EmailNotificationHistory, "client") as mock_client:
-        history.retry()
+        history.retry(statuses=[NotificationStatus.FAILED])
     mock_client.send_message.assert_not_called()
 
 
 @pytest.mark.django_db(transaction=True)
-def test_history_retry_resends_failed_sent_to(email_template):
+def test_history_retry_resends_matching_status(email_template):
     history = _create_history(email_template)
     history.sent_to_list.update(status=NotificationStatus.FAILED)
 
     with patch.object(EmailNotificationHistory, "client"):
-        history.retry()
+        history.retry(statuses=[NotificationStatus.FAILED])
     sent_to = history.sent_to_list.get()
     assert sent_to.status == NotificationStatus.SENT
 

app/notification/test/tasks_test.py

@@ -76,6 +76,17 @@ def test_task_skips_sent_row_to_prevent_duplicate_send(sent_to):
     mock_client.send_message.assert_not_called()
 
 
+@pytest.mark.django_db
+def test_task_force_bypasses_status_guard(sent_to):
+    sent_to.status = NotificationStatus.SENT
+    sent_to.save(update_fields=["status"])
+    with patch.object(EmailNotificationHistory, "client") as mock_client:
+        send_notification_to_recipient(LABEL, sent_to.id, force=True)
+    mock_client.send_message.assert_called_once()
+    sent_to.refresh_from_db()
+    assert sent_to.status == NotificationStatus.SENT
+
+
 @pytest.mark.django_db
 def test_task_marks_failed_and_propagates_external_failure(sent_to):
     with patch.object(EmailNotificationHistory, "client") as mock_client: