refactor/#108: adjust types and configurations

Author: ohchanghoon

src/apis/auth/social/dto/auth-social.dto.ts

@@ -2,7 +2,7 @@ import { ApiProperty } from "@nestjs/swagger";
 import { UserGender, UserLoginType, UserRole } from "@src/apis/users/constants/user.enum";
 import { PHONE_NUMBER_REGEXP } from "@src/constants/regexp.constant";
 import { IsNullable } from "@src/decorators/validators/is-nullable.decorator";
-import { IsEmail, IsEnum, IsOptional, IsString, Length, Matches, Max, Min } from "class-validator";
+import { IsEmail, IsEnum, IsInt, IsString, Length, Matches, Max, Min } from "class-validator";
 import { CheckRegistrationRequestBodyDto } from "./auth-registration.dto";
 import { USER_GRADE, USER_NAME_LENGTH } from "@src/apis/users/constants/user.constant";
 
@@ -13,21 +13,24 @@ export class SignUpRequestBodyDto extends CheckRegistrationRequestBodyDto {
         maxLength: USER_NAME_LENGTH.MAX,
     })
     @Length(USER_NAME_LENGTH.MIN, USER_NAME_LENGTH.MAX)
+    @IsNullable()
     name: string;
 
     @ApiProperty({
         description: 'email',
         format: 'email',
     })
     @IsEmail()
+    @IsNullable()
     email: string;
 
     @ApiProperty({
         description: 'role',
         enum: UserRole,
     })
     @IsEnum(UserRole)
-    role: UserRole;
+    @IsNullable()
+    role: UserRole = UserRole.Student;
 
     @ApiProperty({
         description: 'phone number',
@@ -71,8 +74,9 @@ export class SignUpRequestBodyDto extends CheckRegistrationRequestBodyDto {
     @IsNullable()
     profilePath: string | null;
 
-    @IsOptional()
-    majorId: number = 1;
+    @IsInt()
+    @IsNullable()
+    majorId: number;
 }
 
 export class SignInRequestBodyDto extends CheckRegistrationRequestBodyDto { }

src/apis/auth/social/service/auth-social.service.ts

@@ -9,53 +9,42 @@ import { HttpInternalServerErrorException } from "@src/http-exceptions/exception
 import { COMMON_ERROR_CODE } from "@src/constants/error/common/common-error-code.constant";
 import { AUTH_ERROR_CODE } from "@src/constants/error/auth/auth-error-code.constant";
 import { AuthService } from "../../services/auth.service";
+import { AuthRegistrationService } from "./auth-registration.service";
 
 @Injectable()
 export class AuthSocialService {
   constructor(
     private readonly usersService: UsersService,
     private readonly authService: AuthService,
+    private readonly authRegistrationService: AuthRegistrationService,
   ) { }
 
   async signUp(signUpRequestBodyDto: SignUpRequestBodyDto) {
     const {
       loginType,
       snsToken,
-      email,
-      phoneNumber,
     } = signUpRequestBodyDto;
-    
+
+    // 동시성 문제
+    const isUserRegistered = this.authRegistrationService.isUserRegistered({ loginType, snsToken })
+    if (!isUserRegistered) {
+      throw new HttpBadRequestException({
+        code: AUTH_ERROR_CODE.ACCOUNT_NOT_FOUND,
+      });
+    }
+
     const snsProfile = await getSnsProfile(loginType, snsToken);
-    if (!snsProfile.sns_id) {
+    if (!snsProfile.snsId) {
       throw new HttpInternalServerErrorException({
         code: COMMON_ERROR_CODE.SERVER_ERROR,
         ctx: '소셜 프로필 조회 중 알 수 없는 에러',
       });
     }
 
-    const existUser = await this.usersService.findOneBy({
-      loginType,
-      email: email,
-      phoneNumber: phoneNumber,
-    });
-
-    if (existUser) {
-      if (existUser.email.toLowerCase() === email.toLowerCase()) {
-        throw new HttpConflictException({
-          code: USER_ERROR_CODE.ALREADY_EXIST_USER_EMAIL,
-        });
-      }
-      if (existUser.phoneNumber === phoneNumber) {
-        throw new HttpConflictException({
-          code: USER_ERROR_CODE.ALREADY_EXIST_USER_PHONE_NUMBER,
-        });
-      }
-    }
-    
-    const user = this.usersService.create({
-        ...signUpRequestBodyDto,
-        snsId: snsProfile.sns_id,
-        password: null
+    const user = await this.usersService.create({
+      ...signUpRequestBodyDto,
+      snsId: snsProfile.snsId,
+      password: null
     })
 
     return user;
@@ -66,7 +55,7 @@ export class AuthSocialService {
 
     const snsProfile = await getSnsProfile(loginType, snsToken);
 
-    if (!snsProfile.sns_id) {
+    if (!snsProfile.snsId) {
       throw new HttpInternalServerErrorException({
         code: COMMON_ERROR_CODE.SERVER_ERROR,
         ctx: '소셜 프로필 조회 중 알 수 없는 에러',
@@ -75,7 +64,7 @@ export class AuthSocialService {
 
     const existUser = await this.usersService.findOneBy({
       loginType,
-      snsId: snsProfile.sns_id
+      snsId: snsProfile.snsId
     });
 
     if (!existUser) {

src/apis/auth/social/types/auth-social.type.ts

@@ -1,7 +1,7 @@
 import { UserLoginType } from "@src/apis/users/constants/user.enum";
 
 export interface SnsProfileBase {
-  sns_id: string;
+  snsId: string;
 }
 
 export interface SnsProfile extends SnsProfileBase {

src/entities/User.ts

@@ -81,7 +81,7 @@ export class User {
     comment: '유저 이름', 
     length: 20 
   })
-  name: string;
+  name: string | null;
 
   @Column('varchar', {
     name: 'password',