refactor(be): requestDTO 추가 #152

boostcampwm-2022 · Dec 15, 2022 · 3b1fd39 · 3b1fd39
1 parent b36c2b6
commit 3b1fd39
Show file tree

Hide file tree

Showing 8 changed files with 91 additions and 95 deletions.
diff --git a/server/src/database/user.repository.ts b/server/src/database/user.repository.ts
@@ -9,8 +9,8 @@ import {
   UserDuplicateNicknameException,
   UserNotFoundException,
 } from '../exception/user.exception';
-import { SearchUserListDto } from 'src/domain/user/dto/search-user-list.dto';
 import { SEARCH_USER_LIMIT } from '../constants/pagination.constants';
+import { SearchUserListDto } from 'src/domain/user/dto/request.dto';
 
 @Injectable()
 export class UserRepository {

diff --git a/server/src/domain/user/dto/get-update-password.dto.ts b/server/src/domain/user/dto/get-update-password.dto.ts
diff --git a/server/src/domain/user/dto/request.dto.ts b/server/src/domain/user/dto/request.dto.ts
@@ -0,0 +1,79 @@
+import {
+  IsString,
+  MaxLength,
+  IsNotEmpty,
+  Matches,
+  IsByteLength,
+  IsOptional,
+  IsEmail,
+  IsNumber,
+} from 'class-validator';
+
+export class UserUpdateDto {
+  @IsString()
+  @IsOptional()
+  @MaxLength(500)
+  bio: string;
+
+  @IsOptional()
+  @IsNotEmpty()
+  @IsString()
+  @Matches(/^[a-zA-Zㄱ-ㅎㅏ-ㅣ가-힣\d_]{1,16}$/)
+  @IsByteLength(1, 16)
+  nickname: string;
+}
+export class UserProfileDto {
+  @IsNotEmpty()
+  @IsString()
+  userid: string;
+
+  @IsNotEmpty()
+  @IsString()
+  nickname: string;
+
+  @IsEmail()
+  @IsNotEmpty()
+  email: string;
+
+  @IsNotEmpty()
+  @IsString()
+  profileimg = '';
+
+  @IsNotEmpty()
+  @IsString()
+  bio = '';
+
+  @IsNotEmpty()
+  @IsNumber()
+  postcount: number;
+
+  @IsNotEmpty()
+  @IsNumber()
+  follower: number;
+
+  @IsNotEmpty()
+  @IsNumber()
+  following: number;
+
+  @IsNotEmpty()
+  state: boolean;
+}
+export class SearchUserListDto {
+  @IsString()
+  keyword = '';
+
+  @IsString()
+  @IsOptional()
+  next = '';
+}
+export class GetUserUpdatePasswordDto {
+  @IsNotEmpty()
+  @IsString()
+  @Matches(/^[a-zA-Z\d!@#$%^&*()-_=+]{6,16}$/)
+  prevPassword: string;
+
+  @IsNotEmpty()
+  @IsString()
+  @Matches(/^[a-zA-Z\d!@#$%^&*()-_=+]{6,16}$/)
+  newPassword: string;
+}
diff --git a/server/src/domain/user/dto/search-user-list.dto.ts b/server/src/domain/user/dto/search-user-list.dto.ts
diff --git a/server/src/domain/user/dto/user-profile.dto.ts b/server/src/domain/user/dto/user-profile.dto.ts
diff --git a/server/src/domain/user/dto/user-update.dto.ts b/server/src/domain/user/dto/user-update.dto.ts
diff --git a/server/src/domain/user/user.controller.ts b/server/src/domain/user/user.controller.ts
@@ -18,18 +18,20 @@ import {
 } from '@nestjs/common';
 import { UserService } from './user.service';
 import { User } from 'src/database/user.schema';
-import { UserUpdateDto } from './dto/user-update.dto';
 import { UpdateAuthGuard } from 'src/guard/update-user.guard';
 import { JwtAuthGuard } from 'src/guard/jwt-auth.guard';
 import { GetUser } from 'src/decorator/get-user.decorator';
 import { NcloudService } from 'src/domain/ncloud/ncloud.service';
 import { FileInterceptor } from '@nestjs/platform-express';
-import { GetUserUpdatePasswordDto } from './dto/get-update-password.dto';
 import { MoheyumInterceptor } from 'src/cache/cache.interceptor';
 import { CacheEvict } from 'src/cache/cache-evict.decorator';
 import { CacheIndividual } from 'src/cache/cahce-individual.decorator';
 import { CachePagination } from 'src/cache/cache-next-ttl.decorator';
-import { SearchUserListDto } from './dto/search-user-list.dto';
+import {
+  GetUserUpdatePasswordDto,
+  SearchUserListDto,
+  UserUpdateDto,
+} from './dto/request.dto';
 
 @Controller('user')
 @UseInterceptors(MoheyumInterceptor)

diff --git a/server/src/domain/user/user.service.ts b/server/src/domain/user/user.service.ts
@@ -1,13 +1,15 @@
 import { BadRequestException, Injectable } from '@nestjs/common';
-import { UserProfileDto } from './dto/user-profile.dto';
-import { UserUpdateDto } from './dto/user-update.dto';
 import { UserRepository } from 'src/database/user.repository';
 import { FollowRepository } from 'src/database/follow.repository';
 import * as bcrypt from 'bcrypt';
 import { ConfigService } from '@nestjs/config';
-import { GetUserUpdatePasswordDto } from './dto/get-update-password.dto';
-import { SearchUserListDto } from './dto/search-user-list.dto';
 import { SEARCH_USER_LIMIT } from 'src/constants/pagination.constants';
+import {
+  GetUserUpdatePasswordDto,
+  SearchUserListDto,
+  UserProfileDto,
+  UserUpdateDto,
+} from './dto/request.dto';
 
 @Injectable()
 export class UserService {