Merge pull request #140 from platinouss/feature/231125-enter-room-api

Feature: DB에서 참여 코드 관리 & 강의실 입장 시 해당 유저의 수강한 강의 목록에 추가

backend/src/room/dto/create-room.dto.ts

@@ -1,4 +1,5 @@
 export class CreateRoomDto {
+  email: string;
   title: string;
   description: string;
 }

backend/src/room/dto/enter-room.dto.ts

@@ -0,0 +1,3 @@
+export class EnterRoomDto {
+  email: string;
+}

backend/src/room/room-code.schema.ts

@@ -0,0 +1,14 @@
+import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
+import mongoose from 'mongoose';
+import { Lecture } from '../lecture/lecture.schema';
+
+@Schema()
+export class EnterCode {
+  @Prop({ required: true })
+  code: string;
+
+  @Prop({ type: mongoose.Schema.Types.ObjectId, ref: 'Lecture' })
+  lecture_id: Lecture;
+}
+
+export const EnterCodeSchema = SchemaFactory.createForClass(EnterCode);

backend/src/room/room.controller.ts

@@ -1,15 +1,31 @@
-import { Body, Controller, HttpStatus, Post, Res } from '@nestjs/common';
+import { Body, Controller, HttpStatus, Param, Patch, Post, Res } from '@nestjs/common';
 import { RoomService } from './room.service';
 import { Response } from 'express';
 import { CreateRoomDto } from './dto/create-room.dto';
+import { EnterRoomDto } from './dto/enter-room.dto';
+import { UserService } from '../user/user.service';
 
 @Controller('/room')
 export class RoomController {
-  constructor(private readonly roomService: RoomService) {}
+  constructor(
+    private readonly roomService: RoomService,
+    private readonly userService: UserService
+  ) {}
 
   @Post()
-  create(@Body() createRoomDto: CreateRoomDto, @Res() res: Response) {
-    this.roomService.createRoom(createRoomDto);
-    res.status(HttpStatus.CREATED).send({ code: this.roomService.generateRoomCode() });
+  async create(@Body() createRoomDto: CreateRoomDto, @Res() res: Response) {
+    const code = await this.roomService.createRoom(createRoomDto);
+    res.status(HttpStatus.CREATED).send({ code: code });
+  }
+
+  @Patch('/:code')
+  async enter(@Param('code') code: string, @Body() enterRoomDto: EnterRoomDto, @Res() res: Response) {
+    const enterCodeDocument = await this.roomService.findRoomByCode(code);
+    if (!enterCodeDocument) {
+      res.status(HttpStatus.NOT_FOUND).send();
+      return;
+    }
+    const result = await this.userService.updateLecture(enterRoomDto.email, enterCodeDocument.lecture_id);
+    res.status(HttpStatus.OK).send(result);
   }
 }

backend/src/room/room.module.ts

@@ -3,10 +3,19 @@ import { RoomController } from './room.controller';
 import { RoomService } from './room.service';
 import { MongooseModule } from '@nestjs/mongoose';
 import { Room, RoomSchema } from './room.schema';
+import { EnterCode, EnterCodeSchema } from './room-code.schema';
+import { UserService } from '../user/user.service';
+import { User, UserSchema } from '../schema/user.schema';
 
 @Module({
-  imports: [MongooseModule.forFeature([{ name: Room.name, schema: RoomSchema }])],
+  imports: [
+    MongooseModule.forFeature([
+      { name: Room.name, schema: RoomSchema },
+      { name: EnterCode.name, schema: EnterCodeSchema },
+      { name: User.name, schema: UserSchema }
+    ])
+  ],
   controllers: [RoomController],
-  providers: [RoomService]
+  providers: [RoomService, UserService]
 })
 export class RoomModule {}

backend/src/room/room.service.ts

@@ -4,28 +4,40 @@ import { InjectModel } from '@nestjs/mongoose';
 import { Room } from './room.schema';
 import { Model } from 'mongoose';
 import { CreateRoomDto } from './dto/create-room.dto';
+import { EnterCode } from './room-code.schema';
+import { UserService } from '../user/user.service';
 
 @Injectable()
 export class RoomService {
-  private readonly currentRoomCode;
+  constructor(
+    @InjectModel(Room.name)
+    private roomModel: Model<Room>,
+    @InjectModel(EnterCode.name)
+    private enterCodeModel: Model<EnterCode>,
+    private readonly userService: UserService
+  ) {}
 
-  constructor(@InjectModel(Room.name) private roomModel: Model<Room>) {
-    // TODO: 현재 사용 중인 방 코드를 Redis 같은 곳에서 관리 필요
-    this.currentRoomCode = new Set();
+  async createRoom(createRoomDto: CreateRoomDto) {
+    const user = await this.userService.findOneByEmail(createRoomDto.email);
+    const createdRoom = new this.roomModel({ ...createRoomDto, presenter_id: user.id });
+    const createdEnterCode = new this.enterCodeModel({
+      code: await this.generateRoomCode(),
+      lecture_id: createdRoom.id
+    });
+    await Promise.all([createdRoom.save(), createdEnterCode.save()]);
+    return createdEnterCode.code;
   }
 
-  async createRoom(createRoomDto: CreateRoomDto): Promise<void> {
-    const createdRoom = new this.roomModel(createRoomDto);
-    await createdRoom.save();
-  }
-
-  generateRoomCode(): string {
+  async generateRoomCode() {
     const generateUtils = new GenerateUtils();
     let roomCode = generateUtils.generateRandomNumber();
-    while (this.currentRoomCode.has(roomCode)) {
+    while (await this.findRoomByCode(roomCode)) {
       roomCode = generateUtils.generateRandomNumber();
     }
-    this.currentRoomCode.add(roomCode);
     return roomCode;
   }
+
+  async findRoomByCode(code: string) {
+    return await this.enterCodeModel.findOne({ code: code });
+  }
 }

backend/src/user/dto/username.update.dto.ts → backend/src/user/dto/user.update.dto.ts

@@ -1,4 +1,4 @@
-export class UsernameUpdateDto {
+export class UserUpdateDto {
   email: string;
   username: string;
 }

backend/src/user/user.controller.ts

@@ -2,7 +2,7 @@ import { Body, Controller, Get, HttpStatus, Post, Query, Res } from '@nestjs/com
 import { Response } from 'express';
 import { UserService } from './user.service';
 import { UserInfoDto } from '../auth/dto/userInfo.dto';
-import { UsernameUpdateDto } from './dto/username.update.dto';
+import { UserUpdateDto } from './dto/user.update.dto';
 
 @Controller('/profile')
 export class UserController {
@@ -19,8 +19,8 @@ export class UserController {
   }
 
   @Post()
-  async changeUsername(@Body() usernameUpdateDto: UsernameUpdateDto, @Res() res: Response) {
-    const result = await this.userService.updateUsername(usernameUpdateDto);
+  async changeUsername(@Body() userUpdateDto: UserUpdateDto, @Res() res: Response) {
+    const result = await this.userService.updateUsername(userUpdateDto);
     if (!result) {
       res.status(HttpStatus.NOT_FOUND).send();
       return;

backend/src/user/user.service.ts

@@ -14,4 +14,8 @@ export class UserService {
   async updateUsername({ email, username }) {
     return await this.userModel.findOneAndUpdate({ email: email }, { username: username }, { new: true });
   }
+
+  async updateLecture(email, lecture) {
+    return await this.userModel.findOneAndUpdate({ email: email }, { $push: { lecture_id: lecture } }, { new: true });
+  }
 }