refactor(接口测试): 优化接口导入选择覆盖数据，全部数据被更新的缺陷

metersphere · May 11, 2024 · af684b2 · af684b2
1 parent eae3398
commit af684b2
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 38 deletions.
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/schema/JsonSchemaItem.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/schema/JsonSchemaItem.java
@@ -5,7 +5,6 @@
 import io.metersphere.sdk.constants.ValueEnum;
 import io.metersphere.system.valid.EnumValue;
 import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotBlank;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -29,7 +28,6 @@ public class JsonSchemaItem {
     /**
      * 参数ID
      */
-    @NotBlank
     private String id;
     /**
      * 参数名称

diff --git a/...t/src/main/java/io/metersphere/api/service/definition/ApiDefinitionImportUtilService.java b/...t/src/main/java/io/metersphere/api/service/definition/ApiDefinitionImportUtilService.java
@@ -608,56 +608,69 @@ public boolean dataIsSame(MsHTTPElement dbRequest, MsHTTPElement importRequest)
             Body dbbody = dbRequest.getBody();
             Body importBody = importRequest.getBody();
             if (dbbody != null && importBody != null) {
+                if (!StringUtils.equals(dbbody.getBodyType(), importBody.getBodyType())) {
+                    return false;
+                }
                 //判断null类型
                 StringUtils.equals(String.valueOf(dbbody.getNoneBody()), String.valueOf(importBody.getNoneBody()));
                 //判断form类型
-                FormDataBody formDataBody = dbbody.getFormDataBody();
-                FormDataBody importFormDataBody = importBody.getFormDataBody();
-                if (ObjectUtils.isNotEmpty(formDataBody) || ObjectUtils.isNotEmpty(importFormDataBody)) {
-                    List<FormDataKV> formValues = formDataBody.getFormValues();
-                    List<FormDataKV> importFormValues = importFormDataBody.getFormValues();
-                    if (CollectionUtils.isNotEmpty(formValues) || CollectionUtils.isNotEmpty(importFormValues)) {
-                        List<String> dbFormKeys = formValues.stream().map(FormDataKV::getKey).toList();
-                        List<String> importFormKeys = importFormValues.stream().map(FormDataKV::getKey).toList();
-                        if (paramsIsSame(dbFormKeys, importFormKeys)) {
-                            return false;
+                if (StringUtils.equals(dbbody.getBodyType(), Body.BodyType.FORM_DATA.name())) {
+                    FormDataBody formDataBody = dbbody.getFormDataBody();
+                    FormDataBody importFormDataBody = importBody.getFormDataBody();
+                    if (ObjectUtils.isNotEmpty(formDataBody) || ObjectUtils.isNotEmpty(importFormDataBody)) {
+                        List<FormDataKV> formValues = formDataBody.getFormValues();
+                        List<FormDataKV> importFormValues = importFormDataBody.getFormValues();
+                        if (CollectionUtils.isNotEmpty(formValues) || CollectionUtils.isNotEmpty(importFormValues)) {
+                            List<String> dbFormKeys = formValues.stream().map(FormDataKV::getKey).toList();
+                            List<String> importFormKeys = importFormValues.stream().map(FormDataKV::getKey).toList();
+                            if (paramsIsSame(dbFormKeys, importFormKeys)) {
+                                return false;
+                            }
                         }
                     }
                 }
-                //判读www类型
-                WWWFormBody wwwBody = dbbody.getWwwFormBody();
-                WWWFormBody importWwwBody = importBody.getWwwFormBody();
-                if (ObjectUtils.isNotEmpty(wwwBody) || ObjectUtils.isNotEmpty(importWwwBody)) {
-                    List<WWWFormKV> wwwValues = wwwBody.getFormValues();
-                    List<WWWFormKV> importWwwValues = importWwwBody.getFormValues();
-                    if (CollectionUtils.isNotEmpty(wwwValues) || CollectionUtils.isNotEmpty(importWwwValues)) {
-                        List<String> dbWwwKeys = wwwValues.stream().map(WWWFormKV::getKey).toList();
-                        List<String> importWwwKeys = importWwwValues.stream().map(WWWFormKV::getKey).toList();
-                        if (paramsIsSame(dbWwwKeys, importWwwKeys)) {
-                            return false;
+                if (StringUtils.equals(dbbody.getBodyType(), Body.BodyType.WWW_FORM.name())) {
+                    //判读www类型
+                    WWWFormBody wwwBody = dbbody.getWwwFormBody();
+                    WWWFormBody importWwwBody = importBody.getWwwFormBody();
+                    if (ObjectUtils.isNotEmpty(wwwBody) || ObjectUtils.isNotEmpty(importWwwBody)) {
+                        List<WWWFormKV> wwwValues = wwwBody.getFormValues();
+                        List<WWWFormKV> importWwwValues = importWwwBody.getFormValues();
+                        if (CollectionUtils.isNotEmpty(wwwValues) || CollectionUtils.isNotEmpty(importWwwValues)) {
+                            List<String> dbWwwKeys = wwwValues.stream().map(WWWFormKV::getKey).toList();
+                            List<String> importWwwKeys = importWwwValues.stream().map(WWWFormKV::getKey).toList();
+                            if (paramsIsSame(dbWwwKeys, importWwwKeys)) {
+                                return false;
+                            }
                         }
                     }
                 }
+
                 //TODO 判断binary类型
 
                 //判断raw类型
-                RawBody rawBody = dbbody.getRawBody();
-                RawBody importRawBody = importBody.getRawBody();
-                if (ObjectUtils.isNotEmpty(rawBody) || ObjectUtils.isNotEmpty(importRawBody)) {
-                    return false;
-                }
-                //判断json类型
-                JsonBody jsonBody = dbbody.getJsonBody();
-                JsonBody importJsonBody = importBody.getJsonBody();
-                if (ObjectUtils.isNotEmpty(jsonBody) || ObjectUtils.isNotEmpty(importJsonBody)) {
-                    if (StringUtils.isNotBlank(jsonBody.getJsonValue()) || StringUtils.isNotBlank(importJsonBody.getJsonValue())) {
+                if (StringUtils.equals(dbbody.getBodyType(), Body.BodyType.RAW.name())) {
+                    RawBody rawBody = dbbody.getRawBody();
+                    RawBody importRawBody = importBody.getRawBody();
+                    if (ObjectUtils.isNotEmpty(rawBody) || ObjectUtils.isNotEmpty(importRawBody)) {
                         return false;
                     }
-                    //判断jsonschema
-                    JsonSchemaItem jsonSchema = jsonBody.getJsonSchema();
-                    JsonSchemaItem importJsonSchema = importJsonBody.getJsonSchema();
-                    if (jsonSchema != null && importJsonSchema != null) {
-                        return jsonSchemaIsSame(jsonSchema, importJsonSchema);
+                }
+                //判断json类型
+                if (StringUtils.equals(dbbody.getBodyType(), Body.BodyType.JSON.name())) {
+                    //判断json类型
+                    JsonBody jsonBody = dbbody.getJsonBody();
+                    JsonBody importJsonBody = importBody.getJsonBody();
+                    if (ObjectUtils.isNotEmpty(jsonBody) || ObjectUtils.isNotEmpty(importJsonBody)) {
+                        if (!StringUtils.equals(jsonBody.getJsonValue(), importJsonBody.getJsonValue())) {
+                            return false;
+                        }
+                        //判断jsonschema
+                        JsonSchemaItem jsonSchema = jsonBody.getJsonSchema();
+                        JsonSchemaItem importJsonSchema = importJsonBody.getJsonSchema();
+                        if (jsonSchema != null && importJsonSchema != null) {
+                            return jsonSchemaIsSame(jsonSchema, importJsonSchema);
+                        }
                     }
                 }
             }