[BE#255] 이미지 null일때 분기처리

boostcampwm2023 · Nov 29, 2023 · 3cfa2c8 · 3cfa2c8
1 parent d062a0d
commit 3cfa2c8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/BE/src/auth/auth.controller.ts b/BE/src/auth/auth.controller.ts
@@ -26,7 +26,6 @@ import {
 } from '@nestjs/swagger';
 import { UsersService } from 'src/users/users.service';
 import { UpdateUserDto } from 'src/users/dto/update-user.dto';
-import { UsersModel } from 'src/users/entity/users.entity';
 import { FileInterceptor } from '@nestjs/platform-express';
 import { ConfigService } from '@nestjs/config';
 import * as path from 'path';
@@ -80,14 +79,17 @@ export class AuthController {
     @Body() user: UpdateUserDto,
     @UploadedFile() file: Express.Multer.File,
   ): Promise<any> {
-    const isNomal = await this.usersService.isNormalImage(file);
-    if (!isNomal) {
-      throw new BadRequestException('유해한 이미지 입니다!!');
+    let image_url: string;
+    if (file) {
+      const isNomal = await this.usersService.isNormalImage(file);
+      if (!isNomal) {
+        throw new BadRequestException('유해한 이미지 입니다!!');
+      }
+      image_url = await this.usersService.s3Upload(file);
     }
-    const image_url = await this.usersService.s3Upload(file);
     const updatedUser = await this.usersService.updateUser(
       user_id,
-      user as UsersModel,
+      user,
       image_url,
     );
     return {

diff --git a/BE/src/users/users.service.ts b/BE/src/users/users.service.ts
@@ -8,6 +8,7 @@ import { GreenEyeResponse } from './interface/greeneye.interface';
 import { S3Service } from 'src/common/s3.service';
 import * as path from 'path';
 import { ENV } from 'src/common/const/env-keys.const';
+import { UpdateUserDto } from './dto/update-user.dto';
 
 @Injectable()
 export class UsersService {
@@ -51,7 +52,7 @@ export class UsersService {
 
   async updateUser(
     user_id: number,
-    user: UsersModel,
+    user: UpdateUserDto,
     image_url?: string,
   ): Promise<UsersModel> {
     const selectedUser = await this.usersRepository.findOne({