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

删除项目时，删除接口测试相关资源

This commit is contained in:
q4speed 2020-05-26 13:12:37 +08:00
parent e4acd3cdf6
commit d240c1a377
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/api/controller/APITestController.java
View File

@ -61,7 +61,7 @@ public class APITestController {
@PostMapping("/delete")
public void delete(@RequestBody DeleteAPITestRequest request) {
apiTestService.delete(request);
apiTestService.delete(request.getId());
}
@PostMapping(value = "/run")

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

@ -73,10 +73,10 @@ public class APITestService {
return apiTestMapper.selectByPrimaryKey(id);
}
public void delete(DeleteAPITestRequest request) {
deleteFileByTestId(request.getId());
apiReportService.deleteByTestId(request.getId());
apiTestMapper.deleteByPrimaryKey(request.getId());
public void delete(String testId) {
deleteFileByTestId(testId);
apiReportService.deleteByTestId(testId);
apiTestMapper.deleteByPrimaryKey(testId);
}
public String run(SaveAPITestRequest request) {

20
backend/src/main/java/io/metersphere/service/ProjectService.java
View File

@ -1,5 +1,7 @@
package io.metersphere.service;
import io.metersphere.api.dto.QueryAPITestRequest;
import io.metersphere.api.service.APITestService;
import io.metersphere.base.domain.LoadTest;
import io.metersphere.base.domain.LoadTestExample;
import io.metersphere.base.domain.Project;
@ -14,8 +16,6 @@ import io.metersphere.dto.ProjectDTO;
import io.metersphere.dto.ProjectRelatedResourceDTO;
import io.metersphere.i18n.Translator;
import io.metersphere.performance.service.PerformanceTestService;
import io.metersphere.track.dto.TestPlanDTO;
import io.metersphere.track.request.testcase.QueryTestCaseRequest;
import io.metersphere.track.request.testcase.QueryTestPlanRequest;
import io.metersphere.track.request.testplan.DeleteTestPlanRequest;
import io.metersphere.track.service.TestCaseService;
@ -24,12 +24,12 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
import java.util.stream.Collectors;
import javax.annotation.Resource;
@Service
@Transactional(rollbackFor = Exception.class)
public class ProjectService {
@ -53,6 +53,8 @@ public class ProjectService {
private TestPlanService testPlanService;
@Resource
private TestCaseService testCaseService;
@Resource
private APITestService apiTestService;
public Project addProject(Project project) {
if (StringUtils.isBlank(project.getName())) {
@ -98,7 +100,7 @@ public class ProjectService {
deleteTrackResourceByProjectId(projectId);
// TODO 删除项目下 接口测试 相关
deleteAPIResourceByProjectId(projectId);
// delete project
projectMapper.deleteByPrimaryKey(projectId);
}
@ -112,6 +114,14 @@ public class ProjectService {
testCaseService.deleteTestCaseByProjectId(projectId);
}
private void deleteAPIResourceByProjectId(String projectId) {
QueryAPITestRequest request = new QueryAPITestRequest();
request.setProjectId(projectId);
apiTestService.list(request).forEach(test -> {
apiTestService.delete(test.getId());
});
}
public void updateProject(Project project) {
project.setCreateTime(null);
project.setUpdateTime(System.currentTimeMillis());