From d14c30cdb2a8e21313dca35c5e0376947f501517 Mon Sep 17 00:00:00 2001
From: WangXu10 <xu.wang@fit2cloud.com>
Date: Wed, 10 Jan 2024 16:02:49 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E5=8A=9F=E8=83=BD=E7=94=A8=E4=BE=8B):?=
 =?UTF-8?q?=20=E5=8A=9F=E8=83=BD=E7=94=A8=E4=BE=8B=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E7=BC=BA=E9=99=B7=E5=88=97=E8=A1=A8=E8=BF=94=E5=9B=9E=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=96=B0=E5=A2=9E=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/dto/BugProviderDTO.java    | 14 +++++++++++++-
 .../src/main/resources/i18n/bug_en_US.properties   |  4 +++-
 .../src/main/resources/i18n/bug_zh_CN.properties   |  4 +++-
 .../src/main/resources/i18n/bug_zh_TW.properties   |  4 +++-
 .../bug/mapper/ExtBugRelateCaseMapper.xml          |  9 ++++++---
 .../bug/provider/AssociateBugProvider.java         | 12 +++++++++++-
 .../bug/controller/AssociateBugProviderTests.java  |  4 ++++
 .../test/resources/dml/init_bug_relation_case.sql  |  5 ++++-
 8 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/backend/framework/provider/src/main/java/io/metersphere/dto/BugProviderDTO.java b/backend/framework/provider/src/main/java/io/metersphere/dto/BugProviderDTO.java
index 897a96b5fe..dd791e264f 100644
--- a/backend/framework/provider/src/main/java/io/metersphere/dto/BugProviderDTO.java
+++ b/backend/framework/provider/src/main/java/io/metersphere/dto/BugProviderDTO.java
@@ -15,9 +15,12 @@ public class BugProviderDTO implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
 
-    @Schema(description = "缺陷id")
+    @Schema(description = "id")
     private String id;
 
+    @Schema(description = "bugId")
+    private String bugId;
+
     @Schema(description = "缺陷名称")
     private String name;
 
@@ -35,4 +38,13 @@ public class BugProviderDTO implements Serializable {
 
     @Schema(description = "创建时间")
     private Long createTime;
+
+    @Schema(description = "计划名称")
+    private String testPlanName;
+
+    @Schema(description = "计划id")
+    private String testPlanId;
+
+    @Schema(description = "来源")
+    private String source;
 }
diff --git a/backend/framework/sdk/src/main/resources/i18n/bug_en_US.properties b/backend/framework/sdk/src/main/resources/i18n/bug_en_US.properties
index f287dbe00a..a950440f4c 100644
--- a/backend/framework/sdk/src/main/resources/i18n/bug_en_US.properties
+++ b/backend/framework/sdk/src/main/resources/i18n/bug_en_US.properties
@@ -117,4 +117,6 @@ bug.export.system.other.columns.create_time=Create time
 bug.export.system.other.columns.case_count=Case count
 bug.export.system.other.columns.comment=Comment
 bug.export.system.other.columns.platform=Platform
-permission.bug.name=Bug management
\ No newline at end of file
+permission.bug.name=Bug management
+test_plan_related=Test plan related
+direct_related=Direct related
\ No newline at end of file
diff --git a/backend/framework/sdk/src/main/resources/i18n/bug_zh_CN.properties b/backend/framework/sdk/src/main/resources/i18n/bug_zh_CN.properties
index 25b4416ebb..bb9d8a054e 100644
--- a/backend/framework/sdk/src/main/resources/i18n/bug_zh_CN.properties
+++ b/backend/framework/sdk/src/main/resources/i18n/bug_zh_CN.properties
@@ -117,4 +117,6 @@ bug.export.system.other.columns.create_time=创建时间
 bug.export.system.other.columns.case_count=用例数
 bug.export.system.other.columns.comment=评论
 bug.export.system.other.columns.platform=所属平台
-permission.bug.name=缺陷管理
\ No newline at end of file
+permission.bug.name=缺陷管理
+test_plan_relate=测试计划关联
+direct_related=直接关联
\ No newline at end of file
diff --git a/backend/framework/sdk/src/main/resources/i18n/bug_zh_TW.properties b/backend/framework/sdk/src/main/resources/i18n/bug_zh_TW.properties
index 55f285de7b..38f48f3c50 100644
--- a/backend/framework/sdk/src/main/resources/i18n/bug_zh_TW.properties
+++ b/backend/framework/sdk/src/main/resources/i18n/bug_zh_TW.properties
@@ -118,4 +118,6 @@ bug.export.system.other.columns.create_time=創建時間
 bug.export.system.other.columns.case_count=用例數
 bug.export.system.other.columns.comment=評論
 bug.export.system.other.columns.platform=所屬平台
-permission.bug.name=缺陷管理
\ No newline at end of file
+permission.bug.name=缺陷管理
+test_plan_related=測試計劃關聯
+direct_related=直接關聯
\ No newline at end of file
diff --git a/backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugRelateCaseMapper.xml b/backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugRelateCaseMapper.xml
index 527827d71a..0c31406bfd 100644
--- a/backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugRelateCaseMapper.xml
+++ b/backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugRelateCaseMapper.xml
@@ -22,14 +22,17 @@
 
     <select id="getAssociateBugs" resultType="io.metersphere.dto.BugProviderDTO">
         SELECT
