From 37f22f28170b770a0669436edaf84471c15eb975 Mon Sep 17 00:00:00 2001
From: shizhendong <shizhendong@zdjizhi.com>
Date: Wed, 13 Nov 2024 10:14:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20application=20mr=20=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E5=90=8E=EF=BC=8C=E6=8A=9B=E5=87=BA=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=EF=BC=8C=E4=BF=9D=E6=8C=81=20mr=20open=20=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/net/geedge/asw/common/util/RCode.java     |  2 +-
 .../service/impl/ApplicationMergeServiceImpl.java  | 14 +-------------
 src/main/resources/db/migration/R__AZ_sys_i18n.sql |  4 ++--
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/main/java/net/geedge/asw/common/util/RCode.java b/src/main/java/net/geedge/asw/common/util/RCode.java
index 7cc834e..6fd4efa 100644
--- a/src/main/java/net/geedge/asw/common/util/RCode.java
+++ b/src/main/java/net/geedge/asw/common/util/RCode.java
@@ -62,7 +62,7 @@ public enum RCode {
 
 	// GIT
 	GIT_COMMIT_CONFLICT_ERROR(203001, "Commit failed; fix conflicts and then commit the result"),
-	GIT_MERGE_FAILED(203002, "Merge failed"),
+	GIT_MERGE_FAILED(203002, "Merge failed,error message: {0}"),
 	GIT_PARENT_COMMITID_NOT_FOUND(203003, "Parent commitId not found"),
 	GIT_BINARY_CONFLICT_ERROR(203004, "Binary file conflict found; resolve conflicts in binary files manually"),
 	GIT_MERGE_NOT_SUPPORTED(203005, "Cannot merge in the {0} state"),
diff --git a/src/main/java/net/geedge/asw/module/app/service/impl/ApplicationMergeServiceImpl.java b/src/main/java/net/geedge/asw/module/app/service/impl/ApplicationMergeServiceImpl.java
index 700d5c5..adf60d1 100644
--- a/src/main/java/net/geedge/asw/module/app/service/impl/ApplicationMergeServiceImpl.java
+++ b/src/main/java/net/geedge/asw/module/app/service/impl/ApplicationMergeServiceImpl.java
@@ -247,9 +247,7 @@ public class ApplicationMergeServiceImpl extends ServiceImpl<ApplicationMergeDao
                     entity.setStatus(MergeRequestStatus.MERGED.toString());
                 } catch (Exception e) {
                     log.error(e, "[newMr] [merge error] [workspaceId: {}] [srcBranch: {}] [tgtBranch: {}] [msg: {}]", workspaceId, srcBranch, tgtBranch, e.getMessage());
-                    entity.setCommitId("");
-                    entity.setStatus(MergeRequestStatus.FAILED.toString());
-                    entity.setMessage(e.getMessage());
+                    throw new ASWException(RCode.GIT_MERGE_FAILED.setParam(e.getMessage()));
                 }
 
                 // remove source branch
@@ -307,16 +305,6 @@ public class ApplicationMergeServiceImpl extends ServiceImpl<ApplicationMergeDao
                 return false;
             }
         },
-        FAILED {
-            // 合并失败
-            public String toString() {
-                return "failed";
-            }
-
-            public boolean canMerge() {
-                return false;
-            }
-        },
         CLOSED {
             // 合并关闭
             public String toString() {
diff --git a/src/main/resources/db/migration/R__AZ_sys_i18n.sql b/src/main/resources/db/migration/R__AZ_sys_i18n.sql
index 890005a..bd4c075 100644
--- a/src/main/resources/db/migration/R__AZ_sys_i18n.sql
+++ b/src/main/resources/db/migration/R__AZ_sys_i18n.sql
@@ -143,8 +143,8 @@ INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_
 INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (235, '202003', 'PACKAGE_FILE_TYPE_ERROR', '无效安装包文件', 'zh', '', 'admin', 1724030366000);
 INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (236, '203001', 'GIT_COMMIT_CONFLICT_ERROR', 'Commit failed; fix conflicts and then commit the result', 'en', '', 'admin', 1724030366000);
 INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (237, '203001', 'GIT_COMMIT_CONFLICT_ERROR', '提交失败；解决冲突，然后提交结果', 'zh', '', 'admin', 1724030366000);
-INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (238, '203002', 'GIT_MERGE_FAILED', 'Merge failed', 'en', '', 'admin', 1724030366000);
-INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (239, '203002', 'GIT_MERGE_FAILED', '合并失败', 'zh', '', 'admin', 1724030366000);
+INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (238, '203002', 'GIT_MERGE_FAILED', 'Merge failed,error message: {0}', 'en', '', 'admin', 1724030366000);
+INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (239, '203002', 'GIT_MERGE_FAILED', '合并失败，错误信息：{0}', 'zh', '', 'admin', 1724030366000);
 INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (240, '302003', 'PLAYBOOK_INVALID_FILE', 'playbook Invalid file', 'en', '', 'admin', 1724030366000);
 INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (241, '302003', 'PLAYBOOK_INVALID_FILE', '无效文件', 'zh', '', 'admin', 1724030366000);
 INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (242, '202004', 'PACKAGE_CANNOT_DELETE', 'The referenced package cannot be deleted', 'en', '', 'admin', 1724030366000);