refactor(server): refactor function template (#1476)

* refactor(server): refactor function template * chore * refactor Reducing redundant code * chore
labring · Aug 23, 2023 · 77ce3de · 77ce3de
1 parent cfb475f
commit 77ce3de
Show file tree

Hide file tree

Showing 3 changed files with 460 additions and 416 deletions.
diff --git a/server/src/function-template/dto/function-templates.dto.ts b/server/src/function-template/dto/function-templates.dto.ts
@@ -80,6 +80,12 @@ export class FunctionTemplatesDto {
 
   @ApiPropertyOptional({ type: UserInfo })
   user?: UserInfo
+
+  @ApiProperty({ type: String })
+  author?: string
+
+  @ApiProperty({ type: Boolean })
+  stared?: boolean
 }
 
 export class GetMyStaredFunctionTemplatesDto {

diff --git a/server/src/function-template/function-template.controller.ts b/server/src/function-template/function-template.controller.ts
@@ -304,35 +304,42 @@ export class FunctionTemplateController {
     }
 
     if (type === 'default' && keyword) {
-      const res =
-        await this.functionTemplateService.findMyFunctionTemplatesByName(
-          asc,
-          page,
-          pageSize,
-          req.user._id,
-          keyword,
-        )
+      const condition = {
+        asc,
+        page,
+        pageSize,
+        name: keyword,
+      }
+      const res = await this.functionTemplateService.findMyFunctionTemplates(
+        req.user._id,
+        condition,
+      )
       return ResponseUtil.ok(res)
     }
 
     if (type === 'default' && sort === 'hot') {
-      const hot = true
-      const res = await this.functionTemplateService.findMyFunctionTemplates(
-        asc,
+      const condition = {
         page,
         pageSize,
+        asc,
+        hot: true,
+      }
+      const res = await this.functionTemplateService.findMyFunctionTemplates(
         req.user._id,
-        hot,
+        condition,
       )
       return ResponseUtil.ok(res)
     }
 
     if (type === 'default') {
-      const res = await this.functionTemplateService.findMyFunctionTemplates(
+      const condition = {
         asc,
         page,
         pageSize,
+      }
+      const res = await this.functionTemplateService.findMyFunctionTemplates(
         req.user._id,
+        condition,
       )
       return ResponseUtil.ok(res)
     }
@@ -442,6 +449,7 @@ export class FunctionTemplateController {
     @Query('pageSize') pageSize: number,
     @Query('keyword') keyword: string,
     @Query('sort') sort: string,
+    @Req() req: IRequest,
   ) {
     asc = asc === 0 ? Number(asc) : 1
     page = page ? Number(page) : 1
@@ -460,6 +468,7 @@ export class FunctionTemplateController {
 
     const res =
       await this.functionTemplateService.findRecommendFunctionTemplates(
+        req.user._id,
         condition,
       )
 
@@ -508,6 +517,7 @@ export class FunctionTemplateController {
     @Query('pageSize') pageSize: number,
     @Query('keyword') keyword: string,
     @Query('sort') sort: string,
+    @Req() req: IRequest,
   ) {
     asc = asc === 0 ? Number(asc) : 1
     page = page ? Number(page) : 1
@@ -522,25 +532,17 @@ export class FunctionTemplateController {
           page,
           pageSize,
           keyword,
+          req.user._id,
         )
       return ResponseUtil.ok(res)
     }
 
-    if (sort === 'hot') {
-      const hot = true
-      const res = await this.functionTemplateService.findFunctionTemplates(
-        asc,
-        page,
-        pageSize,
-        hot,
-      )
-      return ResponseUtil.ok(res)
-    }
-
     const res = await this.functionTemplateService.findFunctionTemplates(
       asc,
       page,
       pageSize,
+      req.user._id,
+      sort,
     )
 
     return ResponseUtil.ok(res)