From 7c4e964e74116de77f8be446f4fae40e18cd6493 Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Sat, 12 Oct 2024 11:18:31 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E7=AE=A1=E7=90=86):?=
 =?UTF-8?q?=20=E5=9C=BA=E6=99=AF=E5=AF=BC=E5=85=A5=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A2=9E=E5=8A=A0config=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../definition/ApiTestCaseAssociateDTO.java   | 15 ++++
 .../api/mapper/ExtApiDefinitionMapper.xml     |  3 +
 .../api/mapper/ExtApiTestCaseMapper.java      |  6 ++
 .../api/mapper/ExtApiTestCaseMapper.xml       | 86 +++++++++++++++++--
 .../ApiScenarioSelectAssociateService.java    | 27 ++++--
 5 files changed, 123 insertions(+), 14 deletions(-)
 create mode 100644 backend/services/api-test/src/main/java/io/metersphere/api/dto/definition/ApiTestCaseAssociateDTO.java

diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/definition/ApiTestCaseAssociateDTO.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/definition/ApiTestCaseAssociateDTO.java
new file mode 100644
index 0000000000..dd55f1ac58
--- /dev/null
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/dto/definition/ApiTestCaseAssociateDTO.java
@@ -0,0 +1,15 @@
+package io.metersphere.api.dto.definition;
+
+import io.metersphere.api.domain.ApiTestCase;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class ApiTestCaseAssociateDTO extends ApiTestCase {
+
+    @Schema(description = "请求方法")
+    private String method;
+
+    @Schema(description = "协议")
+    private String protocol;
+}
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.xml b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.xml
index c0a8a85f0a..f0c622284a 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.xml
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.xml
@@ -688,6 +688,7 @@
         api_definition.num,
         api_definition.project_id,
         api_definition.version_id,
+        api_definition.protocol,
         api_definition.pos
         from api_definition
         where api_definition.deleted = false
@@ -709,6 +710,7 @@
         api_definition.num,
         api_definition.project_id,
         api_definition.version_id,
+        api_definition.protocol,
         api_definition.pos
         from api_definition
         where api_definition.deleted = false
@@ -733,6 +735,7 @@
         api_definition.num,
         api_definition.project_id,
         api_definition.version_id,
