Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions src/main/java/com/pickyfy/pickyfy/common/config/AsyncConfig.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
package com.pickyfy.pickyfy.common.config;

import lombok.extern.slf4j.Slf4j;
import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.AsyncConfigurer;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;

import java.lang.reflect.Method;
import java.util.concurrent.Executor;

@Slf4j
@Configuration
@EnableAsync
public class AsyncConfig implements AsyncConfigurer {

@Override
public Executor getAsyncExecutor(){
ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
executor.setCorePoolSize(2);
executor.setMaxPoolSize(5);
executor.setQueueCapacity(10);
executor.setThreadNamePrefix("Async MailExecutor-");
executor.initialize();
return executor;
}

@Override
public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler(){
return new CustomAsyncExceptionHandler();
}

private static class CustomAsyncExceptionHandler implements AsyncUncaughtExceptionHandler {
@Override
public void handleUncaughtException(Throwable throwable, Method method, Object... obj) {
log.error("비동기 메서드 예외 발생: {}", method.getName(), throwable);
}
}
}
48 changes: 5 additions & 43 deletions src/main/java/com/pickyfy/pickyfy/service/EmailServiceImpl.java
Original file line number Diff line number Diff line change
@@ -1,87 +1,49 @@
package com.pickyfy.pickyfy.service;

import com.pickyfy.pickyfy.web.apiResponse.error.ErrorStatus;
import com.pickyfy.pickyfy.common.Constant;
import com.pickyfy.pickyfy.common.util.JwtUtil;
import com.pickyfy.pickyfy.common.util.RedisUtil;
import com.pickyfy.pickyfy.web.controller.AsyncEmailService;
import com.pickyfy.pickyfy.web.dto.request.EmailVerificationSendRequest;
import com.pickyfy.pickyfy.web.dto.request.EmailVerificationVerifyRequest;
import com.pickyfy.pickyfy.web.dto.response.EmailVerificationSendResponse;
import com.pickyfy.pickyfy.web.dto.response.EmailVerificationVerifyResponse;
import com.pickyfy.pickyfy.exception.ExceptionHandler;
import jakarta.mail.MessagingException;
import jakarta.mail.internet.MimeMessage;
import jakarta.transaction.Transactional;
import lombok.RequiredArgsConstructor;
import org.springframework.mail.javamail.JavaMailSender;
import org.springframework.mail.javamail.MimeMessageHelper;
import org.springframework.stereotype.Service;
import org.thymeleaf.TemplateEngine;
import org.thymeleaf.context.Context;
import java.util.concurrent.ThreadLocalRandom;

@Service
@RequiredArgsConstructor
public class EmailServiceImpl implements EmailService {

private static final String ENCODING = "utf-8";
private static final String EMAIL_TITLE = "[Pickyfy] 인증코드";
private static final String VARIABLE_NAME = "code";
private static final String TEMPLATE = "mail";

private final JavaMailSender javaMailSender;
private final TemplateEngine templateEngine;
private final AsyncEmailService asyncEmailService;
private final RedisUtil redisUtil;
private final JwtUtil jwtUtil;

@Transactional
@Override
public EmailVerificationSendResponse sendAuthCode(EmailVerificationSendRequest request) {
String email = request.email();
String code = generateVerificationCode();
sendVerificationEmail(code, email);
asyncEmailService.sendVerificationEmail(code, email);
return new EmailVerificationSendResponse(email, code);
}

@Transactional
@Override
public EmailVerificationVerifyResponse verifyAuthCode(EmailVerificationVerifyRequest request) {
String email = request.email();
String inputCode = request.code();
String savedCode = redisUtil.getData("email:" + email);
redisUtil.deleteData("email:" + email);

if(!savedCode.equals(inputCode)){
throw new ExceptionHandler(ErrorStatus.AUTH_CODE_INVALID);
}

return new EmailVerificationVerifyResponse(email, jwtUtil.createEmailToken(email));
}

private String generateVerificationCode() {
return Long.toString(ThreadLocalRandom.current().nextLong(100000L, 999999L));
}

private void sendVerificationEmail(String code, String email) {
try {
MimeMessage mimeMessage = createMimeMessage(code, email);
javaMailSender.send(mimeMessage);
} catch (MessagingException e) {
throw new ExceptionHandler(ErrorStatus._INTERNAL_SERVER_ERROR);
}

redisUtil.setData("email:" + email, code, Constant.EMAIL_TOKEN_EXPIRATION_TIME);
}

private MimeMessage createMimeMessage(String code, String email) throws MessagingException {
MimeMessage mimeMessage = javaMailSender.createMimeMessage();
MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, true, ENCODING);
helper.setSubject(EMAIL_TITLE);
helper.setTo(email);

Context context = new Context();
context.setVariable(VARIABLE_NAME, code);
String htmlContent = templateEngine.process(TEMPLATE, context);
helper.setText(htmlContent, true);

return mimeMessage;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
package com.pickyfy.pickyfy.web.controller;

import com.pickyfy.pickyfy.common.Constant;
import com.pickyfy.pickyfy.common.util.RedisUtil;
import com.pickyfy.pickyfy.exception.ExceptionHandler;
import com.pickyfy.pickyfy.web.apiResponse.error.ErrorStatus;
import jakarta.mail.MessagingException;
import jakarta.mail.internet.MimeMessage;
import lombok.RequiredArgsConstructor;
import org.springframework.mail.javamail.JavaMailSender;
import org.springframework.mail.javamail.MimeMessageHelper;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.thymeleaf.TemplateEngine;
import org.thymeleaf.context.Context;

@Service
@RequiredArgsConstructor
public class AsyncEmailService {

private static final String ENCODING = "utf-8";
private static final String EMAIL_TITLE = "[Pickyfy] 인증코드";
private static final String VARIABLE_NAME = "code";
private static final String TEMPLATE = "mail";

private final JavaMailSender javaMailSender;
private final TemplateEngine templateEngine;
private final RedisUtil redisUtil;

@Async
public void sendVerificationEmail(String code, String email) {
try {
MimeMessage mimeMessage = createMimeMessage(code, email);
javaMailSender.send(mimeMessage);
} catch (MessagingException e) {
throw new ExceptionHandler(ErrorStatus._INTERNAL_SERVER_ERROR);
}
redisUtil.setData("email:" + email, code, Constant.EMAIL_TOKEN_EXPIRATION_TIME);
}

private MimeMessage createMimeMessage(String code, String email) throws MessagingException {
MimeMessage mimeMessage = javaMailSender.createMimeMessage();
MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, true, ENCODING);
helper.setSubject(EMAIL_TITLE);
helper.setTo(email);

Context context = new Context();
context.setVariable(VARIABLE_NAME, code);
String htmlContent = templateEngine.process(TEMPLATE, context);
helper.setText(htmlContent, true);

return mimeMessage;
}
}