From 439cf3b89bfde37af5a78635008a38b1381b92de Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 1 Dec 2020 15:00:30 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):?=
 =?UTF-8?q?=20=E7=94=A8=E4=BE=8B=E8=AF=84=E5=AE=A1=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ext/ExtTestPlanTestCaseMapper.java |  7 --
 .../mapper/ext/ExtTestPlanTestCaseMapper.xml  |  7 --
 .../mapper/ext/ExtTestReviewCaseMapper.java   |  7 ++
 .../mapper/ext/ExtTestReviewCaseMapper.xml    | 14 +++-
 .../service/CheckOwnerService.java            |  4 ++
 .../io/metersphere/service/FileService.java   |  2 +-
 .../TestReviewTestCaseController.java         | 15 ++++-
 .../service/TestReviewTestCaseService.java    |  9 +++
 .../view/comonents/TestPlanTestCaseEdit.vue   |  8 +--
 .../components/TestReviewTestCaseEdit.vue     | 65 +++++++++----------
 frontend/src/business/components/xpack        |  2 +-
 11 files changed, 84 insertions(+), 56 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.java
index 0d5932d03..a095f8162 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.java
@@ -40,11 +40,4 @@ public interface ExtTestPlanTestCaseMapper {
 
     TestPlanCaseDTO get(String testPlanTestCaseId);
 
-    /**
-     * 获取测试计划下的 TestPlanTestCaseID 和 TestCaseName
-     * @param request planId 不能为空
-     * @return List<TestPlanCaseDTO>
-     */
-    List<TestPlanCaseDTO> getTestPlanTestCaseList(@Param("request") QueryTestPlanCaseRequest request);
-
 }
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
index aaf36a69b..6bfdd21c0 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
@@ -214,13 +214,6 @@
         </if>
     </select>
 
-    <select id="getTestPlanTestCaseList" resultType="io.metersphere.track.dto.TestPlanCaseDTO">
-        select test_plan_test_case.id as id, test_case.name
-        from test_plan_test_case
-        inner join test_case on test_plan_test_case.case_id = test_case.id
-        where test_plan_test_case.plan_id = #{request.planId}
-    </select>
-
     <select id="listTestCaseByProjectIds" resultType="io.metersphere.track.dto.TestPlanCaseDTO">
         select distinct * from test_plan_test_case, test_case
         where test_plan_test_case.case_id = test_case.id
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestReviewCaseMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestReviewCaseMapper.java
index 1cfd37615..aee48a0b9 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestReviewCaseMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestReviewCaseMapper.java
@@ -19,4 +19,11 @@ public interface ExtTestReviewCaseMapper {
      * @return List<TestReviewCaseDTO>
      */
     List<TestReviewCaseDTO> listTestCaseByProjectIds(@Param("ids") List<String> ids);
+
+    /**
+     * 获取 TestReviewTestCase 详细信息
+     * @param id TestReviewTestCase id
+     * @return TestReviewTestCase 详细信息
+     */
+    TestReviewCaseDTO get(@Param("id") String id);
 }
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestReviewCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestReviewCaseMapper.xml
index ed50f42be..f680343e9 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestReviewCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestReviewCaseMapper.xml
@@ -97,7 +97,10 @@
     </sql>
 
     <select id="list" resultType="io.metersphere.track.dto.TestReviewCaseDTO">
-        select test_case.remark, test_case_review_test_case.*, test_case.*, test_case_node.name as model, project.name as projectName
+        select test_case_review_test_case.id as id, test_case.id as caseId, test_case.name, test_case.priority,
+        test_case.type, test_case.node_path, test_case.method, test_case.num, test_case_review_test_case.reviewer,
+        test_case.review_status, test_case_review_test_case.update_time, test_case_node.name as model,
+        project.name as projectName, test_case_review_test_case.review_id as reviewId
         from test_case_review_test_case
         inner join test_case on test_case_review_test_case.case_id = test_case.id
         left join test_case_node on test_case_node.id=test_case.node_id
@@ -181,6 +184,15 @@
         </if>
     </select>
 
+    <select id="get" resultType="io.metersphere.track.dto.TestReviewCaseDTO">
+        select test_case.remark, test_case_review_test_case.*, test_case.*, test_case_node.name as model, project.name as projectName
+        from test_case_review_test_case
+        inner join test_case on test_case_review_test_case.case_id = test_case.id
+        left join test_case_node on test_case_node.id=test_case.node_id
+        inner join project on project.id = test_case.project_id
+        where test_case_review_test_case.id = #{id}
+    </select>
+
     <select id="getStatusByReviewId" resultType="java.lang.String">
         select review_status
         from test_case
