From 8f43deaf41af42d52cd0320a585b88dcbe6f195a Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 25 May 2021 19:01:57 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=B5=8B=E8=AF=95=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B=E6=A8=A1=E5=9D=97=E6=A0=91=E5=8A=A0=E8=BD=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/service/ApiModuleService.java         |  7 +-
 .../mapper/ext/ExtApiDefinitionMapper.java    |  4 +-
 .../mapper/ext/ExtApiDefinitionMapper.xml     | 97 ++++++++++---------
 3 files changed, 57 insertions(+), 51 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiModuleService.java b/backend/src/main/java/io/metersphere/api/service/ApiModuleService.java
index 09e88479e8..a227616dc8 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiModuleService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiModuleService.java
@@ -93,16 +93,11 @@ public class ApiModuleService extends NodeTreeService<ApiModuleDTO> {
             moduleIds = this.nodeList(apiModules, node.getId(), moduleIds);
             moduleIds.add(node.getId());
             request.setModuleIds(moduleIds);
-            int num = this.getCaseNum(request);
-            node.setCaseNum(num);
+            node.setCaseNum(extApiDefinitionMapper.moduleCount(request));
         });
         return getNodeTrees(apiModules);
     }
 
-    private int getCaseNum(ApiDefinitionRequest request) {
-        return extApiDefinitionMapper.list(request).size();
-    }
-
     public static List<String> nodeList(List<ApiModuleDTO> apiNodes, String pid, List<String> list) {
         for (ApiModuleDTO node : apiNodes) {
             //遍历出父id等于参数的id，add进子节点集合
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.java
index 37f919f171..bc48afd234 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.java
@@ -17,6 +17,8 @@ public interface ExtApiDefinitionMapper {
 
     List<ApiDefinitionResult> list(@Param("request") ApiDefinitionRequest request);
 
+    int moduleCount(@Param("request") ApiDefinitionRequest request);
+
     //List<ApiComputeResult> selectByIds(@Param("ids") List<String> ids);
 
     List<ApiComputeResult> selectByIds(@Param("ids") List<String> ids, @Param("projectId") String projectId);
@@ -46,4 +48,4 @@ public interface ExtApiDefinitionMapper {
     List<ApiDefinition> selectEffectiveIdByProjectId(String projectId);
 
     List<ApiDefinitionResult> listByIds(@Param("ids") List<String> ids);
-}
\ No newline at end of file
+}
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
index 76f2f11a2a..bdda804945 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
@@ -487,6 +487,40 @@
         WHERE project_id = #{0} AND status != 'Trash' AND protocol = 'HTTP'
     </select>
 
+    <select id="moduleCount" resultType="java.lang.Integer">
+        select count(id) from api_definition
+        <include refid="queryWhereCondition"/>
+    </select>
+
+    <sql id="filter">
+        <if test="request.filters != null and request.filters.size() > 0">
+            <foreach collection="request.filters.entrySet()" index="key" item="values">
+                <if test="values != null and values.size() > 0">
+                    <choose>
+                        <when test="key=='status'">
+                            and api_definition.status in
+                            <foreach collection="values" item="value" separator="," open="(" close=")">
+                                #{value}
+                            </foreach>
+                        </when>
+                        <when test="key=='method'">
+                            and api_definition.method in
+                            <foreach collection="values" item="value" separator="," open="(" close=")">
+                                #{value}
+                            </foreach>
+                        </when>
+                        <when test="key=='user_id'">
+                            and api_definition.user_id in
+                            <foreach collection="values" item="value" separator="," open="(" close=")">
+                                #{value}
+                            </foreach>
+                        </when>
+                    </choose>
+                </if>
+            </foreach>
+        </if>
+    </sql>
+
     <sql id="queryWhereCondition">
         <where>
             <if test="request.combine != null">
@@ -504,12 +538,6 @@
             <if test="request.protocol != null">
                 AND api_definition.protocol = #{request.protocol}
             </if>
-            <if test="request.workspaceId != null">
-                AND project.workspace_id = #{request.workspaceId}
-            </if>
-            <if test="request.projectId != null">
-                AND project.id = #{request.projectId}
-            </if>
             <if test="request.id != null">
                 AND api_definition.id = #{request.id}
             </if>
@@ -522,41 +550,24 @@
             <if test="request.moduleId != null">
                 AND api_definition.module_id = #{request.moduleId}
             </if>
-            <if test="request.projectId != null">
-                AND api_definition.project_id = #{request.projectId}
-            </if>
-            <if test="request.moduleIds != null and request.moduleIds.size() > 0">
-                AND api_definition.module_id in
-                <foreach collection="request.moduleIds" item="nodeId" separator="," open="(" close=")">
-                    #{nodeId}
-                </foreach>
-            </if>
-            <if test="request.filters != null and request.filters.size() > 0">
-                <foreach collection="request.filters.entrySet()" index="key" item="values">
-                    <if test="values != null and values.size() > 0">
-                        <choose>
-                            <when test="key=='status'">
-                                and api_definition.status in
-                                <foreach collection="values" item="value" separator="," open="(" close=")">
-                                    #{value}
-                                </foreach>
-                            </when>
-                            <when test="key=='method'">
-                                and api_definition.method in
-                                <foreach collection="values" item="value" separator="," open="(" close=")">
-                                    #{value}
-                                </foreach>
-                            </when>
-                            <when test="key=='user_id'">
-                                and api_definition.user_id in
-                                <foreach collection="values" item="value" separator="," open="(" close=")">
-                                    #{value}
-                                </foreach>
-                            </when>
-                        </choose>
-                    </if>
-                </foreach>
-            </if>
+            <choose>
+                <when test="request.moduleIds != null and request.moduleIds.size() > 0">
+                    AND api_definition.module_id in
+                    <foreach collection="request.moduleIds" item="nodeId" separator="," open="(" close=")">
+                        #{nodeId}
+                    </foreach>
+                </when>
+                <when test="request.projectId != null">
+                    AND api_definition.project_id = #{request.projectId}
+                </when>
+                <when test="request.projectId != null">
+                    AND project.id = #{request.projectId}
+                </when>
+                <when test="request.workspaceId != null">
+                    AND project.workspace_id = #{request.workspaceId}
+                </when>
+            </choose>
+            <include refid="filter"/>
             <if test="request.apiCaseCoverage == 'uncoverage' ">
                 and api_definition.id not in
                 (SELECT api_definition_id FROM api_test_case)
@@ -565,8 +576,6 @@
                 and api_definition.id in
                 (SELECT api_definition_id FROM api_test_case)
             </if>
-
-
         </where>
     </sql>
-</mapper>
\ No newline at end of file
+</mapper>