[app-builder] change feedback api from usr to user

Author: desAweis

app-builder/plugins/aipp-northbound/src/main/java/modelengine/fit/jade/aipp/northbound/controller/UserFeedbackController.java

@@ -16,8 +16,8 @@
 import modelengine.fit.jane.common.response.Rsp;
 import modelengine.fit.jane.task.gateway.Authenticator;
 import modelengine.fitframework.annotation.Component;
-import modelengine.jade.app.engine.base.dto.UsrFeedbackDto;
-import modelengine.jade.app.engine.base.service.UsrFeedbackService;
+import modelengine.jade.app.engine.base.dto.UserFeedbackDto;
+import modelengine.jade.app.engine.base.service.UserFeedbackService;
 
 /**
  * 用户反馈北向接口。
@@ -28,54 +28,54 @@
 @Component
 @RequestMapping(path = "/api/app/v1/aipp/user")
 public class UserFeedbackController extends AbstractController {
-    private final UsrFeedbackService usrFeedbackService;
+    private final UserFeedbackService userFeedbackService;
 
     /**
-     * 用身份校验器 {@link Authenticator} 和 Aipp 用户反馈功能接口 {@link UsrFeedbackService} 构造 {@link UserFeedbackController}。
+     * 用身份校验器 {@link Authenticator} 和 Aipp 用户反馈功能接口 {@link UserFeedbackService} 构造 {@link UserFeedbackController}。
      *
      * @param authenticator 表示身份校验器的 {@link Authenticator}。
-     * @param usrFeedbackService 表示 Aipp 用户反馈功能接口的 {@link UsrFeedbackService}。
+     * @param userFeedbackService 表示 Aipp 用户反馈功能接口的 {@link UserFeedbackService}。
      */
