Skip to content

Commit

Permalink
refactor(接口测试): 优化大数据量，查看报告的逻辑
Browse files Browse the repository at this point in the history
  • Loading branch information
@wxg0103
wxg0103 committed May 24, 2024
1 parent 705122c commit 71649dd
Show file tree
Hide file tree
Showing 4 changed files with 68 additions and 46 deletions.
2 changes: 1 addition & 1 deletion ...services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioReportMapper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ List<ReportDTO> getReports(@Param("request") TaskCenterBatchRequest request, @Pa

void updateApiScenario(List<String> ids);

List<ApiScenarioReportStepDTO> selectStepDetailByReportId(String id);
List<ApiScenarioReportStepDTO> selectStepDetailByReportId(@Param("id") String id, @Param("limit") int limit, @Param("offset") int offset);

List<ApiReportMessageDTO> getNoticeList(@Param("ids") List<String> ids);

Expand Down
3 changes: 2 additions & 1 deletion .../services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioReportMapper.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,8 @@
api_scenario_report_detail.script_identifier,
api_scenario_report_detail.sort as loopIndex
from api_scenario_report_detail
where api_scenario_report_detail.report_id = #{reportId}
where api_scenario_report_detail.report_id = #{id}
limit #{limit} offset #{offset}
</select>
<select id="getNoticeList" resultType="io.metersphere.system.dto.sdk.ApiReportMessageDTO">
select id ,name from api_scenario_report
Expand Down
108 changes: 64 additions & 44 deletions .../api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioReportService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ public class ApiScenarioReportService {
@Resource
private ApiScenarioReportNoticeService apiScenarioReportNoticeService;
private static final String SPLITTER = "_";
private static final int MAX = 50000;
private static final int BATCH_SIZE = 1000;

@Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
public void insertApiScenarioReport(List<ApiScenarioReport> reports, List<ApiScenarioRecord> records) {
Expand Down Expand Up @@ -190,10 +192,71 @@ public ApiScenarioReportDTO get(String id) {
//需要查询出所有的步骤
List<ApiScenarioReportStepDTO> scenarioReportSteps = extApiScenarioReportMapper.selectStepByReportId(id);
//查询所有步骤的detail
List<ApiScenarioReportStepDTO> deatilList = extApiScenarioReportMapper.selectStepDetailByReportId(id);
ApiScenarioReportDetailExample detailExample = new ApiScenarioReportDetailExample();
detailExample.createCriteria().andReportIdEqualTo(id);
long detailCount = apiScenarioReportDetailMapper.countByExample(detailExample);
// 分批查询 一次性查询1000个 超过50000个也只查询50000条
if (detailCount > MAX) {
detailCount = MAX;

Check warning on line 200 in backend/services/api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioReportService.java

View check run for this annotation

Codecov / codecov/patch

backend/services/api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioReportService.java#L200 

Added line #L200 was not covered by tests
}
int remainingCount = (int) detailCount;
List<ApiScenarioReportStepDTO> deatilList = new ArrayList<>();
for (int i = 0; i < detailCount; i += BATCH_SIZE) {
int currentBatchSize = Math.min(BATCH_SIZE, remainingCount);
deatilList.addAll(extApiScenarioReportMapper.selectStepDetailByReportId(id, currentBatchSize, i));
remainingCount -= currentBatchSize;
}

//根据stepId进行分组
Map<String, List<ApiScenarioReportStepDTO>> detailMap = deatilList.stream().collect(Collectors.groupingBy(ApiScenarioReportStepDTO::getStepId));
//只处理请求的
detailRequest(scenarioReportSteps, detailMap);

//将scenarioReportSteps按照parentId进行分组 值为list 然后根据sort进行排序
Map<String, List<ApiScenarioReportStepDTO>> scenarioReportStepMap = scenarioReportSteps.stream().collect(Collectors.groupingBy(ApiScenarioReportStepDTO::getParentId));
// TODO 查询修改
List<ApiScenarioReportStepDTO> steps = Optional.ofNullable(scenarioReportStepMap.get("NONE")).orElse(new ArrayList<>(0));
steps.sort(Comparator.comparingLong(ApiScenarioReportStepDTO::getSort));

getStepTree(steps, scenarioReportStepMap);

scenarioReportDTO.setStepTotal(steps.size());
scenarioReportDTO.setRequestTotal(getRequestTotal(scenarioReportDTO));
scenarioReportDTO.setChildren(steps);

scenarioReportDTO.setStepErrorCount(steps.stream().filter(step -> StringUtils.equals(ApiReportStatus.ERROR.name(), step.getStatus())).count());
scenarioReportDTO.setStepSuccessCount(steps.stream().filter(step -> StringUtils.equals(ApiReportStatus.SUCCESS.name(), step.getStatus())).count());
scenarioReportDTO.setStepPendingCount(steps.stream().filter(step -> StringUtils.equals(ApiReportStatus.PENDING.name(), step.getStatus()) || StringUtils.isBlank(step.getStatus())).count());
scenarioReportDTO.setStepFakeErrorCount(steps.stream().filter(step -> StringUtils.equals(ApiReportStatus.FAKE_ERROR.name(), step.getStatus())).count());
//控制台信息 console
ApiScenarioReportLogExample example = new ApiScenarioReportLogExample();
example.createCriteria().andReportIdEqualTo(id);
List<ApiScenarioReportLog> apiScenarioReportLogs = apiScenarioReportLogMapper.selectByExampleWithBLOBs(example);
if (CollectionUtils.isNotEmpty(apiScenarioReportLogs)) {
//获取所有的console,生成集合
List<String> consoleList = apiScenarioReportLogs.stream().map(c -> new String(c.getConsole())).toList();
scenarioReportDTO.setConsole(String.join("\n", consoleList));
}
//查询资源池名称
scenarioReportDTO.setPoolName(testResourcePoolMapper.selectByPrimaryKey(scenarioReport.getPoolId()).getName());
//查询环境名称
String environmentName = null;
if (StringUtils.isNotBlank(scenarioReport.getEnvironmentId())) {
Environment environment = environmentMapper.selectByPrimaryKey(scenarioReport.getEnvironmentId());
if (environment != null) {
environmentName = environment.getName();
}
EnvironmentGroup environmentGroup = environmentGroupMapper.selectByPrimaryKey(scenarioReport.getEnvironmentId());
if (environmentGroup != null) {
environmentName = environmentGroup.getName();
}
}
scenarioReportDTO.setEnvironmentName(environmentName);
scenarioReportDTO.setCreatUserName(userMapper.selectByPrimaryKey(scenarioReport.getCreateUser()).getName());
return scenarioReportDTO;
}

private static void detailRequest(List<ApiScenarioReportStepDTO> scenarioReportSteps, Map<String, List<ApiScenarioReportStepDTO>> detailMap) {
List<String> stepTypes = Arrays.asList(ApiScenarioStepType.API_CASE.name(),
ApiScenarioStepType.API.name(),
ApiScenarioStepType.CUSTOM_REQUEST.name(),
Expand Down Expand Up @@ -247,49 +310,6 @@ public ApiScenarioReportDTO get(String id) {
}
}
});

//将scenarioReportSteps按照parentId进行分组 值为list 然后根据sort进行排序
Map<String, List<ApiScenarioReportStepDTO>> scenarioReportStepMap = scenarioReportSteps.stream().collect(Collectors.groupingBy(ApiScenarioReportStepDTO::getParentId));
// TODO 查询修改
List<ApiScenarioReportStepDTO> steps = Optional.ofNullable(scenarioReportStepMap.get("NONE")).orElse(new ArrayList<>(0));
steps.sort(Comparator.comparingLong(ApiScenarioReportStepDTO::getSort));

getStepTree(steps, scenarioReportStepMap);

scenarioReportDTO.setStepTotal(steps.size());
scenarioReportDTO.setRequestTotal(getRequestTotal(scenarioReportDTO));
scenarioReportDTO.setChildren(steps);

scenarioReportDTO.setStepErrorCount(steps.stream().filter(step -> StringUtils.equals(ApiReportStatus.ERROR.name(), step.getStatus())).count());
scenarioReportDTO.setStepSuccessCount(steps.stream().filter(step -> StringUtils.equals(ApiReportStatus.SUCCESS.name(), step.getStatus())).count());
scenarioReportDTO.setStepPendingCount(steps.stream().filter(step -> StringUtils.equals(ApiReportStatus.PENDING.name(), step.getStatus()) || StringUtils.isBlank(step.getStatus())).count());
scenarioReportDTO.setStepFakeErrorCount(steps.stream().filter(step -> StringUtils.equals(ApiReportStatus.FAKE_ERROR.name(), step.getStatus())).count());
//控制台信息 console
ApiScenarioReportLogExample example = new ApiScenarioReportLogExample();
example.createCriteria().andReportIdEqualTo(id);
List<ApiScenarioReportLog> apiScenarioReportLogs = apiScenarioReportLogMapper.selectByExampleWithBLOBs(example);
if (CollectionUtils.isNotEmpty(apiScenarioReportLogs)) {
//获取所有的console,生成集合
List<String> consoleList = apiScenarioReportLogs.stream().map(c -> new String (c.getConsole())).toList();
scenarioReportDTO.setConsole(String.join("\n", consoleList));
}
//查询资源池名称
scenarioReportDTO.setPoolName(testResourcePoolMapper.selectByPrimaryKey(scenarioReport.getPoolId()).getName());
//查询环境名称
String environmentName = null;
if (StringUtils.isNotBlank(scenarioReport.getEnvironmentId())) {
Environment environment = environmentMapper.selectByPrimaryKey(scenarioReport.getEnvironmentId());
if (environment != null) {
environmentName = environment.getName();
}
EnvironmentGroup environmentGroup = environmentGroupMapper.selectByPrimaryKey(scenarioReport.getEnvironmentId());
if (environmentGroup != null) {
environmentName = environmentGroup.getName();
}
}
scenarioReportDTO.setEnvironmentName(environmentName);
scenarioReportDTO.setCreatUserName(userMapper.selectByPrimaryKey(scenarioReport.getCreateUser()).getName());
return scenarioReportDTO;
}

public long getRequestTotal(ApiScenarioReport report) {
Expand Down
1 change: 1 addition & 0 deletions frontend/src/views/api-test/management/components/management/mock/mockTable.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -651,6 +651,7 @@
id: res.id,
type: 'mock',
isNew: false,
isCopy: false,
protocol: res.protocol,
activeTab: RequestComposition.BODY,
executeLoading: false,
Expand Down

0 comments on commit 71649dd

Please sign in to comment.