feat(controller): artifact's list api support search by name (#2735)

star-whale · Sep 11, 2023 · 7a08654 · 7a08654
1 parent 76946de
commit 7a08654
Show file tree

Hide file tree

Showing 15 changed files with 24 additions and 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
@@ -420,7 +420,7 @@ public ResponseEntity<ResponseMessage<PageInfo<DatasetVo>>> 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
@@ -88,7 +88,7 @@ public ResponseEntity<ResponseMessage<PageInfo<ModelVo>>> 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
@@ -68,7 +68,7 @@ public ResponseEntity<ResponseMessage<PageInfo<RuntimeVo>>> listRuntime(
         PageInfo<RuntimeVo> 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
@@ -189,7 +189,7 @@ public PageInfo<DatasetVo> listDataset(DatasetQuery query, PageParams pageParams
         Long projectId = projectService.getProjectId(query.getProjectUrl());
         Long userId = userService.getUserId(query.getOwner());
         PageHelper.startPage(pageParams.getPageNum(), pageParams.getPageSize());
-        List<DatasetEntity> entities = datasetMapper.list(projectId, query.getNamePrefix(), userId, null);
+        List<DatasetEntity> 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
@@ -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
@@ -38,7 +38,7 @@ public interface DatasetMapper {
 
     @SelectProvider(value = DatasetProvider.class, method = "listSql")
     List<DatasetEntity> 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
@@ -182,7 +182,7 @@ public PageInfo<ModelVo> listModel(ModelQuery query, PageParams pageParams) {
         Long projectId = projectService.getProjectId(query.getProjectUrl());
         Long userId = userService.getUserId(query.getOwner());
         PageHelper.startPage(pageParams.getPageNum(), pageParams.getPageSize());
-        List<ModelEntity> entities = modelMapper.list(projectId, query.getNamePrefix(), userId, null);
+        List<ModelEntity> 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
@@ -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
@@ -38,7 +38,7 @@ public interface ModelMapper {
 
     @SelectProvider(value = ModelProvider.class, method = "listSql")
     List<ModelEntity> 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
@@ -196,7 +196,7 @@ public PageInfo<RuntimeVo> listRuntime(RuntimeQuery runtimeQuery, PageParams pag
         Long projectId = projectService.getProjectId(runtimeQuery.getProjectUrl());
         Long userId = userService.getUserId(runtimeQuery.getOwner());
         PageHelper.startPage(pageParams.getPageNum(), pageParams.getPageSize());
-        List<RuntimeEntity> entities = runtimeMapper.list(projectId, runtimeQuery.getNamePrefix(), userId, null);
+        List<RuntimeEntity> 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
@@ -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
@@ -39,7 +39,7 @@ public interface RuntimeMapper {
 
     @SelectProvider(value = RuntimeProvider.class, method = "listSql")
     List<RuntimeEntity> 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
@@ -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
@@ -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
@@ -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)),