feat(trash): restore/list_trash/purge/purge_expired + alive() helper

tests/test_services_trash.py

@@ -77,3 +77,74 @@ async def test_delete_rulebook_cascades_topics_and_rules():
         batch = await delete(user_id=7, entity_type="rulebook", entity_id=2)
     assert isinstance(batch, str)
     assert session.execute.await_count == 5
+
+
+def _rowcount_result(n):
+    r = MagicMock()
+    r.rowcount = n
+    return r
+
+
+@pytest.mark.asyncio
+async def test_restore_clears_batch_across_all_models():
+    session = _make_mock_session()
+    # 7 models, each returns a rowcount
+    session.execute = AsyncMock(side_effect=[_rowcount_result(i) for i in [2, 0, 1, 1, 0, 0, 0]])
+    with patch("fabledassistant.services.trash.async_session") as cls:
+        cls.return_value = session
+        from fabledassistant.services.trash import restore
+        n = await restore(user_id=1, batch_id="abc")
+    assert n == 4
+    assert session.execute.await_count == 7
+    assert session.commit.called
+
+
+@pytest.mark.asyncio
+async def test_purge_expired_skips_when_retention_zero():
+    session = _make_mock_session()
+    session.execute = AsyncMock()
+    with patch("fabledassistant.services.trash.async_session") as cls:
+        cls.return_value = session
+        from fabledassistant.services.trash import purge_expired
+        n = await purge_expired(0)
+    assert n == 0
+    assert not session.execute.called  # never opens a delete
+
+
+@pytest.mark.asyncio
+async def test_purge_expired_deletes_across_models_when_positive():
+    session = _make_mock_session()
+    session.execute = AsyncMock(side_effect=[_rowcount_result(1) for _ in range(7)])
+    with patch("fabledassistant.services.trash.async_session") as cls:
+        cls.return_value = session
+        from fabledassistant.services.trash import purge_expired
+        n = await purge_expired(90)
+    assert n == 7
+    assert session.execute.await_count == 7
+
+
+@pytest.mark.asyncio
+async def test_list_trash_groups_by_batch():
+    session = _make_mock_session()
+
+    def _note(id, batch, title):
+        from datetime import datetime, timezone
+        n = MagicMock()
+        n.id = id; n.deleted_batch_id = batch; n.title = title
+        n.deleted_at = datetime(2026, 5, 28, tzinfo=timezone.utc)
+        return n
+
+    # Note model returns 2 rows in one batch; the other 6 models return none.
+    note_rows = MagicMock()
+    note_rows.scalars.return_value.all.return_value = [_note(1, "b1", "Task A"), _note(2, "b1", "Sub")]
+    empty = MagicMock()
+    empty.scalars.return_value.all.return_value = []
+    session.execute = AsyncMock(side_effect=[note_rows] + [empty] * 6)
+    with patch("fabledassistant.services.trash.async_session") as cls:
+        cls.return_value = session
+        from fabledassistant.services.trash import list_trash
+        out = await list_trash(user_id=1)
+    assert len(out) == 1
+    assert out[0]["batch_id"] == "b1"
+    assert out[0]["count"] == 2
+    assert out[0]["summary"] == "Task A"