-    public UserFeedbackController(Authenticator authenticator, UsrFeedbackService usrFeedbackService) {
+    public UserFeedbackController(Authenticator authenticator, UserFeedbackService userFeedbackService) {
         super(authenticator);
-        this.usrFeedbackService = usrFeedbackService;
+        this.userFeedbackService = userFeedbackService;
     }
 
     /**
      * 创建用户反馈记录。
      *
-     * @param usrFeedbackDto 表示用户反馈消息体的 {@link UsrFeedbackDto}。
+     * @param userFeedbackDto 表示用户反馈消息体的 {@link UserFeedbackDto}。
      */
     @PostMapping(path = "/feedback", summary = "创建用户反馈记录",
             description = "该接口用于创建用户对一个对话实例的反馈记录。")
-    public Rsp<Void> createUsrFeedback(@RequestBody UsrFeedbackDto usrFeedbackDto) {
-        this.usrFeedbackService.create(usrFeedbackDto);
+    public Rsp<Void> createUsrFeedback(@RequestBody UserFeedbackDto userFeedbackDto) {
+        this.userFeedbackService.create(userFeedbackDto);
         return Rsp.ok();
     }
 
     /**
      * 更新用户反馈信息。
      *
-     * @param usrFeedbackDto 表示用户反馈消息体的 {@link UsrFeedbackDto}。
+     * @param userFeedbackDto 表示用户反馈消息体的 {@link UserFeedbackDto}。
      * @param instanceId 表示对话实例 Id 的 {@link String}。
      */
     @PatchMapping(path = "/feedback/{instanceId}", summary = "更新用户反馈记录",
             description = "该接口用于更新用户对一个对话实例反馈记录。")
     public Rsp<Void> updateUsrFeedback(@PathVariable("instanceId") String instanceId,
-            @RequestBody UsrFeedbackDto usrFeedbackDto) {
-        this.usrFeedbackService.updateOne(instanceId, usrFeedbackDto);
+            @RequestBody UserFeedbackDto userFeedbackDto) {
+        this.userFeedbackService.updateOne(instanceId, userFeedbackDto);
         return Rsp.ok();
     }
 
     /**
      * 通过 logId 查询用户反馈记录
      *
      * @param instanceId 表示对话实例 Id 的 {@link String}。
-     * @return 表示反馈记录的 {@link UsrFeedbackDto}。
+     * @return 表示反馈记录的 {@link UserFeedbackDto}。
      */
     @GetMapping(path = "/feedback/{instanceId}", summary = "查询用户反馈记录",
             description = "该接口可以通过待查询实例的唯一标识符来查询实例的反馈记录。")
-    public Rsp<UsrFeedbackDto> getAllAnswerByInstanceId(@PathVariable("instanceId") String instanceId) {
-        return Rsp.ok(this.usrFeedbackService.getUsrFeedbackByInstanceId(instanceId));
+    public Rsp<UserFeedbackDto> getAllAnswerByInstanceId(@PathVariable("instanceId") String instanceId) {
+        return Rsp.ok(this.userFeedbackService.getUserFeedbackByInstanceId(instanceId));
     }
 }

app-builder/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/controller/AppBuilderGuestController.java

@@ -54,9 +54,9 @@
 import modelengine.fitframework.util.ObjectUtils;
 import modelengine.fitframework.util.StringUtils;
 import modelengine.jade.app.engine.base.dto.AppBuilderRecommendDto;
-import modelengine.jade.app.engine.base.dto.UsrFeedbackDto;
+import modelengine.jade.app.engine.base.dto.UserFeedbackDto;
 import modelengine.jade.app.engine.base.service.AppBuilderRecommendService;
-import modelengine.jade.app.engine.base.service.UsrFeedbackService;
+import modelengine.jade.app.engine.base.service.UserFeedbackService;
 import modelengine.jade.service.annotations.CarverSpan;
 import modelengine.jade.service.annotations.SpanAttr;
 
@@ -80,15 +80,15 @@ public class AppBuilderGuestController extends AbstractController {
     private final AippLogService aippLogService;
     private final AppBuilderPromptService appBuilderPromptService;
     private final AippRunTimeService aippRunTimeService;
-    private final UsrFeedbackService usrFeedbackService;
+    private final UserFeedbackService userFeedbackService;
     private final AppBuilderRecommendService recommendService;
     private final FileService fileService;
     private final AippChatService aippChatService;
 
     /**
      * 用限校验认的证器对象 {@link Authenticator}， 应用通用服务 {@link AppBuilderAppService}，对话服务 {@link AppChatService}，实例历史记录服务
      * {@link AippLogService}，灵感大全服务类 {@link AppBuilderPromptService}，运行时服务类 {@link AippRunTimeService}，用户反馈服务类
-     * {@link UsrFeedbackService}，
+     * {@link UserFeedbackService}，
      * 猜你想问服务类 {@link AppBuilderRecommendService}，文件服务类 {@link FileService} 和应用聊天服务类 {@link AippChatService} 构造
      * {@link AppBuilderGuestController}。
      *
@@ -98,23 +98,23 @@ public class AppBuilderGuestController extends AbstractController {
      * @param aippLogService 表示实例历史记录服务的 {@link AippLogService}。
      * @param appBuilderPromptService 表示灵感大全服务的 {@link AppBuilderPromptService}。
      * @param aippRunTimeService 表示运行时服务的 {@link AippRunTimeService}。
-     * @param usrFeedbackService 表示用户反馈服务的 {@link UsrFeedbackService}。
+     * @param userFeedbackService 表示用户反馈服务的 {@link UserFeedbackService}。
      * @param recommendService 表示猜你想问服务的 {@link AppBuilderRecommendService}。
      * @param fileService 表示文件服务的 {@link FileService}。
      * @param aippChatService 表示应用聊天服务的 {@link AippChatService}。
      */
     public AppBuilderGuestController(Authenticator authenticator, AppBuilderAppService appGenericable,
             AppChatService appChatService, AippLogService aippLogService,
             AppBuilderPromptService appBuilderPromptService, AippRunTimeService aippRunTimeService,
-            UsrFeedbackService usrFeedbackService, AppBuilderRecommendService recommendService, FileService fileService,
+            UserFeedbackService userFeedbackService, AppBuilderRecommendService recommendService, FileService fileService,
             AippChatService aippChatService) {
         super(authenticator);
         this.appGenericable = appGenericable;
         this.appChatService = appChatService;
         this.aippLogService = aippLogService;
         this.appBuilderPromptService = appBuilderPromptService;
         this.aippRunTimeService = aippRunTimeService;
-        this.usrFeedbackService = usrFeedbackService;
+        this.userFeedbackService = userFeedbackService;
         this.recommendService = recommendService;
         this.fileService = fileService;
         this.aippChatService = aippChatService;
@@ -375,23 +375,23 @@ public Rsp<Void> deleteLogs(@RequestBody List<Long> logIds) {
     /**
      * 创建用户反馈记录。
      *
-     * @param usrFeedbackDto 表示用户反馈消息体的 {@link UsrFeedbackDto}。
+     * @param userFeedbackDto 表示用户反馈消息体的 {@link UserFeedbackDto}。
      */
     @PostMapping("/feedback")
-    public void createUsrFeedback(@RequestBody UsrFeedbackDto usrFeedbackDto) {
-        this.usrFeedbackService.create(usrFeedbackDto);
+    public void createUserFeedback(@RequestBody UserFeedbackDto userFeedbackDto) {
+        this.userFeedbackService.create(userFeedbackDto);
     }
 
     /**
      * 更新用户反馈信息。
      *
      * @param instanceId 表示对话实例标识的 {@link String}。
-     * @param usrFeedbackDto 表示用户反馈消息体的 {@link UsrFeedbackDto}。
+     * @param userFeedbackDto 表示用户反馈消息体的 {@link UserFeedbackDto}。
      */
     @PatchMapping("/feedback/{instanceId}")
-    public void updateUsrFeedback(@PathVariable("instanceId") String instanceId,
-            @RequestBody UsrFeedbackDto usrFeedbackDto) {
-        this.usrFeedbackService.updateOne(instanceId, usrFeedbackDto);
+    public void updateUserFeedback(@PathVariable("instanceId") String instanceId,
+            @RequestBody UserFeedbackDto userFeedbackDto) {
+        this.userFeedbackService.updateOne(instanceId, userFeedbackDto);
     }
 
     /**
@@ -401,28 +401,28 @@ public void updateUsrFeedback(@PathVariable("instanceId") String instanceId,
      */
     @DeleteMapping("/feedback/{instanceId}")
     public void deleteByLogId(@PathVariable("instanceId") String instanceId) {
-        this.usrFeedbackService.deleteByLogId(instanceId);
+        this.userFeedbackService.deleteByLogId(instanceId);
     }
 
     /**
      * 获取用户反馈信息列表。
      *
-     * @return 表示用户反馈信息列表的 {@link List}{@code <}{@link UsrFeedbackDto}{@code >}。
+     * @return 表示用户反馈信息列表的 {@link List}{@code <}{@link UserFeedbackDto}{@code >}。
      */
     @GetMapping("/feedbacks")
-    public List<UsrFeedbackDto> getAllUsrFeedbacks() {
-        return this.usrFeedbackService.getAllUsrFeedbacks();
+    public List<UserFeedbackDto> getAllUserFeedbacks() {
+        return this.userFeedbackService.getAllUserFeedbacks();
     }
 
     /**
      * 通过日志唯一标识获取对话信息列表。
      *
      * @param instanceId 对话实例唯一标识的 {@link String}。
-     * @return 表示对话信息的 {@link UsrFeedbackDto}。
+     * @return 表示对话信息的 {@link UserFeedbackDto}。
      */
     @GetMapping("/feedback/{instanceId}")
-    public UsrFeedbackDto getAllAnswerByInstanceId(@PathVariable("instanceId") String instanceId) {
-        return this.usrFeedbackService.getUsrFeedbackByInstanceId(instanceId);
+    public UserFeedbackDto getAllAnswerByInstanceId(@PathVariable("instanceId") String instanceId) {
+        return this.userFeedbackService.getUserFeedbackByInstanceId(instanceId);
     }
 
     /**

app-builder/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/domains/app/service/impl/AppDomainServiceImpl.java

@@ -20,12 +20,11 @@
 import modelengine.fit.jober.aipp.dto.export.AppExportDto;
 import modelengine.fit.jober.aipp.service.UploadedFileManageService;
 import modelengine.fitframework.annotation.Value;
-import modelengine.jade.app.engine.base.service.UsrAppCollectionService;
+import modelengine.jade.app.engine.base.service.UserAppCollectionService;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import lombok.AllArgsConstructor;
 import modelengine.fitframework.annotation.Component;
 import modelengine.fitframework.log.Logger;
 import modelengine.fitframework.transaction.Transactional;
@@ -46,17 +45,17 @@ public class AppDomainServiceImpl implements AppDomainService {
     private final AppFactory appFactory;
     private final AppVersionService appVersionService;
     private final UploadedFileManageService uploadedFileManageService;
-    private final UsrAppCollectionService usrAppCollectionService;
+    private final UserAppCollectionService userAppCollectionService;
     private final ConverterFactory converterFactory;
     private final String contextRoot;
 
     public AppDomainServiceImpl(AppFactory appFactory, AppVersionService appVersionService,
-            UploadedFileManageService uploadedFileManageService, UsrAppCollectionService usrAppCollectionService,
+            UploadedFileManageService uploadedFileManageService, UserAppCollectionService userAppCollectionService,
             ConverterFactory converterFactory, @Value("${app-engine.contextRoot}") String contextRoot) {
         this.appFactory = appFactory;
         this.appVersionService = appVersionService;
         this.uploadedFileManageService = uploadedFileManageService;
-        this.usrAppCollectionService = usrAppCollectionService;
+        this.userAppCollectionService = userAppCollectionService;
         this.converterFactory = converterFactory;
         this.contextRoot = contextRoot;
     }
@@ -69,7 +68,7 @@ public void deleteByAppId(String appId, OperationContext context) {
         App app = this.appFactory.create(appSuiteId);
         app.delete(context);
         this.uploadedFileManageService.cleanAippFiles(Collections.singletonList(appId));
-        this.usrAppCollectionService.deleteByAppId(appId);
+        this.userAppCollectionService.deleteByAppId(appId);
     }
 
     @Override

app-builder/plugins/aipp-plugin/src/test/java/modelengine/fit/jober/aipp/domains/app/AppServiceTest.java

@@ -37,15 +37,13 @@
 import modelengine.fit.jober.aipp.po.AppBuilderAppPo;
 import modelengine.fit.jober.aipp.service.UploadedFileManageService;
 import modelengine.fitframework.util.StringUtils;
-import modelengine.jade.app.engine.base.service.UsrAppCollectionService;
+import modelengine.jade.app.engine.base.service.UserAppCollectionService;
 import modelengine.jade.store.service.AppService;
 import modelengine.fitframework.util.IoUtils;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -63,19 +61,19 @@ public class AppServiceTest {
     private AppFactory appFactory;
     private AppVersionService appVersionService;
     private UploadedFileManageService uploadedFileManageService;
-    private UsrAppCollectionService usrAppCollectionService;
+    private UserAppCollectionService userAppCollectionService;
     private IconConverter iconConverter;
 
     @BeforeEach
     public void setUp() {
         this.appFactory = mock(AppFactory.class);
         this.appVersionService = mock(AppVersionService.class);
         this.uploadedFileManageService = mock(UploadedFileManageService.class);
-        this.usrAppCollectionService = mock(UsrAppCollectionService.class);
+        this.userAppCollectionService = mock(UserAppCollectionService.class);
         this.iconConverter = mock(IconConverter.class);
         ConverterFactory converterFactory = new ConverterFactory(List.of(new AppVersionToAppDtoConverter(iconConverter)));
         this.appDomainService = new AppDomainServiceImpl(this.appFactory, this.appVersionService,
-                this.uploadedFileManageService, this.usrAppCollectionService, converterFactory, StringUtils.EMPTY);
+                this.uploadedFileManageService, this.userAppCollectionService, converterFactory, StringUtils.EMPTY);
     }
 
     @Test
@@ -92,7 +90,7 @@ public void testGetVersions() {
         doNothing().when(app).delete(any());
 
         doNothing().when(this.uploadedFileManageService).cleanAippFiles(any());
-        doNothing().when(this.usrAppCollectionService).deleteByAppId(anyString());
+        doNothing().when(this.userAppCollectionService).deleteByAppId(anyString());
 
         // when.
         this.appDomainService.deleteByAppId("app_version_1", new OperationContext());
@@ -101,7 +99,7 @@ public void testGetVersions() {
         verify(app, times(1)).delete(any());
         verify(this.uploadedFileManageService, times(1)).cleanAippFiles(
                 argThat(strings -> strings.size() == 1 && strings.get(0).equals("app_version_1")));
-        verify(this.usrAppCollectionService, times(1)).deleteByAppId(eq("app_version_1"));
+        verify(this.userAppCollectionService, times(1)).deleteByAppId(eq("app_version_1"));
     }
 
     @Test