From 292c3abe6120519ee3b6491718c2c1968b1e5344 Mon Sep 17 00:00:00 2001
From: AgAngle <1323481023@qq.com>
Date: Mon, 27 May 2024 11:36:01 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8=E7=9A=84=E5=9C=BA=E6=99=AFcsv=E4=B8=8D?=
 =?UTF-8?q?=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1041213 --user=陈建星 【场景】-场景引用有CSV参数的场景作为步骤，执行时，引用场景步骤内的CSV没有循环取值 https://www.tapd.cn/55049933/s/1521182
---
 .../api/mapper/ExtApiScenarioStepMapper.java  |  2 +-
 .../api/mapper/ExtApiScenarioStepMapper.xml   |  7 +++--
 .../service/scenario/ApiScenarioService.java  | 30 +++++++++++++------
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioStepMapper.java b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioStepMapper.java
index b3471c6724..ef0129dc55 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioStepMapper.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioStepMapper.java
@@ -15,7 +15,7 @@ public interface ExtApiScenarioStepMapper {
 
     List<ApiScenarioStepDTO> getStepDTOByScenarioIds(@Param("scenarioIds") List<String> scenarioIds);
 
-    List<ApiScenarioCsvStep> getCsvStepByScenarioId(@Param("scenarioId") String scenarioId);
+    List<ApiScenarioCsvStep> getCsvStepByScenarioIds(@Param("scenarioIds") List<String> scenarioId);
 
     /**
      * 查询有步骤详情的请求类型的步骤
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioStepMapper.xml b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioStepMapper.xml
index 7916b2dd04..4e0edf75e9 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioStepMapper.xml
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioStepMapper.xml
@@ -13,10 +13,13 @@
             #{scenarioId}
         </foreach>
     </select>
-    <select id="getCsvStepByScenarioId" resultType="io.metersphere.api.domain.ApiScenarioCsvStep">
+    <select id="getCsvStepByScenarioIds" resultType="io.metersphere.api.domain.ApiScenarioCsvStep">
         select
         <include refid="io.metersphere.api.mapper.ApiScenarioCsvStepMapper.Base_Column_List"/>
-        from api_scenario_csv_step where scenario_id = #{scenarioId}
+        from api_scenario_csv_step where scenario_id in
+        <foreach collection="scenarioIds" item="scenarioId" open="(" separator="," close=")">
+            #{scenarioId}
+        </foreach>
     </select>
     <select id="getHasBlobRequestStepIds" resultType="java.lang.String">
         select id
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 3f83c8fde4..652942d242 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
@@ -2224,15 +2224,8 @@ public class ApiScenarioService extends MoveNodeService {
                 .distinct() // 这里可能存在多次引用相同场景，步骤可能会重复，去重
                 .collect(Collectors.toList());
 
-        //获取所有步骤的csv的关联关系
-        List<ApiScenarioCsvStep> csvSteps = extApiScenarioStepMapper.getCsvStepByScenarioId(scenarioId);
-        // 构造 map，key 为步骤ID，value 为csv文件ID列表
-        Map<String, List<String>> stepsCsvMap = csvSteps.stream()
-                .collect(Collectors.groupingBy(ApiScenarioCsvStep::getStepId, Collectors.mapping(ApiScenarioCsvStep::getFileId, Collectors.toList())));
-        //将stepsCsvMap根据步骤id放入到allSteps中
-        if (CollectionUtils.isNotEmpty(allSteps)) {
-            allSteps.forEach(step -> step.setCsvIds(stepsCsvMap.get(step.getId())));
-        }
+        // 设置步骤的 csvIds
+        setStepCsvIds(scenarioId, allSteps);
 
         // 构造 map，key 为场景ID，value 为步骤列表
         Map<String, List<ApiScenarioStepDTO>> scenarioStepMap = allSteps.stream()
@@ -2265,6 +2258,25 @@ public class ApiScenarioService extends MoveNodeService {
         return apiScenarioDetail;
     }
 
+    private void setStepCsvIds(String scenarioId, List<ApiScenarioStepDTO> allSteps) {
+        List<String> refScenarioIds = allSteps.stream()
+                .filter(step -> isRefOrPartialScenario(step))
+                .map(ApiScenarioStepCommonDTO::getResourceId)
+                .collect(Collectors.toList());
+        refScenarioIds.add(scenarioId);
+
+        //获取所有步骤的csv的关联关系
+        List<ApiScenarioCsvStep> csvSteps = extApiScenarioStepMapper.getCsvStepByScenarioIds(refScenarioIds);
+        // 构造 map，key 为步骤ID，value 为csv文件ID列表
+        Map<String, List<String>> stepsCsvMap = csvSteps.stream()
+                .collect(Collectors.groupingBy(ApiScenarioCsvStep::getStepId, Collectors.mapping(ApiScenarioCsvStep::getFileId, Collectors.toList())));
+
+        //将stepsCsvMap根据步骤id放入到allSteps中
+        if (CollectionUtils.isNotEmpty(allSteps)) {
+            allSteps.forEach(step -> step.setCsvIds(stepsCsvMap.get(step.getId())));
+        }
+    }
+
     private List<CsvVariable> getCsvVariables(String scenarioId) {
         ApiScenarioCsvExample example = new ApiScenarioCsvExample();
         example.createCriteria().andScenarioIdEqualTo(scenarioId);