fix(接口测试): 修复接口测试首页中未覆盖接口跳转查询数据不对的缺陷

--bug=1015150 --user=宋天阳 【接口测试】首页-接口、场景用例数量统计，已覆盖/未覆盖数量跳转后没有显示对应的接口
https://www.tapd.cn/55049933/s/1210220

backend/src/main/java/io/metersphere/api/controller/APITestController.java

@@ -319,7 +319,7 @@ public class APITestController {
          */
         List<ApiDefinition> apiNoCaseList = apiDefinitionService.selectEffectiveIdByProjectIdAndHaveNotCase(projectId);
         Map<String, Map<String, String>> scenarioUrlList = apiAutomationService.selectScenarioUseUrlByProjectId(projectId);
-        int apiInScenario = apiAutomationService.countApiInScenario(projectId, scenarioUrlList, apiNoCaseList);
+        int apiInScenario = apiAutomationService.getApiIdInScenario(projectId, scenarioUrlList, apiNoCaseList).size();
 
         try {
             if (effectiveApiCount == 0) {

backend/src/main/java/io/metersphere/api/dto/definition/ApiDefinitionRequest.java

@@ -4,6 +4,8 @@ import io.metersphere.controller.request.BaseQueryRequest;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 @Getter
 @Setter
 public class ApiDefinitionRequest extends BaseQueryRequest {
@@ -29,6 +31,9 @@ public class ApiDefinitionRequest extends BaseQueryRequest {
     private String path;
     private String method;
 
+    //被场景覆盖的接口id集合
+    private List<String> coverageIds;
+
     // 测试计划是否允许重复
     private boolean repeatCase;
     //是否进入待更新列表

backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java

@@ -1776,7 +1776,7 @@ public class ApiAutomationService {
         if (CollectionUtils.isEmpty(apiList)) {
             return coverage;
         }
-        int urlContainsCount = this.countApiInScenario(projectId, scenarioUrlMap, apiList);
+        int urlContainsCount = this.getApiIdInScenario(projectId, scenarioUrlMap, apiList).size();
         coverage.setCoverate(urlContainsCount);
         coverage.setNotCoverate(apiList.size() - urlContainsCount);
         float coverageRageNumber = (float) urlContainsCount * 100 / apiList.size();
@@ -1785,9 +1785,9 @@ public class ApiAutomationService {
         return coverage;
     }
 
-    public int countApiInScenario(String projectId, Map<String, Map<String, String>> scenarioUrlMap, List<ApiDefinition> apiList) {
+    public List<String> getApiIdInScenario(String projectId, Map<String, Map<String, String>> scenarioUrlMap, List<ApiDefinition> apiList) {
-        int urlContainsCount = 0;
+        List<String> apiIdList = new ArrayList<>();
-        if (MapUtils.isNotEmpty(scenarioUrlMap)) {
+        if (MapUtils.isNotEmpty(scenarioUrlMap) && CollectionUtils.isNotEmpty(apiList)) {
             ProjectApplication urlRepeatableConfig = projectApplicationService.getProjectApplication(projectId, ProjectApplicationType.URL_REPEATABLE.name());
             boolean isUrlRepeatable = BooleanUtils.toBoolean(urlRepeatableConfig.getTypeValue());
             for (ApiDefinition model : apiList) {
@@ -1799,26 +1799,26 @@ public class ApiAutomationService {
                             if (StringUtils.isNotEmpty(url)) {
                                 boolean urlMatched = MockApiUtils.isUrlMatch(model.getPath(), url);
                                 if (urlMatched) {
-                                    urlContainsCount++;
+                                    apiIdList.add(model.getId());
                                 }
                             }
                         } else {
                             Collection<String> scenarioUrlList = scenarioUrlMap.get(model.getMethod()).values();
                             boolean matchedUrl = MockApiUtils.isUrlInList(model.getPath(), scenarioUrlList);
                             if (matchedUrl) {
-                                urlContainsCount++;
+                                apiIdList.add(model.getId());
                             }
                         }
                     }
                 } else {
                     Map<String, String> stepIdAndUrlMap = scenarioUrlMap.get("MS_NOT_HTTP");
                     if (stepIdAndUrlMap != null && stepIdAndUrlMap.containsKey(model.getId())) {
-                        urlContainsCount++;
+                        apiIdList.add(model.getId());
                     }
                 }
             }
         }
-        return urlContainsCount;
+        return apiIdList;
     }
 
     public ScenarioEnv getApiScenarioProjectId(String id) {

backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java

@@ -164,6 +164,9 @@ public class ApiDefinitionService {
     private ApiScenarioReferenceIdMapper apiScenarioReferenceIdMapper;
     @Resource
     private ApiScenarioMapper apiScenarioMapper;
+    @Lazy
+    @Resource
+    private ApiAutomationService apiAutomationService;
 
     private final ThreadLocal<Long> currentApiOrder = new ThreadLocal<>();
     private final ThreadLocal<Long> currentApiCaseOrder = new ThreadLocal<>();
@@ -323,6 +326,23 @@ public class ApiDefinitionService {
                 }
             }
         }
+        if (StringUtils.isNotEmpty(request.getProjectId())) {
+            List<ApiDefinition> definitionList = null;
+            if (StringUtils.equalsAnyIgnoreCase(request.getApiCoverage(), "uncoverage", "coverage")) {
+                //计算没有用例接口的覆盖数量
+                definitionList = this.selectEffectiveIdByProjectIdAndHaveNotCase(request.getProjectId());
+            }
+            if (StringUtils.equalsAnyIgnoreCase(request.getScenarioCoverage(), "uncoverage", "coverage")) {
+                //计算全部用例
+                definitionList = this.selectEffectiveIdByProjectId(request.getProjectId());
+            }
+            //如果查询条件中有未覆盖/已覆盖， 则需要解析出没有用例的接口中，有多少是符合场景覆盖规律的。然后将这些接口的id作为查询参数
+            Map<String, Map<String, String>> scenarioUrlList = apiAutomationService.selectScenarioUseUrlByProjectId(request.getProjectId());
+            List<String> apiIdInScenario = apiAutomationService.getApiIdInScenario(request.getProjectId(), scenarioUrlList, definitionList);
+            if (CollectionUtils.isNotEmpty(apiIdInScenario)) {
+                request.setCoverageIds(apiIdInScenario);
+            }
+        }
         return request;
     }
 

backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml

@@ -785,24 +785,30 @@
             </choose>
             <include refid="filter"/>
 
-            <if test="request.apiCoverage == 'uncoverage' ">
+            <if test="request.apiCoverage == 'uncoverage'">
                 and
                 api_definition.id not in (SELECT api_definition_id FROM api_test_case)
-                and
+                <if test=" request.coverageIds != null and request.coverageIds.size() > 0">
-                api_definition.id not in (
+                    and
-                SELECT reference_id FROM api_scenario_reference_id WHERE api_scenario_id in
+                    api_definition.id not in (
-                (SELECT id FROM api_scenario WHERE `status` is null or `status` != 'Trash') AND reference_id is not null
+                    <foreach collection="request.coverageIds" item="nodeId" separator="," open="(" close=")">
-                )
+                        #{nodeId}
+                    </foreach>
+                    )
+                </if>
             </if>
             <if test="request.apiCoverage == 'coverage' ">
                 and
                 (
                 api_definition.id in (SELECT api_definition_id FROM api_test_case)
-                or
+                <if test=" request.coverageIds != null and request.coverageIds.size() > 0">
-                api_definition.id in (
+                    or
-                SELECT reference_id FROM api_scenario_reference_id WHERE api_scenario_id in
+                    api_definition.id in (
-                (SELECT id FROM api_scenario WHERE `status` is null or `status` != 'Trash') and reference_id is not null
+                    <foreach collection="request.coverageIds" item="nodeId" separator="," open="(" close=")">
-                )
+                        #{nodeId}
+                    </foreach>
+                    )
+                </if>
                 )
             </if>
             <if test="request.apiCaseCoverage == 'uncoverage' ">
@@ -814,18 +820,22 @@
                 (SELECT api_definition_id FROM api_test_case)
             </if>
             <if test="request.scenarioCoverage == 'uncoverage' ">
-                and api_definition.id not in
+                <if test=" request.coverageIds != null and request.coverageIds.size() > 0">
-                (
+                    and api_definition.id not in (
-                SELECT reference_id FROM api_scenario_reference_id WHERE api_scenario_id in
+                    <foreach collection="request.coverageIds" item="nodeId" separator="," open="(" close=")">
-                (SELECT id FROM api_scenario WHERE `status` is null or `status` != 'Trash') and reference_id is not null
+                        #{nodeId}
-                )
+                    </foreach>
+                    )
+                </if>
             </if>
             <if test="request.scenarioCoverage == 'coverage' ">
-                and api_definition.id in
+                <if test=" request.coverageIds != null and request.coverageIds.size() > 0">
-                (
+                    and api_definition.id in (
-                SELECT reference_id FROM api_scenario_reference_id WHERE api_scenario_id in
+                    <foreach collection="request.coverageIds" item="nodeId" separator="," open="(" close=")">
-                (SELECT id FROM api_scenario WHERE `status` is null or `status` != 'Trash') and reference_id is not null
+                        #{nodeId}
-                )
+                    </foreach>
+                    )
+                </if>
             </if>
             <include refid="queryVersionCondition">
                 <property name="versionTable" value="api_definition"/>
@@ -892,21 +902,27 @@
             <if test="request.apiCoverage == 'uncoverage' ">
                 and
                 api_definition.id not in (SELECT api_definition_id FROM api_test_case)
-                and
+                <if test=" request.coverageIds != null and request.coverageIds.size() > 0">
-                api_definition.id not in (
+                    and
-                SELECT reference_id FROM api_scenario_reference_id WHERE api_scenario_id in
+                    api_definition.id not in (
-                (SELECT id FROM api_scenario WHERE `status` is null or `status` != 'Trash') AND reference_id is not null
+                    <foreach collection="request.coverageIds" item="nodeId" separator="," open="(" close=")">
-                )
+                        #{nodeId}
+                    </foreach>
+                    )
+                </if>
             </if>
             <if test="request.apiCoverage == 'coverage' ">
                 and
                 (
                 api_definition.id in (SELECT api_definition_id FROM api_test_case)
-                or
+                <if test=" request.coverageIds != null and request.coverageIds.size() > 0">
-                api_definition.id in (
+                    or
-                SELECT reference_id FROM api_scenario_reference_id WHERE api_scenario_id in
+                    api_definition.id in (
-                (SELECT id FROM api_scenario WHERE `status` is null or `status` != 'Trash')
+                    <foreach collection="request.coverageIds" item="nodeId" separator="," open="(" close=")">
-                )
+                        #{nodeId}
+                    </foreach>
+                    )
+                </if>
                 )
             </if>
             <if test="request.apiCaseCoverage == 'uncoverage' ">
@@ -918,18 +934,22 @@
                 (SELECT api_definition_id FROM api_test_case)
             </if>
             <if test="request.scenarioCoverage == 'uncoverage' ">
-                and api_definition.id not in
+                <if test=" request.coverageIds != null and request.coverageIds.size() > 0">
-                (
+                    and api_definition.id not in (
-                SELECT reference_id FROM api_scenario_reference_id WHERE api_scenario_id in
+                    <foreach collection="request.coverageIds" item="nodeId" separator="," open="(" close=")">
-                (SELECT id FROM api_scenario WHERE `status` is null or `status` != 'Trash') and reference_id is not null
+                        #{nodeId}
-                )
+                    </foreach>
+                    )
+                </if>
             </if>
             <if test="request.scenarioCoverage == 'coverage' ">
-                and api_definition.id in
+                <if test=" request.coverageIds != null and request.coverageIds.size() > 0">
-                (
+                    and api_definition.id in (
-                SELECT reference_id FROM api_scenario_reference_id WHERE api_scenario_id in
+                    <foreach collection="request.coverageIds" item="nodeId" separator="," open="(" close=")">
-                (SELECT id FROM api_scenario WHERE `status` is null or `status` != 'Trash') and reference_id is not null
+                        #{nodeId}
-                )
+                    </foreach>
+                    )
+                </if>
             </if>
             <include refid="queryVersionCondition">
                 <property name="versionTable" value="api_definition"/>

frontend/src/business/components/api/definition/components/list/ApiList.vue

@@ -635,9 +635,11 @@ export default {
           break;
         case 'notCoverate':
           this.condition.apiCoverage = 'uncoverage';
+          this.condition.scenarioCoverage = null;
           break;
         case 'coverate':
           this.condition.apiCoverage = 'coverage';
+          this.condition.scenarioCoverage = null;
           break;
         case 'unCoverageTestCase':
           this.condition.apiCaseCoverage = 'uncoverage';
@@ -647,9 +649,11 @@ export default {
           break;
         case 'coverageScenario':
           this.condition.scenarioCoverage = 'coverage';
+          this.condition.apiCoverage = null;
           break;
         case 'unCoverageScenario':
           this.condition.scenarioCoverage = 'uncoverage';
+          this.condition.apiCoverage = null;
           break;
         case 'Prepare':
           this.condition.filters.status = [this.selectDataRange];