From a6c2e506ba62873b4f88bf8adf399cbddba993e6 Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Tue, 6 Sep 2022 16:16:17 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E5=AF=BC=E5=85=A5=E9=BB=98=E8=AE=A4=E7=94=9F?=
 =?UTF-8?q?=E6=88=90case=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--user=郭雨琦
https://www.tapd.cn/55049933/bugtrace/bugs/view?bug_id=1155049933001016605

fix(接口测试): 插件导入默认生成case问题

--user=郭雨琦
https://www.tapd.cn/55049933/bugtrace/bugs/view?bug_id=1155049933001016605
---
 .../api/dto/ApiTestImportRequest.java         |  2 ++
 .../parse/PostmanDefinitionParser.java        | 19 +++++++++++--------
 .../api/service/ApiDefinitionService.java     |  6 ++++--
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/ApiTestImportRequest.java b/backend/src/main/java/io/metersphere/api/dto/ApiTestImportRequest.java
index 5704d9fbde..e2ec0fd464 100644
--- a/backend/src/main/java/io/metersphere/api/dto/ApiTestImportRequest.java
+++ b/backend/src/main/java/io/metersphere/api/dto/ApiTestImportRequest.java
@@ -39,5 +39,7 @@ public class ApiTestImportRequest {
     private Boolean coverModule;
     // 当前协议
     private String protocol;
+    //上传文件来源，目前用于辨别是否是idea插件
+    private String origin;
 
 }
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/parse/PostmanDefinitionParser.java b/backend/src/main/java/io/metersphere/api/dto/definition/parse/PostmanDefinitionParser.java
index 0be4eabb38..9e0c663ea2 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/parse/PostmanDefinitionParser.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/parse/PostmanDefinitionParser.java
@@ -25,6 +25,7 @@ public class PostmanDefinitionParser extends PostmanAbstractParserParser<ApiDefi
     public ApiDefinitionImport parse(InputStream source, ApiTestImportRequest request) {
         String testStr = getApiTestStr(source);
         this.projectId = request.getProjectId();
+        boolean addCase = !StringUtils.equals("idea", request.getOrigin());
         JSONObject jsonObject = JSON.parseObject(testStr);
         Object info = jsonObject.get("info");
         if (info == null) {
@@ -40,14 +41,14 @@ public class PostmanDefinitionParser extends PostmanAbstractParserParser<ApiDefi
         }
         List<ApiTestCaseWithBLOBs> cases = new ArrayList<>();
         parseItem(postmanCollection.getItem(), modulePath, results,
-                cases);
+                cases, addCase);
         apiImport.setData(results);
         apiImport.setCases(cases);
         return apiImport;
     }
 
     protected void parseItem(List<PostmanItem> items, String modulePath, List<ApiDefinitionWithBLOBs> results,
-                             List<ApiTestCaseWithBLOBs> cases) {
+                             List<ApiTestCaseWithBLOBs> cases, boolean addCase) {
         for (PostmanItem item : items) {
             List<PostmanItem> childItems = item.getItem();
             if (childItems != null) {
@@ -57,7 +58,7 @@ public class PostmanDefinitionParser extends PostmanAbstractParserParser<ApiDefi
                 } else {
                     itemModulePath = item.getName();
                 }
-                parseItem(childItems, itemModulePath, results, cases);
+                parseItem(childItems, itemModulePath, results, cases, addCase);
             } else {
                 MsHTTPSamplerProxy msHTTPSamplerProxy = parsePostman(item);
                 HttpResponse response = parsePostmanResponse(item);
@@ -71,11 +72,13 @@ public class PostmanDefinitionParser extends PostmanAbstractParserParser<ApiDefi
                     request.setModulePath(modulePath);
                 }
                 results.add(request);
-                ApiTestCaseWithBLOBs apiTestCase = new ApiTestCaseWithBLOBs();
-                BeanUtils.copyBean(apiTestCase, request);
-                apiTestCase.setApiDefinitionId(request.getId());
-                apiTestCase.setPriority("P0");
-                cases.add(apiTestCase);
+                if (addCase) {
+                    ApiTestCaseWithBLOBs apiTestCase = new ApiTestCaseWithBLOBs();
+                    BeanUtils.copyBean(apiTestCase, request);
+                    apiTestCase.setApiDefinitionId(request.getId());
+                    apiTestCase.setPriority("P0");
+                    cases.add(apiTestCase);
+                }
             }
         }
     }
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
index ab96f106a3..f547582b4f 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
@@ -835,7 +835,8 @@ public class ApiDefinitionService {
                     apiDefinition.setVersionId(apiTestImportRequest.getDefaultVersion());
                 }
                 boolean newCreate = !StringUtils.equals(ApiImportPlatform.Swagger2.name(), apiTestImportRequest.getPlatform())
-                        && !StringUtils.isNotBlank(apiTestImportRequest.getSwaggerUrl());
+                        && !StringUtils.isNotBlank(apiTestImportRequest.getSwaggerUrl())
+                        && !StringUtils.equals("idea", apiTestImportRequest.getOrigin());
                 caseList = setRequestAndAddNewCase(apiDefinition, caseList, newCreate);
                 reSetImportMocksApiId(mocks, originId, apiDefinition.getId(), apiDefinition.getNum());
                 batchMapper.insert(apiDefinition);
@@ -958,7 +959,8 @@ public class ApiDefinitionService {
 
             reSetImportMocksApiId(mocks, originId, apiDefinition.getId(), apiDefinition.getNum());
             boolean newCreate = !StringUtils.equals(ApiImportPlatform.Swagger2.name(), apiTestImportRequest.getPlatform())
-                    && !StringUtils.isNotBlank(apiTestImportRequest.getSwaggerUrl());
+                    && !StringUtils.isNotBlank(apiTestImportRequest.getSwaggerUrl())
+                    && !StringUtils.equals("idea", apiTestImportRequest.getOrigin());
             caseList = setRequestAndAddNewCase(apiDefinition, caseList, newCreate);
             batchMapper.insert(apiDefinition);
             importCase(apiDefinition, apiTestCaseMapper, caseList);