+        api_definition.protocol,
         api_definition.pos
         from api_definition
         where api_definition.deleted = false
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiTestCaseMapper.java b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiTestCaseMapper.java
index 0394f3a5a9..19b2dad415 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiTestCaseMapper.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiTestCaseMapper.java
@@ -111,6 +111,12 @@ public interface ExtApiTestCaseMapper {
 
     List<ApiTestCase> getListBySelectIds(@Param("projectId") String projectId, @Param("ids") List<String> ids, @Param("testPlanId") String testPlanId, @Param("protocols") List<String> protocols);
 
+    List<ApiTestCaseAssociateDTO>selectAllApiCaseWithAssociate(@Param("projectId") String projectId, @Param("protocols") List<String> protocols);
+
+    List<ApiTestCaseAssociateDTO> getListBySelectModulesWithAssociate(@Param("projectId") String projectId, @Param("moduleIds") List<String> moduleIds, @Param("protocols") List<String> protocols);
+
+    List<ApiTestCaseAssociateDTO> getListBySelectIdsWithAssociate(@Param("projectId") String projectId, @Param("ids") List<String> ids, @Param("protocols") List<String> protocols);
+
     List<ApiTestCase> getCaseListBySelectIds(@Param("isRepeat") boolean isRepeat, @Param("projectId") String projectId, @Param("ids") List<String> ids, @Param("testPlanId") String testPlanId, @Param("protocols") List<String> protocols);
 
     void setApiChangeByApiDefinitionId(@Param("apiDefinitionId") String apiDefinitionId);
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiTestCaseMapper.xml b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiTestCaseMapper.xml
index 48e3ce5af0..4d0f1b71c0 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiTestCaseMapper.xml
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiTestCaseMapper.xml
@@ -766,10 +766,6 @@
         api_test_case.id,
         api_test_case.create_user,
         api_test_case.environment_id,
-        api_test_case.name,
-        api_test_case.project_id,
-        api_test_case.num,
-        api_test_case.version_id,
         api_test_case.pos
         from api_test_case
         INNER JOIN api_definition ON api_test_case.api_definition_id = api_definition.id
@@ -795,10 +791,6 @@
         api_test_case.id,
         api_test_case.create_user,
         api_test_case.environment_id,
-        api_test_case.name,
-        api_test_case.project_id,
-        api_test_case.num,
-        api_test_case.version_id,
         api_test_case.pos
         from api_test_case
         inner join api_definition on api_definition.id = api_test_case.api_definition_id
@@ -822,6 +814,54 @@
     </select>
 
     <select id="getListBySelectIds" resultType="io.metersphere.api.domain.ApiTestCase">
+        select
+        api_test_case.id,
+        api_test_case.create_user,
+        api_test_case.environment_id,
+        api_test_case.pos
+        from api_test_case
+        inner join api_definition on api_definition.id = api_test_case.api_definition_id
+        where api_test_case.deleted = false
+        and api_test_case.project_id = #{projectId}
+        AND api_test_case.id in
+        <foreach collection="ids" item="id" separator="," open="(" close=")">
+            #{id}
+        </foreach>
+        <if test="protocols != null and protocols.size() > 0">
+            and api_definition.protocol in
+            <foreach collection="protocols" item="protocol" separator="," open="(" close=")">
+                #{protocol}
+            </foreach>
+        </if>
+    </select>
+
+    <select id="selectAllApiCaseWithAssociate" resultType="io.metersphere.api.dto.definition.ApiTestCaseAssociateDTO">
+        select
+        api_test_case.id,
+        api_test_case.create_user,
+        api_test_case.environment_id,
+        api_test_case.name,
+        api_test_case.project_id,
+        api_definition.method as method,
+        api_definition.protocol as protocol,
+        api_test_case.num,
+        api_test_case.version_id,
+        api_test_case.pos
+        from api_test_case
+        INNER JOIN api_definition ON api_test_case.api_definition_id = api_definition.id
+        where api_test_case.deleted = false
+        and api_test_case.project_id = #{projectId}
+        <if test="protocols != null and protocols.size() > 0">
+            and api_definition.protocol in
+            <foreach collection="protocols" item="protocol" separator="," open="(" close=")">
+                #{protocol}
+            </foreach>
+        </if>
+        order by api_test_case.pos asc
+    </select>
+
+
+    <select id="getListBySelectModulesWithAssociate" resultType="io.metersphere.api.dto.definition.ApiTestCaseAssociateDTO">
         select
         api_test_case.id,
         api_test_case.create_user,
@@ -830,6 +870,36 @@
         api_test_case.project_id,
         api_test_case.num,
         api_test_case.version_id,
+        api_definition.method as method,
+        api_definition.protocol as protocol,
+        api_test_case.pos
+        from api_test_case
+        inner join api_definition on api_definition.id = api_test_case.api_definition_id
+        where api_test_case.deleted = false
+        and api_test_case.project_id = #{projectId}
+        and api_definition.module_id in
+        <foreach collection="moduleIds" item="moduleId" open="(" separator="," close=")">
+            #{moduleId}
+        </foreach>
+        <if test="protocols != null and protocols.size() > 0">
+            and api_definition.protocol in
+            <foreach collection="protocols" item="protocol" separator="," open="(" close=")">
+                #{protocol}
+            </foreach>
+        </if>
+    </select>
+
+    <select id="getListBySelectIdsWithAssociate" resultType="io.metersphere.api.dto.definition.ApiTestCaseAssociateDTO">
+        select
+        api_test_case.id,
+        api_test_case.create_user,
+        api_test_case.environment_id,
+        api_test_case.name,
+        api_test_case.project_id,
+        api_test_case.num,
+        api_test_case.version_id,
+        api_definition.method as method,
+        api_definition.protocol as protocol,
         api_test_case.pos
         from api_test_case
         inner join api_definition on api_definition.id = api_test_case.api_definition_id
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioSelectAssociateService.java b/backend/services/api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioSelectAssociateService.java
index 17d75dfb78..0c5de298c6 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioSelectAssociateService.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioSelectAssociateService.java
@@ -5,6 +5,7 @@ import io.metersphere.api.domain.ApiDefinition;
 import io.metersphere.api.domain.ApiScenario;
 import io.metersphere.api.domain.ApiScenarioCsvStep;
 import io.metersphere.api.domain.ApiTestCase;
+import io.metersphere.api.dto.definition.ApiTestCaseAssociateDTO;
 import io.metersphere.api.dto.scenario.ApiScenarioSelectAssociateDTO;
 import io.metersphere.api.dto.scenario.ApiScenarioStepCommonDTO;
 import io.metersphere.api.dto.scenario.ApiScenarioStepDTO;
@@ -99,6 +100,13 @@ public class ApiScenarioSelectAssociateService {
     private static void getApiSteps(ApiScenarioSelectAssociateDTO request, List<ApiDefinition> apiDefinitionList, List<ApiScenarioStepDTO> steps) {
         apiDefinitionList.forEach(item -> {
             ApiScenarioStepDTO step = new ApiScenarioStepDTO();
+            LinkedHashMap<String, Object> config = new LinkedHashMap<>();
+            config.put("enable", true);
+            config.put("id", "");
+            config.put("method", item.getMethod());
+            config.put("name", "");
+            config.put("protocol", item.getProtocol());
+            step.setConfig(config);
             step.setStepType(ApiScenarioStepType.API.name());
             step.setName(item.getName());
             step.setResourceId(item.getId());
@@ -118,20 +126,20 @@ public class ApiScenarioSelectAssociateService {
         moduleMaps.remove(MODULE_ALL);
         if (selectAllModule) {
             // 选择了全部模块
-            List<ApiTestCase> apiTestCaseList = extApiTestCaseMapper.selectAllApiCase(true, request.getProjectId(), null, request.getProtocols());
+            List<ApiTestCaseAssociateDTO> apiTestCaseList = extApiTestCaseMapper.selectAllApiCaseWithAssociate(request.getProjectId(),  request.getProtocols());
             getCaseSteps(request, apiTestCaseList, steps);
         } else {
             AssociateCaseDTO dto = getCaseIds(moduleMaps);
-            List<ApiTestCase> apiTestCaseList = new ArrayList<>();
+            List<ApiTestCaseAssociateDTO> apiTestCaseList = new ArrayList<>();
             //获取全选的模块数据
             if (CollectionUtils.isNotEmpty(dto.getModuleIds())) {
-                apiTestCaseList = extApiTestCaseMapper.getListBySelectModules(true, request.getProjectId(), dto.getModuleIds(), null, request.getProtocols());
+                apiTestCaseList = extApiTestCaseMapper.getListBySelectModulesWithAssociate( request.getProjectId(), dto.getModuleIds(), request.getProtocols());
             }
 
             if (CollectionUtils.isNotEmpty(dto.getSelectIds())) {
                 CollectionUtils.removeAll(dto.getSelectIds(), apiTestCaseList.stream().map(ApiTestCase::getId).toList());
                 //获取选中的ids数据
-                List<ApiTestCase> selectIdList = extApiTestCaseMapper.getListBySelectIds(request.getProjectId(), dto.getSelectIds(), null, request.getProtocols());
+                List<ApiTestCaseAssociateDTO> selectIdList = extApiTestCaseMapper.getListBySelectIdsWithAssociate(request.getProjectId(), dto.getSelectIds(),  request.getProtocols());
                 apiTestCaseList.addAll(selectIdList);
             }
 
@@ -142,7 +150,7 @@ public class ApiScenarioSelectAssociateService {
             }
 
             if (CollectionUtils.isNotEmpty(apiTestCaseList)) {
-                List<ApiTestCase> list = apiTestCaseList.stream().sorted(Comparator.comparing(ApiTestCase::getPos)).toList();
+                List<ApiTestCaseAssociateDTO> list = apiTestCaseList.stream().sorted(Comparator.comparing(ApiTestCase::getPos)).toList();
                 getCaseSteps(request, list, steps);
             }
 
@@ -151,10 +159,17 @@ public class ApiScenarioSelectAssociateService {
         return steps;
     }
 
-    private static void getCaseSteps(ApiScenarioSelectAssociateDTO request, List<ApiTestCase> apiTestCaseList, List<ApiScenarioStepDTO> steps) {
+    private static void getCaseSteps(ApiScenarioSelectAssociateDTO request, List<ApiTestCaseAssociateDTO> apiTestCaseList, List<ApiScenarioStepDTO> steps) {
         apiTestCaseList.forEach(item -> {
             ApiScenarioStepDTO step = new ApiScenarioStepDTO();
             step.setStepType(ApiScenarioStepType.API_CASE.name());
+            LinkedHashMap<String, Object> config = new LinkedHashMap<>();
+            config.put("enable", true);
+            config.put("id", "");
+            config.put("method", item.getMethod());
+            config.put("name", "");
+            config.put("protocol", item.getProtocol());
+            step.setConfig(config);
             step.setName(item.getName());
             step.setResourceId(item.getId());
             step.setRefType(request.getRefType());