From 4f7d1af0f82fa94cbe6eacb4b79c25f2d4dc57aa Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Thu, 31 Aug 2023 11:26:01 +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=E5=9B=A0=E4=BC=98=E5=8C=96=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1=E6=97=B6?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0=E7=9A=84=E9=83=A8=E5=88=86=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtApiTestCaseMapper.java     |  2 ++
 .../base/mapper/ext/ExtApiTestCaseMapper.xml      | 15 +++++++++++++++
 .../controller/home/ApiHomeController.java        |  5 ++---
 .../service/definition/ApiTestCaseService.java    |  4 ++++
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.java b/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.java
index e64250f280..68c6fa1445 100644
--- a/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.java
+++ b/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.java
@@ -27,6 +27,8 @@ public interface ExtApiTestCaseMapper {
 
     List<ApiDataCountResult> countProtocolByProjectID(@Param("projectId") String projectId, @Param("versionId") String versionId);
 
+    long countByProjectID(@Param("projectId") String projectId, @Param("versionId") String versionId);
+
     long countByProjectIDAndCreateInThisWeek(@Param("projectId") String projectId, @Param("versionId") String versionId, @Param("firstDayTimestamp") long firstDayTimestamp, @Param("lastDayTimestamp") long lastDayTimestamp);
 
     List<ApiTestCaseInfo> getRequest(@Param("request") ApiTestCaseRequest request);
diff --git a/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml b/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
index 18342fb9d0..0235fa0723 100644
--- a/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
+++ b/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
@@ -694,6 +694,21 @@
         </if>
         GROUP BY apiDef.protocol
     </select>
+
+    <select id="countByProjectID" resultType="java.lang.Long">
+        SELECT COUNT(testCase.id) AS countNumber
+        FROM api_test_case testCase
+        INNER JOIN api_definition apiDef ON testCase.api_definition_id = apiDef.id
+        WHERE testCase.project_id = #{projectId}
+        AND (testCase.status IS NULL or testCase.status != "Trash")
+        <if test="versionId != null">
+            AND apiDef.version_id = #{versionId}
+        </if>
+        <if test="versionId == null">
+            AND apiDef.latest = 1
+        </if>
+    </select>
+
     <select id="findApiUrlAndMethodById" resultType="io.metersphere.base.domain.ApiDefinition">
         SELECT method, path
         FROM api_definition
diff --git a/api-test/backend/src/main/java/io/metersphere/controller/home/ApiHomeController.java b/api-test/backend/src/main/java/io/metersphere/controller/home/ApiHomeController.java
index 88a8fcafb8..f832b30e1b 100644
--- a/api-test/backend/src/main/java/io/metersphere/controller/home/ApiHomeController.java
+++ b/api-test/backend/src/main/java/io/metersphere/controller/home/ApiHomeController.java
@@ -166,13 +166,13 @@ public class ApiHomeController {
     public ApiDataCountDTO caseCovered(@PathVariable String projectId, @PathVariable String versionId) throws Exception {
         versionId = this.initializationVersionId(versionId);
         ApiDataCountDTO apiCountResult = new ApiDataCountDTO();
+        long allCount = apiTestCaseService.countByProjectID(projectId, versionId);
         //两个大数据量下耗时比较长的查询同时进行
         CountDownLatch countDownLatch = new CountDownLatch(2);
         try {
             //未覆盖 已覆盖： 统计当前接口下是否含有案例
             List<ApiDataCountResult> countResultByApiCoverageList = apiDefinitionService.countApiCoverageByProjectID(projectId, versionId);
             apiCountResult.countApiCoverage(countResultByApiCoverageList);
-            long allCount = apiCountResult.getCoveredCount() + apiCountResult.getNotCoveredCount();
             if (allCount != 0) {
                 float coveredRateNumber = (float) apiCountResult.getCoveredCount() * 100 / allCount;
                 DecimalFormat df = new DecimalFormat("0.0");
@@ -183,9 +183,8 @@ public class ApiHomeController {
         }
         try {
             //计算用例的通过率和执行率
-            List<ExecuteResultCountDTO> apiCaseExecResultList = apiTestCaseService.selectExecuteResultByProjectId(apiCountResult.getTotal(), projectId, versionId);
+            List<ExecuteResultCountDTO> apiCaseExecResultList = apiTestCaseService.selectExecuteResultByProjectId(allCount, projectId, versionId);
             apiCountResult.countApiCaseRunResult(apiCaseExecResultList);
-            long allCount = apiCountResult.getExecutedCount() + apiCountResult.getNotExecutedCount();
             if (apiCountResult.getExecutedCount() > 0) {
                 //通过率
                 float coveredRateNumber = (float) apiCountResult.getPassCount() * 100 / allCount;
diff --git a/api-test/backend/src/main/java/io/metersphere/service/definition/ApiTestCaseService.java b/api-test/backend/src/main/java/io/metersphere/service/definition/ApiTestCaseService.java
index 7563c67ece..747c147454 100644
--- a/api-test/backend/src/main/java/io/metersphere/service/definition/ApiTestCaseService.java
+++ b/api-test/backend/src/main/java/io/metersphere/service/definition/ApiTestCaseService.java
@@ -631,6 +631,10 @@ public class ApiTestCaseService {
         return extApiTestCaseMapper.countProtocolByProjectID(projectId, versionId);
     }
 
+    public long countByProjectID(String projectId, String versionId) {
+        return extApiTestCaseMapper.countByProjectID(projectId, versionId);
+    }
+
     public long countByProjectIDAndCreateInThisWeek(String projectId, String versionId) {
         Map<String, Date> startAndEndDateInWeek = DateUtils.getWeedFirstTimeAndLastTime(new Date());