From eed41fab067b50ef129ab3e4507ca92bfe61b5a4 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 5 Mar 2021 16:17:18 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=9C=BA=E6=99=AF=E7=94=A8=E4=BE=8B=E6=97=B6?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=89=A7=E8=A1=8C=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/dto/automation/ApiScenarioDTO.java    |  5 +++
 .../api/service/ApiAutomationService.java     | 25 ++++++-----
 .../base/mapper/ext/ExtApiScenarioMapper.xml  |  1 +
 .../testcase/ApiCaseRelevanceRequest.java     | 11 +++++
 .../service/TestPlanScenarioCaseService.java  | 29 ++++++++-----
 .../comonents/api/RelevanceScenarioList.vue   | 41 ++++++++++++++++++-
 .../api/TestCaseScenarioRelevance.vue         | 20 ++++++---
 7 files changed, 105 insertions(+), 27 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/ApiScenarioDTO.java b/backend/src/main/java/io/metersphere/api/dto/automation/ApiScenarioDTO.java
index 358ca88ea3..b1f9e6e044 100644
--- a/backend/src/main/java/io/metersphere/api/dto/automation/ApiScenarioDTO.java
+++ b/backend/src/main/java/io/metersphere/api/dto/automation/ApiScenarioDTO.java
@@ -13,4 +13,9 @@ public class ApiScenarioDTO extends ApiScenarioWithBLOBs {
     private String projectName;
     private String userName;
     private List<String> tagNames;
+
+    /**
+     * 场景跨项目ID
+     */
+    private List<String> projectIds;
 }
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
index 88fc2242a2..5c99b63cd1 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
@@ -654,24 +654,29 @@ public class ApiAutomationService {
     }
 
     public void relevance(ApiCaseRelevanceRequest request) {
-        List<String> ids = request.getSelectIds();
-        if (CollectionUtils.isEmpty(ids)) {
+        Map<String, List<String>> mapping = request.getMapping();
+        Map<String, String> envMap = request.getEnvMap();
+        Set<String> set = mapping.keySet();
+        if (set.isEmpty()) {
             return;
         }
-        List<ApiScenario> apiScenarios = selectByIds(ids);
-        SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
-
-        ExtTestPlanScenarioCaseMapper batchMapper = sqlSession.getMapper(ExtTestPlanScenarioCaseMapper.class);
-        apiScenarios.forEach(scenario -> {
+        set.forEach(id -> {
+            Map<String, String> newEnvMap = new HashMap<>(16);
+            if (envMap != null && !envMap.isEmpty()) {
+                List<String> list = mapping.get(id);
+                list.forEach(l -> {
+                    newEnvMap.put(l, envMap.get(l));
+                });
+            }
             TestPlanApiScenario testPlanApiScenario = new TestPlanApiScenario();
             testPlanApiScenario.setId(UUID.randomUUID().toString());
-            testPlanApiScenario.setApiScenarioId(scenario.getId());
+            testPlanApiScenario.setApiScenarioId(id);
             testPlanApiScenario.setTestPlanId(request.getPlanId());
             testPlanApiScenario.setCreateTime(System.currentTimeMillis());
             testPlanApiScenario.setUpdateTime(System.currentTimeMillis());
-            batchMapper.insertIfNotExists(testPlanApiScenario);
+            testPlanApiScenario.setEnvironment(JSON.toJSONString(newEnvMap));
+            testPlanApiScenarioMapper.insert(testPlanApiScenario);
         });
-        sqlSession.flushStatements();
     }
 
     public List<ApiScenario> selectByIds(List<String> ids) {
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
index 59e9100554..139de4d8d5 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
@@ -134,6 +134,7 @@
     </sql>
     <select id="list" resultMap="BaseResultMap">
         select api_scenario.id, api_scenario.project_id, api_scenario.tags, api_scenario.user_id, api_scenario.num,
+               api_scenario.scenario_definition,
         api_scenario.api_scenario_module_id,api_scenario.module_path, api_scenario.name, api_scenario.level,
         api_scenario.status, api_scenario.principal, api_scenario.step_total, api_scenario.follow_people,
         api_scenario.last_result,api_scenario.pass_rate,api_scenario.report_id,
diff --git a/backend/src/main/java/io/metersphere/track/request/testcase/ApiCaseRelevanceRequest.java b/backend/src/main/java/io/metersphere/track/request/testcase/ApiCaseRelevanceRequest.java
index eb7f838fcc..e73396a2c3 100644
--- a/backend/src/main/java/io/metersphere/track/request/testcase/ApiCaseRelevanceRequest.java
+++ b/backend/src/main/java/io/metersphere/track/request/testcase/ApiCaseRelevanceRequest.java
@@ -5,6 +5,7 @@ import lombok.Setter;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 @Getter
 @Setter
@@ -25,4 +26,14 @@ public class ApiCaseRelevanceRequest {
      * 具体要关联的用例
      */
     private List<String> selectIds = new ArrayList<>();
+
+    /**
+     * 项目环境对应关系
+     */
+    private Map<String, String> envMap;
+
+    /**
+     * 用例的环境的对应关系
+     */
+    private Map<String, List<String>> mapping;
 }
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanScenarioCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanScenarioCaseService.java
index 3e8a534270..63c9d59467 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanScenarioCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanScenarioCaseService.java
@@ -1,14 +1,13 @@
 package io.metersphere.track.service;
 
-import io.metersphere.api.dto.DeleteAPIReportRequest;
+import com.alibaba.fastjson.JSON;
 import io.metersphere.api.dto.automation.ApiScenarioDTO;
 import io.metersphere.api.dto.automation.ApiScenarioRequest;
 import io.metersphere.api.dto.automation.RunScenarioRequest;
 import io.metersphere.api.dto.automation.TestPlanScenarioRequest;
+import io.metersphere.api.dto.definition.RunDefinitionRequest;
 import io.metersphere.api.service.ApiAutomationService;
 import io.metersphere.api.service.ApiScenarioReportService;
-import io.metersphere.base.domain.TestPlanApiCase;
-import io.metersphere.base.domain.TestPlanApiCaseExample;
 import io.metersphere.base.domain.TestPlanApiScenario;
 import io.metersphere.base.domain.TestPlanApiScenarioExample;
 import io.metersphere.base.mapper.TestPlanApiScenarioMapper;
@@ -20,7 +19,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
-
 import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -49,13 +47,24 @@ public class TestPlanScenarioCaseService {
     }
 
     public List<ApiScenarioDTO> relevanceList(ApiScenarioRequest request) {
-//        List<String> ids = apiAutomationService.selectIdsNotExistsInPlan(request.getProjectId(), request.getPlanId());
-//        if (CollectionUtils.isEmpty(ids)) {
-//            return new ArrayList<>();
-//        }
-//        request.setIds(ids);
         request.setNotInTestPlan(true);
-        return apiAutomationService.list(request);
+        List<ApiScenarioDTO> list = apiAutomationService.list(request);
+        list.forEach(data -> {
+            String definition = data.getScenarioDefinition();
+            RunDefinitionRequest d = JSON.parseObject(definition, RunDefinitionRequest.class);
+            Map<String, String> map = d.getEnvironmentMap();
+            List<String> idList = new ArrayList<>();
+            if (map != null) {
+                Set<String> set = d.getEnvironmentMap().keySet();
+                idList = new ArrayList<>(set);
+            } else {
+                if (org.apache.commons.lang3.StringUtils.isNotBlank(d.getEnvironmentId())) {
+                    idList.add(d.getEnvironmentId());
+                }
+            }
+            data.setProjectIds(idList);
+        });
+        return list;
     }
 
     public int delete(String id) {
diff --git a/frontend/src/business/components/track/plan/view/comonents/api/RelevanceScenarioList.vue b/frontend/src/business/components/track/plan/view/comonents/api/RelevanceScenarioList.vue
index 3f40e57480..a20cb5f123 100644
--- a/frontend/src/business/components/track/plan/view/comonents/api/RelevanceScenarioList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/api/RelevanceScenarioList.vue
@@ -2,6 +2,9 @@
   <div>
     <el-card class="table-card" v-loading="result.loading">
 
+      <env-popover :env-map="projectEnvMap" :project-ids="projectIds" @setProjectEnvMap="setProjectEnvMap"
+                   :project-list="projectList" ref="envPopover" class="env-popover"/>
+
       <el-table ref="scenarioTable" border :data="tableData" class="adjust-table" @select-all="handleSelectAll" @select="handleSelect">
         <el-table-column type="selection"/>
 
@@ -56,10 +59,12 @@
   import MsTestPlanList from "../../../../../api/automation/scenario/testplan/TestPlanList";
   import TestPlanScenarioListHeader from "./TestPlanScenarioListHeader";
   import {_handleSelect, _handleSelectAll} from "../../../../../../../common/js/tableUtils";
+  import EnvPopover from "@/business/components/api/automation/scenario/EnvPopover";
 
   export default {
     name: "RelevanceScenarioList",
     components: {
+      EnvPopover,
       TestPlanScenarioListHeader,
       MsTablePagination, MsTableMoreBtn, ShowMoreBtn, MsTableHeader, MsTag, MsApiReportDetail, MsTestPlanList},
     props: {
@@ -84,7 +89,10 @@
         total: 0,
         reportId: "",
         infoDb: false,
-        selectRows: new Set()
+        selectRows: new Set(),
+        projectEnvMap: new Map(),
+        projectList: [],
+        projectIds: new Set(),
       }
     },
     watch: {
@@ -95,8 +103,13 @@
         this.search();
       },
     },
+    created() {
+      this.getWsProjects();
+    },
     methods: {
       search() {
+        this.projectEnvMap.clear();
+        this.projectIds.clear();
         if (!this.projectId) {
           return;
         }
@@ -129,10 +142,31 @@
       },
       handleSelectAll(selection) {
         _handleSelectAll(this, selection, this.tableData, this.selectRows);
+        this.initProjectIds();
       },
       handleSelect(selection, row) {
         _handleSelect(this, selection, row, this.selectRows);
+        this.initProjectIds();
       },
+      setProjectEnvMap(projectEnvMap) {
+        this.projectEnvMap = projectEnvMap;
+      },
+      getWsProjects() {
+        this.$get("/project/listAll", res => {
+          this.projectList = res.data;
+        })
+      },
+      initProjectIds() {
+        this.projectIds.clear();
+        this.selectRows.forEach(row => {
+          row.projectIds.forEach(id => {
+            this.projectIds.add(id);
+          })
+        })
+      },
+      checkEnv() {
+        return this.$refs.envPopover.checkEnv();
+      }
     }
   }
 </script>
@@ -141,4 +175,9 @@
   /deep/ .el-drawer__header {
     margin-bottom: 0px;
   }
+
+  .env-popover {
+    float: right;
+    margin-top: 4px;
+  }
 </style>
diff --git a/frontend/src/business/components/track/plan/view/comonents/api/TestCaseScenarioRelevance.vue b/frontend/src/business/components/track/plan/view/comonents/api/TestCaseScenarioRelevance.vue
index c0bd9f7354..0791495606 100644
--- a/frontend/src/business/components/track/plan/view/comonents/api/TestCaseScenarioRelevance.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/api/TestCaseScenarioRelevance.vue
@@ -31,7 +31,7 @@
 
   import TestCaseRelevanceBase from "../base/TestCaseRelevanceBase";
   import MsApiModule from "../../../../../api/definition/components/module/ApiModule";
-  import {getCurrentProjectID} from "../../../../../../../common/js/utils";
+  import {getCurrentProjectID, strMapToObj} from "../../../../../../../common/js/utils";
   import ApiList from "../../../../../api/definition/components/list/ApiList";
   import ApiCaseSimpleList from "../../../../../api/definition/components/list/ApiCaseSimpleList";
   import MsApiScenarioList from "../../../../../api/automation/scenario/ApiScenarioList";
@@ -98,13 +98,21 @@
       },
 
       saveCaseRelevance() {
+        const sign = this.$refs.apiScenarioList.checkEnv();
+        if (!sign) {
+          return false;
+        }
         let param = {};
-        let url = '';
-        let selectIds = [];
-        url = '/api/automation/relevance';
-        selectIds = Array.from(this.$refs.apiScenarioList.selectRows).map(row => row.id);
+        let url = '/api/automation/relevance';
+        let rows = this.$refs.apiScenarioList.selectRows;
+        const envMap = this.$refs.apiScenarioList.projectEnvMap;
+        let map = new Map();
+        rows.forEach(row => {
+          map.set(row.id, row.projectIds);
+        })
         param.planId = this.planId;
-        param.selectIds = selectIds;
+        param.mapping = strMapToObj(map);
+        param.envMap = strMapToObj(envMap);
 
         this.result = this.$post(url, param, () => {
           this.$success(this.$t('commons.save_success'));