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

refactor(接口测试): 发送通知方法优化 

Signed-off-by: fit2-zhao <yong.zhao@fit2cloud.com>
This commit is contained in:
fit2-zhao 2024-07-12 15:44:08 +08:00 committed by Craftsman
parent 028b641e02
commit 1e91f20744
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionImportUtilService.java
View File

@ -116,20 +116,20 @@ public class ApiDefinitionImportUtilService {
for (ApiImportSendNoticeDTO apiImportSendNoticeDTO : apiImportSendNoticeDTOS) { for (ApiImportSendNoticeDTO apiImportSendNoticeDTO : apiImportSendNoticeDTOS) {
ApiDefinitionResult apiDefinitionResult = apiImportSendNoticeDTO.getApiDefinitionResult(); ApiDefinitionResult apiDefinitionResult = apiImportSendNoticeDTO.getApiDefinitionResult();
if (apiDefinitionResult != null && !apiDefinitionResult.isUpdated()) { if (apiDefinitionResult != null && !apiDefinitionResult.isUpdated()) {
String context = SessionUtils.getUserId().concat("新建了接口定义").concat(":").concat(apiDefinitionResult.getName()); String context = Objects.requireNonNull(SessionUtils.getUserId()).concat("新建了接口定义").concat(":").concat(apiDefinitionResult.getName());
ApiDefinitionImportUtil.sendImportApiNotice(apiDefinitionResult, context, NoticeConstants.Event.CREATE, "api_create_notice"); ApiDefinitionImportUtil.sendImportApiNotice(apiDefinitionResult, context, NoticeConstants.Event.CREATE, "api_create_notice");
} }
if (apiDefinitionResult != null && apiDefinitionResult.isUpdated()) { if (apiDefinitionResult != null && apiDefinitionResult.isUpdated()) {
String context = SessionUtils.getUserId().concat("更新了接口定义").concat(":").concat(apiDefinitionResult.getName()); String context = Objects.requireNonNull(SessionUtils.getUserId()).concat("更新了接口定义").concat(":").concat(apiDefinitionResult.getName());
ApiDefinitionImportUtil.sendImportApiNotice(apiDefinitionResult, context, NoticeConstants.Event.UPDATE, "api_update_notice"); ApiDefinitionImportUtil.sendImportApiNotice(apiDefinitionResult, context, NoticeConstants.Event.UPDATE, "api_update_notice");
} }
if (CollectionUtils.isNotEmpty(apiImportSendNoticeDTO.getCaseDTOList())) { if (CollectionUtils.isNotEmpty(apiImportSendNoticeDTO.getCaseDTOList())) {
for (ApiTestCaseDTO apiTestCaseDTO : apiImportSendNoticeDTO.getCaseDTOList()) { for (ApiTestCaseDTO apiTestCaseDTO : apiImportSendNoticeDTO.getCaseDTOList()) {
if (apiTestCaseDTO.isUpdated()) { if (apiTestCaseDTO.isUpdated()) {
String context = SessionUtils.getUserId().concat("更新了接口用例").concat(":").concat(apiTestCaseDTO.getName()); String context = Objects.requireNonNull(SessionUtils.getUserId()).concat("更新了接口用例").concat(":").concat(apiTestCaseDTO.getName());
ApiDefinitionImportUtil.sendImportCaseNotice(apiTestCaseDTO, context, NoticeConstants.Event.CASE_UPDATE, "api_case_update_notice"); ApiDefinitionImportUtil.sendImportCaseNotice(apiTestCaseDTO, context, NoticeConstants.Event.CASE_UPDATE, "api_case_update_notice");
} else { } else {
String context = SessionUtils.getUserId().concat("新建了接口用例").concat(":").concat(apiTestCaseDTO.getName()); String context = Objects.requireNonNull(SessionUtils.getUserId()).concat("新建了接口用例").concat(":").concat(apiTestCaseDTO.getName());
ApiDefinitionImportUtil.sendImportCaseNotice(apiTestCaseDTO, context, NoticeConstants.Event.CASE_CREATE, "api_case_create_notice"); ApiDefinitionImportUtil.sendImportCaseNotice(apiTestCaseDTO, context, NoticeConstants.Event.CASE_CREATE, "api_case_create_notice");
} }
} }
@ -302,7 +302,7 @@ public class ApiDefinitionImportUtilService {
mockConfigService.importMock(apiImport, sqlSession, request); mockConfigService.importMock(apiImport, sqlSession, request);
} }
sqlSession.flushStatements(); sqlSession.flushStatements();
if (sqlSession != null && sqlSessionFactory != null) { if (sqlSessionFactory != null) {
SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory); SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
} }
@ -633,7 +633,7 @@ public class ApiDefinitionImportUtilService {
//指定版本无数据 //指定版本无数据
//如果系统内的所有版本都不是当前选择的数据更新版本，需要与lasted = 1 比较请求参数，参数一致，仅变更接口模块为当前导入接口的模块，不一致，新增并变更接口模块为当前导入接口的模块 //如果系统内的所有版本都不是当前选择的数据更新版本，需要与lasted = 1 比较请求参数，参数一致，仅变更接口模块为当前导入接口的模块，不一致，新增并变更接口模块为当前导入接口的模块
if (latestApi != null) { if (latestApi != null) {
Boolean hasChange; boolean hasChange;
if (apiDefinitionWithBLOBs.getProtocol().equals("HTTP")) { if (apiDefinitionWithBLOBs.getProtocol().equals("HTTP")) {
hasChange = ApiDefinitionImportUtil.checkIsSynchronize(latestApi, apiDefinitionWithBLOBs); hasChange = ApiDefinitionImportUtil.checkIsSynchronize(latestApi, apiDefinitionWithBLOBs);
} else { } else {
@ -1180,7 +1180,7 @@ public class ApiDefinitionImportUtilService {
for (List<ApiTestCaseWithBLOBs> value : values) { for (List<ApiTestCaseWithBLOBs> value : values) {
oldCaseList.addAll(value); oldCaseList.addAll(value);
} }
List<ApiTestCaseWithBLOBs> collect = oldCaseList.stream().filter(t -> !caseIds.contains(t.getId())).collect(Collectors.toList()); List<ApiTestCaseWithBLOBs> collect = oldCaseList.stream().filter(t -> !caseIds.contains(t.getId())).toList();
optionDataCases.addAll(collect); optionDataCases.addAll(collect);
} }
} }
@ -1322,7 +1322,7 @@ public class ApiDefinitionImportUtilService {
ScheduleExample schedule = new ScheduleExample(); ScheduleExample schedule = new ScheduleExample();
schedule.createCriteria().andResourceIdEqualTo(apiDefinitionImportParamDTO.getScheduleId()); schedule.createCriteria().andResourceIdEqualTo(apiDefinitionImportParamDTO.getScheduleId());
List<Schedule> list = scheduleMapper.selectByExample(schedule); List<Schedule> list = scheduleMapper.selectByExample(schedule);
if (list.size() > 0) { if (!list.isEmpty()) {
User user = baseUserService.getUserDTO(list.get(0).getUserId()); User user = baseUserService.getUserDTO(list.get(0).getUserId());
msOperLog.setOperUser(user.getName() + TIMING_SYNCHRONIZATION); msOperLog.setOperUser(user.getName() + TIMING_SYNCHRONIZATION);
msOperLog.setCreateUser(user.getId()); msOperLog.setCreateUser(user.getId());