Merge pull request #343 from boostcampwm-2024/feat/user-signup

✨ feat: 사용자 회원가입 API 구현

Author: asn6878

server/package-lock.json

@@ -53,7 +53,7 @@
     "rxjs": "^7.8.1",
     "sanitize-html": "^2.14.0",
     "typeorm": "^0.3.20",
-    "uuid": "^11.0.3",
+    "uuid": "^11.1.0",
     "winston": "^3.16.0",
     "winston-daily-rotate-file": "^5.0.0"
   },

server/package.json

@@ -12,6 +12,7 @@ import { StatisticModule } from './statistic/module/statistic.module';
 import { TestModule } from './common/test/test.module';
 import { UserModule } from './user/module/user.module';
 import { ActivityModule } from './activity/module/activity.module';
+import { EmailModule } from './common/email/email.module';
 
 @Module({
   imports: [
@@ -40,6 +41,7 @@ import { ActivityModule } from './activity/module/activity.module';
     ActivityModule,
     TestModule,
     StatisticModule,
+    EmailModule,
   ],
   controllers: [],
   providers: [],

server/src/app.module.ts

@@ -3,8 +3,13 @@ import * as nodemailer from 'nodemailer';
 import { ConfigService } from '@nestjs/config';
 import { WinstonLoggerService } from '../logger/logger.service';
 import SMTPTransport from 'nodemailer/lib/smtp-transport';
-import { createMailContent } from './mail_content';
+import {
+  createRssRegistrationContent,
+  createVerificationMailContent,
+  PRODUCT_DOMAIN,
+} from './mail_content';
 import { Rss } from '../../rss/entity/rss.entity';
+import { User } from '../../user/entity/user.entity';
 
 @Injectable()
 export class EmailService {
@@ -52,9 +57,34 @@ export class EmailService {
       approveFlag,
       description,
     );
+
+    await this.sendMail(mailOptions);
+  }
+
+  async sendUserCertificationMail(user: User, uuid: string): Promise<void> {
+    const mailOptions = this.createCertificationMail(user, uuid);
+
     await this.sendMail(mailOptions);
   }
 
+  private createCertificationMail(
+    user: User,
+    uuid: string,
+  ): nodemailer.SendMailOptions {
+    const redirectUrl = `${PRODUCT_DOMAIN}/api/user/cert?token=${uuid}`;
+
+    return {
+      from: `Denamu<${this.emailUser}>`,
+      to: user.email,
+      subject: `[🎋 Denamu] 회원가입 인증 메일`,
+      html: createVerificationMailContent(
+        user.userName,
+        redirectUrl,
+        this.emailUser,
+      ),
+    };
+  }
+
   private createRssRegistrationMail(
     rss: Rss,
     approveFlag: boolean,
@@ -65,7 +95,12 @@ export class EmailService {
       from: `Denamu<${this.emailUser}>`,
       to: `${rss.userName}<${rss.email}>`,
       subject: `[🎋 Denamu] RSS 등록이 ${result} 되었습니다.`,
-      html: createMailContent(rss, approveFlag, this.emailUser, description),
+      html: createRssRegistrationContent(
+        rss,
+        approveFlag,
+        this.emailUser,
+        description,
+      ),
     };
   }
 }

server/src/common/email/email.service.ts

@@ -1,6 +1,7 @@
 import { Rss } from '../../rss/entity/rss.entity';
+export const PRODUCT_DOMAIN = 'https://denamu.site';
 
-export function createMailContent(
+export function createRssRegistrationContent(
   rss: Rss,
   approveFlag: boolean,
   serviceAddress: string,
@@ -23,7 +24,7 @@ export function createMailContent(
             <p><strong>블로거 이름:</strong> ${rss.userName}</p>
             <p><strong>RSS 주소:</strong> ${rss.rssUrl}</p>
           </div>
-          ${approveFlag ? acceptContent(rss) : rejectContent(rss, description)}
+          ${approveFlag ? acceptContent() : rejectContent(description)}
           <center>
             <a href="https://denamu.site" style="display: inline-block; padding: 12px 24px; background-color: #007bff; color: #ffffff; text-decoration: none; border-radius: 4px; margin: 20px 0;">${approveFlag ? '서비스 바로가기' : '다시 신청하러 가기'}</a>
           </center>
@@ -38,17 +39,54 @@ export function createMailContent(
 `;
 }
 
-function acceptContent(rss: Rss) {
+function acceptContent() {
   return `
     <p>안녕하세요! 귀하의 블로그가 저희 서비스에 성공적으로 등록되었음을 알려드립니다.</p>
     <p>이제 귀하의 새로운 글이 업데이트될 때마다 저희 플랫폼에서 확인하실 수 있습니다.</p>
   `;
 }
 
-function rejectContent(rss: Rss, description: string) {
+function rejectContent(description: string) {
   return `
     <p><strong>거부 사유:</strong></p>
     <div style="background-color: #f8f9fa; border-radius: 8px; padding: 15px 20px; margin: 15px 0; color: #666; line-height: 1.6;">${description}</div>
     <p>위 사유를 해결하신 후 다시 신청해 주시기 바랍니다.</p>
   `;
 }
+
+export function createVerificationMailContent(
+  userName: string,
+  verificationLink: string,
+  serviceAddress: string,
+) {
+  return `
+  <div style="font-family: 'Apple SD Gothic Neo', 'Malgun Gothic', '맑은 고딕', sans-serif; margin: 0; padding: 1px; background-color: #f4f4f4;">
+    <div style="max-width: 600px; margin: 20px auto; background-color: #ffffff; padding: 20px; border-radius: 8px; box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);">
+      <div style="text-align: center; padding: 20px 0; border-bottom: 2px solid #f0f0f0;">
+        <img src="https://denamu.site/files/Denamu_Logo_KOR.png" alt="Denamu Logo" width="244" height="120">
+      </div>
+      <div style="padding: 20px 0;">
+        <div style="color: #007bff; font-size: 24px; font-weight: bold; margin-bottom: 20px; text-align: center;">회원가입 인증을 완료해주세요</div>
+          <div style="background-color: #f8f9fa; padding: 15px; border-radius: 4px; margin: 15px 0;">
+            <p><strong>안녕하세요, ${userName}님!</strong></p>
+            <p>Denamu 서비스에 가입해 주셔서 감사합니다.</p>
+            <p>아래 버튼을 클릭하여 회원가입 인증을 완료해 주세요.</p>
+          </div>
+          <center>
+            <a href="${verificationLink}" style="display: inline-block; padding: 12px 24px; background-color: #007bff; color: #ffffff; text-decoration: none; border-radius: 4px; margin: 20px 0; font-weight: bold;">이메일 인증하기</a>
+          </center>
+          <div style="font-size: 14px; color: #6c757d; margin-top: 20px; text-align: center;">
+            <p>버튼이 작동하지 않는 경우, 아래 링크를 복사하여 브라우저에 붙여넣기 해주세요:</p>
+            <p style="word-break: break-all; background-color: #f8f9fa; padding: 10px; border-radius: 4px;">${verificationLink}</p>
+            <p>이 링크는 10분 동안 유효합니다.</p>
+          </div>
+        </div>
+      </div>
+      <div style="display: flex; flex-direction: column; justify-content: center; align-items: center; border-top: 2px solid #f0f0f0; color: #6c757d; font-size: 14px; height: 100px;">
+        <p>본 메일은 발신전용입니다.</p>
+        <p>문의사항이 있으시다면 ${serviceAddress}로 연락주세요.</p>
+      </div>
+    </div>
+  </div>
+`;
+}

server/src/common/email/mail_content.ts

@@ -0,0 +1,48 @@
+import { ApiTags } from '@nestjs/swagger';
+import {
+  Body,
+  Controller,
+  Get,
+  HttpCode,
+  HttpStatus,
+  Post,
+  Query,
+} from '@nestjs/common';
+import { ApiResponse } from '../../common/response/common.response';
+import { UserService } from '../service/user.service';
+import { SignupDto } from '../dto/request/signup.dto';
+
+@ApiTags('User')
+@Controller('user')
+export class UserController {
+  constructor(private readonly userService: UserService) {}
+
+  @Get('/email-check')
+  @HttpCode(HttpStatus.OK)
+  async checkEmailDuplication(@Query('email') email: string) {
+    return ApiResponse.responseWithData(
+      '이메일 중복 조회 요청이 성공적으로 처리되었습니다.',
+      {
+        exists: await this.userService.checkEmailDuplication(email),
+      },
+    );
+  }
+
+  @Post('/signup')
+  @HttpCode(HttpStatus.CREATED)
+  async signupUser(@Body() signupDto: SignupDto) {
+    await this.userService.signupUser(signupDto);
+    return ApiResponse.responseWithNoContent(
+      '회원가입이 요청이 성공적으로 처리되었습니다.',
+    );
+  }
+
+  @Post('/certificate')
+  @HttpCode(HttpStatus.OK)
+  async certificateUser(@Body() uuid: string) {
+    await this.userService.certificateUser(uuid);
+    return ApiResponse.responseWithNoContent(
+      '이메일 인증이 성공적으로 처리되었습니다.',
+    );
+  }
+}

server/src/user/controller/user.controller.ts

@@ -0,0 +1,34 @@
+import { IsEmail, IsNotEmpty } from 'class-validator';
+import { User } from '../../entity/user.entity';
+
+export class SignupDto {
+  @IsEmail(
+    {},
+    {
+      message: '이메일 주소 형식에 맞춰서 작성해주세요.',
+    },
+  )
+  @IsNotEmpty({
+    message: '이메일이 없습니다.',
+  })
+  email: string;
+
+  @IsNotEmpty({
+    message: '비밀번호가 없습니다.',
+  })
+  password: string;
+
+  @IsNotEmpty({
+    message: '사용자 이름이 없습니다.',
+  })
+  userName: string;
+
+  toEntity() {
+    const user = new User();
+    user.email = this.email;
+    user.password = this.password;
+    user.userName = this.userName;
+
+    return user;
+  }
+}

server/src/user/dto/request/signup.dto.ts

@@ -42,6 +42,7 @@ export class User extends BaseEntity {
 
   @Column({
     name: 'introduction',
+    nullable: true,
   })
   introduction: string;
 

server/src/user/entity/user.entity.ts

@@ -1,9 +1,12 @@
 import { Module } from '@nestjs/common';
 import { AdminRepository } from '../../admin/repository/admin.repository';
+import { UserRepository } from '../repository/user.repository';
+import { UserService } from '../service/user.service';
+import { UserController } from '../controller/user.controller';
 
 @Module({
   imports: [],
-  controllers: [],
-  providers: [AdminRepository],
+  controllers: [UserController],
+  providers: [UserService, AdminRepository, UserRepository],
 })
 export class UserModule {}

server/src/user/module/user.module.ts

@@ -0,0 +1,62 @@
+import { UserRepository } from '../repository/user.repository';
+import {
+  ConflictException,
+  Injectable,
+  NotFoundException,
+} from '@nestjs/common';
+import { SignupDto } from '../dto/request/signup.dto';
+import { v4 as uuidv4 } from 'uuid';
+import { RedisService } from '../../common/redis/redis.service';
+import { USER_CONSTANTS } from '../user.constants';
+import { EmailService } from '../../common/email/email.service';
+
+@Injectable()
+export class UserService {
+  constructor(
+    private readonly userRepository: UserRepository,
+    private readonly redisService: RedisService,
+    private readonly emailService: EmailService,
+  ) {}
+
+  async checkEmailDuplication(email: string): Promise<boolean> {
+    const user = await this.userRepository.findOne({
+      where: { email },
+    });
+
+    return !!user;
+  }
+
+  async signupUser(signupDto: SignupDto): Promise<void> {
+    const user = await this.userRepository.findOne({
+      where: { email: signupDto.email },
+    });
+
+    if (user) {
+      throw new ConflictException('이미 존재하는 이메일입니다.');
+    }
+
+    const newUser = signupDto.toEntity();
+
+    const uuid = uuidv4();
+    await this.redisService.set(
+      `${USER_CONSTANTS.USER_AUTH_KEY}_${newUser.email}_${uuid}`,
+      JSON.stringify(newUser),
+      'EX',
+      600,
+    );
+
+    this.emailService.sendUserCertificationMail(newUser, uuid);
+  }
+
+  async certificateUser(uuid: string): Promise<void> {
+    const user = await this.redisService.get(
+      `${USER_CONSTANTS.USER_AUTH_KEY}_${uuid}`,
+    );
+
+    if (!user) {
+      throw new NotFoundException('인증에 실패했습니다.');
+    }
+
+    await this.userRepository.save(JSON.parse(user));
+  }
+}