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

refactor(接口测试): 修改接口查询资源池权限

This commit is contained in:
wxg0103 2024-03-15 21:33:05 +08:00 committed by Craftsman
parent 5e17455904
commit fe1893db5e
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
backend/services/api-test/src/main/java/io/metersphere/api/controller/ApiTestController.java
View File

@ -112,9 +112,9 @@ public class ApiTestController {
@GetMapping("/pool-option/{projectId}")
@Operation(summary = "接口测试-获取资源池")
@RequiresPermissions(value = {
PermissionConstants.PROJECT_API_DEFINITION_CASE_EXECUTE,
PermissionConstants.PROJECT_API_DEFINITION_EXECUTE,
PermissionConstants.PROJECT_API_SCENARIO_EXECUTE
PermissionConstants.PROJECT_API_DEFINITION_READ,
PermissionConstants.PROJECT_API_DEFINITION_CASE_READ,
PermissionConstants.PROJECT_API_SCENARIO_READ
}, logical = Logical.OR)
@CheckOwner(resourceId = "#projectId", resourceType = "project")
public List<TestResourcePool> getPool(@PathVariable String projectId) {
@ -124,9 +124,9 @@ public class ApiTestController {
@GetMapping("/get-pool/{projectId}")
@Operation(summary = "接口测试-获取资源池")
@RequiresPermissions(value = {
PermissionConstants.PROJECT_API_DEFINITION_CASE_EXECUTE,
PermissionConstants.PROJECT_API_DEFINITION_EXECUTE,
PermissionConstants.PROJECT_API_SCENARIO_EXECUTE
PermissionConstants.PROJECT_API_DEFINITION_READ,
PermissionConstants.PROJECT_API_DEFINITION_CASE_READ,
PermissionConstants.PROJECT_API_SCENARIO_READ
}, logical = Logical.OR)
@CheckOwner(resourceId = "#projectId", resourceType = "project")
public String getPoolId(@PathVariable String projectId) {

3
backend/services/api-test/src/main/java/io/metersphere/api/service/ApiTestService.java
View File

@ -118,6 +118,9 @@ public class ApiTestService {
public String getPoolId(String projectId) {
Map<String, Object> configMap = new HashMap<>();
projectApplicationService.putResourcePool(projectId, configMap, "apiTest");
if (configMap.isEmpty()) {
return null;
}
return (String) configMap.get(ProjectApplicationType.API.API_RESOURCE_POOL_ID.name());
}
}

11
backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiTestControllerTests.java
View File

@ -6,8 +6,11 @@ import io.metersphere.api.service.BaseResourcePoolTestService;
import io.metersphere.plugin.api.dto.ApiPluginSelectOption;
import io.metersphere.project.api.KeyValueParam;
import io.metersphere.project.constants.ScriptLanguageType;
import io.metersphere.project.domain.ProjectTestResourcePool;
import io.metersphere.project.domain.ProjectTestResourcePoolExample;
import io.metersphere.project.dto.customfunction.request.CustomFunctionRunRequest;
import io.metersphere.project.dto.environment.EnvironmentConfig;
import io.metersphere.project.mapper.ProjectTestResourcePoolMapper;
import io.metersphere.sdk.constants.PermissionConstants;
import io.metersphere.sdk.constants.SessionConstants;
import io.metersphere.sdk.domain.Environment;
@ -64,6 +67,8 @@ public class ApiTestControllerTests extends BaseTest {
private BasePluginTestService basePluginTestService;
@Resource
private BaseEnvTestService baseEnvTestService;
@Resource
private ProjectTestResourcePoolMapper projectTestResourcePoolMapper;
@Override
protected String getBasePath() {
@ -233,6 +238,12 @@ public class ApiTestControllerTests extends BaseTest {
public void getPoolId() throws Exception {
// @@请求成功
this.requestGet("/get-pool/" + DEFAULT_PROJECT_ID);
ProjectTestResourcePoolExample example = new ProjectTestResourcePoolExample();
example.createCriteria().andProjectIdEqualTo(DEFAULT_PROJECT_ID);
List<ProjectTestResourcePool> projectTestResourcePools = projectTestResourcePoolMapper.selectByExample(example);
projectTestResourcePoolMapper.deleteByExample(example);
this.requestGet("/get-pool/" + DEFAULT_PROJECT_ID);
projectTestResourcePoolMapper.batchInsert(projectTestResourcePools);
}
}