fix(subscription): isolate statistic report failures

tests/fixtures/architecture/dependency-baseline.json

@@ -13,8 +13,8 @@
     "runtime_to_db": [],
     "workflow_to_db": []
   },
-  "edge_count": 6702,
-  "edge_sha256": "a6d5e5b0ccca6f84fe5d8aa5acb0402e7253958913da8d9624a23bd80ceab748",
+  "edge_count": 6706,
+  "edge_sha256": "dc1249bc5f0ae05ec11c680236cf4dd389258cf883fbed66ed57b53875f9ef0e",
   "edges": [
     "app -> app.runtime",
     "app -> app.runtime.compat",
@@ -2863,6 +2863,8 @@
     "app.application.storage -> app.schemas.types",
     "app.application.subscription.complete -> app.application",
     "app.application.subscription.complete -> app.application.outbox",
+    "app.application.subscription.complete -> app.runtime",
+    "app.application.subscription.complete -> app.runtime.log",
     "app.application.subscription.contract -> app.domain",
     "app.application.subscription.contract -> app.domain.meta",
     "app.application.subscription.contract -> app.domain.meta.metabase",
@@ -2873,6 +2875,8 @@
     "app.application.subscription.contract -> app.schemas.types",
     "app.application.subscription.delete -> app.application",
     "app.application.subscription.delete -> app.application.outbox",
+    "app.application.subscription.delete -> app.runtime",
+    "app.application.subscription.delete -> app.runtime.log",
     "app.application.subscription.delete -> app.schemas",
     "app.application.subscription.delete -> app.schemas.event",
     "app.application.subscription.identity -> app.application",

tests/test_subscribe_create_command.py

@@ -4,6 +4,7 @@ import asyncio
 from unittest.mock import AsyncMock, Mock
 
 import pytest
+from sqlalchemy import select
 
 from app.application.subscription.write import (
     AsyncCreateSubscriptionCommand,
@@ -11,6 +12,7 @@ from app.application.subscription.write import (
     add_subscribe,
     async_add_subscribe,
 )
+from app.db.models.outbox import OutboxMessage
 from app.db.models.subscribe import Subscribe
 from app.db.oper.subscribe import SubscribeOper, SubscribeStageResult
 from app.domain.context import MediaInfo
@@ -190,6 +192,55 @@ def test_default_sync_writer_persists_once_and_reuses_duplicate(db) -> None:
     ]
 
 
+def test_default_sync_writer_keeps_failed_report_pending_without_raising(db) -> None:
+    """新增统计未确认时接口仍成功，事件 intent 收口而统计 intent 等待重试。"""
+    db.watermark(Subscribe, OutboxMessage)
+    media = _media("arch-221-report-pending")
+
+    subscribe_id, message = add_subscribe(
+        mediainfo=media,
+        after_commit=lambda _subscribe_id: False,
+    )
+
+    assert subscribe_id > 0
+    assert message == "新增订阅成功"
+    intents = db.session.execute(
+        select(OutboxMessage)
+        .where(OutboxMessage.event_key.contains(media.media_id))
+        .order_by(OutboxMessage.id)
+    ).scalars().all()
+    assert [(intent.topic, intent.status) for intent in intents] == [
+        ("subscribe.added", "completed"),
+        ("subscribe.added.report", "pending"),
+    ]
+
+
+def test_default_async_writer_keeps_failed_report_pending_without_raising(db) -> None:
+    """异步新增入口同样返回成功，并只留下统计 intent 等待重试。"""
+    db.watermark(Subscribe, OutboxMessage)
+    media = _media("arch-221-async-report-pending")
+
+    async def report_failed(_subscribe_id: int) -> bool:
+        """模拟异步统计接口未确认。"""
+        return False
+
+    subscribe_id, message = asyncio.run(
+        async_add_subscribe(mediainfo=media, after_commit=report_failed)
+    )
+
+    assert subscribe_id > 0
+    assert message == "新增订阅成功"
+    intents = db.session.execute(
+        select(OutboxMessage)
+        .where(OutboxMessage.event_key.contains(media.media_id))
+        .order_by(OutboxMessage.id)
+    ).scalars().all()
+    assert [(intent.topic, intent.status) for intent in intents] == [
+        ("subscribe.added", "completed"),
+        ("subscribe.added.report", "pending"),
+    ]
+
+
 def test_stage_add_reuses_explicit_session_without_commit(db, monkeypatch) -> None:
     """Oper 将调用方 Session 传给 Model 查询原语，暂存期间不自行提交。"""
     db.watermark(Subscribe)

tests/test_subscribe_delete_command.py

@@ -200,7 +200,14 @@ def _async_report_command(candidate, calls, result=True, error=None, outbox=None
     )
 
 
-def _sync_command(candidate, calls, commit_error=None, delete_error=None, outbox=None):
+def _sync_command(
+    candidate,
+    calls,
+    commit_error=None,
+    delete_error=None,
+    outbox=None,
+    report_result=True,
+):
     """构造可观察事务和副作用顺序的同步订阅删除命令。"""
     def publish(payload):
         """记录同步删除事件。"""
@@ -209,7 +216,7 @@ def _sync_command(candidate, calls, commit_error=None, delete_error=None, outbox
     def report(payload):
         """记录同步删除统计。"""
         calls.append(("report", payload))
-        return True
+        return report_result
 
     return SyncDeleteSubscribeCommand(
         repository=_SyncRepository(candidate, calls, delete_error),
@@ -321,15 +328,14 @@ async def test_event_failure_happens_after_commit_and_stops_report():
 
 @pytest.mark.asyncio
 async def test_report_failure_happens_after_commit_and_event():
-    """上报失败保持原有传播语义，且不得改变已经提交和发出的事件。"""
+    """上报异常不得把已经提交的删除误报为失败。"""
     calls = []
     command = _command(_candidate(), calls, report_error=RuntimeError("report failed"))
 
-    with pytest.raises(RuntimeError, match="report failed"):
-        await command.execute(
-            7,
-            SubscribeDeletionActor(username="alice", is_superuser=False),
-        )
+    assert await command.execute(
+        7,
+        SubscribeDeletionActor(username="alice", is_superuser=False),
+    ) is True
 
     assert [call[0] for call in calls] == ["get", "delete", "commit", "event", "report"]
 
@@ -408,15 +414,14 @@ async def test_async_reporter_completes_report_intent_only_after_confirmation():
 
 @pytest.mark.asyncio
 async def test_async_reporter_false_keeps_report_intent_pending():
-    """异步 reporter 未确认时必须保留待重试统计 intent。"""
+    """异步 reporter 未确认时返回成功并保留待重试统计 intent。"""
     calls = []
     command = _async_report_command(_candidate(), calls, result=False, outbox=_Outbox(calls))
 
-    with pytest.raises(RuntimeError, match="未确认"):
-        await command.execute(
-            7,
-            SubscribeDeletionActor(username="alice", is_superuser=False),
-        )
+    assert await command.execute(
+        7,
+        SubscribeDeletionActor(username="alice", is_superuser=False),
+    ) is True
 
     assert [call[0] for call in calls] == [
         "get", "delete", "outbox_stage", "outbox_stage", "commit",
@@ -426,7 +431,7 @@ async def test_async_reporter_false_keeps_report_intent_pending():
 
 @pytest.mark.asyncio
 async def test_async_reporter_error_keeps_report_intent_pending():
-    """异步 reporter 异常时必须保留待重试统计 intent。"""
+    """异步 reporter 异常时返回成功并保留待重试统计 intent。"""
     calls = []
     command = _async_report_command(
         _candidate(),
@@ -435,11 +440,10 @@ async def test_async_reporter_error_keeps_report_intent_pending():
         outbox=_Outbox(calls),
     )
 
-    with pytest.raises(RuntimeError, match="remote failed"):
-        await command.execute(
-            7,
-            SubscribeDeletionActor(username="alice", is_superuser=False),
-        )
+    assert await command.execute(
+        7,
+        SubscribeDeletionActor(username="alice", is_superuser=False),
+    ) is True
 
     assert [call[0] for call in calls] == [
         "get", "delete", "outbox_stage", "outbox_stage", "commit",
@@ -505,6 +509,26 @@ def test_sync_delete_uses_same_durable_effect_order():
     ]
     assert calls[2][1].topic == "subscribe.deleted"
     assert calls[3][1].topic == "subscribe.deleted.report"
+
+
+def test_sync_delete_report_failure_returns_success_and_keeps_intent_pending():
+    """同步删除统计未确认时仍返回成功，且不收口 report intent。"""
+    calls = []
+    command = _sync_command(
+        _candidate(),
+        calls,
+        outbox=_SyncOutbox(calls),
+        report_result=False,
+    )
+
+    assert command.execute(
+        7,
+        SubscribeDeletionActor(username="alice", is_superuser=False),
+    ) is True
+    assert [call[0] for call in calls] == [
+        "get", "delete", "outbox_stage", "outbox_stage", "commit",
+        "event", "outbox_complete", "report",
+    ]
     assert calls[7][1] == _candidate().event_payload
 
 

tests/test_subscription_completion_command.py

@@ -71,6 +71,7 @@ def _command(
     report_result=True,
     notify_error=None,
     claim_result=True,
+    report_error=None,
 ):
     """构造可注入失败的完成命令。"""
     def notify() -> None:
@@ -88,6 +89,8 @@ def _command(
     def report(payload) -> bool:
         """记录完成统计。"""
         calls.append(("report", payload))
+        if report_error:
+            raise report_error
         return report_result
 
     return CompleteSubscriptionCommand(
@@ -98,14 +101,13 @@ def _command(
     ), notify, report
 
 
-@pytest.mark.parametrize("failure", ["event", "report", "notify"])
+@pytest.mark.parametrize("failure", ["event", "notify"])
 def test_completion_stages_business_and_independent_intents_before_commit(failure):
     """完成事务先提交业务和两个 intent，提交后按通知、事件、统计顺序执行。"""
     calls = []
     command, notify, report = _command(
         calls,
         publish_error=RuntimeError("event failed") if failure == "event" else None,
-        report_result=False if failure == "report" else True,
         notify_error=RuntimeError("notify failed") if failure == "notify" else None,
     )
 
@@ -127,10 +129,47 @@ def test_completion_stages_business_and_independent_intents_before_commit(failur
         assert [call[0] for call in calls[5:]] == ["notify"]
     elif failure == "event":
         assert [call[0] for call in calls[5:]] == ["notify", "claim", "event"]
-    else:
-        assert [call[0] for call in calls[5:]] == [
-            "notify", "claim", "event", "complete", "claim", "report",
-        ]
+
+
+def test_completion_report_failure_returns_success_and_keeps_intent_pending():
+    """统计未确认不得误报完成失败，且 report intent 必须留待重试。"""
+    calls = []
+    command, notify, report = _command(calls, report_result=False)
+
+    command.execute(
+        7,
+        {"id": 7, "media_source": "tmdb", "media_id": "123", "season": 2},
+        {"title": "Test"},
+        notify=notify,
+        report=report,
+    )
+
+    assert [call[0] for call in calls] == [
+        "history", "delete", "stage", "stage", "commit",
+        "notify", "claim", "event", "complete", "claim", "report",
+    ]
+
+
+def test_completion_report_error_returns_success_and_keeps_intent_pending():
+    """统计上报抛出异常也不得覆盖已经成功提交的完成结果。"""
+    calls = []
+    command, notify, report = _command(
+        calls,
+        report_error=RuntimeError("remote failed"),
+    )
+
+    command.execute(
+        7,
+        {"id": 7, "media_source": "tmdb", "media_id": "123", "season": 2},
+        {"title": "Test"},
+        notify=notify,
+        report=report,
+    )
+
+    assert [call[0] for call in calls] == [
+        "history", "delete", "stage", "stage", "commit",
+        "notify", "claim", "event", "complete", "claim", "report",
+    ]
 
 
 def test_completion_success_closes_event_then_report_intent():