Merge pull request #4 from macowners/schema

Schema

src/sign/sign.controller.ts

@@ -1,8 +1,9 @@
-import { Body, Controller, Delete, Post, UseGuards } from '@nestjs/common'
+import { Body, Controller, Delete, Post, UploadedFile, UseGuards, UseInterceptors } from '@nestjs/common'
 import { UserDto } from '../dto/user.dto'
 import { SignService } from './sign.service'
 import { ApiBearerAuth, ApiOperation, ApiResponse, ApiSecurity, ApiTags } from '@nestjs/swagger'
 import { JwtAuthGuard } from '../guard/AuthGuard'
+import { FileInterceptor } from '@nestjs/platform-express'
 
 @ApiBearerAuth()
 @ApiSecurity('basic')
@@ -20,10 +21,11 @@ export class SignController {
     status: 401,
     description: '서버 에러',
   })
+  @UseInterceptors(FileInterceptor('file'))
   @ApiOperation({ summary: '회원가입' })
   @Post('up')
-  signUp(@Body() body: UserDto) {
-    return this.signService.sign_up({ ...body, img: 'default.jpg', score: 100 })
+  signUp(@UploadedFile() file: Array<Express.Multer.File>, @Body() body: UserDto) {
+    return this.signService.sign_up({ ...body, img: 'default.jpg', score: 100, group: [] })
   }
 
   @ApiResponse({

src/user/user.controller.ts

@@ -57,9 +57,14 @@ export class UserController {
     return this.userService.profile(_id, JSON.parse(JSON.stringify(file)).filename)
   }
 
-  @ApiOperation({ summary: '분배기능' })
-  @Post('calculate-study-schedule')
-  calculateStudySchedule(@Body('courseCount') courseCount: number, @Body('pageCount') pageCount: number, @Body('remainingDays') remainingDays: number) {
-    return this.userService.calculateStudySchedule(courseCount, pageCount, remainingDays)
+  @ApiOperation({ summary: '분배기능-문제집' })
+  @Post('calculate-study-schedule-P')
+  calculateStudySchedule_P(@Body('pageCount') pageCount: number, @Body('remainingDays') remainingDays: number) {
+    return this.userService.calculateStudySchedule_P(pageCount, remainingDays)
+  }
+  @ApiOperation({ summary: '분배기능-강의' })
+  @Post('calculate-study-schedule-S')
+  calculateStudySchedule_S(@Body('courseCount') courseCount: number, @Body('remainingDays') remainingDays: number) {
+    return this.userService.calculateStudySchedule_S(courseCount, remainingDays)
   }
 }

src/user/user.service.ts

@@ -19,13 +19,19 @@ export class UserService {
     return this.userModel.findByIdAndUpdate(_id, { img }).exec()
   }
 
-  calculateStudySchedule(courseCount: number, pageCount: number, remainingDays: number) {
-    const daysPerCourse = Math.ceil(courseCount / remainingDays) // 남은 일 수로 강의를 분배
+  calculateStudySchedule_P(pageCount: number, remainingDays: number) {
     const daysPerPage = Math.ceil(pageCount / remainingDays) // 남은 일 수로 페이지를 분배
 
     return {
-      daysPerCourse,
       daysPerPage,
     }
   }
+
+  calculateStudySchedule_S(courseCount: number, remainingDays: number) {
+    const daysPerCourse = Math.ceil(courseCount / remainingDays) // 남은 일 수로 강의를 분배
+
+    return {
+      daysPerCourse,
+    }
+  }
 }