From deb9ad96709bd80fd4ae1f1461a47a6b61f90ac4 Mon Sep 17 00:00:00 2001
From: metersphere-bot <78466014+metersphere-bot@users.noreply.github.com>
Date: Tue, 11 Jan 2022 16:44:42 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=8E=B7=E5=8F=96=E5=9C=BA?=
 =?UTF-8?q?=E6=99=AF=E6=8A=A5=E5=91=8A=E6=8E=A5=E5=8F=A3=E6=95=88=E7=8E=87?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=20(#9219)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: chenjianxing <jianxing.chen@fit2cloud.com>
Co-authored-by: jianxing <41557596+AgAngle@users.noreply.github.com>
---
 .../api/service/ApiScenarioReportService.java        | 11 ++++++++++-
 .../base/mapper/ext/ExtApiScenarioReportMapper.xml   | 12 +++---------
 .../resources/db/migration/V105__v1.16.5_release.sql |  5 ++++-
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
index f2dbfb5a24..b78d0c1b4e 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
@@ -133,7 +133,16 @@ public class ApiScenarioReportService {
 
     public List<APIScenarioReportResult> list(QueryAPIReportRequest request) {
         request.setOrders(ServiceUtils.getDefaultOrder(request.getOrders()));
-        return extApiScenarioReportMapper.list(request);
+        List<APIScenarioReportResult> list = extApiScenarioReportMapper.list(request);
+        List<String> userIds = list.stream().map(APIScenarioReportResult::getUserId)
+                .collect(Collectors.toList());
+        Map<String, User> userMap = ServiceUtils.getUserMap(userIds);
+        list.forEach(item -> {
+            User user = userMap.get(item.getUserId());
+            if (user != null)
+                item.setUserName(user.getName());
+        });
+        return list;
     }
 
     public List<String> idList(QueryAPIReportRequest request) {
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.xml
index 4c4bc807c3..f0cda17d4d 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.xml
@@ -99,13 +99,10 @@
     </sql>
 
     <select id="list" resultMap="BaseResultMap">
-        SELECT r.name AS test_name,r.end_time,
-        r.name, r.description, r.id, r.project_id, r.create_time, r.update_time, r.status, r.trigger_mode,IfNULL(s.name,r.scenario_name) as scenario_name,
-        project.name AS project_name, user.name AS user_name
+        SELECT r.name AS test_name,r.end_time, r.user_id,
+        r.name, r.description, r.id, r.project_id, r.create_time, r.update_time, r.status, r.trigger_mode,IfNULL(s.name,r.scenario_name) as scenario_name
         FROM api_scenario_report r
         LEFT JOIN api_scenario s on r.scenario_id = s.id
-        LEFT JOIN project ON project.id = r.project_id
-        LEFT JOIN user ON user.id = r.user_id
         <where>
             <if test="request.combine != null">
                 <include refid="combine">
@@ -121,10 +118,7 @@
                 AND r.user_id = #{request.userId,jdbcType=VARCHAR}
             </if>
             <if test="request.projectId != null">
-                AND project.id = #{request.projectId}
-            </if>
-            <if test="request.workspaceId != null">
-                AND project.workspace_id = #{request.workspaceId,jdbcType=VARCHAR}
+                AND r.project_id = #{request.projectId}
             </if>
             <if test="request.filters != null and request.filters.size() > 0">
                 <foreach collection="request.filters.entrySet()" index="key" item="values">
diff --git a/backend/src/main/resources/db/migration/V105__v1.16.5_release.sql b/backend/src/main/resources/db/migration/V105__v1.16.5_release.sql
index 86a2d35b9d..69e8dd689a 100644
--- a/backend/src/main/resources/db/migration/V105__v1.16.5_release.sql
+++ b/backend/src/main/resources/db/migration/V105__v1.16.5_release.sql
@@ -1,3 +1,6 @@
 ALTER TABLE test_plan_report_content ADD plan_scenario_report_struct longtext NULL;
 ALTER TABLE test_plan_report_content ADD plan_api_case_report_struct longtext NULL;
-ALTER TABLE test_plan_report_content ADD plan_load_case_report_struct longtext NULL;
\ No newline at end of file
+ALTER TABLE test_plan_report_content ADD plan_load_case_report_struct longtext NULL;
+
+CREATE INDEX api_scenario_report_result_report_id_IDX ON api_scenario_report_result (report_id);
+