Merge pull request #224 from boostcampwm-2024/dev

[Deploy] 5주차 스프린트 배포 - 1

Author: ShipFriend0516

.prettierrc

@@ -4,7 +4,7 @@
   "semi": true,
   "singleQuote": false,
   "trailingComma": "es5",
-  "bracketSpacing": true, 
+  "bracketSpacing": true,
   "arrowParens": "always",
   "bracketSameLine": false,
   "jsxSingleQuote": false,
@@ -21,7 +21,8 @@
     {
       "files": "backend/**/*.{js,jsx,ts,tsx}",
       "options": {
-        "tabWidth": 4
+        "tabWidth": 4,
+        "printWidth": 100
       }
     }
   ]

backend/package.json

@@ -10,6 +10,7 @@
     "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
     "start": "nest start",
     "start:dev": "nest start --watch",
+    "start:dev1": "PORT=3001 nest start --watch",
     "start:debug": "nest start --debug --watch",
     "start:prod": "node dist/main",
     "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
@@ -28,15 +29,20 @@
     "@nestjs/platform-socket.io": "^10.4.6",
     "@nestjs/typeorm": "^10.0.2",
     "@nestjs/websockets": "^10.4.6",
+    "@socket.io/redis-adapter": "^8.3.0",
     "@types/passport-jwt": "^4.0.1",
     "axios": "^1.7.7",
     "cookie-parser": "^1.4.7",
+    "class-transformer": "^0.5.1",
+    "class-validator": "^0.14.1",
     "dotenv": "^16.4.5",
     "ioredis": "^5.4.1",
     "mysql2": "^3.11.4",
+    "nestjs-redis-om": "^0.1.2",
     "passport": "^0.7.0",
     "passport-custom": "^1.1.1",
     "passport-jwt": "^4.0.1",
+    "redis-om": "^0.4.7",
     "reflect-metadata": "^0.2.0",
     "rxjs": "^7.8.1",
     "socket.io": "^4.8.1",

backend/src/app.controller.spec.ts

@@ -3,9 +3,7 @@ import { Module } from "@nestjs/common";
 import { AppController } from "./app.controller";
 import { AppService } from "./app.service";
 
-import { SocketModule } from "./signaling-server/socket.module";
 import { RoomModule } from "./room/room.module";
-import { RedisModule } from "./redis/redis.module";
 import { AuthModule } from "./auth/auth.module";
 import { UserModule } from "./user/user.module";
 import { TypeOrmModule } from "@nestjs/typeorm";
@@ -14,19 +12,23 @@ import "dotenv/config";
 
 import { createDataSource, typeOrmConfig } from "./config/typeorm.config";
 import { QuestionListModule } from "./question-list/question-list.module";
+import { RedisOmModule } from "nestjs-redis-om";
+import { SigServerModule } from "@/signaling-server/sig-server.module";
 
 @Module({
     imports: [
         TypeOrmModule.forRootAsync({
             useFactory: async () => typeOrmConfig, // 설정 객체를 직접 반환
             dataSourceFactory: async () => await createDataSource(), // 분리된 데이터소스 생성 함수 사용
         }),
-        SocketModule,
+        RedisOmModule.forRoot({
+            url: `redis://${process.env.REDIS_HOST}:${process.env.REDIS_PORT}`,
+        }),
         RoomModule,
-        RedisModule,
         AuthModule,
         UserModule,
         QuestionListModule,
+        SigServerModule,
     ],
     controllers: [AppController],
     providers: [AppService],

backend/src/app.module.ts

@@ -35,16 +35,12 @@ export class QuestionListRepository {
     }
 
     async findCategoryNamesByQuestionListId(questionListId: number) {
-        const questionList = await this.dataSource
-            .getRepository(QuestionList)
-            .findOne({
-                where: { id: questionListId },
-                relations: ["categories"], // 질문지와 관련된 카테고리도 함께 조회
-            });
-        console.log(questionList);
-        return questionList
-            ? questionList.categories.map((category) => category.name)
-            : [];
+        const questionList = await this.dataSource.getRepository(QuestionList).findOne({
+            where: { id: questionListId },
+            relations: ["categories"], // 질문지와 관련된 카테고리도 함께 조회
+        });
+
+        return questionList ? questionList.categories.map((category) => category.name) : [];
     }
 
     async findCategoriesByNames(categoryNames: string[]) {