Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat:用例支持按作者进行筛选的操作 #396

Merged
merged 2 commits into from
Dec 20, 2023
Merged

feat:用例支持按作者进行筛选的操作 #396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4002924
增加接口，支持查询指定项目，指定平台下，所有的用例作者列表集合
caofengbin Dec 20, 2023
9ffd935
用例支持按作者进行筛选的操作
caofengbin Dec 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions ...r-controller/src/main/java/org/cloud/sonic/controller/controller/TestCasesController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ public class TestCasesController {
@Parameter(name = "platform", description = "平台类型"),
@Parameter(name = "name", description = "用例名称"),
@Parameter(name = "moduleIds", description = "模块Id"),
@Parameter(name = "caseAuthorNames", description = "用例作者列表"),
@Parameter(name = "page", description = "页码"),
@Parameter(name = "pageSize", description = "页数据大小"),
@Parameter(name = "idSort", description = "控制id排序方式"),
@Parameter(name = "designerSort", description = "控制designer排序方式"),
@Parameter(name = "editTimeSort", description = "控制editTime排序方式")

})
Expand All @@ -71,15 +71,16 @@ public RespModel<CommentPage<TestCasesDTO>> findAll(@RequestParam(name = "projec
@RequestParam(name = "platform") int platform,
@RequestParam(name = "name", required = false) String name,
@RequestParam(name = "moduleIds[]", required = false) List<Integer> moduleIds,
@RequestParam(name = "caseAuthorNames[]", required = false) List<String> caseAuthorNames,
@RequestParam(name = "page") int page,
@RequestParam(name = "pageSize") int pageSize,
@RequestParam(name = "idSort", required = false) String idSort,
@RequestParam(value = "designerSort", required = false) String designerSort,
@RequestParam(value = "editTimeSort", required = false) String editTimeSort) {
Page<TestCases> pageable = new Page<>(page, pageSize);
return new RespModel<>(
RespEnum.SEARCH_OK,
testCasesService.findAll(projectId, platform, name, moduleIds, pageable, idSort, designerSort, editTimeSort)
testCasesService.findAll(projectId, platform, name, moduleIds, caseAuthorNames,
pageable, idSort, editTimeSort)
);
}

Expand Down Expand Up @@ -167,4 +168,19 @@ public RespModel<String> copyTestById(@RequestParam(name = "id") Integer id) {
testCasesService.copyTestById(id);
return new RespModel<>(RespEnum.COPY_OK);
}

@WebAspect
@Operation(summary = "查询用例所有的作者列表", description = "查找对应项目id下对应平台的所有作者列表")
@Parameters(value = {
@Parameter(name = "projectId", description = "项目id"),
@Parameter(name = "platform", description = "平台类型"),
})
@GetMapping("/listAllCaseAuthor")
public RespModel<List<String>> findAllCaseAuthor(@RequestParam(name = "projectId") int projectId,
@RequestParam(name = "platform") int platform) {
return new RespModel<>(
RespEnum.SEARCH_OK,
testCasesService.findAllCaseAuthor(projectId, platform)
);
}
}
3 changes: 3 additions & 0 deletions sonic-server-controller/src/main/java/org/cloud/sonic/controller/mapper/TestCasesMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,7 @@ public interface TestCasesMapper extends BaseMapper<TestCases> {
"where tstc.test_suites_id = #{suiteId} " +
"order by tstc.sort asc")
List<TestCases> listByTestSuitesId(@Param("suiteId") int suiteId);

@Select("select DISTINCT designer from test_cases WHERE project_id= #{projectId} and platform= #{platform}")
List<String> listAllTestCaseAuthor(@Param("projectId") int projectId, @Param("platform") int platform);
}
14 changes: 12 additions & 2 deletions ...server-controller/src/main/java/org/cloud/sonic/controller/services/TestCasesService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@
* @date 2021/8/20 17:51
*/
public interface TestCasesService extends IService<TestCases> {
CommentPage<TestCasesDTO> findAll(int projectId, int platform, String name, List<Integer> moduleIds, Page<TestCases> pageable,
String idSort, String designerSort, String editTimeSort);
CommentPage<TestCasesDTO> findAll(int projectId, int platform, String name, List<Integer> moduleIds,
List<String> caseAuthorNames, Page<TestCases> pageable,
String idSort, String editTimeSort);

List<TestCases> findAll(int projectId, int platform);

Expand All @@ -41,4 +42,13 @@ CommentPage<TestCasesDTO> findAll(int projectId, int platform, String name, List
boolean copyTestById(int id);

Boolean updateTestCaseModuleByModuleId(Integer module);

/**
* 查询指定项目，指定平台下，所有的用例作者列表集合
*
* @param projectId 项目id
* @param platform 平台
* @return 用例作者列表集合
*/
List<String> findAllCaseAuthor(int projectId, int platform);
}
17 changes: 12 additions & 5 deletions ...ntroller/src/main/java/org/cloud/sonic/controller/services/impl/TestCasesServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,20 +66,22 @@ public class TestCasesServiceImpl extends SonicServiceImpl<TestCasesMapper, Test
private ModulesMapper modulesMapper;

@Override
public CommentPage<TestCasesDTO> findAll(int projectId, int platform, String name, List<Integer> moduleIds, Page<TestCases> pageable,
String idSort, String designerSort, String editTimeSort) {
public CommentPage<TestCasesDTO> findAll(int projectId, int platform, String name, List<Integer> moduleIds,
List<String> caseAuthorNames,
Page<TestCases> pageable,
String idSort, String editTimeSort) {

LambdaQueryChainWrapper<TestCases> lambdaQuery = lambdaQuery();

lambdaQuery.eq(projectId != 0, TestCases::getProjectId, projectId)
.eq(platform != 0, TestCases::getPlatform, platform)
.in(moduleIds != null && moduleIds.size() > 0, TestCases::getModuleId, moduleIds)
.in(caseAuthorNames != null && caseAuthorNames.size() > 0, TestCases::getDesigner, caseAuthorNames)
.like(!StringUtils.isEmpty(name), TestCases::getName, name)
.orderByDesc(StringUtils.isEmpty(editTimeSort) && StringUtils.isEmpty(idSort) && StringUtils.isEmpty(designerSort),
.orderByDesc(StringUtils.isEmpty(editTimeSort) && StringUtils.isEmpty(idSort),
TestCases::getEditTime)
.orderBy(!StringUtils.isEmpty(editTimeSort), "asc".equals(editTimeSort), TestCases::getEditTime)
.orderBy(!StringUtils.isEmpty(idSort), "asc".equals(idSort), TestCases::getId)
.orderBy(!StringUtils.isEmpty(designerSort), "asc".equals(designerSort), TestCases::getDesigner);
.orderBy(!StringUtils.isEmpty(idSort), "asc".equals(idSort), TestCases::getId);

//写入对应模块信息
Page<TestCases> page = lambdaQuery.page(pageable);
Expand Down Expand Up @@ -286,5 +288,10 @@ public Boolean updateTestCaseModuleByModuleId(Integer module) {
}
return true;
}

@Override
public List<String> findAllCaseAuthor(int projectId, int platform) {
return testCasesMapper.listAllTestCaseAuthor(projectId, platform);
}
}

Loading