Merge commit 'a89c7805ac8627bd3cbc0058835c759feb5b5d9f' into feature/231211-audio-replay

Author: Jw705

backend/src/auth/auth.controller.ts

@@ -1,7 +1,6 @@
-import { Body, Controller, Get, HttpException, HttpStatus, Post, Req, Res, UseGuards } from '@nestjs/common';
-import { ApiBody, ApiHeader, ApiResponse, ApiTags } from '@nestjs/swagger';
+import { Body, Controller, HttpException, HttpStatus, Post, Res } from '@nestjs/common';
+import { ApiBody, ApiOperation, ApiResponse, ApiTags } from '@nestjs/swagger';
 import { Response } from 'express';
-import { CustomAuthGuard } from './auth.guard';
 import { AuthService } from './auth.service';
 import { ResponseSignInDto } from './dto/response-signin.dto';
 import { SignInDto } from './dto/sign-in.dto';
@@ -13,6 +12,7 @@ export class AuthController {
   constructor(private authService: AuthService) {}
 
   @Post('/signup')
+  @ApiOperation({ summary: '회원가입 API' })
   @ApiBody({ type: SignUpDto })
   @ApiResponse({ status: 201 })
   @ApiResponse({ status: 409, description: '이미 가입되어 있는 사용자입니다.' })
@@ -25,6 +25,7 @@ export class AuthController {
   }
 
   @Post('/signin')
+  @ApiOperation({ summary: '로그인 API' })
   @ApiBody({ type: SignInDto })
   @ApiResponse({ status: 200, type: ResponseSignInDto })
   @ApiResponse({ status: 404, description: '해당 사용자가 없습니다.' })
@@ -34,13 +35,6 @@ export class AuthController {
       throw new HttpException('해당 사용자가 없습니다.', HttpStatus.NOT_FOUND);
     }
     const result = await this.authService.signIn(signInDto);
-    return res.status(HttpStatus.OK).send(new ResponseSignInDto(result));
-  }
-
-  @ApiHeader({ name: 'Authorization' })
-  @UseGuards(CustomAuthGuard)
-  @Get('profile')
-  getProfile(@Req() req: any) {
-    return req.user;
+    return res.status(HttpStatus.OK).send(result);
   }
 }

backend/src/auth/auth.service.ts

@@ -7,6 +7,7 @@ import { ConfigService } from '@nestjs/config';
 import { decryptPassword, encryptPassword } from 'src/utils/GenerateUtils';
 import { SignUpDto } from './dto/sign-up.dto';
 import { SignInDto } from './dto/sign-in.dto';