-            brc.bug_id id,
-            b.title NAME,
+            brc.id id,
+            brc.bug_id bugId,
+            b.title name,
             b.handle_user handleUser,
             b.`status`,
-            brc.test_plan_id
+            brc.test_plan_id testPlanId,
+            tp.name testPlanName
         FROM
             bug_relation_case brc
                 INNER JOIN bug b ON brc.bug_id = b.id
+        left join test_plan tp on brc.test_plan_id = tp.id
         where b.deleted = false
         <include refid="queryWhereConditionByProvider"/>
         order by
diff --git a/backend/services/bug-management/src/main/java/io/metersphere/bug/provider/AssociateBugProvider.java b/backend/services/bug-management/src/main/java/io/metersphere/bug/provider/AssociateBugProvider.java
index 4d848b988b..dfc22cfe82 100644
--- a/backend/services/bug-management/src/main/java/io/metersphere/bug/provider/AssociateBugProvider.java
+++ b/backend/services/bug-management/src/main/java/io/metersphere/bug/provider/AssociateBugProvider.java
@@ -11,9 +11,11 @@ import io.metersphere.provider.BaseAssociateBugProvider;
 import io.metersphere.request.AssociateBugPageRequest;
 import io.metersphere.request.AssociateBugRequest;
 import io.metersphere.request.BugPageProviderRequest;
+import io.metersphere.sdk.util.Translator;
 import io.metersphere.system.uid.IDGenerator;
 import jakarta.annotation.Resource;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -75,7 +77,15 @@ public class AssociateBugProvider implements BaseAssociateBugProvider {
 
     @Override
     public List<BugProviderDTO> hasAssociateBugPage(AssociateBugPageRequest request) {
-        return extBugRelateCaseMapper.getAssociateBugs(request, request.getSortString());
+        List<BugProviderDTO> associateBugs = extBugRelateCaseMapper.getAssociateBugs(request, request.getSortString());
         //TODO 需要转义状态和处理人属性
+        associateBugs.stream().forEach(item -> {
+            if (StringUtils.isNotBlank(item.getTestPlanName())) {
+                item.setSource(Translator.get("test_plan_relate"));
+            } else {
+                item.setSource(Translator.get("direct_related"));
+            }
+        });
+        return associateBugs;
     }
 }
diff --git a/backend/services/bug-management/src/test/java/io/metersphere/bug/controller/AssociateBugProviderTests.java b/backend/services/bug-management/src/test/java/io/metersphere/bug/controller/AssociateBugProviderTests.java
index 6becb8d9c2..abdb590c02 100644
--- a/backend/services/bug-management/src/test/java/io/metersphere/bug/controller/AssociateBugProviderTests.java
+++ b/backend/services/bug-management/src/test/java/io/metersphere/bug/controller/AssociateBugProviderTests.java
@@ -86,5 +86,9 @@ public class AssociateBugProviderTests extends BaseTest {
         request.setPageSize(10);
         request.setCaseId("123");
         associateBugProvider.hasAssociateBugPage(request);
+        request.setCaseId("wx_2");
+        associateBugProvider.hasAssociateBugPage(request);
+        request.setCaseId("wx_3");
+        associateBugProvider.hasAssociateBugPage(request);
     }
 }
diff --git a/backend/services/bug-management/src/test/resources/dml/init_bug_relation_case.sql b/backend/services/bug-management/src/test/resources/dml/init_bug_relation_case.sql
index fbe217f6ac..b0f843daf7 100644
--- a/backend/services/bug-management/src/test/resources/dml/init_bug_relation_case.sql
+++ b/backend/services/bug-management/src/test/resources/dml/init_bug_relation_case.sql
@@ -6,4 +6,7 @@ INSERT INTO bug (id, num, title, handle_users, handle_user, create_user, create_
 INSERT INTO bug_relation_case(id, case_id, bug_id, case_type, test_plan_id, test_plan_case_id, create_user, create_time, update_time)
 VALUES ('wx_test_id_1', 'wx_1', 'bug_id_1', 'FUNCTIONAL', null, null, 'admin', UNIX_TIMESTAMP() * 1000, UNIX_TIMESTAMP() * 1000),
        ('wx_test_id_2', 'wx_2', 'bug_id_1', 'FUNCTIONAL', 'test-plan-id', 'bug_relate_case', 'admin', UNIX_TIMESTAMP() * 1000, UNIX_TIMESTAMP() * 1000),
-       ('wx_test_id_3', 'wx_3', 'bug_id_2', 'FUNCTIONAL', 'test-plan-id', 'bug_relate_case-1', 'admin', UNIX_TIMESTAMP() * 1000, UNIX_TIMESTAMP() * 1000);
\ No newline at end of file
+       ('wx_test_id_3', 'wx_3', 'bug_id_2', 'FUNCTIONAL', null, null, 'admin', UNIX_TIMESTAMP() * 1000, UNIX_TIMESTAMP() * 1000);
+
+INSERT INTO `test_plan` (`id`,`project_id`,`parent_id`,`name`,`status`,`stage`,`create_time`,`create_user`)
+VALUES('test-plan-id','wx_test','3','cececec','3','4',UNIX_TIMESTAMP() * 1000,'admin');
\ No newline at end of file