From 9b53716bac7ceb9cd5019f071d0871eee8d0d8ce Mon Sep 17 00:00:00 2001
From: Jianguo-Genius <herman.song.yang@gmail.com>
Date: Fri, 18 Oct 2024 15:57:10 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20=E5=9C=BA=E6=99=AF=E5=AF=BC=E5=87=BA=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/dto/scenario/ApiScenarioDetail.java   |  2 ++
 .../api/mapper/ExtApiTestCaseMapper.java      |  2 ++
 .../api/mapper/ExtApiTestCaseMapper.xml       | 11 +++++++++
 .../ApiScenarioDataTransferService.java       |  4 ++--
 .../service/scenario/ApiScenarioService.java  | 24 ++++++++++++++-----
 .../api/utils/ApiScenarioUtils.java           | 10 +++++++-
 6 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/scenario/ApiScenarioDetail.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/scenario/ApiScenarioDetail.java
index 0f3201c684..3dc34805c7 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/dto/scenario/ApiScenarioDetail.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/dto/scenario/ApiScenarioDetail.java
@@ -10,6 +10,8 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class ApiScenarioDetail extends ApiScenario {
+    @Schema(description = "模块路径")
+    private String modulePath;
     @Schema(description = "场景的通用配置")
     private ScenarioConfig scenarioConfig = new ScenarioConfig();
     @Schema(description = "步骤")
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 40007825e2..93d86a7693 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
@@ -127,4 +127,6 @@ public interface ExtApiTestCaseMapper {
     void clearApiChange(@Param("ids")  List<String> ids);
 
     List<ApiTestCaseWithBlob> selectAllDetailByApiIds(@Param("apiIds") List<String> apiIds);
+
+    List<ApiTestCaseWithBlob> selectAllDetailByIds(@Param("ids") List<String> apiIds);
 }
\ No newline at end of file
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 9b17fbd557..20698c3379 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
@@ -980,6 +980,17 @@
             #{id}
         </foreach>
     </select>
+
+    <select id="selectAllDetailByIds" resultMap="ApiTestCaseDetailMap">
+        SELECT apiTestCase.*,apiTestCaseBlob.request
+        FROM api_test_case apiTestCase
+        INNER JOIN api_test_case_blob apiTestCaseBlob ON apiTestCase.id = apiTestCaseBlob.id
+        WHERE apiTestCase.id IN
+        <foreach collection="ids" item="id" separator="," open="(" close=")">
+            #{id}
+        </foreach>
+    </select>
+
     <select id="getNameInfo" resultType="io.metersphere.api.domain.ApiTestCase">
         SELECT id,name
         FROM api_test_case
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/service/ApiScenarioDataTransferService.java b/backend/services/api-test/src/main/java/io/metersphere/api/service/ApiScenarioDataTransferService.java
index 869a6f85b9..202aa8491a 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/service/ApiScenarioDataTransferService.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/service/ApiScenarioDataTransferService.java
@@ -626,7 +626,7 @@ public class ApiScenarioDataTransferService {
 
     private ApiScenarioExportResponse genMetersphereExportResponse(ApiScenarioBatchExportRequest request, Map<String, String> moduleMap, String exportType, String userId) {
         Project project = projectMapper.selectByPrimaryKey(request.getProjectId());
-        MetersphereApiScenarioExportResponse response = apiScenarioService.selectAndSortScenarioDetailWithIds(request.getSelectIds());
+        MetersphereApiScenarioExportResponse response = apiScenarioService.selectAndSortScenarioDetailWithIds(request.getSelectIds(), moduleMap);
         response.setProjectId(project.getId());
         response.setOrganizationId(project.getOrganizationId());
 
@@ -649,7 +649,7 @@ public class ApiScenarioDataTransferService {
             });
             List<ApiTestCaseWithBlob> apiTestCaseWithBlobs = null;
             if (CollectionUtils.isNotEmpty(apiCaseIdList)) {
-                apiTestCaseWithBlobs = extApiTestCaseMapper.selectAllDetailByApiIds(apiCaseIdList);
+                apiTestCaseWithBlobs = extApiTestCaseMapper.selectAllDetailByIds(apiCaseIdList);
                 if (CollectionUtils.isNotEmpty(apiCaseIdList)) {
                     apiTestCaseWithBlobs.forEach(item -> {
                         if (!apiDefinitionIdList.contains(item.getApiDefinitionId())) {
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioService.java b/backend/services/api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioService.java
index dbb4ba17ea..a60e371567 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioService.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioService.java
@@ -1446,6 +1446,13 @@ public class ApiScenarioService extends MoveNodeService {
                 .collect(Collectors.toMap(ApiScenarioStepBlob::getId, blob -> new String(blob.getContent())));
     }
 
+    public Map<String, String> getStepDetailMap(List<? extends ApiScenarioStepCommonDTO> steps) {
+        List<String> stepIdList = steps.stream()
+                .map(ApiScenarioStepCommonDTO::getId).distinct()
+                .toList();
+        return getStepBlobByIds(stepIdList).stream()
+                .collect(Collectors.toMap(ApiScenarioStepBlob::getId, blob -> new String(blob.getContent())));
+    }
     public List<ApiScenarioStepBlob> getStepBlobByIds(List<String> stepIds) {
         if (CollectionUtils.isEmpty(stepIds)) {
             return Collections.emptyList();
@@ -2467,7 +2474,7 @@ public class ApiScenarioService extends MoveNodeService {
         return apiStepResourceInfo;
     }
 
-    public MetersphereApiScenarioExportResponse selectAndSortScenarioDetailWithIds(@Valid List<@NotBlank(message = "{id must not be blank}") String> scenarioIds) {
+    public MetersphereApiScenarioExportResponse selectAndSortScenarioDetailWithIds(@Valid List<@NotBlank(message = "{id must not be blank}") String> scenarioIds, Map<String, String> moduleMap) {
         MetersphereApiScenarioExportResponse response = new MetersphereApiScenarioExportResponse();
 
         // 数据准备
@@ -2481,13 +2488,18 @@ public class ApiScenarioService extends MoveNodeService {
                     .stream()
                     .distinct() // 这里可能存在多次引用相同场景，步骤可能会重复，去重
                     .collect(Collectors.toList());
+            response.setScenarioStepList(allSteps);
 
             //查询引用的场景ID
             List<String> stepScenarioIds = allSteps.stream().filter(step -> isScenarioStep(step.getStepType())).map(ApiScenarioStepDTO::getResourceId).toList();
 
             // 查询所有场景的blob
             List<String> allScenarioIds = new ArrayList<>(scenarioIds);
-            allScenarioIds.addAll(stepScenarioIds);
+            stepScenarioIds.forEach(stepScenarioId -> {
+                if (!allScenarioIds.contains(stepScenarioId)) {
+                    allScenarioIds.add(stepScenarioId);
+                }
+            });
             ApiScenarioBlobExample scenarioBlobExample = new ApiScenarioBlobExample();
             scenarioBlobExample.createCriteria().andIdIn(allScenarioIds);
             Map<String, ApiScenarioBlob> scenarioBlobMap = apiScenarioBlobMapper.selectByExampleWithBLOBs(scenarioBlobExample).stream().collect(Collectors.toMap(ApiScenarioBlob::getId, Function.identity()));
@@ -2497,17 +2509,17 @@ public class ApiScenarioService extends MoveNodeService {
             response.setApiScenarioCsvList(apiScenarioCsvMapper.selectByExample(apiScenarioCsvExample));
 
             // 导出的场景
-            response.setExportScenarioList(ApiScenarioUtils.parseApiScenarioDetail(exportApiScenarios, scenarioBlobMap));
+            response.setExportScenarioList(ApiScenarioUtils.parseApiScenarioDetail(exportApiScenarios, scenarioBlobMap, moduleMap));
 
             //步骤引用的场景
             if (CollectionUtils.isNotEmpty(stepScenarioIds)) {
                 scenarioExample.clear();
                 scenarioExample.createCriteria().andIdIn(stepScenarioIds);
                 List<ApiScenario> otherScenarios = apiScenarioMapper.selectByExample(scenarioExample);
-                response.setExportScenarioList(ApiScenarioUtils.parseApiScenarioDetail(otherScenarios, scenarioBlobMap));
+                response.setRelatedScenarioList(ApiScenarioUtils.parseApiScenarioDetail(otherScenarios, scenarioBlobMap, moduleMap));
             }
-            
-            response.setScenarioStepBlobMap(getPartialRefStepDetailMap(allSteps));
+
+            response.setScenarioStepBlobMap(getStepDetailMap(allSteps));
         }
 
         return response;
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/utils/ApiScenarioUtils.java b/backend/services/api-test/src/main/java/io/metersphere/api/utils/ApiScenarioUtils.java
index 3f5eb1b714..77518ab439 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/utils/ApiScenarioUtils.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/utils/ApiScenarioUtils.java
@@ -4,19 +4,27 @@ import io.metersphere.api.domain.ApiScenario;
 import io.metersphere.api.domain.ApiScenarioBlob;
 import io.metersphere.api.dto.scenario.ApiScenarioDetail;
 import io.metersphere.api.dto.scenario.ScenarioConfig;
+import io.metersphere.sdk.constants.ModuleConstants;
 import io.metersphere.sdk.util.BeanUtils;
 import io.metersphere.sdk.util.JSON;
+import io.metersphere.sdk.util.Translator;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
 public class ApiScenarioUtils {
-    public static List<ApiScenarioDetail> parseApiScenarioDetail(List<ApiScenario> apiScenarios, Map<String, ApiScenarioBlob> scenarioBlobMap) {
+    public static List<ApiScenarioDetail> parseApiScenarioDetail(List<ApiScenario> apiScenarios, Map<String, ApiScenarioBlob> scenarioBlobMap, Map<String, String> moduleMap) {
         List<ApiScenarioDetail> returnList = new ArrayList<>();
         for (ApiScenario apiScenario : apiScenarios) {
             ApiScenarioDetail apiScenarioDetail = BeanUtils.copyBean(new ApiScenarioDetail(), apiScenario);
             apiScenarioDetail.setSteps(List.of());
+            if (moduleMap.containsKey(apiScenarioDetail.getModuleId())) {
+                apiScenarioDetail.setModulePath(moduleMap.get(apiScenarioDetail.getModuleId()));
+            } else {
+                apiScenarioDetail.setModuleId(ModuleConstants.DEFAULT_NODE_ID);
+                apiScenarioDetail.setModulePath(Translator.get("api_unplanned_scenario"));
+            }
             ApiScenarioBlob apiScenarioBlob = scenarioBlobMap.get(apiScenario.getId());
             if (apiScenarioBlob != null) {
                 apiScenarioDetail.setScenarioConfig(JSON.parseObject(new String(apiScenarioBlob.getConfig()), ScenarioConfig.class));