+import { ResponseSignInDto } from './dto/response-signin.dto';
 
 @Injectable()
 export class AuthService {
@@ -22,7 +23,7 @@ export class AuthService {
     return { username: user.username, email: user.email };
   }
 
-  async signIn(signInDto: SignInDto): Promise<string> {
+  async signIn(signInDto: SignInDto): Promise<ResponseSignInDto> {
     const user = await this.findUserByEmail(signInDto.email);
     if (!user) {
       throw new HttpException('해당 사용자가 없습니다.', HttpStatus.NOT_FOUND);
@@ -32,8 +33,8 @@ export class AuthService {
     if (!validatedPassword) {
       throw new HttpException('해당 사용자가 없습니다.', HttpStatus.NOT_FOUND);
     }
-
-    return await this.generateCookie({ username: user.username, email: user.email });
+    const token = await this.generateCookie({ username: user.username, email: user.email });
+    return new ResponseSignInDto(token, user.email, user.username);
   }
 
   async findUserByEmail(email: string): Promise<User> {

backend/src/auth/dto/response-signin.dto.ts

@@ -4,7 +4,15 @@ export class ResponseSignInDto {
   @ApiProperty()
   token: string;
 
-  constructor(token: string) {
+  @ApiProperty()
+  email: string;
+
+  @ApiProperty()
+  username: string;
+
+  constructor(token: string, email: string, username: string) {
     this.token = token;
+    this.email = email;
+    this.username = username;
   }
 }

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

@@ -6,7 +6,4 @@ export class CreateLectureDto {
 
   @ApiProperty({ example: '이런이런 강의입니다' })
   description: string;
-
-  @ApiProperty({ description: '강의를 만든 발표자 email', example: '[email protected]' })
-  email: string;
 }

backend/src/lecture/lecture.controller.ts

@@ -12,7 +12,7 @@ import {
   Res,
   UseGuards
 } from '@nestjs/common';
-import { ApiBody, ApiHeader, ApiParam, ApiQuery, ApiResponse, ApiTags } from '@nestjs/swagger';
+import { ApiBody, ApiHeader, ApiOperation, ApiParam, ApiQuery, ApiResponse, ApiTags } from '@nestjs/swagger';
 import { Response } from 'express';
 import { UserService } from 'src/user/user.service';
 import { CreateLectureDto } from './dto/create-lecture.dto';
@@ -32,11 +32,18 @@ export class LectureController {
     private readonly userService: UserService
   ) {}
 
+  @UseGuards(CustomAuthGuard)
   @Post()
+  @ApiHeader({ name: 'Authorization' })
+  @ApiOperation({ description: '강의를 생성합니다.' })
   @ApiBody({ type: CreateLectureDto })
   @ApiResponse({ status: 201 })
-  async create(@Body() createLecture: CreateLectureDto, @Res() res: Response) {
-    const user = await this.userService.findOneByEmail(createLecture.email);
+  @ApiResponse({ status: 401, description: '로그인 되지 않은 사용자입니다.' })
+  async create(@Body() createLecture: CreateLectureDto, @Req() req: any, @Res() res: Response) {
+    if (!req.user) {
+      throw new HttpException('로그인 되지 않은 사용자입니다.', HttpStatus.UNAUTHORIZED);
+    }
+    const user = await this.userService.findOneByEmail(req.user.email);
     const code = await this.lectureService.createLecture(createLecture, user.id);
     res.status(HttpStatus.CREATED).send({ code: code });
   }
@@ -54,7 +61,8 @@ export class LectureController {
   @ApiHeader({ name: 'Authorization' })
   @ApiParam({ name: 'code', type: 'string' })
   @ApiResponse({ status: 200 })
-  @ApiResponse({ status: 404 })
+  @ApiResponse({ status: 401, description: '로그인 되지 않은 사용자입니다.' })
+  @ApiResponse({ status: 404, description: '유효하지 않은 강의 참여코드입니다.' })
   async enter(@Param('code') code: string, @Req() req: any, @Res() res: Response) {
     if (!req.user) {
       throw new HttpException('로그인 되지 않은 사용자입니다.', HttpStatus.UNAUTHORIZED);
@@ -123,4 +131,16 @@ export class LectureController {
     const result = await this.lectureService.findLectureRecord(id);
     return res.status(HttpStatus.OK).send(result);
   }
+
+  @UseGuards(CustomAuthGuard)
+  @Get('/list')
+  @ApiHeader({ name: 'Authorization' })
+  async getLectureList(@Req() req: any, @Res() res: Response) {
+    if (!req.user) {
+      throw new HttpException('로그인 되지 않은 사용자입니다.', HttpStatus.UNAUTHORIZED);
+    }
+
+    const result = await this.userService.findLectureList(req.user.email);
+    return res.status(HttpStatus.OK).send(result);
+  }
 }

backend/src/lecture/lecture.service.ts

@@ -91,7 +91,7 @@ export class LectureService {
   }
 
   async findLogs(lecture: Lecture) {
-    return await this.whiteboardLogModel.find({ lecture_id: lecture }).exec();
+    return await this.whiteboardLogModel.find({ lecture_id: lecture }, { _id: 0, lecture_id: 0, __v: 0 }).exec();
   }
 
   async findLectureRecord(id: Types.ObjectId) {

backend/src/user/dto/userInfo.dto.ts

@@ -13,9 +13,8 @@ export class UserInfoDto {
 
   lecture_id: mongoose.Types.ObjectId;
 
-  constructor({ username, email, lecture_id }) {
+  constructor({ username, email }) {
     this.username = username;
     this.email = email;
-    this.lecture_id = lecture_id;
   }
 }

backend/src/user/user.controller.ts

@@ -19,13 +19,7 @@ export class UserController {
     if (!req.user) {
       throw new HttpException('로그인 되지 않은 사용자입니다.', HttpStatus.UNAUTHORIZED);
     }
-    const userInfo = await (
-      await this.userService.findOneByEmail(req.user.email)
-    ).populate({
-      path: 'lecture_id',
-      select: '-_id title description',
-      populate: { path: 'presenter_id', select: '-_id username' }
-    });
+    const userInfo = await this.userService.findOneByEmail(req.user.email);
 
     if (!userInfo) {
       throw new HttpException('사용자 정보가 존재하지 않습니다.', HttpStatus.NOT_FOUND);

backend/src/user/user.service.ts

@@ -28,4 +28,16 @@ export class UserService {
       { new: true }
     );
   }
+
+  async findLectureList(email: string) {
+    return (
+      await (
+        await this.findOneByEmail(email)
+      ).populate({
+        path: 'lecture_id',
+        select: '-__v',
+        populate: { path: 'presenter_id', select: '-_id username' }
+      })
+    ).lecture_id;
+  }
 }