[app-builder] 修改检视意见，优化 repo 层与 service 层的职责边界。

Author: lizhichao51

app-builder/plugins/aipp-custom-model-center/src/main/java/modelengine/fit/jade/aipp/model/repository/UserModelRepo.java

@@ -25,7 +25,7 @@ public interface UserModelRepo {
      * @param userId 表示用户标识的 {@link String}。
      * @return 该用户可用的模型列表的 {@link List}{@code <}{@link ModelPo}{@code >}。
      */
-    List<ModelPo> getModelList(String userId);
+    List<ModelPo> listModelsByUserId(String userId);
 
     /**
      * 查询特定的模型访问信息。
@@ -51,7 +51,7 @@ public interface UserModelRepo {
      * @param userId 表示用户标识的 {@link String}。
      * @return 该用户可用的用户模型列表的 {@link List}{@code <}{@link UserModelPo}{@code >}。
      */
-    List<UserModelPo> listUserModels(String userId);
+    List<UserModelPo> listUserModelsByUserId(String userId);
 
     /**
      * 根据模型标识列表批量查询模型信息。

app-builder/plugins/aipp-custom-model-center/src/main/java/modelengine/fit/jade/aipp/model/repository/impl/UserModelRepoImpl.java

@@ -37,7 +37,7 @@ public UserModelRepoImpl(ModelMapper modelMapper, UserModelMapper userModelMappe
     }
 
     @Override
-    public List<ModelPo> getModelList(String userId) {
+    public List<ModelPo> listModelsByUserId(String userId) {
         return this.getModelPos(this.userModelMapper.listUserModels(userId));
     }
 
@@ -79,7 +79,7 @@ public ModelPo getDefaultModel(String userId) {
     }
 
     @Override
-    public List<UserModelPo> listUserModels(String userId) {
+    public List<UserModelPo> listUserModelsByUserId(String userId) {
         return this.userModelMapper.listUserModels(userId);
     }
 

app-builder/plugins/aipp-custom-model-center/src/main/java/modelengine/fit/jade/aipp/model/service/impl/CustomAippModelCenter.java

@@ -50,7 +50,7 @@ public CustomAippModelCenter(UserModelRepo userModelRepo,
     @Override
     public ModelListDto fetchModelList(String type, String scene, OperationContext context) {
         LOG.info("[Custom][fetchModelList] operator={}, type={}, scene={}.", context.getOperator(), type, scene);
-        List<ModelPo> modelList = this.userModelRepo.getModelList(context.getOperator());
+        List<ModelPo> modelList = this.userModelRepo.listModelsByUserId(context.getOperator());
         if (CollectionUtils.isEmpty(modelList)) {
             return this.defaultModelCenter.fetchModelList(type, scene, context);
         }

app-builder/plugins/aipp-custom-model-center/src/main/java/modelengine/fit/jade/aipp/model/service/impl/UserModelConfigService.java

@@ -40,7 +40,7 @@
 public class UserModelConfigService implements UserModelConfig {
     private static final Logger log = Logger.get(UserModelConfig.class);
     private static final String FITABLE_ID = "aipp.model.service.impl";
-    public static final String DEFAULT_MODEL_TYPE = "chat_completions";
+    private static final String DEFAULT_MODEL_TYPE = "chat_completions";
     private final UserModelRepo userModelRepo;
 
     /**
@@ -60,7 +60,7 @@ public UserModelConfigService(UserModelRepo userModelRepo) {
     @Property(description = "返回该用户可用的模型列表")
     public List<UserModelDetailDto> getUserModelList(String userId) {
         log.info("start get model list for {}.", userId);
-        List<UserModelPo> userModelPos = this.userModelRepo.listUserModels(userId);
+        List<UserModelPo> userModelPos = this.userModelRepo.listUserModelsByUserId(userId);
         if (CollectionUtils.isEmpty(userModelPos)) {
             log.warn("No user model records found for userId={}.", userId);
             return Collections.emptyList();
@@ -130,7 +130,7 @@ public String addUserModel(String userId, String apiKey, String modelName, Strin
     @Property(description = "删除用户绑定的模型信息")
     public String deleteUserModel(String userId, String modelId) {
         log.info("start delete user model for {}.", userId);
-        List<UserModelPo> userModels = this.userModelRepo.listUserModels(userId);
+        List<UserModelPo> userModels = this.userModelRepo.listUserModelsByUserId(userId);
         if (CollectionUtils.isEmpty(userModels)) {
             return "删除模型失败，当前用户没有任何模型记录。";
         }

app-builder/plugins/aipp-custom-model-center/src/test/java/modelengine/fit/jade/aipp/model/service/impl/CustomAippModelCenterTest.java

@@ -49,7 +49,7 @@ void shouldGetResultWhenFetchModelListGivenUserModelRepoHasData() {
                 .type("type")
                 .tag("tag1")
                 .build();
-        Mockito.when(this.userModelRepo.getModelList(userId)).thenReturn(Collections.singletonList(modelPo));
+        Mockito.when(this.userModelRepo.listModelsByUserId(userId)).thenReturn(Collections.singletonList(modelPo));
         OperationContext context = new OperationContext();
         context.setOperator(userId);
 
@@ -78,7 +78,7 @@ void shouldGetDefaultWhenFetchModelListGivenUserModelRepoNoData() {
                 .tag("tag1")
                 .build();
         ModelAccessInfo model1 = ModelAccessInfo.builder().serviceName("gpt").baseUrl("").tag("").build();
-        Mockito.when(this.userModelRepo.getModelList(userId)).thenReturn(Collections.emptyList());
+        Mockito.when(this.userModelRepo.listModelsByUserId(userId)).thenReturn(Collections.emptyList());
         ModelListDto expectModelList = ModelListDto.builder()
                 .models(Collections.singletonList(model1))
                 .total(1)

app-builder/plugins/aipp-custom-model-center/src/test/java/modelengine/fit/jade/aipp/model/service/impl/UserModelConfigServiceTest.java

@@ -60,7 +60,7 @@ void shouldReturnUserModelListWhenUserHasModels() {
 
         ModelPo modelPo = ModelPo.builder().modelId(modelId).name("gpt").baseUrl("http://testUrl").build();
 
-        Mockito.when(userModelRepo.listUserModels(userId)).thenReturn(Collections.singletonList(userModelPo));
+        Mockito.when(userModelRepo.listUserModelsByUserId(userId)).thenReturn(Collections.singletonList(userModelPo));
         Mockito.when(userModelRepo.listModels(Collections.singletonList(modelId)))
                 .thenReturn(Collections.singletonList(modelPo));
 
@@ -98,7 +98,7 @@ void shouldDeleteModelWhenItIsNotDefault() {
                 .createdAt(LocalDateTime.now())
                 .build();
 
-        Mockito.when(userModelRepo.listUserModels(userId)).thenReturn(Collections.singletonList(userModelPo));
+        Mockito.when(userModelRepo.listUserModelsByUserId(userId)).thenReturn(Collections.singletonList(userModelPo));
 
         String result = userModelConfigService.deleteUserModel(userId, modelId);
         assertEquals("删除模型成功。", result);