From 9ac29aed4357a0620ec7a1c6b1a831ad1f757d4f Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Fri, 20 Oct 2023 16:38:45 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8E=A5=E5=8F=A3=E5=88=97=E8=A1=A8=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=94=A8=E4=BE=8B=E7=8A=B6=E6=80=81=E7=9A=84?=
 =?UTF-8?q?=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【【接口测试】github#27157，接口测试，接口定义列表，用例状态没有同步】https://www.tapd.cn/55049933/bugtrace/bugs/view?bug_id=1155049933001032207
---
 .../mapper/ext/ExtApiDefinitionMapper.java    |  2 ++
 .../mapper/ext/ExtApiDefinitionMapper.xml     | 15 ++++++++
 .../definition/ApiDefinitionService.java      | 36 +++++++++++++++++--
 3 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.java b/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.java
index d86b1ca336..f4417457c5 100644
--- a/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.java
+++ b/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.java
@@ -24,6 +24,8 @@ public interface ExtApiDefinitionMapper {
 
     List<ApiComputeResult> countByApiIdAndStatusIsNotTrash(@Param("ids") List<String> ids, @Param("projectId") String projectId);
 
+    List<ApiComputeResult> selectByIdsAndStatusIsNotTrash(@Param("ids") List<String> ids, @Param("projectId") String projectId);
+
     int removeToGcByExample(ApiDefinitionExampleWithOperation example);
 
     int reduction(@Param("ids") List<String> ids);
diff --git a/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml b/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
index a023ef07b1..1335e251e6 100644
--- a/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
+++ b/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
@@ -117,6 +117,21 @@
         </foreach>
     </select>
 
+    <select id="selectByIdsAndStatusIsNotTrash" resultType="io.metersphere.api.dto.definition.ApiComputeResult">
+        SELECT t1.api_definition_id apiDefinitionId,count(t1.id) caseTotal,
+        SUM(case when t2.status ='SUCCESS' then 1 else 0 end) as SUCCESS ,SUM(case when t2.status in
+        ('ERROR','FAKE_ERROR') then 1 else 0
+        end) as ERROR,
+        CONCAT(FORMAT(SUM(IF (t2.`status`='SUCCESS',1,0))/COUNT(t1.id)*100,2),'%') passRate
+        FROM api_test_case t1
+        LEFT JOIN api_definition_exec_result t2 ON t1.last_result_id=t2.id
+        WHERE t1.project_id = #{projectId} and (t1.status is null or t1.status != 'Trash')
+        group by t1.api_definition_id having t1.api_definition_id in
+        <foreach collection="ids" item="v" separator="," open="(" close=")">
+            #{v}
+        </foreach>
+    </select>
+
     <select id="countByApiIdAndStatusIsNotTrash" resultType="io.metersphere.api.dto.definition.ApiComputeResult">
         SELECT t1.api_definition_id apiDefinitionId,count(t1.id) caseTotal
         FROM api_test_case t1
diff --git a/api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionService.java b/api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionService.java
index 1bd2c09fca..1934da9161 100644
--- a/api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionService.java
+++ b/api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionService.java
@@ -99,6 +99,7 @@ public class ApiDefinitionService {
     public static final String JSONSCHEMA = "jsonSchema";
     private static final String COPY = "Copy";
     private static final String SCHEDULE = "schedule";
+    private static final String API_CASE = "apiCase";
     @Resource
     private ExtApiDefinitionMapper extApiDefinitionMapper;
     @Resource
@@ -190,7 +191,7 @@ public class ApiDefinitionService {
         buildUserInfo(resList);
         if (StringUtils.isNotBlank(request.getProjectId())) {
             buildProjectInfo(resList, request.getProjectId());
-            calculateResult(resList, request.getProjectId());
+            calculateApiResult(resList, request.getProjectId());
         } else {
             buildProjectInfoWithoutProject(resList);
         }
@@ -198,6 +199,35 @@ public class ApiDefinitionService {
         return resList;
     }
 
+    public void calculateApiResult(List<ApiDefinitionResult> resList, String projectId) {
+        if (!resList.isEmpty()) {
+            List<String> ids = resList.stream().map(ApiDefinitionResult::getId).collect(Collectors.toList());
+            List<ApiComputeResult> results = extApiDefinitionMapper.selectByIdsAndStatusIsNotTrash(ids, projectId);
+            Map<String, ApiComputeResult> resultMap = results.stream().collect(Collectors.toMap(ApiComputeResult::getApiDefinitionId, Function.identity()));
+            for (ApiDefinitionResult res : resList) {
+                ApiComputeResult compRes = resultMap.get(res.getId());
+                if (compRes != null) {
+                    res.setCaseType(API_CASE);
+                    res.setCaseTotal(String.valueOf(compRes.getCaseTotal()));
+                    res.setCasePassingRate(compRes.getPassRate());
+                    // 状态优先级 未执行，未通过，通过
+                    if ((compRes.getError() + compRes.getSuccess()) < compRes.getCaseTotal()) {
+                        res.setCaseStatus(ApiReportStatus.PENDING.name());
+                    } else if (compRes.getError() > 0) {
+                        res.setCaseStatus(ApiReportStatus.ERROR.name());
+                    } else {
+                        res.setCaseStatus(ApiReportStatus.SUCCESS.name());
+                    }
+                } else {
+                    res.setCaseType(API_CASE);
+                    res.setCaseTotal("0");
+                    res.setCasePassingRate("-");
+                    res.setCaseStatus("-");
+                }
+            }
+        }
+    }
+
     private void setCustomFieldsOrder(ApiDefinitionRequest request) {
         if (request.getCombine() != null && !request.getCombine().isEmpty()) {
             request.setIsCustomSorted(true);
@@ -1380,10 +1410,10 @@ public class ApiDefinitionService {
             for (ApiDefinitionResult res : resList) {
                 ApiComputeResult compRes = resultMap.get(res.getId());
                 if (compRes != null) {
-                    res.setCaseType("apiCase");
+                    res.setCaseType(API_CASE);
                     res.setCaseTotal(String.valueOf(compRes.getCaseTotal()));
                 } else {
-                    res.setCaseType("apiCase");
+                    res.setCaseType(API_CASE);
                     res.setCaseTotal("0");
                 }
             }