Merge branch 'main' of github.com:import-ai/omnibox-backend into refactor/permissions

Author: ycdzj

src/conversations/conversations.service.ts

@@ -205,10 +205,10 @@ export class ConversationsService {
     };
   }
 
-  private async convertToConversationDetail(
+  private convertToConversationDetail(
     conversation: Conversation,
     messages: Message[],
-  ): Promise<ConversationDetailDto> {
+  ): ConversationDetailDto {
     const detail: ConversationDetailDto = {
       id: conversation.id,
       title: conversation.title,
@@ -275,7 +275,7 @@ export class ConversationsService {
       user.id,
       conversation.id,
     );
-    return await this.convertToConversationDetail(conversation, messages);
+    return this.convertToConversationDetail(conversation, messages);
   }
 
   async getConversationForShare(
@@ -289,7 +289,7 @@ export class ConversationsService {
       undefined,
       conversation.id,
     );
-    return await this.convertToConversationDetail(conversation, messages);
+    return this.convertToConversationDetail(conversation, messages);
   }
 
   async findOne(id: string) {

src/user/user.controller.ts

@@ -69,6 +69,11 @@ export class UserController {
     return await this.userService.createOption(req.user.id, createOptionDto);
   }
 
+  @Get('option/list')
+  async listOption(@Req() req) {
+    return await this.userService.listOption(req.user.id);
+  }
+
   @Get('option/:name')
   async getOption(@Req() req, @Param('name') name: string) {
     return await this.userService.getOption(req.user.id, name);

src/user/user.service.ts

@@ -420,6 +420,16 @@ export class UserService {
     await repo.save(repo.create({ userId, name, value }));
   }
 
+  async listOption(userId: string, entityManager?: EntityManager) {
+    const repo = entityManager
+      ? entityManager.getRepository(UserOption)
+      : this.userOptionRepository;
+    const optionList = await repo.findBy({
+      userId,
+    });
+    return optionList;
+  }
+
   async getOption(userId: string, name: string, entityManager?: EntityManager) {
     const repo = entityManager
       ? entityManager.getRepository(UserOption)