feat/#108: add and modify columns in user entity, update login_type

modern-agile-team · Jan 18, 2024 · 1d21ec4 · 1d21ec4
1 parent dcfc13d
commit 1d21ec4
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 1 deletion.
diff --git a/src/apis/users/constants/user.enum.ts b/src/apis/users/constants/user.enum.ts
@@ -10,6 +10,9 @@ export enum UserGender {
 
 export enum UserLoginType {
   Email = 'email',
+  Kakao = 'KAKAO',
+  Google = 'GOOGLE',
+  Naver = 'NAVER',
 }
 
 export enum UserStatus {

diff --git a/src/apis/users/dto/create-user-request-body.dto.ts b/src/apis/users/dto/create-user-request-body.dto.ts
@@ -39,6 +39,11 @@ export class CreateUserRequestBodyDto
   @IsEnum(UserLoginType)
   loginType: UserLoginType;
 
+  @ApiProperty({
+    description: 'snsId',
+  })
+  snsId: string;
+
   @ApiProperty({
     description: 'name',
     minLength: USER_NAME_LENGTH.MIN,
@@ -68,6 +73,7 @@ export class CreateUserRequestBodyDto
     pattern: String(USER_PASSWORD_REGEXP),
   })
   @Matches(USER_PASSWORD_REGEXP)
+  @IsOptional()
   @ValidateIf((object, value) => {
     if (object.loginType === UserLoginType.Email) {
       return true;

diff --git a/src/apis/users/dto/user.dto.ts b/src/apis/users/dto/user.dto.ts
@@ -10,6 +10,7 @@ import { PHONE_NUMBER_REGEXP } from '@src/constants/regexp.constant';
 import { BaseDto } from '@src/dto/base.dto';
 import { User } from '@src/entities/User';
 import { Exclude } from 'class-transformer';
+import { IsOptional } from 'class-validator';
 
 export class UserDto
   extends BaseDto
@@ -46,6 +47,12 @@ export class UserDto
   })
   email: string;
 
+  @ApiProperty({
+    description: 'SNS 토큰',
+  })
+  @IsOptional()
+  snsToken: string;
+
   @ApiProperty({
     description: '유저 로그인 타입',
     enum: UserLoginType,

diff --git a/src/entities/User.ts b/src/entities/User.ts
@@ -60,14 +60,27 @@ export class User {
   })
   studentNumber: string | null;
 
+  @Column('varchar', {
+    name: 'sns_id',
+    comment: '소셜 고유 ID',
+    nullable: true,
+    length: 255,
+  })
+  snsId: string | null;
+
   @Column('enum', {
     name: 'login_type',
     comment: '로그인 타입',
     enum: UserLoginType,
   })
   loginType: UserLoginType;
 
-  @Column('varchar', { name: 'name', comment: '유저 이름', length: 20 })
+  @Column('varchar', { 
+    name: 'name', 
+    nullable: true,
+    comment: '유저 이름', 
+    length: 20 
+  })
   name: string;
 
   @Column('varchar', {