diff --git a/backend/src/main/java/io/metersphere/service/CheckOwnerService.java b/backend/src/main/java/io/metersphere/service/CheckOwnerService.java
index 0977f3dc2..1ef7cffbd 100644
--- a/backend/src/main/java/io/metersphere/service/CheckOwnerService.java
+++ b/backend/src/main/java/io/metersphere/service/CheckOwnerService.java
@@ -61,6 +61,10 @@ public class CheckOwnerService {
     }
 
     public void checkPerformanceTestOwner(String testId) {
+        // 关联为其他时
+        if (StringUtils.equals("other", testId)) {
+            return;
+        }
         String workspaceId = SessionUtils.getCurrentWorkspaceId();
         QueryTestPlanRequest request = new QueryTestPlanRequest();
         request.setWorkspaceId(workspaceId);
diff --git a/backend/src/main/java/io/metersphere/service/FileService.java b/backend/src/main/java/io/metersphere/service/FileService.java
index e87980ed7..37c10e704 100644
--- a/backend/src/main/java/io/metersphere/service/FileService.java
+++ b/backend/src/main/java/io/metersphere/service/FileService.java
@@ -42,7 +42,7 @@ public class FileService {
         final List<LoadTestFile> loadTestFiles = loadTestFileMapper.selectByExample(loadTestFileExample);
 
         if (CollectionUtils.isEmpty(loadTestFiles)) {
-            return null;
+            return new ArrayList<>();
         }
         List<String> fileIds = loadTestFiles.stream().map(LoadTestFile::getFileId).collect(Collectors.toList());
         FileMetadataExample example = new FileMetadataExample();
diff --git a/backend/src/main/java/io/metersphere/track/controller/TestReviewTestCaseController.java b/backend/src/main/java/io/metersphere/track/controller/TestReviewTestCaseController.java
index 4a25b740a..8d125d552 100644
--- a/backend/src/main/java/io/metersphere/track/controller/TestReviewTestCaseController.java
+++ b/backend/src/main/java/io/metersphere/track/controller/TestReviewTestCaseController.java
@@ -44,7 +44,7 @@ public class TestReviewTestCaseController {
     }
 
     @PostMapping("/list/all")
-    public List<TestReviewCaseDTO> getTestPlanCases(@RequestBody QueryCaseReviewRequest request) {
+    public List<TestReviewCaseDTO> getTestReviewCases(@RequestBody QueryCaseReviewRequest request) {
         return testReviewTestCaseService.list(request);
     }
 
@@ -53,4 +53,17 @@ public class TestReviewTestCaseController {
     public void editTestCase(@RequestBody TestCaseReviewTestCase testCaseReviewTestCase) {
         testReviewTestCaseService.editTestCase(testCaseReviewTestCase);
     }
+
+    @GetMapping("/get/{reviewId}")
+    @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER, RoleConstants.TEST_VIEWER}, logical = Logical.OR)
+    public TestReviewCaseDTO get(@PathVariable String reviewId) {
+        return testReviewTestCaseService.get(reviewId);
+    }
+
+    @PostMapping("/list/ids")
+    @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER, RoleConstants.TEST_VIEWER}, logical = Logical.OR)
+    public List<TestReviewCaseDTO> getTestReviewCaseList(@RequestBody QueryCaseReviewRequest request) {
+        return testReviewTestCaseService.getTestCaseReviewDTOList(request);
+    }
+
 }
diff --git a/backend/src/main/java/io/metersphere/track/service/TestReviewTestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestReviewTestCaseService.java
index 9ba0d15ba..21f63600f 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestReviewTestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestReviewTestCaseService.java
@@ -128,4 +128,13 @@ public class TestReviewTestCaseService {
         testCase.setReviewStatus(testCaseReviewTestCase.getStatus());
         testCaseMapper.updateByPrimaryKeySelective(testCase);
     }
+
+    public List<TestReviewCaseDTO> getTestCaseReviewDTOList(QueryCaseReviewRequest request) {
+        request.setOrders(ServiceUtils.getDefaultOrder(request.getOrders()));
+        return extTestReviewCaseMapper.list(request);
+    }
+
+    public TestReviewCaseDTO get(String reviewId) {
+        return extTestReviewCaseMapper.get(reviewId);
+    }
 }
