From b5dc1a4096dc2379e68644936a7619cbd3468ab4 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Wed, 26 Apr 2023 11:06:17 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E4=BF=9D=E5=AD=98=E5=AE=9E?=
 =?UTF-8?q?=E6=97=B6=E6=8A=A5=E5=91=8A=E6=97=B6=E5=90=8C=E6=97=B6=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E5=AF=B9=E5=BA=94=E7=9A=84=E6=9C=80=E6=96=B0=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

测试计划保存实时报告时同时保存对应的最新报告
---
 .../ext/ExtApiDefinitionExecResultMapper.java |  2 ++
 .../ext/ExtApiDefinitionExecResultMapper.xml  | 21 ++++++++++++-------
 .../plan/TestPlanScenarioCaseService.java     | 16 ++++++++++++++
 3 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.java b/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.java
index 97f09dc255..9f62a599be 100644
--- a/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.java
+++ b/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.java
@@ -21,6 +21,8 @@ public interface ExtApiDefinitionExecResultMapper {
 
     ApiDefinitionExecResultWithBLOBs selectMaxResultByResourceId(String resourceId);
 
+    String selectMaxResultIdByResourceId(String resourceId);
+
     ApiDefinitionExecResultWithBLOBs selectMaxResultByResourceIdAndType(String resourceId, String type);
 
     long countByProjectIDAndCreateInThisWeek(@Param("projectId") String projectId, @Param("version") String version, @Param("firstDayTimestamp") long firstDayTimestamp, @Param("lastDayTimestamp") long lastDayTimestamp);
diff --git a/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.xml b/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.xml
index 2098f279d3..6f43f9848e 100644
--- a/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.xml
+++ b/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.xml
@@ -12,7 +12,16 @@
         select *
         from api_definition_exec_result
         where resource_id = #{resourceId,jdbcType=VARCHAR}
-        ORDER BY create_time DESC LIMIT 1
+        ORDER BY create_time DESC
+        LIMIT 1
+    </select>
+    <select id="selectMaxResultIdByResourceId" parameterType="java.lang.String"
+            resultType="java.lang.String">
+        select id
+        from api_definition_exec_result
+        where resource_id = #{resourceId,jdbcType=VARCHAR}
+        ORDER BY create_time DESC
+        LIMIT 1
     </select>
     <select id="selectMaxResultByResourceIdAndType"
             resultType="io.metersphere.base.domain.ApiDefinitionExecResultWithBLOBs">
@@ -20,7 +29,8 @@
         from api_definition_exec_result
         where resource_id = #{resourceId,jdbcType=VARCHAR}
           and `type` = #{type, jdbcType=VARCHAR}
-        ORDER BY start_time DESC LIMIT 5, 1
+        ORDER BY start_time DESC
+        LIMIT 5, 1
     </select>
 
     <select id="countByProjectIDAndCreateInThisWeek" resultType="java.lang.Long">
@@ -283,12 +293,9 @@
         FROM api_definition_exec_result r
                  INNER JOIN api_test_case c ON r.resource_id = c.id
             AND c.`status` != 'Trash'
-        WHERE
-            r.status not in ('SUCCESS'
-            , 'FAKE_ERROR')
+        WHERE r.status not in ('SUCCESS', 'FAKE_ERROR')
           AND r.integrated_report_id = #{reportId}
-        ORDER BY
-            r.create_time ASC
+        ORDER BY r.create_time ASC
     </select>
     <select id="selectByProjectIdAndLessThanTime" resultType="java.lang.String">
         select id
diff --git a/api-test/backend/src/main/java/io/metersphere/service/plan/TestPlanScenarioCaseService.java b/api-test/backend/src/main/java/io/metersphere/service/plan/TestPlanScenarioCaseService.java
index 5aa601ae75..e87b11d604 100644
--- a/api-test/backend/src/main/java/io/metersphere/service/plan/TestPlanScenarioCaseService.java
+++ b/api-test/backend/src/main/java/io/metersphere/service/plan/TestPlanScenarioCaseService.java
@@ -14,6 +14,7 @@ import io.metersphere.base.domain.ApiScenarioReportResult;
 import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.ApiScenarioMapper;
 import io.metersphere.base.mapper.ApiTestEnvironmentMapper;
+import io.metersphere.base.mapper.ext.ExtApiDefinitionExecResultMapper;
 import io.metersphere.base.mapper.ext.ExtApiScenarioModuleMapper;
 import io.metersphere.base.mapper.ext.ExtApiScenarioReportResultMapper;
 import io.metersphere.base.mapper.plan.TestPlanApiScenarioMapper;
@@ -96,6 +97,8 @@ public class TestPlanScenarioCaseService {
     private BaseEnvGroupProjectService environmentGroupProjectService;
     @Resource
     private ExtApiScenarioModuleMapper extApiScenarioModuleMapper;
+    @Resource
+    private ExtApiDefinitionExecResultMapper extApiDefinitionExecResultMapper;
     @Lazy
     @Resource
     private ApiScenarioModuleService apiScenarioModuleService;
@@ -868,12 +871,25 @@ public class TestPlanScenarioCaseService {
             if (checkReportConfig(config, "api", "all")) {
                 // 接口
                 apiAllCases = testPlanApiCaseService.getAllCases(planId);
+                apiAllCases.forEach(item -> {
+                    String reportId = extApiDefinitionExecResultMapper.selectMaxResultIdByResourceId(item.getId());
+                    if (StringUtils.isBlank(reportId)) {
+                        item.setReportId(StringUtils.EMPTY);
+                    } else {
+                        item.setReportId(reportId);
+                    }
+                });
                 report.setApiAllCases(apiAllCases);
                 if (saveResponse) {
                     testPlanApiCaseService.buildApiResponse(apiAllCases);
                 }
                 //场景
                 scenarioAllCases = getAllCases(planId);
+                scenarioAllCases.forEach(item -> {
+                    if (StringUtils.isBlank(item.getReportId())) {
+                        item.setReportId(StringUtils.EMPTY);
+                    }
+                });
                 if (saveResponse) {
                     buildScenarioResponse(scenarioAllCases);
                 }