fix: 修复解决冲突验证失败时未能正常跳过的问题 (#266)

he0119 · web-flow · commit 1cd50198d959 · 2024-11-18T11:26:19.000+08:00
顺便调整了 remove 插件中的 update_file
diff --git a/src/plugins/github/plugins/publish/utils.py b/src/plugins/github/plugins/publish/utils.py
@@ -96,11 +96,6 @@ async def resolve_conflict_pull_requests(
         issue_handler = await handler.to_issue_handler(issue_number)
 
         if publish_type:
-            # 需要先获取远程分支，否则无法切换到对应分支
-            run_shell_command(["git", "fetch", "origin"])
-            # 因为当前分支为触发处理冲突的分支，所以需要切换到每个拉取请求对应的分支
-            run_shell_command(["git", "checkout", pull.head.ref])
-
             # 重新测试
             match publish_type:
                 case PublishType.ADAPTER:
@@ -112,14 +107,19 @@ async def resolve_conflict_pull_requests(
                 case _:
                     raise ValueError("暂不支持的发布类型")
 
-            # 回到主分支
+            # 如果信息验证失败，则跳过更新
+            if not result.valid:
+                logger.error("信息验证失败，已跳过")
+                continue
+
+            # 每次切换前都要确保回到主分支
             run_shell_command(["git", "checkout", plugin_config.input_config.base])
             # 切换到对应分支
             run_shell_command(["git", "switch", "-C", pull.head.ref])
             # 更新文件
             update_file(result)
-            message = commit_message(result.type, result.name, issue_number)
 
+            message = commit_message(result.type, result.name, issue_number)
             issue_handler.commit_and_push(message, pull.head.ref)
 
             logger.info("拉取请求更新完毕")
diff --git a/src/plugins/github/plugins/remove/utils.py b/src/plugins/github/plugins/remove/utils.py
@@ -1,5 +1,6 @@
 from githubkit.exception import RequestFailed
 from nonebot import logger
+from pydantic_core import PydanticCustomError
 
 from src.plugins.github import plugin_config
 from src.plugins.github.depends.utils import (
@@ -16,11 +17,11 @@
 from .validation import RemoveInfo, load_publish_data, validate_author_info
 
 
-def update_file(type: PublishType, key: str):
+def update_file(result: RemoveInfo):
     """删除对应的包储存在 registry 里的数据"""
     logger.info("开始更新文件")
 
-    match type:
+    match result.publish_type:
         case PublishType.PLUGIN:
             path = plugin_config.input_config.plugin_path
         case PublishType.BOT:
@@ -30,9 +31,9 @@ def update_file(type: PublishType, key: str):
         case _:
             raise ValueError("不支持的删除类型")
 
-    data = load_publish_data(type)
+    data = load_publish_data(result.publish_type)
     # 删除对应的数据项
-    data.pop(key)
+    data.pop(result.key)
     dump_json5(path, list(data.values()))
     logger.info(f"已更新 {path.name} 文件")
 
@@ -52,7 +53,7 @@ async def process_pull_reqeusts(
     # 切换分支
     run_shell_command(["git", "switch", "-C", branch_name])
     # 更新文件并提交更改
-    update_file(result.publish_type, result.key)
+    update_file(result)
     store_handler.commit_and_push(message, branch_name, author=handler.author)
     # 创建拉取请求
     logger.info("开始创建拉取请求")
@@ -95,19 +96,22 @@ async def resolve_conflict_pull_requests(
         issue_handler = await handler.to_issue_handler(issue_number)
 
         if publish_type:
-            # 需要先获取远程分支，否则无法切换到对应分支
-            run_shell_command(["git", "fetch", "origin"])
-            # 当前分支未触发处理冲突的分支，切换到主分支后验证其它的删除请求
+            # 验证作者信息
+            try:
+                result = await validate_author_info(issue_handler.issue, publish_type)
+            except PydanticCustomError as e:
+                logger.error(f"验证作者信息失败: {e}")
+                continue
+
+            # 每次切换前都要确保回到主分支
             run_shell_command(["git", "checkout", plugin_config.input_config.base])
-            # 再验证作者信息
-            result = await validate_author_info(issue_handler.issue, publish_type)
             # 切换到对应分支
             run_shell_command(["git", "switch", "-C", pull.head.ref])
             # 更新文件
-            update_file(publish_type, result.key)
+            update_file(result)
+
             # 生成提交信息并推送
             message = commit_message(COMMIT_MESSAGE_PREFIX, result.name, issue_number)
-
             issue_handler.commit_and_push(message, pull.head.ref)
 
             logger.info("拉取请求更新完毕")
diff --git a/tests/github/publish/utils/test_publish_resolve_conflict_pull_requests.py b/tests/github/publish/utils/test_publish_resolve_conflict_pull_requests.py
@@ -80,10 +80,6 @@ async def test_resolve_conflict_pull_requests_adapter(
     # 测试 git 命令
     mock_subprocess_run.assert_has_calls(
         [
-            mocker.call(["git", "fetch", "origin"], check=True, capture_output=True),
-            mocker.call(
-                ["git", "checkout", "publish/issue1"], check=True, capture_output=True
-            ),
             mocker.call(["git", "checkout", "master"], check=True, capture_output=True),
             mocker.call(
                 ["git", "switch", "-C", "publish/issue1"],
@@ -213,10 +209,6 @@ async def test_resolve_conflict_pull_requests_bot(
     # 测试 git 命令
     mock_subprocess_run.assert_has_calls(
         [
-            mocker.call(["git", "fetch", "origin"], check=True, capture_output=True),
-            mocker.call(
-                ["git", "checkout", "publish/issue1"], check=True, capture_output=True
-            ),
             mocker.call(["git", "checkout", "master"], check=True, capture_output=True),
             mocker.call(
                 ["git", "switch", "-C", "publish/issue1"],
@@ -364,10 +356,6 @@ async def test_resolve_conflict_pull_requests_plugin(
     # 测试 git 命令
     mock_subprocess_run.assert_has_calls(
         [
-            mocker.call(["git", "fetch", "origin"], check=True, capture_output=True),
-            mocker.call(
-                ["git", "checkout", "publish/issue1"], check=True, capture_output=True
-            ),
             mocker.call(["git", "checkout", "master"], check=True, capture_output=True),
             mocker.call(
                 ["git", "switch", "-C", "publish/issue1"],
@@ -437,6 +425,98 @@ async def test_resolve_conflict_pull_requests_plugin(
     assert mocked_api["homepage"].called
 
 
+async def test_resolve_conflict_pull_requests_plugin_not_valid(
+    app: App, mocker: MockerFixture, mocked_api: MockRouter, tmp_path: Path, mock_pull
+) -> None:
+    """测试插件信息不合法的情况"""
+    from src.plugins.github import plugin_config
+    from src.plugins.github.models import GithubHandler, RepoInfo
+    from src.plugins.github.plugins.publish.utils import resolve_conflict_pull_requests
+    from src.providers.utils import dump_json5
+
+    mock_subprocess_run = mocker.patch("subprocess.run")
+    mock_result = mocker.MagicMock()
+    mock_subprocess_run.side_effect = lambda *args, **kwargs: mock_result
+
+    mock_label = mocker.MagicMock()
+    mock_label.name = "Plugin"
+
+    mock_issue_repo = mocker.MagicMock()
+    mock_issue = MockIssue(
+        number=1,
+        body=MockBody(type="plugin").generate(),
+        user=MockUser(login="he0119", id=1),
+    ).as_mock(mocker)
+    mock_issue_repo.parsed_data = mock_issue
+
+    mock_pull.labels = [mock_label]
+    mock_pull.title = "Plugin: 帮助"
+
+    mock_comment = mocker.MagicMock()
+    mock_comment.body = "Plugin: test"
+    mock_list_comments_resp = mocker.MagicMock()
+    mock_list_comments_resp.parsed_data = [mock_comment]
+
+    mock_test_result = mocker.MagicMock()
+    mock_test_result.load = False
+    mock_test_result.metadata = None
+    mock_docker = mocker.patch("src.providers.docker_test.DockerPluginTest.run")
+    mock_docker.return_value = mock_test_result
+
+    dump_json5(
+        tmp_path / "plugins.json5",
+        [
+            {
+                "module_name": "nonebot_plugin_treehelp",
+                "project_link": "nonebot-plugin-treehelp",
+                "author_id": 1,
+                "tags": [],
+                "is_official": True,
+            }
+        ],
+    )
+
+    async with app.test_api() as ctx:
+        adapter, bot = get_github_bot(ctx)
+
+        handler = GithubHandler(bot=bot, repo_info=RepoInfo(owner="owner", repo="repo"))
+
+        ctx.should_call_api(
+            "rest.issues.async_get",
+            snapshot({"owner": "owner", "repo": "repo", "issue_number": 1}),
+            mock_issue_repo,
+        )
+        ctx.should_call_api(
+            "rest.issues.async_list_comments",
+            {"owner": "owner", "repo": "repo", "issue_number": 1},
+            mock_list_comments_resp,
+        )
+
+        await resolve_conflict_pull_requests(handler, [mock_pull])
+
+    # 测试 git 命令
+    mock_subprocess_run.assert_not_called()
+
+    # 检查文件是否正确
+    # 因为没有进行 git 操作，所有会有两个插件信息
+    check_json_data(
+        plugin_config.input_config.plugin_path,
+        snapshot(
+            [
+                {
+                    "module_name": "nonebot_plugin_treehelp",
+                    "project_link": "nonebot-plugin-treehelp",
+                    "author_id": 1,
+                    "tags": [],
+                    "is_official": True,
+                },
+            ]
+        ),
+    )
+
+    assert not mocked_api["homepage"].called
+
+
 async def test_resolve_conflict_pull_requests_draft(
     app: App, mocker: MockerFixture, mocked_api: MockRouter, tmp_path: Path
 ) -> None:
diff --git a/tests/github/remove/utils/test_remove_resolve_pull_requests.py b/tests/github/remove/utils/test_remove_resolve_pull_requests.py
@@ -87,7 +87,6 @@ async def test_resolve_conflict_pull_requests_bot(
     # 测试 git 命令
     mock_subprocess_run.assert_has_calls(
         [
-            mocker.call(["git", "fetch", "origin"], check=True, capture_output=True),
             mocker.call(["git", "checkout", "master"], check=True, capture_output=True),
             mocker.call(
                 ["git", "switch", "-C", "remove/issue1"],
@@ -196,7 +195,6 @@ async def test_resolve_conflict_pull_requests_plugin(
     # 测试 git 命令
     mock_subprocess_run.assert_has_calls(
         [
-            mocker.call(["git", "fetch", "origin"], check=True, capture_output=True),
             mocker.call(["git", "checkout", "master"], check=True, capture_output=True),
             mocker.call(
                 ["git", "switch", "-C", "remove/issue1"],
@@ -248,8 +246,6 @@ async def test_resolve_conflict_pull_requests_plugin(
 async def test_resolve_conflict_pull_requests_not_found(
     app: App, mocker: MockerFixture, mocked_api: MockRouter, tmp_path: Path, mock_pull
 ) -> None:
-    from pydantic_core import PydanticCustomError
-
     from src.plugins.github import plugin_config
     from src.plugins.github.models import GithubHandler, RepoInfo
     from src.plugins.github.plugins.remove.utils import resolve_conflict_pull_requests
@@ -290,16 +286,10 @@ async def test_resolve_conflict_pull_requests_not_found(
 
         handler = GithubHandler(bot=bot, repo_info=RepoInfo(owner="owner", repo="repo"))
 
-        with pytest.raises(PydanticCustomError):
-            await resolve_conflict_pull_requests(handler, [mock_pull])
+        await resolve_conflict_pull_requests(handler, [mock_pull])
 
     # 测试 git 命令
-    mock_subprocess_run.assert_has_calls(
-        [
-            mocker.call(["git", "fetch", "origin"], check=True, capture_output=True),
-            mocker.call(["git", "checkout", "master"], check=True, capture_output=True),
-        ]  # type: ignore
-    )
+    mock_subprocess_run.assert_not_called()
 
     check_json_data(
         plugin_config.input_config.plugin_path,
diff --git a/tests/github/remove/utils/test_update_file.py b/tests/github/remove/utils/test_update_file.py
@@ -12,6 +12,7 @@ async def test_update_file(
 ) -> None:
     from src.plugins.github import plugin_config
     from src.plugins.github.plugins.remove.utils import update_file
+    from src.plugins.github.plugins.remove.validation import RemoveInfo
     from src.providers.utils import dump_json5
     from src.providers.validation.models import PublishType
 
@@ -37,7 +38,12 @@ async def test_update_file(
 
     check_json_data(plugin_config.input_config.bot_path, data)
 
-    update_file(PublishType.BOT, "CoolQBot:https://github.com/he0119/CoolQBot")
+    remove_info = RemoveInfo(
+        publish_type=PublishType.BOT,
+        key="CoolQBot:https://github.com/he0119/CoolQBot",
+        name="CoolQBot",
+    )
+    update_file(remove_info)
 
     check_json_data(
         plugin_config.input_config.bot_path,
