fix: update patrol delete progress handling

This commit is contained in:
koko
2026-05-02 02:03:49 +08:00
parent 34148b5d8a
commit 7968cef8c3
45 changed files with 373 additions and 218 deletions

View File

@@ -105,7 +105,7 @@ def test_patrol_delete_task_post_result_retries_business_failure(monkeypatch):
assert len(calls) == 3
def test_normalize_country_sections_omits_status_fields_for_complete_draft_rows():
def test_normalize_country_sections_keeps_status_fields_for_complete_draft_rows():
rows = PatrolDeleteTask._normalize_country_sections_for_result(
[
{
@@ -132,7 +132,7 @@ def test_normalize_country_sections_omits_status_fields_for_complete_draft_rows(
{
"country": "意大利",
"rows": [
{"quantity": "12", "deleteQuantity": "3"},
{"status": "商品信息草稿", "quantity": "12", "deleteQuantity": "3", "processStatus": "已完成"},
{"status": "缺少的信息", "quantity": "1", "deleteQuantity": "1", "processStatus": "已完成"},
],
}
@@ -150,8 +150,8 @@ def test_replace_complete_draft_rows_uses_quick_view_rows():
complete_draft_section = {
"country": "西班牙",
"rows": [
{"type": "completeDraft", "quantity": "1", "deleteQuantity": "1"},
{"type": "completeDraft", "quantity": "0", "deleteQuantity": "0"},
{"type": "completeDraft", "quantity": "1", "deleteQuantity": "1", "processStatus": "已完成"},
{"type": "completeDraft", "quantity": "0", "deleteQuantity": "0", "processStatus": ""},
],
}
@@ -161,8 +161,8 @@ def test_replace_complete_draft_rows_uses_quick_view_rows():
"country": "西班牙",
"rows": [
{"status": "全部", "quantity": "6230", "deleteQuantity": "0", "processStatus": "无可删商品"},
{"type": "completeDraft", "quantity": "1", "deleteQuantity": "1"},
{"type": "completeDraft", "quantity": "0", "deleteQuantity": "0"},
{"type": "completeDraft", "quantity": "1", "deleteQuantity": "1", "processStatus": "已完成"},
{"type": "completeDraft", "quantity": "0", "deleteQuantity": "0", "processStatus": ""},
],
}
assert PatrolDeleteTask._normalize_country_sections_for_result([merged]) == [
@@ -170,8 +170,8 @@ def test_replace_complete_draft_rows_uses_quick_view_rows():
"country": "西班牙",
"rows": [
{"status": "全部", "quantity": "6230", "deleteQuantity": "0", "processStatus": "无可删商品"},
{"quantity": "1", "deleteQuantity": "1"},
{"quantity": "0", "deleteQuantity": "0"},
{"status": "商品信息草稿", "quantity": "1", "deleteQuantity": "1", "processStatus": "已完成"},
{"status": "商品信息草稿", "quantity": "0", "deleteQuantity": "0", "processStatus": ""},
],
}
]
@@ -261,6 +261,18 @@ def test_patrol_delete_task_process_task_aggregates_country_results(monkeypatch)
assert runing_task[1]["deleted_listings_count"] == 2
assert "郭亚芳" not in runing_shop
assert calls == [
{
"task_id": 1,
"shop_name": "郭亚芳",
"shop_done": False,
"heartbeat_only": True,
},
{
"task_id": 1,
"shop_name": "郭亚芳",
"shop_done": False,
"heartbeat_only": True,
},
{
"task_id": 1,
"shop_name": "郭亚芳",
@@ -377,16 +389,28 @@ def test_delete_complete_draft_country_section_reports_delete_quantity(monkeypat
assert result["countrySection"] == {
"country": "德国",
"rows": [
{"type": "completeDraft", "status": "未提交的草稿", "quantity": "0", "deleteQuantity": "3"},
{"type": "completeDraft", "status": "已提交:提供缺少的信息", "quantity": "2", "deleteQuantity": "0"},
{
"type": "completeDraft",
"status": "未提交的草稿",
"quantity": "0",
"deleteQuantity": "3",
"processStatus": "已完成",
},
{
"type": "completeDraft",
"status": "已提交:提供缺少的信息",
"quantity": "2",
"deleteQuantity": "0",
"processStatus": "",
},
],
}
assert PatrolDeleteTask._normalize_country_sections_for_result([result["countrySection"]]) == [
{
"country": "德国",
"rows": [
{"quantity": "0", "deleteQuantity": "3"},
{"quantity": "2", "deleteQuantity": "0"},
{"status": "未提交的草稿", "quantity": "0", "deleteQuantity": "3", "processStatus": "已完成"},
{"status": "已提交:提供缺少的信息", "quantity": "2", "deleteQuantity": "0", "processStatus": ""},
],
}
]