diff --git a/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue b/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue
index 70f36abe3..b10289361 100644
--- a/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue
@@ -472,6 +472,7 @@ export default {
       this.getTestCase(this.index);
     },
     getTestCase(index) {
+      this.testCase = {};
       let testCase = this.testCases[index];
       // id 为 TestPlanTestCase 的 id
       this.result = this.$get('/test/plan/case/get/' + testCase.id, response => {
@@ -495,11 +496,10 @@ export default {
         this.testCase = item;
         this.getRelatedTest();
         this.initTest();
+        this.getIssues(item.caseId);
+        this.stepResultChange();
+        this.getFileMetaData(item);
       })
-
-      this.getIssues(testCase.caseId);
-      this.stepResultChange();
-      this.getFileMetaData(testCase);
     },
     getFileMetaData(testCase) {
       this.tableData = [];
diff --git a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue
index 3a55a66aa..2760c085f 100644
--- a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue
+++ b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue
@@ -102,10 +102,11 @@
                     <el-col class="test-detail" :span="20" :offset="1">
                       <el-tabs v-model="activeTab" type="border-card">
                         <el-tab-pane name="detail" :label="$t('test_track.plan_view.test_detail')">
-                          <api-test-detail :is-read-only="true" v-if="testCase.type === 'api'" @runTest="testRun"
+                          <api-test-detail :is-read-only="true" v-if="testCase.type === 'api'"
                                            :id="testCase.testId" ref="apiTestDetail"/>
-                          <performance-test-detail :is-read-only="true" v-if="testCase.type === 'performance'"
-                                                   @runTest="testRun" :id="testCase.testId"
+                          <performance-test-detail v-if="testCase.type === 'performance'"
+                                                   :is-read-only="true"
+                                                   :id="testCase.testId"
                                                    ref="performanceTestDetail"/>
                         </el-tab-pane>
                       </el-tabs>
@@ -211,7 +212,6 @@
                         <test-case-attachment :table-data="tableData"
                                               :read-only="false"
                                               :is-delete="false"
-                                              @handleDelete="handleDelete"
                         />
                       </div>
                     </el-col>
@@ -338,20 +338,26 @@ export default {
       this.getTestCase(this.index);
     },
     getTestCase(index) {
+      this.testCase = {};
       let testCase = this.testCases[index];
-      let item = {};
-      Object.assign(item, testCase);
-      item.steps = JSON.parse(item.steps);
-      item.steptResults = [];
-      for (let i = 0; i < item.steps.length; i++) {
-        item.steps[i].actualResult = '';
-        item.steps[i].executeResult = '';
-        item.steptResults.push(item.steps[i]);
-      }
-      this.testCase = item;
-      this.getComments(item);
-      this.initTest();
-      this.getFileMetaData(testCase);
+      this.result = this.$get("/test/review/case/get/" + testCase.id, response => {
+        let item = {};
+        let data = response.data;
+        Object.assign(item, data);
+        item.steps = JSON.parse(item.steps);
+        item.steptResults = [];
+        for (let i = 0; i < item.steps.length; i++) {
+          item.steps[i].actualResult = '';
+          item.steps[i].executeResult = '';
+          item.steptResults.push(item.steps[i]);
+        }
+        this.testCase = item;
+        this.getRelatedTest();
+        this.getComments(item);
+        this.initTest();
+        this.getFileMetaData(data);
+      })
+
     },
     getFileMetaData(testCase) {
       this.tableData = [];
@@ -375,21 +381,16 @@ export default {
     },
     initTest() {
       this.$nextTick(() => {
-        if (this.testCase.method === 'auto') {
-          if (this.$refs.apiTestDetail && this.testCase.type === 'api') {
-            this.$refs.apiTestDetail.init();
-          } else if (this.testCase.type === 'performance') {
-            this.$refs.performanceTestDetail.init();
+        if (this.testCase.testId && this.testCase.testId !== 'other') {
+          if (this.testCase.method === 'auto') {
+            if (this.$refs.apiTestDetail && this.testCase.type === 'api') {
+              this.$refs.apiTestDetail.init();
+            } else if (this.testCase.type === 'performance') {
+              this.$refs.performanceTestDetail.init();
+            }
           }
         }
       });
-    },
-    testRun(reportId) {
-      this.testCase.reportId = reportId;
-      this.saveReport(reportId);
-    },
-    saveReport(reportId) {
-
     },
     getComments(testCase) {
       let id = '';
@@ -403,13 +404,12 @@ export default {
       })
     },
     initData(testCase) {
-      this.result = this.$post('/test/review/case/list/all', this.searchParam, response => {
+      this.result = this.$post('/test/review/case/list/ids', this.searchParam, response => {
         this.testCases = response.data;
         for (let i = 0; i < this.testCases.length; i++) {
           if (this.testCases[i].id === testCase.id) {
             this.index = i;
             this.getTestCase(i);
-            this.getRelatedTest();
           }
         }
       });
@@ -439,9 +439,6 @@ export default {
         }).length > 0;
       }
     },
-    handleDelete() {
-
-    }
   }
 }
 </script>
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index a22a3005d..8a972a198 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit a22a3005d9bd254793fcf634d72539cbdf31be3a
+Subproject commit 8a972a198775b3783ed6e4cef27197e53d1ebdc8
-- 
GitLab