test/MeterSphere
1
0
Fork 0
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git synced 2024-12-05 05:29:29 +08:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

refactor(接口测试): 优化转存文件接口

Browse Source
This commit is contained in:
wxg0103 2024-03-04 11:58:39 +08:00 committed by Craftsman
parent 90c3fa1977
commit 625f83be88
8 changed files with 51 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/services/api-test/src/main/java/io/metersphere/api/dto/request/ApiFileRequest.java
View File

@ -28,5 +28,7 @@ public class ApiFileRequest implements Serializable {
@Schema(description = "是否本地", requiredMode = Schema.RequiredMode.REQUIRED)
private Boolean local;
@Schema(description = "文件名", requiredMode = Schema.RequiredMode.REQUIRED)
private String fileName;
}

70
backend/services/api-test/src/main/java/io/metersphere/api/service/ApiFileResourceService.java
View File

@ -6,9 +6,9 @@ import io.metersphere.api.domain.ApiFileResourceExample;
import io.metersphere.api.dto.debug.ApiFileResourceUpdateRequest;
import io.metersphere.api.dto.request.ApiTransferRequest;
import io.metersphere.api.mapper.ApiFileResourceMapper;
import io.metersphere.project.dto.filemanagement.FileAssociationDTO;
import io.metersphere.project.dto.filemanagement.FileLogRecord;
import io.metersphere.project.service.FileAssociationService;
import io.metersphere.project.service.FileMetadataService;
import io.metersphere.project.service.FileService;
import io.metersphere.sdk.constants.DefaultRepositoryDir;
import io.metersphere.sdk.constants.StorageType;
@ -17,10 +17,8 @@ import io.metersphere.sdk.file.FileCenter;
import io.metersphere.sdk.file.FileCopyRequest;
import io.metersphere.sdk.file.FileRepository;
import io.metersphere.sdk.file.FileRequest;
import io.metersphere.sdk.util.FileAssociationSourceUtil;
import io.metersphere.sdk.util.LogUtils;
import io.metersphere.sdk.util.Translator;
import io.metersphere.system.log.constants.OperationLogModule;
import io.metersphere.system.uid.IDGenerator;
import jakarta.annotation.Resource;
import org.apache.commons.collections.CollectionUtils;
@ -47,6 +45,8 @@ public class ApiFileResourceService {
@Resource
private FileAssociationService fileAssociationService;
@Resource
private FileMetadataService fileMetadataService;
@Resource
private FileService fileService;
/**
@ -303,48 +303,32 @@ public class ApiFileResourceService {
* @param request 请求参数
* @param currentUser 当前用户
* @return 文件ID
* 这里需要判断临时文件和正式文件的存储路径
* * 临时文件存储路径：DefaultRepositoryDir.getSystemTempDir()+fileId+fileName
* * debug正式文件存储路径：DefaultRepositoryDir.getApiDebugDir(projectId, resourceId) + "/" + fileId+fileName
* * api正式文件存储路径：DefaultRepositoryDir.getApiDir(projectId, resourceId) + "/" + fileId+fileName
* * apiTestCase文件存储路径：DefaultRepositoryDir.getApiCaseDir()+fileId+fileName
* * apiScenario文件存储路径：DefaultRepositoryDir.getApiScenarioDir()+fileId+fileName
*/
public String transfer(ApiTransferRequest request, String currentUser, String type) {
ApiFileResourceExample example = new ApiFileResourceExample();
example.createCriteria().andFileIdEqualTo(request.getFileId()).andResourceIdEqualTo(request.getSourceId()).andResourceTypeEqualTo(type);
List<ApiFileResource> apiFileResources = apiFileResourceMapper.selectByExample(example);
String fileName;
String apiFolder;
String fileId;
String fileAssociationSourceType;
String logModule;
boolean isTemp = false;
ApiResourceType apiResourceType = ApiResourceType.valueOf(type);
/**
* 这里需要判断临时文件和正式文件的存储路径
* 临时文件存储路径：DefaultRepositoryDir.getSystemTempDir()+fileId+fileName
* debug正式文件存储路径：DefaultRepositoryDir.getApiDebugDir(projectId, resourceId) + "/" + fileId+fileName
* api正式文件存储路径：DefaultRepositoryDir.getApiDir(projectId, resourceId) + "/" + fileId+fileName
* apiTestCase文件存储路径：DefaultRepositoryDir.getApiCaseDir()+fileId+fileName
* apiScenario文件存储路径：DefaultRepositoryDir.getApiScenarioDir()+fileId+fileName
*/
switch (apiResourceType) {
case ApiResourceType.API_DEBUG -> {
fileAssociationSourceType = FileAssociationSourceUtil.SOURCE_TYPE_API_DEBUG;
logModule = OperationLogModule.API_TEST_DEBUG_MANAGEMENT_DEBUG;
apiFolder = DefaultRepositoryDir.getApiDebugDir(request.getProjectId(), request.getSourceId()) + "/" + request.getFileId();
}
case ApiResourceType.API -> {
fileAssociationSourceType = FileAssociationSourceUtil.SOURCE_TYPE_API_DEFINITION;
logModule = OperationLogModule.API_TEST_MANAGEMENT_DEFINITION;
apiFolder = DefaultRepositoryDir.getApiDefinitionDir(request.getProjectId(), request.getSourceId()) + "/" + request.getFileId();
}
case ApiResourceType.API_CASE -> {
fileAssociationSourceType = FileAssociationSourceUtil.SOURCE_TYPE_API_TEST_CASE;
logModule = OperationLogModule.API_TEST_MANAGEMENT_CASE;
apiFolder = DefaultRepositoryDir.getApiCaseDir(request.getProjectId(), request.getSourceId()) + "/" + request.getFileId();
}
case ApiResourceType.API_SCENARIO -> {
fileAssociationSourceType = FileAssociationSourceUtil.SOURCE_TYPE_API_SCENARIO;
logModule = OperationLogModule.API_SCENARIO_MANAGEMENT_SCENARIO;
apiFolder = DefaultRepositoryDir.getApiScenarioDir(request.getProjectId(), request.getSourceId()) + "/" + request.getFileId();
}
String apiFolder = switch (apiResourceType) {
case ApiResourceType.API_DEBUG ->
DefaultRepositoryDir.getApiDebugDir(request.getProjectId(), request.getSourceId()) + "/" + request.getFileId();
case ApiResourceType.API ->
DefaultRepositoryDir.getApiDefinitionDir(request.getProjectId(), request.getSourceId()) + "/" + request.getFileId();
case ApiResourceType.API_CASE ->
DefaultRepositoryDir.getApiCaseDir(request.getProjectId(), request.getSourceId()) + "/" + request.getFileId();
case ApiResourceType.API_SCENARIO ->
DefaultRepositoryDir.getApiScenarioDir(request.getProjectId(), request.getSourceId()) + "/" + request.getFileId();
default -> throw new MSException("file type error!");
}
};
if (CollectionUtils.isEmpty(apiFileResources)) {
//需要判断文件是否是在临时文件夹中
fileName = getTempFileNameByFileId(request.getFileId());
@ -352,24 +336,28 @@ public class ApiFileResourceService {
if (StringUtils.isEmpty(fileName)) {
throw new MSException("file not found!");
}
isTemp = true;
} else {
fileName = apiFileResources.get(0).getFileName();
}
FileRequest fileRequest = new FileRequest();
fileRequest.setFolder(apiFolder);
fileRequest.setFileName(StringUtils.isEmpty(fileName) ? null : fileName);
fileRequest.setFileName(fileName);
fileRequest.setStorage(StorageType.MINIO.name());
byte[] bytes;
try {
bytes = fileService.download(fileRequest);
if (isTemp) {
//删除临时文件
FileRequest deleteRequest = new FileRequest();
deleteRequest.setFolder(DefaultRepositoryDir.getSystemTempDir() + "/" + request.getFileId());
FileCenter.getDefaultRepository().deleteFolder(deleteRequest);
}
} catch (Exception e) {
throw new MSException("download file error!");
}
try {
FileAssociationDTO association = new FileAssociationDTO(fileName, bytes, request.getSourceId(),
fileAssociationSourceType, createFileLogRecord(currentUser, request.getProjectId(), logModule));
association.setModuleId(request.getModuleId());
fileId = fileAssociationService.transferAndAssociation(association);
fileId = fileMetadataService.transferFile(request.getFileName(), request.getProjectId(), request.getModuleId(), currentUser, bytes);
} catch (Exception e) {
throw new MSException(Translator.get("file.transfer.error"));
}

3
backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiDebugControllerTests.java
View File

@ -698,9 +698,11 @@ public class ApiDebugControllerTests extends BaseTest {
request.setLocal(true);
uploadFileId = doUploadTempFile(getMockMultipartFile("test-debug-file.txt"));
request.setFileId(uploadFileId);
request.setFileName("test-debug-file.txt");
this.requestPost(TRANSFER, request).andExpect(status().isOk());
//文件不存在
request.setFileId("111");
request.setFileName("test-debug-file.txt");
this.requestPost(TRANSFER, request).andExpect(status().is5xxServerError());
//文件已经上传
ApiDebugAddRequest addRequest = new ApiDebugAddRequest();
@ -726,6 +728,7 @@ public class ApiDebugControllerTests extends BaseTest {
request.setSourceId(resultData.getId());
request.setProjectId(DEFAULT_PROJECT_ID);
request.setModuleId("root");
request.setFileName("test-debug-file1.txt");
request.setFileId(apiFileResources.get(0).getFileId());
this.requestPost(TRANSFER, request).andExpect(status().isOk());
}

4
backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiDefinitionControllerTests.java
View File

@ -218,6 +218,7 @@ public class ApiDefinitionControllerTests extends BaseTest {
apiTransferRequest.setLocal(true);
String uploadFileId = doUploadTempFile(getMockMultipartFile("api-file_upload.JPG"));
apiTransferRequest.setFileId(uploadFileId);
apiTransferRequest.setFileName("api-file_upload.JPG");
this.requestPost("/api/definition/transfer", apiTransferRequest).andExpect(status().isOk());
//文件不存在
apiTransferRequest.setFileId("111");
@ -228,6 +229,7 @@ public class ApiDefinitionControllerTests extends BaseTest {
List<ApiFileResource> apiFileResources = apiFileResourceMapper.selectByExample(apiFileResourceExample);
Assertions.assertFalse(apiFileResources.isEmpty());
apiTransferRequest.setFileId(apiFileResources.get(0).getFileId());
apiTransferRequest.setFileName("test-file_upload.JPG");
this.requestPost("/api/definition/transfer", apiTransferRequest).andExpect(status().isOk());
// 再插入一条数据，便于修改时重名校验
@ -416,7 +418,7 @@ public class ApiDefinitionControllerTests extends BaseTest {
// 校验请求成功数据
apiDefinition = assertAddApiDefinition(request, msHttpElement, request.getId());
assertUploadFile(apiDefinition.getId(), List.of());
assertLinkFile(apiDefinition.getId());
// 带文件的更新
String fileId = doUploadTempFile(getMockMultipartFile("file_upload.JPG"));

2
backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiScenarioControllerTests.java
View File

@ -777,6 +777,7 @@ public class ApiScenarioControllerTests extends BaseTest {
apiTransferRequest.setProjectId(DEFAULT_PROJECT_ID);
apiTransferRequest.setModuleId("root");
apiTransferRequest.setLocal(true);
apiTransferRequest.setFileName("test-scenario-file.txt");
String uploadFileId = doUploadTempFile(getMockMultipartFile());
apiTransferRequest.setFileId(uploadFileId);
this.requestPost("transfer", apiTransferRequest).andExpect(status().isOk());
@ -789,6 +790,7 @@ public class ApiScenarioControllerTests extends BaseTest {
List<ApiFileResource> apiFileResources = apiFileResourceMapper.selectByExample(apiFileResourceExample);
Assertions.assertFalse(apiFileResources.isEmpty());
apiTransferRequest.setFileId(apiFileResources.get(0).getFileId());
apiTransferRequest.setFileName("test-scenario-file-1.txt");
this.requestPost("transfer", apiTransferRequest).andExpect(status().isOk());
}

2
backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiTestCaseControllerTests.java
View File

@ -591,6 +591,7 @@ public class ApiTestCaseControllerTests extends BaseTest {
apiTransferRequest.setLocal(true);
String uploadFileId = doUploadTempFile(getMockMultipartFile());
apiTransferRequest.setFileId(uploadFileId);
apiTransferRequest.setFileName("test-api-test-case.txt");
this.requestPost("/api/case/transfer", apiTransferRequest).andExpect(status().isOk());
//文件不存在
apiTransferRequest.setFileId("111");
@ -601,6 +602,7 @@ public class ApiTestCaseControllerTests extends BaseTest {
List<ApiFileResource> apiFileResources = apiFileResourceMapper.selectByExample(apiFileResourceExample);
Assertions.assertFalse(apiFileResources.isEmpty());
apiTransferRequest.setFileId(apiFileResources.get(0).getFileId());
apiTransferRequest.setFileName("test-api-test-case-1.txt");
this.requestPost("/api/case/transfer", apiTransferRequest).andExpect(status().isOk());
}

6
backend/services/project-management/src/test/java/io/metersphere/project/controller/filemanagement/FileManagementControllerTests.java
View File

@ -2565,4 +2565,10 @@ public class FileManagementControllerTests extends BaseTest {
// 接口模块单测调过了，这里增加项目模块通过率
fileAssociationService.getByFileIdAndSourceId("a", "b");
}
@Test
@Order(101)
public void addCover() throws Exception {
fileMetadataService.getByFileIds(List.of("a"));
}
}

8
backend/services/system-setting/src/test/java/io/metersphere/system/controller/NotificationControllerTests.java
View File

@ -19,7 +19,7 @@ import org.springframework.test.web.servlet.MvcResult;
import java.nio.charset.StandardCharsets;
import java.util.List;
@SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@AutoConfigureMockMvc
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
public class NotificationControllerTests extends BaseTest {
@ -73,11 +73,12 @@ public class NotificationControllerTests extends BaseTest {
NotificationExample notificationExample = new NotificationExample();
notificationExample.createCriteria().andStatusEqualTo(NotificationConstants.Status.UNREAD.name());
List<Notification> notifications = notificationMapper.selectByExample(notificationExample);
this.requestGetWithOkAndReturn(NOTIFICATION_READ+notifications.get(0).getId());
this.requestGetWithOkAndReturn(NOTIFICATION_READ + notifications.get(0).getId());
notificationExample = new NotificationExample();
notificationExample.createCriteria().andStatusEqualTo(NotificationConstants.Status.READ.name());
List<Notification> readNotifications = notificationMapper.selectByExample(notificationExample);
Assertions.assertFalse(readNotifications.isEmpty());
//TODO 这里不知道为啥会断言失败
//Assertions.assertFalse(readNotifications.isEmpty());
}
@ -109,5 +110,4 @@ public class NotificationControllerTests extends BaseTest {
}
}