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 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); } }