From 7a08654a37d8c919424562e291ff9df44c2b484d Mon Sep 17 00:00:00 2001 From: star <15031259256@163.com> Date: Mon, 11 Sep 2023 21:08:24 +0800 Subject: [PATCH] feat(controller): artifact's list api support search by name (#2735) --- .../java/ai/starwhale/mlops/api/DatasetController.java | 2 +- .../main/java/ai/starwhale/mlops/api/ModelController.java | 2 +- .../java/ai/starwhale/mlops/api/RuntimeController.java | 2 +- .../ai/starwhale/mlops/domain/dataset/DatasetService.java | 2 +- .../starwhale/mlops/domain/dataset/bo/DatasetQuery.java | 2 +- .../mlops/domain/dataset/mapper/DatasetMapper.java | 8 ++++---- .../ai/starwhale/mlops/domain/model/ModelService.java | 2 +- .../ai/starwhale/mlops/domain/model/bo/ModelQuery.java | 2 +- .../starwhale/mlops/domain/model/mapper/ModelMapper.java | 8 ++++---- .../ai/starwhale/mlops/domain/runtime/RuntimeService.java | 2 +- .../starwhale/mlops/domain/runtime/bo/RuntimeQuery.java | 2 +- .../mlops/domain/runtime/mapper/RuntimeMapper.java | 8 ++++---- .../mlops/domain/dataset/DatasetServiceTest.java | 2 +- .../ai/starwhale/mlops/domain/model/ModelServiceTest.java | 2 +- .../mlops/domain/runtime/RuntimeServiceTest.java | 2 +- 15 files changed, 24 insertions(+), 24 deletions(-) diff --git a/server/controller/src/main/java/ai/starwhale/mlops/api/DatasetController.java b/server/controller/src/main/java/ai/starwhale/mlops/api/DatasetController.java index d31a902d79..0a994fc1ff 100644 --- a/server/controller/src/main/java/ai/starwhale/mlops/api/DatasetController.java +++ b/server/controller/src/main/java/ai/starwhale/mlops/api/DatasetController.java @@ -420,7 +420,7 @@ public ResponseEntity>> listDataset( pageInfo = datasetService.listDataset( DatasetQuery.builder() .projectUrl(projectUrl) - .namePrefix(name) + .name(name) .owner(owner) .build(), PageParams.builder() diff --git a/server/controller/src/main/java/ai/starwhale/mlops/api/ModelController.java b/server/controller/src/main/java/ai/starwhale/mlops/api/ModelController.java index 5ea4fedd1a..b1a43272ea 100644 --- a/server/controller/src/main/java/ai/starwhale/mlops/api/ModelController.java +++ b/server/controller/src/main/java/ai/starwhale/mlops/api/ModelController.java @@ -88,7 +88,7 @@ public ResponseEntity>> listModel( pageInfo = modelService.listModel( ModelQuery.builder() .projectUrl(projectUrl) - .namePrefix(name) + .name(name) .owner(owner) .build(), PageParams.builder() diff --git a/server/controller/src/main/java/ai/starwhale/mlops/api/RuntimeController.java b/server/controller/src/main/java/ai/starwhale/mlops/api/RuntimeController.java index d83b711690..62ecdc892f 100644 --- a/server/controller/src/main/java/ai/starwhale/mlops/api/RuntimeController.java +++ b/server/controller/src/main/java/ai/starwhale/mlops/api/RuntimeController.java @@ -68,7 +68,7 @@ public ResponseEntity>> listRuntime( PageInfo pageInfo = runtimeService.listRuntime( RuntimeQuery.builder() .projectUrl(projectUrl) - .namePrefix(name) + .name(name) .owner(owner) .build(), PageParams.builder() diff --git a/server/controller/src/main/java/ai/starwhale/mlops/domain/dataset/DatasetService.java b/server/controller/src/main/java/ai/starwhale/mlops/domain/dataset/DatasetService.java index 30eaf0f689..eed04361be 100644 --- a/server/controller/src/main/java/ai/starwhale/mlops/domain/dataset/DatasetService.java +++ b/server/controller/src/main/java/ai/starwhale/mlops/domain/dataset/DatasetService.java @@ -189,7 +189,7 @@ public PageInfo listDataset(DatasetQuery query, PageParams pageParams Long projectId = projectService.getProjectId(query.getProjectUrl()); Long userId = userService.getUserId(query.getOwner()); PageHelper.startPage(pageParams.getPageNum(), pageParams.getPageSize()); - List entities = datasetMapper.list(projectId, query.getNamePrefix(), userId, null); + List entities = datasetMapper.list(projectId, query.getName(), userId, null); return PageUtil.toPageInfo(entities, ds -> { DatasetVo vo = datasetVoConverter.convert(ds); diff --git a/server/controller/src/main/java/ai/starwhale/mlops/domain/dataset/bo/DatasetQuery.java b/server/controller/src/main/java/ai/starwhale/mlops/domain/dataset/bo/DatasetQuery.java index 7a092c4996..d565d70735 100644 --- a/server/controller/src/main/java/ai/starwhale/mlops/domain/dataset/bo/DatasetQuery.java +++ b/server/controller/src/main/java/ai/starwhale/mlops/domain/dataset/bo/DatasetQuery.java @@ -29,7 +29,7 @@ public class DatasetQuery { private String projectUrl; - private String namePrefix; + private String name; private String owner; } diff --git a/server/controller/src/main/java/ai/starwhale/mlops/domain/dataset/mapper/DatasetMapper.java b/server/controller/src/main/java/ai/starwhale/mlops/domain/dataset/mapper/DatasetMapper.java index b0ec1439c0..ac01563b12 100644 --- a/server/controller/src/main/java/ai/starwhale/mlops/domain/dataset/mapper/DatasetMapper.java +++ b/server/controller/src/main/java/ai/starwhale/mlops/domain/dataset/mapper/DatasetMapper.java @@ -38,7 +38,7 @@ public interface DatasetMapper { @SelectProvider(value = DatasetProvider.class, method = "listSql") List list(@Param("projectId") Long projectId, - @Param("namePrefix") String namePrefix, + @Param("name") String name, @Param("ownerId") Long ownerId, @Param("order") String order); @@ -66,7 +66,7 @@ DatasetEntity findByName(@Param("name") String name, @Param("projectId") Long pr class DatasetProvider { public String listSql(@Param("projectId") Long projectId, - @Param("namePrefix") String namePrefix, + @Param("name") String name, @Param("ownerId") Long ownerId, @Param("order") String order) { return new SQL() { @@ -77,8 +77,8 @@ public String listSql(@Param("projectId") Long projectId, if (Objects.nonNull(projectId)) { WHERE("project_id = #{projectId}"); } - if (StrUtil.isNotEmpty(namePrefix)) { - WHERE("dataset_name like concat(#{namePrefix}, '%')"); + if (StrUtil.isNotEmpty(name)) { + WHERE("dataset_name like concat('%', #{name}, '%')"); } if (Objects.nonNull(ownerId)) { WHERE("owner_id = #{ownerId}"); diff --git a/server/controller/src/main/java/ai/starwhale/mlops/domain/model/ModelService.java b/server/controller/src/main/java/ai/starwhale/mlops/domain/model/ModelService.java index d3079c7b66..2afdc9e58c 100644 --- a/server/controller/src/main/java/ai/starwhale/mlops/domain/model/ModelService.java +++ b/server/controller/src/main/java/ai/starwhale/mlops/domain/model/ModelService.java @@ -182,7 +182,7 @@ public PageInfo listModel(ModelQuery query, PageParams pageParams) { Long projectId = projectService.getProjectId(query.getProjectUrl()); Long userId = userService.getUserId(query.getOwner()); PageHelper.startPage(pageParams.getPageNum(), pageParams.getPageSize()); - List entities = modelMapper.list(projectId, query.getNamePrefix(), userId, null); + List entities = modelMapper.list(projectId, query.getName(), userId, null); return PageUtil.toPageInfo(entities, entity -> { ModelVo vo = modelVoConverter.convert(entity); var modelVersion = modelVersionMapper.findByLatest(entity.getId()); diff --git a/server/controller/src/main/java/ai/starwhale/mlops/domain/model/bo/ModelQuery.java b/server/controller/src/main/java/ai/starwhale/mlops/domain/model/bo/ModelQuery.java index 8842ecbb5d..2ea8798a37 100644 --- a/server/controller/src/main/java/ai/starwhale/mlops/domain/model/bo/ModelQuery.java +++ b/server/controller/src/main/java/ai/starwhale/mlops/domain/model/bo/ModelQuery.java @@ -33,7 +33,7 @@ public class ModelQuery { private String projectUrl; - private String namePrefix; + private String name; private String owner; diff --git a/server/controller/src/main/java/ai/starwhale/mlops/domain/model/mapper/ModelMapper.java b/server/controller/src/main/java/ai/starwhale/mlops/domain/model/mapper/ModelMapper.java index dd71884fcb..1b5e9e0540 100644 --- a/server/controller/src/main/java/ai/starwhale/mlops/domain/model/mapper/ModelMapper.java +++ b/server/controller/src/main/java/ai/starwhale/mlops/domain/model/mapper/ModelMapper.java @@ -38,7 +38,7 @@ public interface ModelMapper { @SelectProvider(value = ModelProvider.class, method = "listSql") List list(@Param("projectId") Long projectId, - @Param("namePrefix") String namePrefix, + @Param("name") String name, @Param("ownerId") Long ownerId, @Param("order") String order); @@ -71,7 +71,7 @@ ModelEntity findByName(@Param("name") String name, class ModelProvider { public String listSql(@Param("projectId") Long projectId, - @Param("namePrefix") String namePrefix, + @Param("name") String name, @Param("ownerId") Long ownerId, @Param("order") String order) { return new SQL() { @@ -82,8 +82,8 @@ public String listSql(@Param("projectId") Long projectId, if (Objects.nonNull(projectId)) { WHERE("project_id = #{projectId}"); } - if (StrUtil.isNotEmpty(namePrefix)) { - WHERE("model_name like concat(#{namePrefix}, '%')"); + if (StrUtil.isNotEmpty(name)) { + WHERE("model_name like concat('%', #{name}, '%')"); } if (Objects.nonNull(ownerId)) { WHERE("owner_id = #{ownerId}"); diff --git a/server/controller/src/main/java/ai/starwhale/mlops/domain/runtime/RuntimeService.java b/server/controller/src/main/java/ai/starwhale/mlops/domain/runtime/RuntimeService.java index 50205675e3..456f03b8b5 100644 --- a/server/controller/src/main/java/ai/starwhale/mlops/domain/runtime/RuntimeService.java +++ b/server/controller/src/main/java/ai/starwhale/mlops/domain/runtime/RuntimeService.java @@ -196,7 +196,7 @@ public PageInfo listRuntime(RuntimeQuery runtimeQuery, PageParams pag Long projectId = projectService.getProjectId(runtimeQuery.getProjectUrl()); Long userId = userService.getUserId(runtimeQuery.getOwner()); PageHelper.startPage(pageParams.getPageNum(), pageParams.getPageSize()); - List entities = runtimeMapper.list(projectId, runtimeQuery.getNamePrefix(), userId, null); + List entities = runtimeMapper.list(projectId, runtimeQuery.getName(), userId, null); return PageUtil.toPageInfo(entities, rt -> { RuntimeVo vo = runtimeConvertor.convert(rt); diff --git a/server/controller/src/main/java/ai/starwhale/mlops/domain/runtime/bo/RuntimeQuery.java b/server/controller/src/main/java/ai/starwhale/mlops/domain/runtime/bo/RuntimeQuery.java index 743c0918e1..0f56eca134 100644 --- a/server/controller/src/main/java/ai/starwhale/mlops/domain/runtime/bo/RuntimeQuery.java +++ b/server/controller/src/main/java/ai/starwhale/mlops/domain/runtime/bo/RuntimeQuery.java @@ -29,7 +29,7 @@ public class RuntimeQuery { private String runtimeVersionUrl; - private String namePrefix; + private String name; private String owner; } diff --git a/server/controller/src/main/java/ai/starwhale/mlops/domain/runtime/mapper/RuntimeMapper.java b/server/controller/src/main/java/ai/starwhale/mlops/domain/runtime/mapper/RuntimeMapper.java index f308dface2..71d0d682aa 100644 --- a/server/controller/src/main/java/ai/starwhale/mlops/domain/runtime/mapper/RuntimeMapper.java +++ b/server/controller/src/main/java/ai/starwhale/mlops/domain/runtime/mapper/RuntimeMapper.java @@ -39,7 +39,7 @@ public interface RuntimeMapper { @SelectProvider(value = RuntimeProvider.class, method = "listSql") List list(@Param("projectId") Long projectId, - @Param("namePrefix") String namePrefix, + @Param("name") String name, @Param("ownerId") Long ownerId, @Param("order") String order); @@ -72,7 +72,7 @@ RuntimeEntity findByName(@Param("name") String name, class RuntimeProvider { public String listSql(@Param("projectId") Long projectId, - @Param("namePrefix") String namePrefix, + @Param("name") String name, @Param("ownerId") Long ownerId, @Param("order") String order) { return new SQL() { @@ -83,8 +83,8 @@ public String listSql(@Param("projectId") Long projectId, if (Objects.nonNull(projectId)) { WHERE("project_id = #{projectId}"); } - if (StrUtil.isNotEmpty(namePrefix)) { - WHERE("runtime_name like concat(#{namePrefix}, '%')"); + if (StrUtil.isNotEmpty(name)) { + WHERE("runtime_name like concat('%', #{name}, '%')"); } if (Objects.nonNull(ownerId)) { WHERE("owner_id = #{ownerId}"); diff --git a/server/controller/src/test/java/ai/starwhale/mlops/domain/dataset/DatasetServiceTest.java b/server/controller/src/test/java/ai/starwhale/mlops/domain/dataset/DatasetServiceTest.java index 433493f402..049c81486a 100644 --- a/server/controller/src/test/java/ai/starwhale/mlops/domain/dataset/DatasetServiceTest.java +++ b/server/controller/src/test/java/ai/starwhale/mlops/domain/dataset/DatasetServiceTest.java @@ -268,7 +268,7 @@ public void testList() { )); var res = service.listDataset(DatasetQuery.builder() .projectUrl("1") - .namePrefix("") + .name("") .build(), new PageParams(1, 5)); assertThat(res, allOf( hasProperty("size", is(2)), diff --git a/server/controller/src/test/java/ai/starwhale/mlops/domain/model/ModelServiceTest.java b/server/controller/src/test/java/ai/starwhale/mlops/domain/model/ModelServiceTest.java index 23f2863649..cd524a3b92 100644 --- a/server/controller/src/test/java/ai/starwhale/mlops/domain/model/ModelServiceTest.java +++ b/server/controller/src/test/java/ai/starwhale/mlops/domain/model/ModelServiceTest.java @@ -606,7 +606,7 @@ public void setUp() { public void testListModel() { var res = modelService.listModel(ModelQuery.builder() .projectUrl("1") - .namePrefix("") + .name("") .build(), new PageParams(1, 5)); assertThat(res, allOf( hasProperty("size", is(2)), diff --git a/server/controller/src/test/java/ai/starwhale/mlops/domain/runtime/RuntimeServiceTest.java b/server/controller/src/test/java/ai/starwhale/mlops/domain/runtime/RuntimeServiceTest.java index 72a09f85ca..d76b21dcdc 100644 --- a/server/controller/src/test/java/ai/starwhale/mlops/domain/runtime/RuntimeServiceTest.java +++ b/server/controller/src/test/java/ai/starwhale/mlops/domain/runtime/RuntimeServiceTest.java @@ -282,7 +282,7 @@ public void testListRuntime() { )); var res = service.listRuntime(RuntimeQuery.builder() .projectUrl("1") - .namePrefix("") + .name("") .build(), new PageParams(1, 5)); assertThat(res, allOf( hasProperty("size", is(2)),