refactor(接口测试): 用例列表加载接口优化

--bug=1011348 --user=赵勇【接口测试】-接口定义-case列表查询和执行单接口case变慢了 https://www.tapd.cn/55049933/s/1123873
2022-03-22 19:13:42 +08:00 · 2022-03-22 19:13:42 +08:00 · 85aa8ab18c
parent b7845ffa82
commit 85aa8ab18c
5 changed files with 128 additions and 46 deletions
--- a/backend/src/main/java/io/metersphere/api/dto/definition/ParamsDTO.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/ParamsDTO.java
@ -0,0 +1,9 @@
+package io.metersphere.api.dto.definition;
+
+import lombok.Data;
+
+@Data
+public class ParamsDTO {
+    private String id;
+    private String value;
+}
--- a/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
@ -133,10 +133,7 @@ public class ApiTestCaseService {
        if (CollectionUtils.isEmpty(apiTestCases)) {
            return apiTestCases;
        }
-        if (BooleanUtils.isTrue(request.isSelectEnvironment())) {
-            setCaseEnvironment(apiTestCases);
-        }
-        buildUserInfo(apiTestCases);
+        buildUserInfo(apiTestCases, request.isSelectEnvironment());
        return apiTestCases;
    }

@ -202,17 +199,31 @@ public class ApiTestCaseService {
        return request;
    }

