Merge pull request #300 from boostcampwm-2024/dev

[Deploy] 6주차 1차 배포

backend/package.json

@@ -39,7 +39,6 @@
     "dotenv": "^16.4.5",
     "ioredis": "^5.4.1",
     "mysql2": "^3.11.4",
-    "nestjs-paginate": "^10.0.0",
     "nestjs-redis-om": "^0.1.2",
     "passport": "^0.7.0",
     "passport-custom": "^1.1.1",

backend/src/app.module.ts

@@ -14,6 +14,7 @@ import { createDataSource, typeOrmConfig } from "./config/typeorm.config";
 import { QuestionListModule } from "./question-list/question-list.module";
 import { RedisOmModule } from "@moozeh/nestjs-redis-om";
 import { SigServerModule } from "@/signaling-server/sig-server.module";
+import { QuestionModule } from './question/question.module';
 
 @Module({
     imports: [
@@ -29,6 +30,7 @@ import { SigServerModule } from "@/signaling-server/sig-server.module";
         UserModule,
         QuestionListModule,
         SigServerModule,
+        QuestionModule,
     ],
     controllers: [AppController],
     providers: [AppService],

backend/src/config/typeorm.config.ts

@@ -3,9 +3,9 @@ import { SnakeNamingStrategy } from "typeorm-naming-strategies";
 import { User } from "@/user/user.entity";
 import "dotenv/config";
 import { addTransactionalDataSource } from "typeorm-transactional";
-import { QuestionList } from "@/question-list/question-list.entity";
-import { Question } from "@/question-list/question.entity";
-import { Category } from "@/question-list/category.entity";
+import { QuestionList } from "@/question-list/entity/question-list.entity";
+import { Question } from "@/question-list/entity/question.entity";
+import { Category } from "@/question-list/entity/category.entity";
 
 export const typeOrmConfig: DataSourceOptions = {
     type: "mysql",

backend/src/question-list/dto/paginate-meta.dto.ts

@@ -0,0 +1,24 @@
+import { IsInt, IsNumberString, IsString } from "class-validator";
+import { Expose } from "class-transformer";
+
+export class PaginateMetaDto {
+    @Expose()
+    @IsInt()
+    itemsPerPage: number;
+
+    @Expose()
+    @IsInt()
+    totalItems: number;
+
+    @Expose()
+    @IsNumberString()
+    currentPage: string;
+
+    @Expose()
+    @IsInt()
+    totalPages: number;
+
+    @Expose()
+    @IsString()
+    sortBy: string;
+}

backend/src/question-list/dto/paginate-query.dto.ts

@@ -0,0 +1,29 @@
+import { IsInt, IsOptional, IsString, Min } from "class-validator";
+import { Expose, Transform } from "class-transformer";
+
+export class PaginateQueryDto {
+    @Expose()
+    @IsOptional()
+    @IsInt()
+    @Min(1)
+    @Transform(({ value }) => (value ? parseInt(value) : 1))
+    page?: number;
+
+    @Expose()
+    @IsOptional()
+    @IsInt()
+    @Min(1)
+    @Transform(({ value }) => (value ? parseInt(value) : 4))
+    limit?: number;
+
+    @Expose()
+    @IsOptional()
+    @IsString()
+    @Transform(({ value }) => value || "usage:DESC")
+    sortBy?: string;
+
+    @Expose()
+    @IsOptional()
+    @IsString()
+    category?: string;
+}

backend/src/question-list/dto/paginate.dto.ts

@@ -0,0 +1,9 @@
+import { SelectQueryBuilder } from "typeorm";
+
+export class PaginateDto {
+    queryBuilder: SelectQueryBuilder<any>;
+    skip: number;
+    take: number;
+    field: string;
+    direction: "ASC" | "DESC";
+}

backend/src/question-list/dto/question-list-contents.dto.ts

@@ -1,4 +1,4 @@
-import { Question } from "../question.entity";
+import { Question } from "../entity/question.entity";
 
 export interface QuestionListContentsDto {
     id: number;

backend/src/question-list/question-list.controller.ts

@@ -9,6 +9,8 @@ import {
     Query,
     Req,
     UseGuards,
+    UsePipes,
+    ValidationPipe,
 } from "@nestjs/common";
 import { QuestionListService } from "./question-list.service";
 import { CreateQuestionListDto } from "./dto/create-question-list.dto";
@@ -19,14 +21,15 @@ import { IJwtPayload } from "@/auth/jwt/jwt.model";
 import { UpdateQuestionListDto } from "@/question-list/dto/update-question-list.dto";
 import { QuestionDto } from "@/question-list/dto/question.dto";
 import { DeleteQuestionDto } from "@/question-list/dto/delete-question.dto";
-import { PaginateQuery } from "nestjs-paginate";
+import { PaginateQueryDto } from "@/question-list/dto/paginate-query.dto";
 
 @Controller("question-list")
 export class QuestionListController {
     constructor(private readonly questionListService: QuestionListService) {}
 
     @Get()
-    async getAllQuestionLists(@Query() query: PaginateQuery) {
+    @UsePipes(new ValidationPipe({ transform: true }))
+    async getAllQuestionLists(@Query() query: PaginateQueryDto) {
         try {
             const { allQuestionLists, meta } =
                 await this.questionListService.getAllQuestionLists(query);
@@ -47,6 +50,37 @@ export class QuestionListController {
         }
     }
 
+    @Post("category")
+    @UsePipes(new ValidationPipe({ transform: true }))
+    async getAllQuestionListsByCategoryName(
+        @Query() query: PaginateQueryDto,
+        @Body()
+        body: {
+            categoryName: string;
+        }
+    ) {
+        try {
+            const { categoryName } = body;
+            query.category = categoryName;
+            const { allQuestionLists, meta } =
+                await this.questionListService.getAllQuestionLists(query);
+            return {
+                success: true,
+                message: "All question lists received successfully.",
+                data: {
+                    allQuestionLists,
+                    meta,
+                },
+            };
+        } catch (error) {
+            return {
+                success: false,
+                message: "Failed to get all question lists.",
+                error: error.message,
+            };
+        }
+    }
+
     @Post()
     @UseGuards(AuthGuard("jwt"))
     async createQuestionList(
@@ -92,49 +126,20 @@ export class QuestionListController {
         }
     }
 
-    @Post("category")
-    async getAllQuestionListsByCategoryName(
-        @Query() query: PaginateQuery,
-        @Body()
-        body: {
-            categoryName: string;
-        }
-    ) {
-        try {
-            const { categoryName } = body;
-            const { allQuestionLists, meta } =
-                await this.questionListService.getAllQuestionListsByCategoryName(
-                    categoryName,
-                    query
-                );
-            return {
-                success: true,
-                message: "All question lists received successfully.",
-                data: {
-                    allQuestionLists,
-                    meta,
-                },
-            };
-        } catch (error) {
-            return {
-                success: false,
-                message: "Failed to get all question lists.",
-                error: error.message,
-            };
-        }
-    }
-
     @Post("contents")
+    @UseGuards(AuthGuard("jwt"))
     async getQuestionListContents(
+        @JwtPayload() token: IJwtPayload,
         @Body()
         body: {
             questionListId: number;
         }
     ) {
         try {
+            const userId = token.userId;
             const { questionListId } = body;
             const questionListContents: QuestionListContentsDto =
-                await this.questionListService.getQuestionListContents(questionListId);
+                await this.questionListService.getQuestionListContents(questionListId, userId);
             return {
                 success: true,
                 message: "Question list contents received successfully.",
@@ -153,7 +158,8 @@ export class QuestionListController {
 
     @Get("my")
     @UseGuards(AuthGuard("jwt"))
-    async getMyQuestionLists(@Query() query: PaginateQuery, @JwtPayload() token: IJwtPayload) {
+    @UsePipes(new ValidationPipe({ transform: true }))
+    async getMyQuestionLists(@Query() query: PaginateQueryDto, @JwtPayload() token: IJwtPayload) {
         try {
             const userId = token.userId;
             const { myQuestionLists, meta } = await this.questionListService.getMyQuestionLists(
@@ -353,8 +359,9 @@ export class QuestionListController {
 
     @Get("scrap")
     @UseGuards(AuthGuard("jwt"))
+    @UsePipes(new ValidationPipe({ transform: true }))
     async getScrappedQuestionLists(
-        @Query() query: PaginateQuery,
+        @Query() query: PaginateQueryDto,
         @JwtPayload() token: IJwtPayload
     ) {
         try {

backend/src/question-list/question-list.module.ts

@@ -1,12 +1,20 @@
 import { Module } from "@nestjs/common";
 import { QuestionListController } from "./question-list.controller";
 import { QuestionListService } from "./question-list.service";
-import { QuestionListRepository } from "./question-list.repository";
+import { QuestionListRepository } from "./repository/question-list.repository";
 import { UserRepository } from "@/user/user.repository";
+import { QuestionRepository } from "@/question-list/repository/question.respository";
+import { CategoryRepository } from "@/question-list/repository/category.repository";
 
 @Module({
     controllers: [QuestionListController],
-    providers: [QuestionListService, QuestionListRepository, UserRepository],
-    exports: [QuestionListRepository],
+    providers: [
+        QuestionListService,
+        QuestionListRepository,
+        QuestionRepository,
+        UserRepository,
+        CategoryRepository,
+    ],
+    exports: [QuestionListRepository, QuestionRepository],
 })
 export class QuestionListModule {}