From ed115767c39b98d426d86c25abb2a3a6e468b264 Mon Sep 17 00:00:00 2001
From: AgAngle <1323481023@qq.com>
Date: Fri, 16 Aug 2024 15:21:29 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E6=9C=AA=E8=A7=84=E5=88=92=E6=A8=A1=E5=9D=97=E4=B8=8B=E7=9A=84?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=AF=A6=E6=83=85=E6=B2=A1=E6=9C=89=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E6=A8=A1=E5=9D=97=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1045008 --user=陈建星 【接口测试】定义-预览-基本信息-所属模块显示错误，一直显示- https://www.tapd.cn/55049933/s/1564079
---
 .../definition/ApiDefinitionService.java      |  2 ++
 .../ApiDefinitionControllerTests.java         | 20 +++++++++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/service/definition/ApiDefinitionService.java b/backend/services/api-test/src/main/java/io/metersphere/api/service/definition/ApiDefinitionService.java
index dc49729420..b0adcc21ac 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/service/definition/ApiDefinitionService.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/service/definition/ApiDefinitionService.java
@@ -921,6 +921,8 @@ public class ApiDefinitionService extends MoveNodeService {
         ApiDefinitionModule apiDefinitionModule = apiDefinitionModuleMapper.selectByPrimaryKey(apiDefinitionDTO.getModuleId());
         if (apiDefinitionModule != null) {
             apiDefinitionDTO.setModuleName(apiDefinitionModule.getName());
+        } else {
+            apiDefinitionDTO.setModuleName(Translator.get("api_unplanned_request"));
         }
         return apiDefinitionDTO;
     }
diff --git a/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiDefinitionControllerTests.java b/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiDefinitionControllerTests.java
index f87ca2bbdf..7d302e94c0 100644
--- a/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiDefinitionControllerTests.java
+++ b/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiDefinitionControllerTests.java
@@ -450,6 +450,9 @@ public class ApiDefinitionControllerTests extends BaseTest {
         Assertions.assertEquals(msHTTPElement.getModuleId(), apiDefinition.getModuleId());
         Assertions.assertEquals(msHTTPElement.getNum(), apiDefinition.getNum());
 
+        assertionModuleName(apiDefinitionDTO);
+        copyApiDefinitionDTO.setModuleName(apiDefinitionDTO.getModuleName());
+
         Assertions.assertEquals(apiDefinitionDTO, copyApiDefinitionDTO);
 
         assertErrorCode(this.requestGet(GET + "111"), ApiResultCode.API_DEFINITION_NOT_EXIST);
@@ -458,6 +461,16 @@ public class ApiDefinitionControllerTests extends BaseTest {
         requestGetPermissionTest(PermissionConstants.PROJECT_API_DEFINITION_READ, GET + apiDefinition.getId());
     }
 
+    private void assertionModuleName(ApiDefinitionDTO apiDefinitionDTO) {
+        // 判断模块名是否正确
+        ApiDefinitionModule apiDefinitionModule = apiDefinitionModuleMapper.selectByPrimaryKey(apiDefinitionDTO.getModuleId());
+        if (apiDefinitionModule == null) {
+            Assertions.assertEquals(apiDefinitionDTO.getModuleName(), Translator.get("api_unplanned_request"));
+        } else {
+            Assertions.assertEquals(apiDefinitionDTO.getModuleName(), apiDefinitionModule.getName());
+        }
+    }
+
     @Test
     @Order(3)
     @Sql(scripts = {"/dml/init_api_definition.sql"}, config = @SqlConfig(encoding = "utf-8", transactionMode = SqlConfig.TransactionMode.ISOLATED))
@@ -924,12 +937,7 @@ public class ApiDefinitionControllerTests extends BaseTest {
             List<ApiTestCase> apiTestCases = apiTestCaseMapper.selectByExample(example);
             Assertions.assertEquals(apiDefinitionDTO.getCaseTotal(), apiTestCases.size());
             // 判断模块名是否正确
-            ApiDefinitionModule apiDefinitionModule = apiDefinitionModuleMapper.selectByPrimaryKey(apiDefinitionDTO.getModuleId());
-            if (apiDefinitionModule == null) {
-                Assertions.assertEquals(apiDefinitionDTO.getModuleName(), Translator.get("api_unplanned_request"));
-            } else {
-                Assertions.assertEquals(apiDefinitionDTO.getModuleName(), apiDefinitionModule.getName());
-            }
+            assertionModuleName(apiDefinitionDTO);
         }
     }