From fe1893db5e4f4eae296c148c2ed7fdcca5318a52 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Fri, 15 Mar 2024 21:33:05 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=B1=A0=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/ApiTestController.java            | 12 ++++++------
 .../io/metersphere/api/service/ApiTestService.java   |  3 +++
 .../api/controller/ApiTestControllerTests.java       | 11 +++++++++++
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/controller/ApiTestController.java b/backend/services/api-test/src/main/java/io/metersphere/api/controller/ApiTestController.java
index 15bdf24724..2f8096e8df 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/controller/ApiTestController.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/controller/ApiTestController.java
@@ -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) {
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/service/ApiTestService.java b/backend/services/api-test/src/main/java/io/metersphere/api/service/ApiTestService.java
index 03e4e4146b..2b826ecf6f 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/service/ApiTestService.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/service/ApiTestService.java
@@ -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());
     }
 }
\ No newline at end of file
diff --git a/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiTestControllerTests.java b/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiTestControllerTests.java
index 6032d13116..6fbca23ce7 100644
--- a/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiTestControllerTests.java
+++ b/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiTestControllerTests.java
@@ -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);
     }
 
 }