-    public void buildUserInfo(List<? extends ApiTestCaseDTO> apiTestCases) {
+    public void buildUserInfo(List<? extends ApiTestCaseDTO> apiTestCases, boolean isSelectEnvironment) {
        List<String> userIds = new ArrayList();
        userIds.addAll(apiTestCases.stream().map(ApiTestCaseDTO::getCreateUserId).collect(Collectors.toList()));
        userIds.addAll(apiTestCases.stream().map(ApiTestCaseDTO::getUpdateUserId).collect(Collectors.toList()));
+        List<String> ids = apiTestCases.stream().map(ApiTestCaseDTO::getId).collect(Collectors.toList());
+        List<ParamsDTO> passRateList = extApiTestCaseMapper.findPassRateByIds(ids);
+
+        Map<String, String> passRates = passRateList.stream()
+                .collect(Collectors.toMap(ParamsDTO::getId, ParamsDTO::getValue));
+        Map<String, String> envMap = null;
+        if (BooleanUtils.isTrue(isSelectEnvironment)) {
+            envMap = this.getApiCaseEnvironments(ids);
+        }
        if (!CollectionUtils.isEmpty(userIds)) {
            Map<String, User> userMap = userService.queryNameByIds(userIds);
+            Map<String, String> finalEnvMap = envMap;
            apiTestCases.forEach(caseResult -> {
+                caseResult.setPassRate(passRates.get(caseResult.getId()));
                User createUser = userMap.get(caseResult.getCreateUserId());
                if (createUser != null) {
                    caseResult.setCreateUser(createUser.getName());
                }
+                if (finalEnvMap != null && finalEnvMap.containsKey(caseResult.getId())) {
+                    caseResult.setEnvironment(finalEnvMap.get(caseResult.getId()));
+                }
                User updateUser = userMap.get(caseResult.getUpdateUserId());
                if (updateUser != null) {
                    caseResult.setUpdateUser(updateUser.getName());
@ -222,7 +233,6 @@ public class ApiTestCaseService {
    }

    public ApiTestCaseInfo get(String id) {
-//        ApiTestCaseWithBLOBs returnBlobs = apiTestCaseMapper.selectByPrimaryKey(id);
        ApiTestCaseInfo model = extApiTestCaseMapper.selectApiCaseInfoByPrimaryKey(id);
        if (model != null) {
            if (StringUtils.equalsIgnoreCase(model.getApiMethod(), "esb")) {
@ -1051,6 +1061,35 @@ public class ApiTestCaseService {
        return null;
    }

+    public Map<String, String> getApiCaseEnvironments(List<String> caseIds) {
+        List<ParamsDTO> environments = extApiTestCaseMapper.getApiCaseEnvironments(caseIds);
+        if (CollectionUtils.isEmpty(environments)) {
+            return null;
+        }
+        try {
+            List<String> envIds = environments.stream().map(ParamsDTO::getValue).collect(Collectors.toList());
+            ApiTestEnvironmentExample example = new ApiTestEnvironmentExample();
+            example.createCriteria().andIdIn(envIds);
+            List<ApiTestEnvironment> environmentList = apiTestEnvironmentMapper.selectByExample(example);
+            if (CollectionUtils.isEmpty(environmentList)) {
+                return null;
+            }
+            Map<String, String> envMap = environmentList.stream()
+                    .collect(Collectors.toMap(ApiTestEnvironment::getId, ApiTestEnvironment::getName));
+
+            Map<String, String> caseEnvMap = environments.stream().collect(HashMap::new, (m, v) -> m.put(v.getId(), v.getValue()), HashMap::putAll);
+            caseEnvMap.forEach((k, v) -> {
+                if (envMap.containsKey(v)) {
+                    caseEnvMap.put(k, envMap.get(v));
+                }
+            });
+            return caseEnvMap;
+        } catch (Exception e) {
+            LogUtil.error("api case environmentId incorrect parsing", e);
+        }
+        return null;
+    }
+
    public List<String> getFollows(String testId) {
        List<String> result = new ArrayList<>();
        if (StringUtils.isBlank(testId)) {
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.java
@ -4,7 +4,6 @@ import io.metersphere.api.dto.datacount.ApiDataCountResult;
 import io.metersphere.api.dto.definition.*;
 import io.metersphere.base.domain.ApiDefinition;
 import io.metersphere.base.domain.ApiTestCase;
-import io.metersphere.controller.request.BaseQueryRequest;
 import org.apache.ibatis.annotations.Param;

 import java.util.List;
@ -16,6 +15,7 @@ public interface ExtApiTestCaseMapper {
    List<ApiTestCaseDTO> listSimple(@Param("request") ApiTestCaseRequest request);

    List<String> selectIdsNotExistsInPlan(@Param("projectId") String projectId, @Param("planId") String planId);
+
    List<String> selectIdsNotExistsInReview(@Param("projectId") String projectId, @Param("reviewId") String reviewId);


@ -43,9 +43,10 @@ public interface ExtApiTestCaseMapper {

    List<ApiTestCaseDTO> getCannotReductionApiCaseList(@Param("ids") List<String> ids);

-    List<String> selectCaseIdsByApiIds(@Param("ids")List<String> apiIds);
+    List<String> selectCaseIdsByApiIds(@Param("ids") List<String> apiIds);
+
+    List<String> selectNameByIdIn(@Param("ids") List<String> ids);

-    List<String> selectNameByIdIn(@Param("ids")List<String> ids);
    String selectNameById(String id);

    List<String> selectIdsByQuery(@Param("request") ApiTestCaseRequest request);
@ -54,16 +55,21 @@ public interface ExtApiTestCaseMapper {

    List<String> getIdsOrderByUpdateTime(@Param("projectId") String projectId);

-    Long getPreOrder(@Param("projectId")String projectId, @Param("baseOrder") Long baseOrder);
+    Long getPreOrder(@Param("projectId") String projectId, @Param("baseOrder") Long baseOrder);

-    Long getLastOrder(@Param("projectId")String projectId, @Param("baseOrder") Long baseOrder);
+    Long getLastOrder(@Param("projectId") String projectId, @Param("baseOrder") Long baseOrder);

    /**
     * 获取接口用例的环境
+     *
     * @param caseId 用例ID
     * @return ApiEnvironment
     */
    String getApiCaseEnvironment(@Param("caseId") String caseId);

-    int moduleCount(@Param("request")ApiTestCaseRequest request);
+    int moduleCount(@Param("request") ApiTestCaseRequest request);
+
+    List<ParamsDTO> findPassRateByIds(@Param("ids") List<String> ids);
+
+    List<ParamsDTO> getApiCaseEnvironments(@Param("caseIds") List<String> caseIds);
 }
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
@ -312,22 +312,62 @@

    </select>

+    <select id="findPassRateByIds" resultType="io.metersphere.api.dto.definition.ParamsDTO">
+        SELECT
+         t2.resource_id as id,
+            CONCAT(
+                FORMAT(
+                    SUM(
+                    IF
+                    ( t2.`status` = 'success', 1, 0 ))/ COUNT( t2.id )* 100,
+                    2
+                ),
+                '%'
+            ) value
+        FROM
+            api_definition_exec_result t2
+        WHERE
+            t2.resource_id IN
+            <foreach collection="ids" item="id" separator="," open="(" close=")">
+                #{id}
+            </foreach>
+        GROUP BY
+            t2.resource_id
+    </select>
+
    <select id="listSimple" resultType="io.metersphere.api.dto.definition.ApiTestCaseDTO">
-        select
-        t1.id, t1.project_id, t1.name,t1.case_status, t1.api_definition_id, t1.priority, t1.description,
-        t1.create_user_id, t1.update_user_id, t1.create_time, t1.update_time, t1.num,
-        a.module_id, a.path, a.protocol, t1.tags,t1.status,t3.STATUS AS execResult, t1.last_result_id AS lastResultId ,
-        project.name as project_name,
-        t1.delete_time, deleteUser.name AS deleteUser,CONCAT(FORMAT(SUM(IF
-        (t2.`status`='success',1,0))/COUNT(t2.id)*100,2),'%') passRate, project_version.name as version_name
-        from
+        SELECT
+        t1.id,
+        t1.project_id,
+        t1.NAME,
+        t1.case_status,
+        t1.api_definition_id,
+        t1.priority,
+        t1.description,
+        t1.create_user_id,
+        t1.update_user_id,
+        t1.create_time,
+        t1.update_time,
+        t1.num,
+        a.module_id,
+        a.path,
+        a.protocol,
+        t1.tags,
+        t1.STATUS,
+        t3.STATUS AS execResult,
+        t1.last_result_id AS lastResultId,
+        project.NAME AS project_name,
+        t1.delete_time,
+        deleteUser.NAME AS deleteUser,
+        project_version.NAME AS version_name
+        FROM
        api_test_case t1
-        LEFT JOIN api_definition_exec_result t2 ON t1.id = t2.resource_id
        LEFT JOIN api_definition_exec_result t3 ON t1.last_result_id = t3.id
-        LEFT JOIN user deleteUser ON t1.delete_user_id = deleteUser.id
-        LEFT JOIN api_definition a on t1.api_definition_id = a.id
+        LEFT JOIN USER deleteUser ON t1.delete_user_id = deleteUser.id
+        LEFT JOIN api_definition a ON t1.api_definition_id = a.id
        LEFT JOIN project ON t1.project_id = project.id
-        LEFT JOIN project_version on project.id = project_version.project_id AND project_version.id = t1.version_id
+        LEFT JOIN project_version ON project.id = project_version.project_id
+        AND project_version.id = t1.version_id
        WHERE 1=1
        <if test="request.protocol != null and request.protocol!=''">
            and a.protocol = #{request.protocol}
@ -421,29 +461,11 @@
            and (t1.status is null or t1.status != 'Trash')
        </if>
        <if test="request.toUpdate !=null and request.toUpdate == true">
-            and (t1.update_time >= #{request.updateTime} or t2.status = 'error')
+            and (t1.update_time >= #{request.updateTime} or t3.status = 'error')
        </if>
        <include refid="queryVersionCondition">
            <property name="versionTable" value="t1"/>
        </include>
-        GROUP BY  t1.id,
-        t1.project_id,
-        t1.name,
-        t1.api_definition_id,
-        t1.priority,
-        t1.description,
-        t1.create_user_id,
-        t1.update_user_id,
-        t1.create_time,
-        t1.update_time,
-        t1.num,
-        a.module_id,
-        a.path,
-        a.protocol,
-        t1.tags,
-        t1.status,
-        t1.`order`
-        having 1=1
        <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.orders"/>
    </select>
    <select id="idSimple" resultType="java.lang.String">
@ -564,7 +586,7 @@
    </select>

    <select id="moduleCount" resultType="java.lang.Integer">
-        SELECT count(api_test_case.id)  FROM api_test_case
+        SELECT count(api_test_case.id) FROM api_test_case
        left join project on api_test_case.project_id = project.id
        <include refid="criCondition"/>
    </select>
@ -643,7 +665,7 @@
        WHERE testCase.id = #{0}
    </select>

-<sql id="queryWhereCondition">
+    <sql id="queryWhereCondition">
        <where>
            <if test="request.name != null and request.name!=''">
                and t1.name like CONCAT('%', #{request.name},'%')
@ -751,6 +773,12 @@
        </if>
        order by `order` desc limit 1;
    </select>
+    <select id="getApiCaseEnvironments" resultType="io.metersphere.api.dto.definition.ParamsDTO">
+        select id,JSON_UNQUOTE(JSON_EXTRACT(request, '$.useEnvironment')) as value from api_test_case where id in
+        <foreach collection="caseIds" item="id" separator="," open="(" close=")">
+            #{id}
+        </foreach>
+    </select>
    <select id="getApiCaseEnvironment" resultType="java.lang.String">
        select JSON_UNQUOTE(JSON_EXTRACT(request, '$.useEnvironment')) from api_test_case where id = #{caseId}
    </select>
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewApiCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewApiCaseService.java
@ -42,7 +42,7 @@ public class TestCaseReviewApiCaseService {
        if (CollectionUtils.isEmpty(apiTestCases)) {
            return apiTestCases;
        }
-        apiTestCaseService.buildUserInfo(apiTestCases);
+        apiTestCaseService.buildUserInfo(apiTestCases, request.isSelectEnvironment());
        return apiTestCases;
    }
    public List<String> getExecResultByReviewId(String reviewId) {