test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor(接口测试): 解决同步功能相关问题 

--user=郭雨琦
--bug=1015204
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001015204
--bug=1015205
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001015205
--bug=1015210
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001015210
--bug=1015213
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001015213
This commit is contained in:
guoyuqi 2022-07-22 20:15:33 +08:00 committed by xiaomeinvG
parent f9b4f67586
commit 3210c11ffb
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
View File

@ -404,8 +404,10 @@ public class ApiDefinitionService {
paramMap.put("name", returnModel.getName()); paramMap.put("name", returnModel.getName());
paramMap.put("createUser", returnModel.getCreateUser()); paramMap.put("createUser", returnModel.getCreateUser());
paramMap.put("userId", returnModel.getUserId()); paramMap.put("userId", returnModel.getUserId());
List<String> specialReceivers = new ArrayList<>();
this.getReceivers(request, returnModel, specialReceivers); Set<String> specialReceiversSet = new HashSet<>();
this.getReceivers(request, returnModel, specialReceiversSet);
List<String> specialReceivers = new ArrayList<>(specialReceiversSet);
if (request.getSendSpecialMessage() != null && request.getSendSpecialMessage()) { if (request.getSendSpecialMessage() != null && request.getSendSpecialMessage()) {
paramMap.put("specialReceivers", JSON.toJSONString(specialReceivers)); paramMap.put("specialReceivers", JSON.toJSONString(specialReceivers));
paramMap.put("apiSpecialType", "API_SPECIAL"); paramMap.put("apiSpecialType", "API_SPECIAL");
@ -422,7 +424,7 @@ public class ApiDefinitionService {
return getById(returnModel.getId()); return getById(returnModel.getId());
} }
private void getReceivers(SaveApiDefinitionRequest request, ApiDefinitionWithBLOBs returnModel, List<String> specialReceivers) { private void getReceivers(SaveApiDefinitionRequest request, ApiDefinitionWithBLOBs returnModel, Set<String> specialReceivers) {
if (request.getSendSpecialMessage() != null && request.getSendSpecialMessage()) { if (request.getSendSpecialMessage() != null && request.getSendSpecialMessage()) {
if (request.getCaseCreator() != null && request.getCaseCreator()) { if (request.getCaseCreator() != null && request.getCaseCreator()) {
ApiTestCaseExample apiTestCaseExample = new ApiTestCaseExample(); ApiTestCaseExample apiTestCaseExample = new ApiTestCaseExample();

24
frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue
View File

@ -236,6 +236,7 @@ import {TYPE_TO_C} from "@/business/components/api/automation/scenario/Setting";
import MsDialogFooter from "@/business/components/common/components/MsDialogFooter"; import MsDialogFooter from "@/business/components/common/components/MsDialogFooter";
import {getProjectMemberOption} from "@/network/user"; import {getProjectMemberOption} from "@/network/user";
import SyncSettings from "@/business/components/xpack/workstation/component/SyncSettings"; import SyncSettings from "@/business/components/xpack/workstation/component/SyncSettings";
import {deepClone} from "@/common/js/tableUtils";
const {Body} = require("@/business/components/api/definition/model/ApiTestModel"); const {Body} = require("@/business/components/api/definition/model/ApiTestModel");
const Sampler = require("@/business/components/api/definition/components/jmeter/components/sampler/sampler"); const Sampler = require("@/business/components/api/definition/components/jmeter/components/sampler/sampler");
@ -283,6 +284,8 @@ export default {
}, },
httpForm: {environmentId: "", path: "", tags: []}, httpForm: {environmentId: "", path: "", tags: []},
beforeHttpForm: {environmentId: "", path: "", tags: []}, beforeHttpForm: {environmentId: "", path: "", tags: []},
beforeRequest: {},
beforeResponse: {},
newData: {environmentId: "", path: "", tags: []}, newData: {environmentId: "", path: "", tags: []},
dialogVisible: false, dialogVisible: false,
isShowEnable: true, isShowEnable: true,
@ -538,20 +541,18 @@ export default {
} }
if (!this.beforeHttpForm.tags) { if (!this.beforeHttpForm.tags) {
this.beforeHttpForm.tags = []; this.beforeHttpForm.tags = [];
this.beforeHttpForm.tags = JSON.stringify(this.beforeHttpForm.tags)
} }
if (this.httpForm.tags !== this.beforeHttpForm.tags) { if (this.httpForm.tags !== this.beforeHttpForm.tags) {
if (this.httpForm.tags.length !== this.beforeHttpForm.tags.length) {
this.batchSyncApiVisible = true; this.batchSyncApiVisible = true;
} }
let submitRequest = JSON.stringify(this.request);
} let beforeRequestHeaders = JSON.stringify(this.beforeRequest);
let submitRequest = JSON.stringify(this.httpForm.request); if (submitRequest !== beforeRequestHeaders) {
let beforeRequest = JSON.stringify(this.beforeHttpForm.request);
if (submitRequest !== beforeRequest) {
this.batchSyncApiVisible = true; this.batchSyncApiVisible = true;
} }
let submitResponse = JSON.stringify(this.httpForm.response); let submitResponse = JSON.stringify(this.response);
let beforeResponse = JSON.stringify(this.beforeHttpForm.response); let beforeResponse = JSON.stringify(this.response);
if (submitResponse !== beforeResponse) { if (submitResponse !== beforeResponse) {
this.batchSyncApiVisible = true; this.batchSyncApiVisible = true;
} }
@ -849,7 +850,7 @@ export default {
} }
} }
}); });
} },
}, },
created() { created() {
@ -861,7 +862,10 @@ export default {
this.basisData.moduleId = this.moduleOptions[0].id; this.basisData.moduleId = this.moduleOptions[0].id;
} }
this.httpForm = JSON.parse(JSON.stringify(this.basisData)); this.httpForm = JSON.parse(JSON.stringify(this.basisData));
this.beforeHttpForm = JSON.parse(JSON.stringify(this.basisData)); this.beforeHttpForm = deepClone(this.basisData);
this.beforeRequest = deepClone(this.request);
this.beforeResponse = deepClone(this.response);
this.$get('/api/definition/follow/' + this.basisData.id, response => { this.$get('/api/definition/follow/' + this.basisData.id, response => {
this.httpForm.follows = response.data; this.httpForm.follows = response.data;
this.beforeHttpForm.follows = response.data; this.beforeHttpForm.follows = response.data;