issue # 회원가입 로직 구현 완료

src/modules/account/account.controller.ts

@@ -1,9 +1,12 @@
 import { Body, Controller, Get, Post, Query } from "@nestjs/common";
-import { CheckDuplicationRequestDto } from "./dto/checkDuplication/check-duplication-request.dto";
-import { CheckDuplicationResponseDto } from "./dto/checkDuplication/check-duplication-response.dto";
 import { AccountService } from "./account.service";
-import { SendVerificationCodeRequestDto } from "./dto/sendVerification/send-verification-code-request.dto";
-import { SendVerificationCodeResponseDto } from "./dto/sendVerification/send-verification-code-response.dto";
+import { 
+  CheckDuplicationRequest, CheckDuplicationResponse,
+  SendVerificationCodeRequest, SendVerificationCodeResponse,
+  VerifyCodeRequest, VerifyCodeResponse,
+  LoginRequest, LoginResponse,
+  SignupRequest, SignupResponse
+} from "./dto";
 
 @Controller('account')
 export class AccountController {
@@ -15,13 +18,26 @@ export class AccountController {
   }
 
   @Get('check-duplication')
-  async checkDuplication(@Query() query: CheckDuplicationRequestDto): Promise<CheckDuplicationResponseDto> {
+  async checkDuplication(@Query() query: CheckDuplicationRequest): Promise<CheckDuplicationResponse> {
     return await this.accountService.checkDuplication(query);
   }
 
   @Post('send-verification-code')
-  async sendVerificationCode(@Body() body: SendVerificationCodeRequestDto): Promise<SendVerificationCodeResponseDto> {
+  async sendVerificationCode(@Body() body: SendVerificationCodeRequest): Promise<SendVerificationCodeResponse> {
     const result = await this.accountService.sendVerificationCode(body);
     return result;
   }
+
+  @Post('verify-code')
+  async verifyCode(@Body() body: VerifyCodeRequest): Promise<VerifyCodeResponse> {
+    console.log(body.email);
+    const result = await this.accountService.verifyCode(body);
+    return result;
+  }
+
+  @Post('signup')
+  async signup(@Body() body: SignupRequest): Promise<LoginResponse> {
+    const result = await this.accountService.signup(body);
+    return result;
+  }
 }

src/modules/account/account.repo.ts

@@ -19,17 +19,24 @@ export class AccountRepo {
     return result[0].count;
   }
 
-  async activeAccount(email: string) {
+  async signup(
+    accountId: string,
+    name: string,
+    nickname: string,
+    email: string,
+    password: string
+  ) {
     return this
     .db
-    .update(schema.account)
-    .set({ status: 'active' })
-    .where(
-      and(
-        eq(schema.account.email, email),
-        eq(schema.account.status, 'wait'),
-        eq(schema.account.isDeleted, false)
-      )
-    )
+    .insert(schema.account)
+    .values({
+      accountId: accountId,
+      name: name,
+      nickname: nickname,
+      email: email,
+      password: password
+    });
   }
+
+  async 
 }

src/modules/account/account.service.ts

@@ -1,14 +1,10 @@
 import { Inject, Injectable } from "@nestjs/common";
 import { AccountRepo } from "./account.repo";
-import { CheckDuplicationRequestDto } from "./dto/checkDuplication/check-duplication-request.dto";
-import { CheckDuplicationResponseDto } from "./dto/checkDuplication/check-duplication-response.dto";
-import { SendVerificationCodeRequestDto } from "./dto/sendVerification/send-verification-code-request.dto";
+import * as DTO from './dto';
 import { MailerService } from "src/util/mailer/mailer.service";
 import { Generator } from "src/util/generator";
-import { SendVerificationCodeResponseDto } from "./dto/sendVerification/send-verification-code-response.dto";
 import Redis from "ioredis";
-import { VerifyCodeResponseDto } from "./dto/verifyCode/verify-code-response.dto";
-import { VerifyCodeRequestDto } from "./dto/verifyCode/verify-code-request.dto";
+import { Converter } from "src/util/converter";
 
 @Injectable()
 export class AccountService {
@@ -18,35 +14,60 @@ export class AccountService {
     , @Inject("REDIS") private readonly redis: Redis
   ) {}
 
-  async checkDuplication(data: CheckDuplicationRequestDto): Promise<CheckDuplicationResponseDto> {
-    const count = await this.accountRepo.checkDuplication(data.type, data.value);
+  async checkDuplication(data: DTO.CheckDuplicationRequest): Promise<DTO.CheckDuplicationResponse> {
+    const { type, value } = data;
+    const count = await this.accountRepo.checkDuplication(type, value);
 
     return { isDuplicated: count > 0 };
   }
 
-  async sendVerificationCode(data: SendVerificationCodeRequestDto): Promise<SendVerificationCodeResponseDto> {
+  async sendVerificationCode(data: DTO.SendVerificationCodeRequest): Promise<DTO.SendVerificationCodeResponse> {
+    const { email } = data;
     const code = Generator.getVerificationCode();
     const html = `<p>Your verification code is: <strong style="font-size:16px;">${code}</strong></p>`;
-    const result = await this.mailerService.sendMail(data.email, "<Scheduler> 이메일 인증 코드", html);
+    const result = await this.mailerService.sendMail(email, "<Scheduler> 이메일 인증 코드", html);
 
     if (result.rejected.length > 0) {
       return { success: false, error: result.response }
     } else {
-      await this.redis.set(`verify:${data.email}`, code, 'EX', 600);
+      await this.redis.set(`verify:${email}`, code, 'EX', 600);
 
       return { success: true, message: "이메일 발송 완료" };
     }
   }
 
-  async verifyCode(data: VerifyCodeRequestDto): Promise<VerifyCodeResponseDto>{
+  async verifyCode(data: DTO.VerifyCodeRequest): Promise<DTO.VerifyCodeResponse> {
     const { email, code } = data;
 
     const storedCode = await this.redis.get(`verify:${email}`);
 
-    if (!storedCode) return { verified: false, error: '잘못된 이메일이거나 코드가 만료되었습니다.'};
-    if (storedCode !== code) return { verified: false, error: "잘못된 코드입니다." };
+    if (!storedCode) {
+      return { verified: false, error: '잘못된 이메일이거나 코드가 만료되었습니다.'};
+    }
+    if (storedCode !== code) {
+      return { verified: false, error: "잘못된 코드입니다." };
+    }
 
     await this.redis.del(`verify:${email}`);
     return { verified: true, message: "이메일 인증이 완료되었습니다." };
   }
+
+  async signup(data: DTO.SignupRequest): Promise<DTO.SignupResponse> {
+    const { accountId, name, nickname, email, password } = data;
+    const hashedPassword = Converter.getHashedPassword(password);
+    const result = await this.accountRepo.signup(accountId, name, nickname, email, hashedPassword);
+
+    if (result.rowCount) {
+      return {
+        success: true,
+        message: "회원가입이 완료되었습니다."
+      };
+    } else {
+      return {
+        success: false,
+        error: "회원가입에 실패하였습니다."
+      };
+    }
+    
+  }
 }

src/modules/account/dto/index.ts

@@ -0,0 +1,14 @@
+export { CheckDuplicationRequestDto as CheckDuplicationRequest } from './checkDuplication/check-duplication-request.dto';
+export { CheckDuplicationResponseDto as CheckDuplicationResponse } from './checkDuplication/check-duplication-response.dto';
+
+export { SendVerificationCodeRequestDto as SendVerificationCodeRequest } from './sendVerification/send-verification-code-request.dto';
+export { SendVerificationCodeResponseDto as SendVerificationCodeResponse } from './sendVerification/send-verification-code-response.dto';
+
+export { VerifyCodeRequestDto as VerifyCodeRequest } from './verifyCode/verify-code-request.dto';
+export { VerifyCodeResponseDto as VerifyCodeResponse } from './verifyCode/verify-code-response.dto';
+
+export { SignupRequestDto as SignupRequest } from './signup/signup-request.dto';
+export { SignupResponseDto as SignupResponse } from './signup/signup-response.dto';
+
+export { LoginRequestDto as LoginRequest } from './login/login-request.dto';
+export { LoginResponseDto as LoginResponse } from './login/login-response.dto'

src/modules/account/dto/login/login-request.dto.ts

@@ -0,0 +1,11 @@
+import { IsString } from "@nestjs/class-validator";
+
+export class LoginRequestDto {
+  type: 'email' | 'accountId';
+
+  @IsString()
+  id: string;
+
+  @IsString()
+  password: string;
+}

src/modules/account/dto/login/login-response.dto.ts

@@ -0,0 +1,5 @@
+export class LoginResponseDto {
+  success: boolean;
+  message?: string;
+  error?: string;
+}

src/modules/account/dto/signup/signup-request.dto.ts

@@ -0,0 +1,18 @@
+import { IsEmail, IsString } from "@nestjs/class-validator";
+
+export class SignupRequestDto {
+  @IsEmail()
+  email: string;
+
+  @IsString()
+  name: string;
+
+  @IsString()
+  nickname: string;
+
+  @IsString()
+  accountId: string;
+
+  @IsString()
+  password: string;
+}

src/modules/account/dto/signup/signup-response.dto.ts

@@ -0,0 +1,5 @@
+export class SignupResponseDto {
+  success: boolean;
+  message?: string;
+  error?: string;
+}