Merge pull request #30 from LifePoop/feat/auth

sex, birth optional
LifePoop · Dec 13, 2023 · fc1e298 · fc1e298
2 parents bf4a559 + 437e616
commit fc1e298
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/libs/entity/user/user.entity.ts b/libs/entity/user/user.entity.ts
@@ -30,18 +30,18 @@ export class User {
   @Column({ length: 20 })
   nickname!: string;
 
-  @ApiProperty()
+  @ApiProperty({ nullable: true })
   @IsDate()
   @Column()
-  birth!: Date;
+  birth?: Date;
 
-  @ApiProperty({ enum: SexEnum })
+  @ApiProperty({ enum: SexEnum, nullable: true })
   @IsEnum(SexEnum)
   @Column({
     type: 'enum',
     enum: SexEnum,
   })
-  sex!: SexEnum;
+  sex?: SexEnum;
 
   @ApiProperty()
   @Column({ nullable: true })

diff --git a/src/auth/dto/register.dto.ts b/src/auth/dto/register.dto.ts
@@ -1,14 +1,18 @@
 import { User } from '@app/entity/user/user.entity';
-import { ApiProperty, PickType } from '@nestjs/swagger';
+import {
+  ApiProperty,
+  IntersectionType,
+  PartialType,
+  PickType,
+} from '@nestjs/swagger';
 import { IsString } from 'class-validator';
 
 export class RegisterRequestParamDto extends PickType(User, ['provider']) {}
 
-export class RegisterRequestBodyDto extends PickType(User, [
-  'nickname',
-  'birth',
-  'sex',
-]) {
+export class RegisterRequestBodyDto extends IntersectionType(
+  PickType(User, ['nickname']),
+  PartialType(PickType(User, ['birth', 'sex'])),
+) {
   @ApiProperty()
   @IsString()
   oAuthAccessToken: string;