fix(接口测试): 修复因优化接口测试首页统计时出现的部分数据统计错误

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);

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

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;

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());