diff --git a/.env.example b/.env.example index 91c625cf0..fef28f020 100644 --- a/.env.example +++ b/.env.example @@ -56,6 +56,19 @@ PUSH_TYPE=log # 예: base64 < firebase-adminsdk.json | tr -d '\n' FIREBASE_CREDENTIALS_BASE64=replace-with-base64-encoded-service-account-json +### infrastructure:client — 메일 발송 (log | smtp) ### +# log는 실제 발송 없이 인증 코드를 로그로 남긴다 (로컬 기본값) +EMAIL_TYPE=log + +# type=smtp일 때. 587 포트는 STARTTLS로 접속한다 +SMTP_HOST=replace-with-smtp-host +SMTP_PORT=587 +SMTP_USERNAME=replace-with-smtp-username +# 메일 계정 비밀번호(또는 앱 비밀번호). 코드·로그에 남기지 않는다 +SMTP_PASSWORD=replace-with-smtp-password +# 보내는 주소. 비우면 SMTP_USERNAME으로 보낸다 +EMAIL_FROM= +EMAIL_FROM_NAME=소프트웨어융합대학 학생회 ### infrastructure:client — AI 서버(stream-ai) 챗봇 ### STREAM_AI_BASE_URL=http://localhost:8000 STREAM_AI_CHAT_PATH=/chat diff --git a/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/auth/AppAuthApi.java b/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/auth/AppAuthApi.java index 368785338..2225c2713 100644 --- a/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/auth/AppAuthApi.java +++ b/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/auth/AppAuthApi.java @@ -21,7 +21,7 @@ public interface AppAuthApi { @Operation(summary = "OAuth 로그인", description = """ provider(현재 kconnect)에서 받은 code·codeVerifier·redirectUri로 로그인한다. - 처음 로그인하면 회원이 만들어진다. signUpRequired가 true면 회원가입(전화번호·필수 약관 동의)이 필요하다.""") + 처음 로그인하면 회원이 만들어진다. signUpRequired가 true면 회원가입(전화번호·이메일·필수 약관 동의)이 필요하다.""") @ApiErrorCode(type = CommonErrorCode.class, codes = {"INVALID_INPUT"}) @ApiErrorCode(type = OAuthErrorCode.class, codes = { "UNSUPPORTED_OAUTH_PROVIDER", diff --git a/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/auth/response/OAuthLoginResponse.java b/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/auth/response/OAuthLoginResponse.java index 6525bd932..7fd8c4adf 100644 --- a/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/auth/response/OAuthLoginResponse.java +++ b/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/auth/response/OAuthLoginResponse.java @@ -1,7 +1,7 @@ package kr.ac.kookmin.stream.api.app.core.auth.response; /** - * @param signUpRequired 회원가입(전화번호·필수 약관 동의)을 마치지 않았으면 true. 앱은 이 값으로 회원가입 화면을 띄운다 + * @param signUpRequired 회원가입(전화번호·이메일·필수 약관 동의)을 마치지 않았으면 true. 앱은 이 값으로 회원가입 화면을 띄운다 */ public record OAuthLoginResponse( String accessToken, diff --git a/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/auth/usecase/OAuthLoginUseCase.java b/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/auth/usecase/OAuthLoginUseCase.java index a530c56f8..b11747eb6 100644 --- a/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/auth/usecase/OAuthLoginUseCase.java +++ b/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/auth/usecase/OAuthLoginUseCase.java @@ -30,7 +30,7 @@ public OAuthLoginResponse login(OAuthLoginCommand command) { Member member = findOrRegister(userInfo); String accessToken = authTokenIssuer.issue(member.getId(), member.getRole(), member.getCouncilDepartment()); - // 회원을 이번에 만들었는지가 아니라 저장된 전화번호·동의 기록으로 판단한다. 회원가입 화면에서 이탈한 회원도 다시 가입 화면을 본다 + // 회원을 이번에 만들었는지가 아니라 저장된 전화번호·이메일·동의 기록으로 판단한다. 회원가입 화면에서 이탈한 회원도 다시 가입 화면을 본다 boolean signUpRequired = !memberService.isSignedUp(member.getId()); return new OAuthLoginResponse(accessToken, member.getName(), signUpRequired); } diff --git a/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/member/AppMemberApi.java b/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/member/AppMemberApi.java index 753fc41f8..5ea3b82cb 100644 --- a/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/member/AppMemberApi.java +++ b/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/member/AppMemberApi.java @@ -11,6 +11,7 @@ import kr.ac.kookmin.stream.api.common.openapi.ApiErrorCode; import kr.ac.kookmin.stream.common.CommonErrorCode; import kr.ac.kookmin.stream.member.domain.member.domain.MemberErrorCode; +import kr.ac.kookmin.stream.member.domain.verification.domain.EmailVerificationErrorCode; /** * 학생 앱 회원 API의 문서 명세. 구현은 {@link AppMemberController}가 맡는다. @@ -18,6 +19,7 @@ @Tag(name = "회원", description = "학생 앱 내 정보 조회·회원가입·FCM 토큰 등록·전화번호 변경") public interface AppMemberApi { + /** 회원가입. 로그인 응답의 signUpRequired가 true인 회원이 전화번호·이메일과 약관 동의 여부를 등록한다. */ /** 내 정보 조회. 설정 화면의 계정 정보 카드가 쓴다. */ @Operation(summary = "내 정보 조회", description = """ @@ -29,16 +31,20 @@ public interface AppMemberApi { /** 회원가입. 로그인 응답의 signUpRequired가 true인 회원이 전화번호와 약관 동의 여부를 등록한다. */ @Operation(summary = "회원가입", description = """ - 로그인한 회원의 전화번호와 약관 동의 여부를 저장한다. + 로그인한 회원의 전화번호·이메일과 약관 동의 여부를 저장한다. 전화번호는 하이픈을 넣어도 되고 빼도 된다. 필수 약관(PRIVACY_POLICY, TERMS_OF_SERVICE)에 모두 동의해야 한다. + 이메일은 이메일 인증 API로 인증을 마친 뒤 30분 안에 같은 이메일로 보내야 한다. + 회원 정보에 이미 있는 이메일(이관 회원 등)은 인증 없이 그대로 보낼 수 있다. 가입하면 알림 설정이 모두 켜진 상태로 만들어진다.""") @ApiErrorCode(type = CommonErrorCode.class, codes = {"INVALID_INPUT"}) @ApiErrorCode(type = MemberErrorCode.class, codes = { "MEMBER_NOT_FOUND", "REQUIRED_TERMS_NOT_AGREED", "ALREADY_SIGNED_UP", - "PHONE_NUMBER_ALREADY_EXISTS" + "PHONE_NUMBER_ALREADY_EXISTS", + "EMAIL_ALREADY_EXISTS" }) + @ApiErrorCode(type = EmailVerificationErrorCode.class, codes = {"EMAIL_NOT_VERIFIED"}) ApiResponse signUp(AppApiUser apiUser, MemberSignUpRequest request); /** FCM 토큰 등록. 앱이 Firebase에서 받은 등록 토큰을 로그인한 회원에게 저장한다. */ diff --git a/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/member/request/MemberSignUpRequest.java b/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/member/request/MemberSignUpRequest.java index 04122980d..b269dc4af 100644 --- a/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/member/request/MemberSignUpRequest.java +++ b/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/member/request/MemberSignUpRequest.java @@ -1,10 +1,12 @@ package kr.ac.kookmin.stream.api.app.core.member.request; import jakarta.validation.Valid; +import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; import java.util.EnumMap; import java.util.List; import java.util.Map; @@ -16,6 +18,11 @@ public record MemberSignUpRequest( @Pattern(regexp = "^010-?\\d{4}-?\\d{4}$", message = "전화번호 형식이 올바르지 않습니다.") String phoneNumber, + @NotBlank(message = "이메일을 입력해 주세요.") + @Email(message = "이메일 형식이 올바르지 않습니다.") + @Size(max = 255, message = "이메일은 255자 이하로 입력해 주세요.") + String email, + // 필수 약관 여부는 TermType이 정하므로 여기서는 동의 값을 강제하지 않는다 @NotEmpty(message = "약관 동의 여부를 입력해 주세요.") @Valid @@ -27,7 +34,7 @@ public MemberSignUpCommand toCommand() { Map agreements = new EnumMap<>(TermType.class); termAgreements.forEach(agreement -> agreements.put(agreement.termType(), agreement.agreed())); - return new MemberSignUpCommand(phoneNumber, agreements); + return new MemberSignUpCommand(phoneNumber, email, agreements); } // 같은 약관이 두 번 오면 IllegalArgumentException → GlobalExceptionHandler가 INVALID_INPUT(400)으로 응답한다 diff --git a/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/member/usecase/MemberSignUpUseCase.java b/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/member/usecase/MemberSignUpUseCase.java index 9762661de..70d30820b 100644 --- a/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/member/usecase/MemberSignUpUseCase.java +++ b/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/member/usecase/MemberSignUpUseCase.java @@ -1,26 +1,39 @@ package kr.ac.kookmin.stream.api.app.core.member.usecase; +import kr.ac.kookmin.stream.common.BusinessException; import kr.ac.kookmin.stream.member.domain.member.domain.MemberSignUpCommand; import kr.ac.kookmin.stream.member.domain.member.service.MemberService; import kr.ac.kookmin.stream.member.domain.notification.service.MemberNotificationSettingService; +import kr.ac.kookmin.stream.member.domain.verification.domain.EmailVerificationErrorCode; +import kr.ac.kookmin.stream.member.domain.verification.service.EmailVerificationService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; /** - * 회원가입. {@code member}(전화번호, 약관 동의)와 {@code notification}(기본 알림 설정) 두 도메인을 조합한다. + * 회원가입. {@code member}(전화번호·이메일, 약관 동의), {@code verification}(이메일 인증 여부), + * {@code notification}(기본 알림 설정) 세 도메인을 조합한다. */ @Component @RequiredArgsConstructor public class MemberSignUpUseCase { private final MemberService memberService; + private final EmailVerificationService emailVerificationService; private final MemberNotificationSettingService memberNotificationSettingService; // 가입을 마친 회원에게는 항상 알림 설정이 있도록 한 트랜잭션으로 묶는다 @Transactional public void signUp(Long memberId, MemberSignUpCommand command) { + validateEmailVerified(memberId, command.email()); memberService.signUp(memberId, command); memberNotificationSettingService.createDefaultIfAbsent(memberId); } + + private void validateEmailVerified(Long memberId, String email) { + boolean registeredEmail = email.equalsIgnoreCase(memberService.getById(memberId).getEmail()); + if (!registeredEmail && !emailVerificationService.isVerifiedForSignUp(memberId, email)) { + throw new BusinessException(EmailVerificationErrorCode.EMAIL_NOT_VERIFIED); + } + } } diff --git a/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/verification/AppEmailVerificationApi.java b/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/verification/AppEmailVerificationApi.java new file mode 100644 index 000000000..5c909026e --- /dev/null +++ b/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/verification/AppEmailVerificationApi.java @@ -0,0 +1,51 @@ +package kr.ac.kookmin.stream.api.app.core.verification; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import kr.ac.kookmin.stream.api.app.AppApiUser; +import kr.ac.kookmin.stream.api.app.core.verification.request.EmailVerificationConfirmRequest; +import kr.ac.kookmin.stream.api.app.core.verification.request.EmailVerificationSendRequest; +import kr.ac.kookmin.stream.api.common.dto.ApiResponse; +import kr.ac.kookmin.stream.api.common.openapi.ApiErrorCode; +import kr.ac.kookmin.stream.common.CommonErrorCode; +import kr.ac.kookmin.stream.member.domain.member.domain.MemberErrorCode; +import kr.ac.kookmin.stream.member.domain.verification.domain.EmailVerificationErrorCode; + +/** + * 학생 앱 이메일 인증 API의 문서 명세. 구현은 {@link AppEmailVerificationController}가 맡는다. + */ +@Tag(name = "이메일 인증", description = "회원가입 전 이메일 인증 코드 발송·확인") +public interface AppEmailVerificationApi { + + /** 인증 코드 발송. */ + @Operation(summary = "이메일 인증 코드 발송", + description = """ + 로그인한 회원이 입력한 이메일로 6자리 인증 코드를 보낸다. 코드는 5분 동안 유효하다. + 다시 보내려면 1분을 기다려야 하고, 하루(자정 기준)에 10번까지 보낼 수 있다. + 새 코드를 받으면 앞서 받은 코드는 쓸 수 없다. 다른 회원이 쓰는 이메일로는 보낼 수 없다. + 메일은 응답한 뒤에 보내므로 성공 응답이 메일 도착을 보장하지 않는다. 메일이 오지 않으면 1분 뒤 다시 요청한다. + EMAIL_SEND_FAILED는 발송 요청이 몰려 받지 못했을 때 응답한다.""") + @ApiErrorCode(type = CommonErrorCode.class, codes = {"INVALID_INPUT"}) + @ApiErrorCode(type = MemberErrorCode.class, codes = {"MEMBER_NOT_FOUND", "EMAIL_ALREADY_EXISTS"}) + @ApiErrorCode(type = EmailVerificationErrorCode.class, codes = { + "EMAIL_VERIFICATION_COOLDOWN", + "EMAIL_VERIFICATION_DAILY_LIMIT_EXCEEDED", + "EMAIL_SEND_FAILED" + }) + ApiResponse sendCode(AppApiUser apiUser, EmailVerificationSendRequest request); + + /** 인증 코드 확인. */ + @Operation(summary = "이메일 인증 코드 확인", + description = """ + 가장 최근에 받은 인증 코드를 확인한다. 이메일은 코드를 요청할 때와 같아야 한다. + 코드를 5번 틀리면 코드를 다시 요청해야 한다. 이미 인증한 요청을 다시 보내면 성공으로 응답한다. + 인증한 뒤 30분 안에 회원가입을 마쳐야 한다.""") + @ApiErrorCode(type = CommonErrorCode.class, codes = {"INVALID_INPUT"}) + @ApiErrorCode(type = EmailVerificationErrorCode.class, codes = { + "EMAIL_VERIFICATION_NOT_FOUND", + "EMAIL_VERIFICATION_EXPIRED", + "EMAIL_VERIFICATION_CODE_MISMATCH", + "EMAIL_VERIFICATION_ATTEMPTS_EXCEEDED" + }) + ApiResponse confirm(AppApiUser apiUser, EmailVerificationConfirmRequest request); +} diff --git a/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/verification/AppEmailVerificationController.java b/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/verification/AppEmailVerificationController.java new file mode 100644 index 000000000..7ac082682 --- /dev/null +++ b/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/verification/AppEmailVerificationController.java @@ -0,0 +1,43 @@ +package kr.ac.kookmin.stream.api.app.core.verification; + +import jakarta.validation.Valid; +import kr.ac.kookmin.stream.api.app.AppApiUser; +import kr.ac.kookmin.stream.api.app.core.verification.request.EmailVerificationConfirmRequest; +import kr.ac.kookmin.stream.api.app.core.verification.request.EmailVerificationSendRequest; +import kr.ac.kookmin.stream.api.app.core.verification.usecase.EmailVerificationSendUseCase; +import kr.ac.kookmin.stream.api.common.dto.ApiResponse; +import kr.ac.kookmin.stream.member.domain.verification.service.EmailVerificationService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/v1/app/members/email-verifications") +@RequiredArgsConstructor +public class AppEmailVerificationController implements AppEmailVerificationApi { + + private final EmailVerificationService emailVerificationService; + private final EmailVerificationSendUseCase emailVerificationSendUseCase; + + @Override + @PostMapping + public ApiResponse sendCode( + AppApiUser apiUser, + @Valid @RequestBody EmailVerificationSendRequest request + ) { + emailVerificationSendUseCase.sendCode(apiUser.userId(), request.toCommand()); + return ApiResponse.success(); + } + + @Override + @PostMapping("/confirm") + public ApiResponse confirm( + AppApiUser apiUser, + @Valid @RequestBody EmailVerificationConfirmRequest request + ) { + emailVerificationService.confirm(apiUser.userId(), request.toCommand()); + return ApiResponse.success(); + } +} diff --git a/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/verification/request/EmailVerificationConfirmRequest.java b/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/verification/request/EmailVerificationConfirmRequest.java new file mode 100644 index 000000000..8dfe9b86d --- /dev/null +++ b/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/verification/request/EmailVerificationConfirmRequest.java @@ -0,0 +1,23 @@ +package kr.ac.kookmin.stream.api.app.core.verification.request; + +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; +import kr.ac.kookmin.stream.member.domain.verification.domain.EmailVerificationConfirmCommand; + +public record EmailVerificationConfirmRequest( + @NotBlank(message = "이메일을 입력해 주세요.") + @Email(message = "이메일 형식이 올바르지 않습니다.") + @Size(max = 255, message = "이메일은 255자 이하로 입력해 주세요.") + String email, + + @NotBlank(message = "인증 코드를 입력해 주세요.") + @Pattern(regexp = "^\\d{6}$", message = "인증 코드는 숫자 6자리입니다.") + String code +) { + + public EmailVerificationConfirmCommand toCommand() { + return new EmailVerificationConfirmCommand(email, code); + } +} diff --git a/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/verification/request/EmailVerificationSendRequest.java b/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/verification/request/EmailVerificationSendRequest.java new file mode 100644 index 000000000..dddb3ed93 --- /dev/null +++ b/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/verification/request/EmailVerificationSendRequest.java @@ -0,0 +1,18 @@ +package kr.ac.kookmin.stream.api.app.core.verification.request; + +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; +import kr.ac.kookmin.stream.member.domain.verification.domain.EmailVerificationSendCommand; + +public record EmailVerificationSendRequest( + @NotBlank(message = "이메일을 입력해 주세요.") + @Email(message = "이메일 형식이 올바르지 않습니다.") + @Size(max = 255, message = "이메일은 255자 이하로 입력해 주세요.") + String email +) { + + public EmailVerificationSendCommand toCommand() { + return new EmailVerificationSendCommand(email); + } +} diff --git a/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/verification/usecase/EmailVerificationSendUseCase.java b/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/verification/usecase/EmailVerificationSendUseCase.java new file mode 100644 index 000000000..c8fcc251b --- /dev/null +++ b/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/verification/usecase/EmailVerificationSendUseCase.java @@ -0,0 +1,31 @@ +package kr.ac.kookmin.stream.api.app.core.verification.usecase; + +import kr.ac.kookmin.stream.common.BusinessException; +import kr.ac.kookmin.stream.member.domain.member.domain.MemberErrorCode; +import kr.ac.kookmin.stream.member.domain.member.service.MemberService; +import kr.ac.kookmin.stream.member.domain.verification.domain.EmailVerificationSendCommand; +import kr.ac.kookmin.stream.member.domain.verification.service.EmailVerificationService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +/** + * 이메일 인증 코드 발송. {@code member}(이메일 중복 확인)와 {@code verification}(코드 발송) 두 도메인을 조합한다. + */ +@Component +@RequiredArgsConstructor +public class EmailVerificationSendUseCase { + + private final MemberService memberService; + private final EmailVerificationService emailVerificationService; + + public void sendCode(Long memberId, EmailVerificationSendCommand command) { + validateEmailNotUsedByOthers(memberId, command.email()); + emailVerificationService.sendCode(memberId, command); + } + + private void validateEmailNotUsedByOthers(Long memberId, String email) { + if (memberService.isEmailUsedByOthers(memberId, email)) { + throw new BusinessException(MemberErrorCode.EMAIL_ALREADY_EXISTS); + } + } +} diff --git a/bootstrap/src/main/java/kr/ac/kookmin/stream/bootstrap/config/AsyncConfig.java b/bootstrap/src/main/java/kr/ac/kookmin/stream/bootstrap/config/AsyncConfig.java new file mode 100644 index 000000000..9c8013074 --- /dev/null +++ b/bootstrap/src/main/java/kr/ac/kookmin/stream/bootstrap/config/AsyncConfig.java @@ -0,0 +1,48 @@ +package kr.ac.kookmin.stream.bootstrap.config; + +import java.util.Map; +import kr.ac.kookmin.stream.common.TaskExecutorNames; +import org.slf4j.MDC; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; + +/** + * {@code @Async}를 켜고 작업별 실행기를 등록한다. 빈 이름은 {@link TaskExecutorNames}에 둔다. + */ +@Configuration +@EnableAsync +public class AsyncConfig { + + private static final int EMAIL_POOL_SIZE = 2; + private static final int EMAIL_QUEUE_CAPACITY = 100; + private static final int EMAIL_AWAIT_TERMINATION_SECONDS = 10; + + @Bean(TaskExecutorNames.EMAIL_TASK_EXECUTOR) + public ThreadPoolTaskExecutor emailTaskExecutor() { + ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); + executor.setThreadNamePrefix("email-"); + executor.setCorePoolSize(EMAIL_POOL_SIZE); + executor.setMaxPoolSize(EMAIL_POOL_SIZE); + executor.setQueueCapacity(EMAIL_QUEUE_CAPACITY); + executor.setTaskDecorator(AsyncConfig::copyMdc); + executor.setWaitForTasksToCompleteOnShutdown(true); + executor.setAwaitTerminationSeconds(EMAIL_AWAIT_TERMINATION_SECONDS); + return executor; + } + + private static Runnable copyMdc(Runnable task) { + Map context = MDC.getCopyOfContextMap(); + return () -> { + if (context != null) { + MDC.setContextMap(context); + } + try { + task.run(); + } finally { + MDC.clear(); + } + }; + } +} diff --git a/core/common/src/main/java/kr/ac/kookmin/stream/common/ErrorStatus.java b/core/common/src/main/java/kr/ac/kookmin/stream/common/ErrorStatus.java index 3ebad06b6..d589611b0 100644 --- a/core/common/src/main/java/kr/ac/kookmin/stream/common/ErrorStatus.java +++ b/core/common/src/main/java/kr/ac/kookmin/stream/common/ErrorStatus.java @@ -12,5 +12,6 @@ public final class ErrorStatus { public static final int BAD_REQUEST = 400; public static final int CONFLICT = 409; public static final int FORBIDDEN = 403; + public static final int TOO_MANY_REQUESTS = 429; public static final int BAD_GATEWAY = 502; } diff --git a/core/common/src/main/java/kr/ac/kookmin/stream/common/RetryExecutor.java b/core/common/src/main/java/kr/ac/kookmin/stream/common/RetryExecutor.java new file mode 100644 index 000000000..0ce44d668 --- /dev/null +++ b/core/common/src/main/java/kr/ac/kookmin/stream/common/RetryExecutor.java @@ -0,0 +1,70 @@ +package kr.ac.kookmin.stream.common; + +import java.time.Duration; +import java.util.function.Predicate; +import java.util.function.Supplier; +import org.springframework.core.retry.RetryPolicy; +import org.springframework.core.retry.RetryTemplate; +import org.springframework.stereotype.Component; + +/** + * 실패한 작업을 다시 실행한다. + */ +@Component +public class RetryExecutor { + + /** + * retryOn에 맞는 예외가 나면 delay만큼 쉬고 action을 다시 실행한다. 첫 시도 뒤 최대 maxRetries번 더 실행한다. + *
    + *
  • 트랜잭션을 열지 않는다. 시도마다 action을 처음부터 다시 실행하므로 중복돼도 되는 작업만 넣는다.
  • + *
  • retryOn에 맞지 않는 예외는 바로 던진다. 시도를 다 쓰면 마지막 예외를 그대로 던진다.
  • + *
  • 대기는 호출한 스레드를 멈춘다. 대기 중 인터럽트되면 인터럽트 상태를 되살리고 마지막 예외를 던진다.
  • + *
+ */ + public T executeWithRetry( + Supplier action, + Predicate retryOn, + int maxRetries, + Duration delay + ) { + RetryPolicy retryPolicy = RetryPolicy.builder() + .predicate(retryOn) + .maxRetries(maxRetries) + .delay(delay) + .build(); + return new RetryTemplate(retryPolicy).invoke(action); + } + + /** retryOn 타입(하위 타입 포함)의 예외만 재시도한다. 동작은 {@link #executeWithRetry(Supplier, Predicate, int, Duration)}와 같다. */ + public T executeWithRetry( + Supplier action, + Class retryOn, + int maxRetries, + Duration delay + ) { + return executeWithRetry(action, retryOn::isInstance, maxRetries, delay); + } + + /** 반환값이 없는 action용. 동작은 {@link #executeWithRetry(Supplier, Predicate, int, Duration)}와 같다. */ + public void executeWithRetry( + Runnable action, + Predicate retryOn, + int maxRetries, + Duration delay + ) { + executeWithRetry(() -> { + action.run(); + return null; + }, retryOn, maxRetries, delay); + } + + /** 반환값이 없는 action용. 동작은 {@link #executeWithRetry(Supplier, Class, int, Duration)}와 같다. */ + public void executeWithRetry( + Runnable action, + Class retryOn, + int maxRetries, + Duration delay + ) { + executeWithRetry(action, retryOn::isInstance, maxRetries, delay); + } +} diff --git a/core/common/src/main/java/kr/ac/kookmin/stream/common/TaskExecutorNames.java b/core/common/src/main/java/kr/ac/kookmin/stream/common/TaskExecutorNames.java new file mode 100644 index 000000000..b0f56deae --- /dev/null +++ b/core/common/src/main/java/kr/ac/kookmin/stream/common/TaskExecutorNames.java @@ -0,0 +1,13 @@ +package kr.ac.kookmin.stream.common; + +import lombok.AccessLevel; +import lombok.NoArgsConstructor; + +/** + * {@code @Async}에 적는 실행기 빈 이름. 실행기는 bootstrap의 AsyncConfig가 등록한다. + */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public final class TaskExecutorNames { + + public static final String EMAIL_TASK_EXECUTOR = "emailTaskExecutor"; +} diff --git a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/Member.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/Member.java index 3f666e535..9a3ff61d0 100644 --- a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/Member.java +++ b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/Member.java @@ -19,6 +19,7 @@ public class Member { private Department department; // 로그인 provider가 주는 학적 상태 원문(재학·휴학·졸업 등). 로그인 전 이관 회원은 null이다 private String academicStatus; + // 회원가입 때 인증한 이메일(소문자). 이관 회원은 이전 시스템의 값 그대로다 private String email; // 회원가입 때 받는 휴대전화 번호(숫자만). 가입 전 회원과 이관 회원은 null이다 private String phoneNumber; @@ -68,6 +69,14 @@ public boolean hasPhoneNumber() { return phoneNumber != null; } + public void registerEmail(String email) { + this.email = email; + } + + public boolean hasEmail() { + return email != null; + } + // 회원이 바꾼 전화번호로 갱신한다. 바뀐 값이 있으면 true를 돌려준다 public boolean updatePhoneNumber(String phoneNumber) { if (Objects.equals(this.phoneNumber, phoneNumber)) { diff --git a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/MemberErrorCode.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/MemberErrorCode.java index 9b1d9695a..337a83acc 100644 --- a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/MemberErrorCode.java +++ b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/MemberErrorCode.java @@ -15,7 +15,8 @@ public enum MemberErrorCode implements ErrorCode { DEPARTMENT_NOT_ALLOWED(ErrorStatus.FORBIDDEN, "소프트웨어융합대학 학생만 이용할 수 있습니다."), REQUIRED_TERMS_NOT_AGREED(ErrorStatus.BAD_REQUEST, "필수 약관에 모두 동의해 주세요."), ALREADY_SIGNED_UP(ErrorStatus.CONFLICT, "이미 회원가입을 마쳤습니다."), - PHONE_NUMBER_ALREADY_EXISTS(ErrorStatus.CONFLICT, "이미 사용 중인 전화번호입니다."); + PHONE_NUMBER_ALREADY_EXISTS(ErrorStatus.CONFLICT, "이미 사용 중인 전화번호입니다."), + EMAIL_ALREADY_EXISTS(ErrorStatus.CONFLICT, "이미 사용 중인 이메일입니다."); private final int status; private final String message; diff --git a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/MemberSignUpCommand.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/MemberSignUpCommand.java index 3c89a5f89..80b71f74f 100644 --- a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/MemberSignUpCommand.java +++ b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/MemberSignUpCommand.java @@ -1,16 +1,19 @@ package kr.ac.kookmin.stream.member.domain.member.domain; +import java.util.Locale; import java.util.Map; /** - * 회원가입 요청. 전화번호는 하이픈을 지운 숫자만 담는다. 중복 검사와 저장이 같은 형식을 쓰게 하기 위함이다. + * 회원가입 요청. 전화번호는 하이픈을 지운 숫자만, 이메일은 소문자로 바꿔 담는다. 중복 검사·인증 확인과 저장이 같은 형식을 쓰게 하기 위함이다. */ public record MemberSignUpCommand( String phoneNumber, + String email, Map termAgreements ) { public MemberSignUpCommand { phoneNumber = phoneNumber.replace("-", ""); + email = email.toLowerCase(Locale.ROOT); } } diff --git a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/repository/MemberRepository.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/repository/MemberRepository.java index bd0465e33..ee1c62cf6 100644 --- a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/repository/MemberRepository.java +++ b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/repository/MemberRepository.java @@ -8,6 +8,7 @@ public interface MemberRepository { Optional findById(Long id); Optional findByStudentId(String studentId); boolean existsByPhoneNumber(String phoneNumber); + boolean existsByEmail(String email); List findAllByIds(List ids); List searchIdsByKeyword(String keyword); Member save(Member member); diff --git a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/service/MemberService.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/service/MemberService.java index fb9ea1b06..67bceec24 100644 --- a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/service/MemberService.java +++ b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/service/MemberService.java @@ -25,10 +25,11 @@ public interface MemberService { Member signUp(Long memberId, MemberSignUpCommand command); boolean isSignedUp(Long memberId); /** - * 주어진 회원 중 가입(전화번호 등록 + 필수 약관 동의)을 마친 회원 ID. 기준은 {@link #isSignedUp}과 같고 탈퇴한 회원은 빠진다. + * 주어진 회원 중 가입(전화번호·이메일 등록 + 필수 약관 동의)을 마친 회원 ID. 기준은 {@link #isSignedUp}과 같고 탈퇴한 회원은 빠진다. * 목록에서 회원마다 isSignedUp을 부르지 않도록 한 번에 조회한다. */ Set findSignedUpIds(List memberIds); void updateFcmToken(Long memberId, String fcmToken); void updatePhoneNumber(Long memberId, MemberPhoneNumberUpdateCommand command); + boolean isEmailUsedByOthers(Long memberId, String email); } diff --git a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/service/impl/MemberServiceImpl.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/service/impl/MemberServiceImpl.java index dc3045d0d..90765a9e9 100644 --- a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/service/impl/MemberServiceImpl.java +++ b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/service/impl/MemberServiceImpl.java @@ -71,15 +71,17 @@ public Member registerOrUpdateByStudentId(MemberProfileCommand command) { return applyProfile(found.get(), command); } - // 전화번호 저장과 약관 동의를 한 트랜잭션으로 묶는다. 필수 약관에 동의하지 않으면 전화번호 저장도 롤백된다 + // 전화번호·이메일 저장과 약관 동의를 한 트랜잭션으로 묶는다. 필수 약관에 동의하지 않으면 전화번호·이메일 저장도 롤백된다 @Override @Transactional public Member signUp(Long memberId, MemberSignUpCommand command) { Member member = getById(memberId); validateNotSignedUp(member); validatePhoneNumberNotDuplicated(member, command.phoneNumber()); + validateEmailNotDuplicated(member, command.email()); member.registerPhoneNumber(command.phoneNumber()); + member.registerEmail(command.email()); Member saved = memberRepository.save(member); memberTermService.agree(memberId, command.termAgreements()); return saved; @@ -95,11 +97,11 @@ public Set findSignedUpIds(List memberIds) { if (memberIds.isEmpty()) { return Set.of(); } - List phoneRegisteredIds = findAllByIds(memberIds).stream() - .filter(Member::hasPhoneNumber) + List contactRegisteredIds = findAllByIds(memberIds).stream() + .filter(member -> member.hasPhoneNumber() && member.hasEmail()) .map(Member::getId) .toList(); - return memberTermService.findIdsAgreedRequiredTerms(phoneRegisteredIds); + return memberTermService.findIdsAgreedRequiredTerms(contactRegisteredIds); } // 한 기기를 다른 계정으로 쓰게 되면 이전 회원의 알림이 새 사용자에게 가지 않도록, 다른 회원에게 남은 같은 토큰을 지운다. @@ -124,9 +126,14 @@ public void updatePhoneNumber(Long memberId, MemberPhoneNumberUpdateCommand comm } } - // 전화번호와 필수 약관 동의가 모두 있어야 가입을 마친 것으로 본다 + @Override + public boolean isEmailUsedByOthers(Long memberId, String email) { + return isEmailUsedByOthers(getById(memberId), email); + } + + // 전화번호·이메일과 필수 약관 동의가 모두 있어야 가입을 마친 것으로 본다 private boolean isSignedUp(Member member) { - return member.hasPhoneNumber() && memberTermService.hasAgreedRequiredTerms(member.getId()); + return member.hasPhoneNumber() && member.hasEmail() && memberTermService.hasAgreedRequiredTerms(member.getId()); } private void validateNotSignedUp(Member member) { @@ -145,6 +152,19 @@ private void validatePhoneNumberNotDuplicated(Member member, String phoneNumber) } } + private void validateEmailNotDuplicated(Member member, String email) { + if (isEmailUsedByOthers(member, email)) { + throw new BusinessException(MemberErrorCode.EMAIL_ALREADY_EXISTS); + } + } + + private boolean isEmailUsedByOthers(Member member, String email) { + if (email.equalsIgnoreCase(member.getEmail())) { + return false; + } + return memberRepository.existsByEmail(email); + } + private Member register(MemberProfileCommand command) { Member member = Member.create( command.studentId(), diff --git a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/verification/client/EmailClient.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/verification/client/EmailClient.java new file mode 100644 index 000000000..aafcea6eb --- /dev/null +++ b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/verification/client/EmailClient.java @@ -0,0 +1,10 @@ +package kr.ac.kookmin.stream.member.domain.verification.client; + +import kr.ac.kookmin.stream.member.domain.verification.domain.EmailMessage; + +public interface EmailClient { + /** 메일 서버에 넘기지 못하면 {@code EmailVerificationErrorCode.EMAIL_SEND_FAILED}를 던진다. */ + void send(EmailMessage message); + /** 요청 스레드 밖에서 보낸다. 실패는 로그로만 남기고, 발송 대기열이 가득 차면 {@code TaskRejectedException}을 던진다. */ + void sendAsync(EmailMessage message); +} diff --git a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/verification/domain/EmailMessage.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/verification/domain/EmailMessage.java new file mode 100644 index 000000000..d46c9e9a3 --- /dev/null +++ b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/verification/domain/EmailMessage.java @@ -0,0 +1,10 @@ +package kr.ac.kookmin.stream.member.domain.verification.domain; + +import java.util.Map; + +public record EmailMessage( + String to, + String subject, + EmailTemplate template, + Map variables +) {} diff --git a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/verification/domain/EmailTemplate.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/verification/domain/EmailTemplate.java new file mode 100644 index 000000000..ad9474e76 --- /dev/null +++ b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/verification/domain/EmailTemplate.java @@ -0,0 +1,19 @@ +package kr.ac.kookmin.stream.member.domain.verification.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.experimental.Accessors; + +/** + * 템플릿 파일은 infrastructure:client의 resources/templates/email/{templateName}.html에 둔다. + */ +@Getter +@Accessors(fluent = true) +@AllArgsConstructor +public enum EmailTemplate { + + // 변수: code(인증 코드), expiresInMinutes(유효 시간, 분) + VERIFICATION_CODE("verification-code"); + + private final String templateName; +} diff --git a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/verification/domain/EmailVerification.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/verification/domain/EmailVerification.java new file mode 100644 index 000000000..7da1cb615 --- /dev/null +++ b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/verification/domain/EmailVerification.java @@ -0,0 +1,95 @@ +package kr.ac.kookmin.stream.member.domain.verification.domain; + +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.time.Duration; +import java.time.LocalDateTime; +import java.util.HexFormat; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; + +/** + * 이메일 인증 코드 발송 기록. 코드는 원문 없이 SHA-256 해시로만 저장한다. + */ +@Getter +@EqualsAndHashCode +@AllArgsConstructor(access = AccessLevel.PRIVATE) +public class EmailVerification { + + public static final Duration CODE_VALIDITY = Duration.ofMinutes(5); + public static final Duration RESEND_COOLDOWN = Duration.ofSeconds(60); + private static final int MAX_FAILED_ATTEMPTS = 5; + private static final Duration SIGN_UP_VALIDITY = Duration.ofMinutes(30); + + private Long id; + private Long memberId; + private String email; + private String codeHash; + private LocalDateTime sentAt; + private int failedAttempts; + private LocalDateTime verifiedAt; + + public static EmailVerification create(Long memberId, String email, String code, LocalDateTime now) { + return new EmailVerification(null, memberId, email, hash(code), now, 0, null); + } + + public static EmailVerification of( + Long id, + Long memberId, + String email, + String codeHash, + LocalDateTime sentAt, + int failedAttempts, + LocalDateTime verifiedAt + ) { + return new EmailVerification(id, memberId, email, codeHash, sentAt, failedAttempts, verifiedAt); + } + + public boolean isFor(String email) { + return this.email.equals(email); + } + + public boolean isVerified() { + return verifiedAt != null; + } + + public boolean isExpired(LocalDateTime now) { + return !now.isBefore(sentAt.plus(CODE_VALIDITY)); + } + + public boolean isInResendCooldown(LocalDateTime now) { + return now.isBefore(sentAt.plus(RESEND_COOLDOWN)); + } + + public boolean hasExceededFailedAttempts() { + return failedAttempts >= MAX_FAILED_ATTEMPTS; + } + + public boolean matchesCode(String code) { + return codeHash.equals(hash(code)); + } + + public void recordFailedAttempt() { + failedAttempts++; + } + + public void verify(LocalDateTime now) { + verifiedAt = now; + } + + public boolean canSignUpWith(String email, LocalDateTime now) { + return isFor(email) && isVerified() && now.isBefore(verifiedAt.plus(SIGN_UP_VALIDITY)); + } + + private static String hash(String code) { + try { + byte[] digest = MessageDigest.getInstance("SHA-256").digest(code.getBytes(StandardCharsets.UTF_8)); + return HexFormat.of().formatHex(digest); + } catch (NoSuchAlgorithmException e) { + throw new IllegalStateException("SHA-256을 지원하지 않는 JVM입니다", e); + } + } +} diff --git a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/verification/domain/EmailVerificationConfirmCommand.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/verification/domain/EmailVerificationConfirmCommand.java new file mode 100644 index 000000000..deb870af5 --- /dev/null +++ b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/verification/domain/EmailVerificationConfirmCommand.java @@ -0,0 +1,10 @@ +package kr.ac.kookmin.stream.member.domain.verification.domain; + +import java.util.Locale; + +public record EmailVerificationConfirmCommand(String email, String code) { + + public EmailVerificationConfirmCommand { + email = email.toLowerCase(Locale.ROOT); + } +} diff --git a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/verification/domain/EmailVerificationErrorCode.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/verification/domain/EmailVerificationErrorCode.java new file mode 100644 index 000000000..db6ae9955 --- /dev/null +++ b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/verification/domain/EmailVerificationErrorCode.java @@ -0,0 +1,25 @@ +package kr.ac.kookmin.stream.member.domain.verification.domain; + +import kr.ac.kookmin.stream.common.ErrorCode; +import kr.ac.kookmin.stream.common.ErrorStatus; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.experimental.Accessors; + +@Getter +@Accessors(fluent = true) +@AllArgsConstructor +public enum EmailVerificationErrorCode implements ErrorCode { + + EMAIL_VERIFICATION_COOLDOWN(ErrorStatus.TOO_MANY_REQUESTS, "인증 메일은 1분에 한 번 보낼 수 있습니다. 잠시 후 다시 시도해 주세요."), + EMAIL_VERIFICATION_DAILY_LIMIT_EXCEEDED(ErrorStatus.TOO_MANY_REQUESTS, "오늘 보낼 수 있는 인증 메일을 모두 보냈습니다. 내일 다시 시도해 주세요."), + EMAIL_SEND_FAILED(ErrorStatus.BAD_GATEWAY, "인증 메일을 보내지 못했습니다. 잠시 후 다시 시도해 주세요."), + EMAIL_VERIFICATION_NOT_FOUND(ErrorStatus.BAD_REQUEST, "이 이메일로 받은 인증 코드가 없습니다. 인증 코드를 먼저 요청해 주세요."), + EMAIL_VERIFICATION_EXPIRED(ErrorStatus.BAD_REQUEST, "인증 코드가 만료되었습니다. 인증 코드를 다시 요청해 주세요."), + EMAIL_VERIFICATION_CODE_MISMATCH(ErrorStatus.BAD_REQUEST, "인증 코드가 올바르지 않습니다."), + EMAIL_VERIFICATION_ATTEMPTS_EXCEEDED(ErrorStatus.BAD_REQUEST, "인증 코드를 여러 번 틀렸습니다. 인증 코드를 다시 요청해 주세요."), + EMAIL_NOT_VERIFIED(ErrorStatus.BAD_REQUEST, "이메일 인증을 먼저 완료해 주세요."); + + private final int status; + private final String message; +} diff --git a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/verification/domain/EmailVerificationSendCommand.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/verification/domain/EmailVerificationSendCommand.java new file mode 100644 index 000000000..b8d21ecd6 --- /dev/null +++ b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/verification/domain/EmailVerificationSendCommand.java @@ -0,0 +1,10 @@ +package kr.ac.kookmin.stream.member.domain.verification.domain; + +import java.util.Locale; + +public record EmailVerificationSendCommand(String email) { + + public EmailVerificationSendCommand { + email = email.toLowerCase(Locale.ROOT); + } +} diff --git a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/verification/repository/EmailVerificationRepository.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/verification/repository/EmailVerificationRepository.java new file mode 100644 index 000000000..20a859c3e --- /dev/null +++ b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/verification/repository/EmailVerificationRepository.java @@ -0,0 +1,11 @@ +package kr.ac.kookmin.stream.member.domain.verification.repository; + +import java.time.LocalDateTime; +import java.util.Optional; +import kr.ac.kookmin.stream.member.domain.verification.domain.EmailVerification; + +public interface EmailVerificationRepository { + Optional findLatestByMemberId(Long memberId); + long countSentSince(Long memberId, LocalDateTime since); + EmailVerification save(EmailVerification verification); +} diff --git a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/verification/service/EmailVerificationService.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/verification/service/EmailVerificationService.java new file mode 100644 index 000000000..a081b969e --- /dev/null +++ b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/verification/service/EmailVerificationService.java @@ -0,0 +1,10 @@ +package kr.ac.kookmin.stream.member.domain.verification.service; + +import kr.ac.kookmin.stream.member.domain.verification.domain.EmailVerificationConfirmCommand; +import kr.ac.kookmin.stream.member.domain.verification.domain.EmailVerificationSendCommand; + +public interface EmailVerificationService { + void sendCode(Long memberId, EmailVerificationSendCommand command); + void confirm(Long memberId, EmailVerificationConfirmCommand command); + boolean isVerifiedForSignUp(Long memberId, String email); +} diff --git a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/verification/service/impl/EmailVerificationServiceImpl.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/verification/service/impl/EmailVerificationServiceImpl.java new file mode 100644 index 000000000..a59175293 --- /dev/null +++ b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/verification/service/impl/EmailVerificationServiceImpl.java @@ -0,0 +1,150 @@ +package kr.ac.kookmin.stream.member.domain.verification.service.impl; + +import java.security.SecureRandom; +import java.time.Duration; +import java.time.LocalDateTime; +import java.util.Map; +import kr.ac.kookmin.stream.common.BusinessException; +import kr.ac.kookmin.stream.common.DateUtil; +import kr.ac.kookmin.stream.common.RetryExecutor; +import kr.ac.kookmin.stream.member.domain.verification.client.EmailClient; +import kr.ac.kookmin.stream.member.domain.verification.domain.EmailMessage; +import kr.ac.kookmin.stream.member.domain.verification.domain.EmailTemplate; +import kr.ac.kookmin.stream.member.domain.verification.domain.EmailVerification; +import kr.ac.kookmin.stream.member.domain.verification.domain.EmailVerificationConfirmCommand; +import kr.ac.kookmin.stream.member.domain.verification.domain.EmailVerificationErrorCode; +import kr.ac.kookmin.stream.member.domain.verification.domain.EmailVerificationSendCommand; +import kr.ac.kookmin.stream.member.domain.verification.repository.EmailVerificationRepository; +import kr.ac.kookmin.stream.member.domain.verification.service.EmailVerificationService; +import lombok.RequiredArgsConstructor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.core.task.TaskRejectedException; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class EmailVerificationServiceImpl implements EmailVerificationService { + + private static final Logger log = LoggerFactory.getLogger(EmailVerificationServiceImpl.class); + + private static final int MAX_SENDS_PER_DAY = 10; + private static final int CODE_BOUND = 1_000_000; + private static final String CODE_FORMAT = "%06d"; + private static final String CODE_MAIL_SUBJECT = "[소프트웨어융합대학 학생회] 이메일 인증 코드"; + private static final SecureRandom RANDOM = new SecureRandom(); + private static final int SEND_MAX_RETRIES = 2; + private static final Duration SEND_RETRY_DELAY = Duration.ofMillis(500); + + private final EmailVerificationRepository emailVerificationRepository; + private final EmailClient emailClient; + private final RetryExecutor retryExecutor; + + @Override + public void sendCode(Long memberId, EmailVerificationSendCommand command) { + LocalDateTime now = LocalDateTime.now(DateUtil.KST); + validateNotInResendCooldown(memberId, now); + validateDailyLimitNotExceeded(memberId, now); + + String code = generateCode(); + sendCodeMail(command.email(), code); + emailVerificationRepository.save(EmailVerification.create(memberId, command.email(), code, now)); + } + + // 트랜잭션을 걸면 틀린 횟수 저장이 예외와 함께 롤백되므로 걸지 않는다 + @Override + public void confirm(Long memberId, EmailVerificationConfirmCommand command) { + LocalDateTime now = LocalDateTime.now(DateUtil.KST); + EmailVerification verification = getLatestFor(memberId, command.email()); + if (verification.isVerified()) { + return; + } + validateNotExpired(verification, now); + validateFailedAttemptsNotExceeded(verification); + validateCodeMatched(verification, command.code()); + + verification.verify(now); + emailVerificationRepository.save(verification); + } + + @Override + public boolean isVerifiedForSignUp(Long memberId, String email) { + LocalDateTime now = LocalDateTime.now(DateUtil.KST); + return emailVerificationRepository.findLatestByMemberId(memberId) + .map(verification -> verification.canSignUpWith(email, now)) + .orElse(false); + } + + private EmailVerification getLatestFor(Long memberId, String email) { + return emailVerificationRepository.findLatestByMemberId(memberId) + .filter(verification -> verification.isFor(email)) + .orElseThrow(() -> new BusinessException(EmailVerificationErrorCode.EMAIL_VERIFICATION_NOT_FOUND)); + } + + private void validateNotInResendCooldown(Long memberId, LocalDateTime now) { + boolean inCooldown = emailVerificationRepository.findLatestByMemberId(memberId) + .map(latest -> latest.isInResendCooldown(now)) + .orElse(false); + if (inCooldown) { + throw new BusinessException(EmailVerificationErrorCode.EMAIL_VERIFICATION_COOLDOWN); + } + } + + private void validateDailyLimitNotExceeded(Long memberId, LocalDateTime now) { + long sentToday = emailVerificationRepository.countSentSince(memberId, now.toLocalDate().atStartOfDay()); + if (sentToday >= MAX_SENDS_PER_DAY) { + throw new BusinessException(EmailVerificationErrorCode.EMAIL_VERIFICATION_DAILY_LIMIT_EXCEEDED); + } + } + + private void validateNotExpired(EmailVerification verification, LocalDateTime now) { + if (verification.isExpired(now)) { + throw new BusinessException(EmailVerificationErrorCode.EMAIL_VERIFICATION_EXPIRED); + } + } + + private void validateFailedAttemptsNotExceeded(EmailVerification verification) { + if (verification.hasExceededFailedAttempts()) { + throw new BusinessException(EmailVerificationErrorCode.EMAIL_VERIFICATION_ATTEMPTS_EXCEEDED); + } + } + + private void validateCodeMatched(EmailVerification verification, String code) { + if (verification.matchesCode(code)) { + return; + } + verification.recordFailedAttempt(); + emailVerificationRepository.save(verification); + if (verification.hasExceededFailedAttempts()) { + throw new BusinessException(EmailVerificationErrorCode.EMAIL_VERIFICATION_ATTEMPTS_EXCEEDED); + } + throw new BusinessException(EmailVerificationErrorCode.EMAIL_VERIFICATION_CODE_MISMATCH); + } + + private void sendCodeMail(String email, String code) { + EmailMessage message = createCodeMessage(email, code); + try { + retryExecutor.executeWithRetry( + () -> emailClient.sendAsync(message), + TaskRejectedException.class, + SEND_MAX_RETRIES, + SEND_RETRY_DELAY + ); + } catch (TaskRejectedException e) { + log.warn("인증 메일 발송 대기열이 가득 차 요청을 거절했습니다"); + throw new BusinessException(EmailVerificationErrorCode.EMAIL_SEND_FAILED); + } + } + + private String generateCode() { + return CODE_FORMAT.formatted(RANDOM.nextInt(CODE_BOUND)); + } + + private EmailMessage createCodeMessage(String email, String code) { + Map variables = Map.of( + "code", code, + "expiresInMinutes", EmailVerification.CODE_VALIDITY.toMinutes() + ); + return new EmailMessage(email, CODE_MAIL_SUBJECT, EmailTemplate.VERIFICATION_CODE, variables); + } +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7a02acfb5..0515c97d6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -27,6 +27,7 @@ springBootStarterDataJpa = { module = "org.springframework.boot:spring-boot-star springBootStarterFlyway = { module = "org.springframework.boot:spring-boot-starter-flyway" } springBootStarterJackson = { module = "org.springframework.boot:spring-boot-starter-jackson" } springBootStarterLogging = { module = "org.springframework.boot:spring-boot-starter-logging" } +springBootStarterMail = { module = "org.springframework.boot:spring-boot-starter-mail" } springBootStarterTest = { module = "org.springframework.boot:spring-boot-starter-test" } springBootStarterSecurityTest = { module = "org.springframework.boot:spring-boot-starter-security-test" } springBootStarterDataJpaTest = { module = "org.springframework.boot:spring-boot-starter-data-jpa-test" } @@ -59,6 +60,9 @@ awsS3 = { module = "software.amazon.awssdk:s3" } firebaseAdmin = { module = "com.google.firebase:firebase-admin", version.ref = "firebaseAdminVersion" } +# Thymeleaf — 메일 본문 HTML 템플릿용 (버전은 springBootDependenciesBom이 관리) +thymeleaf = { module = "org.thymeleaf:thymeleaf" } + jjwtApi = { module = "io.jsonwebtoken:jjwt-api", version.ref = "jjwtVersion" } jjwtImpl = { module = "io.jsonwebtoken:jjwt-impl", version.ref = "jjwtVersion" } jjwtJackson = { module = "io.jsonwebtoken:jjwt-jackson", version.ref = "jjwtVersion" } diff --git a/infrastructure/client/build.gradle.kts b/infrastructure/client/build.gradle.kts index 5865b1ae6..618deda3f 100644 --- a/infrastructure/client/build.gradle.kts +++ b/infrastructure/client/build.gradle.kts @@ -23,6 +23,9 @@ dependencies { implementation(libs.firebaseAdmin) + implementation(libs.springBootStarterMail) + implementation(libs.thymeleaf) + testImplementation(platform(libs.springBootDependenciesBom)) testImplementation(libs.springBootStarterTest) testRuntimeOnly(libs.junitPlatformLauncher) diff --git a/infrastructure/client/src/main/java/kr/ac/kookmin/stream/client/email/log/LogEmailClient.java b/infrastructure/client/src/main/java/kr/ac/kookmin/stream/client/email/log/LogEmailClient.java new file mode 100644 index 000000000..ed63e6d10 --- /dev/null +++ b/infrastructure/client/src/main/java/kr/ac/kookmin/stream/client/email/log/LogEmailClient.java @@ -0,0 +1,32 @@ +package kr.ac.kookmin.stream.client.email.log; + +import kr.ac.kookmin.stream.common.TaskExecutorNames; +import kr.ac.kookmin.stream.member.domain.verification.client.EmailClient; +import kr.ac.kookmin.stream.member.domain.verification.domain.EmailMessage; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Component; + +/** + * 로컬용 구현체. 발송하지 않고 인증 코드까지 로그로 남기므로 운영 환경에서는 쓰지 않는다. + */ +@Component +@ConditionalOnProperty(prefix = "email", name = "type", havingValue = "log", matchIfMissing = true) +public class LogEmailClient implements EmailClient { + + private static final Logger log = LoggerFactory.getLogger(LogEmailClient.class); + + @Override + public void send(EmailMessage message) { + log.info("메일 발송(로그 모드): to={}, subject={}, template={}, variables={}", + message.to(), message.subject(), message.template(), message.variables()); + } + + @Override + @Async(TaskExecutorNames.EMAIL_TASK_EXECUTOR) + public void sendAsync(EmailMessage message) { + send(message); + } +} diff --git a/infrastructure/client/src/main/java/kr/ac/kookmin/stream/client/email/smtp/SmtpEmailClient.java b/infrastructure/client/src/main/java/kr/ac/kookmin/stream/client/email/smtp/SmtpEmailClient.java new file mode 100644 index 000000000..581b5aa71 --- /dev/null +++ b/infrastructure/client/src/main/java/kr/ac/kookmin/stream/client/email/smtp/SmtpEmailClient.java @@ -0,0 +1,127 @@ +package kr.ac.kookmin.stream.client.email.smtp; + +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.nio.charset.StandardCharsets; +import java.time.Duration; +import java.util.Arrays; +import java.util.Locale; +import kr.ac.kookmin.stream.common.BusinessException; +import kr.ac.kookmin.stream.common.RetryExecutor; +import kr.ac.kookmin.stream.common.TaskExecutorNames; +import kr.ac.kookmin.stream.member.domain.verification.client.EmailClient; +import kr.ac.kookmin.stream.member.domain.verification.domain.EmailMessage; +import kr.ac.kookmin.stream.member.domain.verification.domain.EmailVerificationErrorCode; +import lombok.RequiredArgsConstructor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.mail.MailAuthenticationException; +import org.springframework.mail.MailException; +import org.springframework.mail.MailSendException; +import org.springframework.mail.javamail.JavaMailSender; +import org.springframework.mail.javamail.MimeMessageHelper; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; +import org.thymeleaf.TemplateEngine; +import org.thymeleaf.context.Context; + +@Component +@ConditionalOnProperty(prefix = "email", name = "type", havingValue = "smtp") +@RequiredArgsConstructor +public class SmtpEmailClient implements EmailClient { + + private static final Logger log = LoggerFactory.getLogger(SmtpEmailClient.class); + + private static final int MAX_RETRIES = 2; + private static final Duration RETRY_DELAY = Duration.ofSeconds(2); + + private final SmtpEmailProperties properties; + private final JavaMailSender javaMailSender; + private final RetryExecutor retryExecutor; + + @Qualifier("emailTemplateEngine") + private final TemplateEngine emailTemplateEngine; + + @Override + public void send(EmailMessage message) { + validateFromConfigured(); + MimeMessage mimeMessage = toMimeMessage(message); + try { + retryExecutor.executeWithRetry( + () -> javaMailSender.send(mimeMessage), + SmtpEmailClient::isTransient, + MAX_RETRIES, + RETRY_DELAY + ); + } catch (MailAuthenticationException e) { + log.error("SMTP 인증 실패(설정 확인 필요)", e); + throw new BusinessException(EmailVerificationErrorCode.EMAIL_SEND_FAILED); + } catch (MailException e) { + // 거절된 받는 주소가 예외 메시지에 들어 있을 수 있어 원인 예외의 종류만 남긴다 + log.warn("메일 발송 실패: {}", e.getMostSpecificCause().getClass().getName()); + throw new BusinessException(EmailVerificationErrorCode.EMAIL_SEND_FAILED); + } + } + + @Override + @Async(TaskExecutorNames.EMAIL_TASK_EXECUTOR) + public void sendAsync(EmailMessage message) { + try { + send(message); + } catch (BusinessException e) { + // send가 실패를 로그로 남긴다 + } + } + + // 연결 실패·시간 초과 같은 네트워크 오류만 다시 보낸다 + private static boolean isTransient(Throwable e) { + if (!(e instanceof MailSendException sendException)) { + return false; + } + return hasIoCause(sendException) + || Arrays.stream(sendException.getMessageExceptions()).anyMatch(SmtpEmailClient::hasIoCause); + } + + private static boolean hasIoCause(Throwable e) { + for (Throwable cause = e; cause != null; cause = cause.getCause()) { + if (cause instanceof IOException) { + return true; + } + } + return false; + } + + private void validateFromConfigured() { + if (!StringUtils.hasText(properties.from())) { + throw new IllegalStateException("email.type=smtp이면 보내는 주소(EMAIL_FROM 또는 SMTP_USERNAME)가 필요하다"); + } + } + + private MimeMessage toMimeMessage(EmailMessage message) { + MimeMessage mimeMessage = javaMailSender.createMimeMessage(); + try { + MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, StandardCharsets.UTF_8.name()); + if (StringUtils.hasText(properties.fromName())) { + helper.setFrom(properties.from(), properties.fromName()); + } else { + helper.setFrom(properties.from()); + } + helper.setTo(message.to()); + helper.setSubject(message.subject()); + helper.setText(renderBody(message), true); + } catch (MessagingException | UnsupportedEncodingException e) { + throw new IllegalStateException("메일 메시지를 만들지 못했습니다: " + e.getClass().getName(), e); + } + return mimeMessage; + } + + private String renderBody(EmailMessage message) { + Context context = new Context(Locale.KOREAN, message.variables()); + return emailTemplateEngine.process(message.template().templateName(), context); + } +} diff --git a/infrastructure/client/src/main/java/kr/ac/kookmin/stream/client/email/smtp/SmtpEmailConfig.java b/infrastructure/client/src/main/java/kr/ac/kookmin/stream/client/email/smtp/SmtpEmailConfig.java new file mode 100644 index 000000000..f2a4f29bf --- /dev/null +++ b/infrastructure/client/src/main/java/kr/ac/kookmin/stream/client/email/smtp/SmtpEmailConfig.java @@ -0,0 +1,34 @@ +package kr.ac.kookmin.stream.client.email.smtp; + +import java.nio.charset.StandardCharsets; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.thymeleaf.TemplateEngine; +import org.thymeleaf.templatemode.TemplateMode; +import org.thymeleaf.templateresolver.ClassLoaderTemplateResolver; + +/** + * 메일 본문용 Thymeleaf 엔진. 웹 뷰 리졸버까지 등록하는 thymeleaf starter 대신 엔진만 둔다. + */ +@Configuration +@ConditionalOnProperty(prefix = "email", name = "type", havingValue = "smtp") +public class SmtpEmailConfig { + + private static final String TEMPLATE_PREFIX = "templates/email/"; + private static final String TEMPLATE_SUFFIX = ".html"; + + @Bean + public TemplateEngine emailTemplateEngine() { + ClassLoaderTemplateResolver templateResolver = new ClassLoaderTemplateResolver(); + templateResolver.setPrefix(TEMPLATE_PREFIX); + templateResolver.setSuffix(TEMPLATE_SUFFIX); + templateResolver.setTemplateMode(TemplateMode.HTML); + templateResolver.setCharacterEncoding(StandardCharsets.UTF_8.name()); + templateResolver.setCheckExistence(true); + + TemplateEngine templateEngine = new TemplateEngine(); + templateEngine.setTemplateResolver(templateResolver); + return templateEngine; + } +} diff --git a/infrastructure/client/src/main/java/kr/ac/kookmin/stream/client/email/smtp/SmtpEmailProperties.java b/infrastructure/client/src/main/java/kr/ac/kookmin/stream/client/email/smtp/SmtpEmailProperties.java new file mode 100644 index 000000000..3800144c8 --- /dev/null +++ b/infrastructure/client/src/main/java/kr/ac/kookmin/stream/client/email/smtp/SmtpEmailProperties.java @@ -0,0 +1,9 @@ +package kr.ac.kookmin.stream.client.email.smtp; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +@ConfigurationProperties(prefix = "email.smtp") +public record SmtpEmailProperties( + String from, + String fromName +) {} diff --git a/infrastructure/client/src/main/resources/application-infrastructure-client.yml b/infrastructure/client/src/main/resources/application-infrastructure-client.yml index fa79542bc..9ba09e9c7 100644 --- a/infrastructure/client/src/main/resources/application-infrastructure-client.yml +++ b/infrastructure/client/src/main/resources/application-infrastructure-client.yml @@ -30,6 +30,29 @@ push: fcm: credentials-base64: ${FIREBASE_CREDENTIALS_BASE64:} +email: + type: ${EMAIL_TYPE:log} + smtp: + from: ${EMAIL_FROM:${spring.mail.username:}} + from-name: ${EMAIL_FROM_NAME:소프트웨어융합대학 학생회} + +spring: + mail: + host: ${SMTP_HOST:} + port: ${SMTP_PORT:587} + username: ${SMTP_USERNAME:} + password: ${SMTP_PASSWORD:} + properties: + "[mail.smtp.auth]": true + "[mail.smtp.starttls.enable]": true + "[mail.smtp.connectiontimeout]": 3000 + "[mail.smtp.timeout]": 5000 + "[mail.smtp.writetimeout]": 5000 + +management: + health: + mail: + enabled: false # AI 서버(stream-ai). 내부 토큰은 저장소에 남기지 않는다 # read-timeout은 전체 답변 시간이 아니라 조각 사이 간격 기준으로 잡는다 chat: diff --git a/infrastructure/client/src/main/resources/templates/email/verification-code.html b/infrastructure/client/src/main/resources/templates/email/verification-code.html new file mode 100644 index 000000000..dd2b79a56 --- /dev/null +++ b/infrastructure/client/src/main/resources/templates/email/verification-code.html @@ -0,0 +1,13 @@ + + + + + 이메일 인증 코드 + + +

아래 인증 코드를 앱에 입력해 주세요.

+

000000

+

인증 코드는 5분 동안 유효합니다.

+

본인이 요청하지 않았다면 이 메일을 무시해 주세요.

+ + diff --git a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/EmailVerificationJpaEntity.java b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/EmailVerificationJpaEntity.java new file mode 100644 index 000000000..9d73a70cc --- /dev/null +++ b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/EmailVerificationJpaEntity.java @@ -0,0 +1,60 @@ +package kr.ac.kookmin.stream.db.member; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import java.time.LocalDateTime; +import kr.ac.kookmin.stream.db.common.BaseTimeEntity; +import kr.ac.kookmin.stream.member.domain.verification.domain.EmailVerification; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; + +@Entity +@Table(name = "email_verifications") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class EmailVerificationJpaEntity extends BaseTimeEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "email_verification_id") + private Long id; + + @Column(name = "member_id", nullable = false) + private Long memberId; + + @Column(nullable = false) + private String email; + + @Column(name = "code_hash", nullable = false, length = 64) + private String codeHash; + + @Column(name = "sent_at", nullable = false) + private LocalDateTime sentAt; + + @Column(name = "failed_attempts", nullable = false) + private int failedAttempts; + + @Column(name = "verified_at") + private LocalDateTime verifiedAt; + + private EmailVerificationJpaEntity(EmailVerification verification) { + this.id = verification.getId(); + this.memberId = verification.getMemberId(); + this.email = verification.getEmail(); + this.codeHash = verification.getCodeHash(); + this.sentAt = verification.getSentAt(); + this.failedAttempts = verification.getFailedAttempts(); + this.verifiedAt = verification.getVerifiedAt(); + } + + public static EmailVerificationJpaEntity from(EmailVerification verification) { + return new EmailVerificationJpaEntity(verification); + } + + public EmailVerification toDomain() { + return EmailVerification.of(id, memberId, email, codeHash, sentAt, failedAttempts, verifiedAt); + } +} diff --git a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/EmailVerificationJpaRepository.java b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/EmailVerificationJpaRepository.java new file mode 100644 index 000000000..e66273509 --- /dev/null +++ b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/EmailVerificationJpaRepository.java @@ -0,0 +1,12 @@ +package kr.ac.kookmin.stream.db.member; + +import java.time.LocalDateTime; +import java.util.Optional; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface EmailVerificationJpaRepository extends JpaRepository { + + Optional findFirstByMemberIdOrderBySentAtDescIdDesc(Long memberId); + + long countByMemberIdAndSentAtGreaterThanEqual(Long memberId, LocalDateTime since); +} diff --git a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/EmailVerificationRepositoryImpl.java b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/EmailVerificationRepositoryImpl.java new file mode 100644 index 000000000..0884a2a93 --- /dev/null +++ b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/EmailVerificationRepositoryImpl.java @@ -0,0 +1,31 @@ +package kr.ac.kookmin.stream.db.member; + +import java.time.LocalDateTime; +import java.util.Optional; +import kr.ac.kookmin.stream.member.domain.verification.domain.EmailVerification; +import kr.ac.kookmin.stream.member.domain.verification.repository.EmailVerificationRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +public class EmailVerificationRepositoryImpl implements EmailVerificationRepository { + + private final EmailVerificationJpaRepository emailVerificationJpaRepository; + + @Override + public Optional findLatestByMemberId(Long memberId) { + return emailVerificationJpaRepository.findFirstByMemberIdOrderBySentAtDescIdDesc(memberId) + .map(EmailVerificationJpaEntity::toDomain); + } + + @Override + public long countSentSince(Long memberId, LocalDateTime since) { + return emailVerificationJpaRepository.countByMemberIdAndSentAtGreaterThanEqual(memberId, since); + } + + @Override + public EmailVerification save(EmailVerification verification) { + return emailVerificationJpaRepository.save(EmailVerificationJpaEntity.from(verification)).toDomain(); + } +} diff --git a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/MemberJpaEntity.java b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/MemberJpaEntity.java index 8a084ba79..1c44c6b57 100644 --- a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/MemberJpaEntity.java +++ b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/MemberJpaEntity.java @@ -20,8 +20,8 @@ @Entity // 가입·FCM 토큰 갱신 등이 동시에 저장될 때 서로 바꾼 컬럼을 옛 값으로 덮어쓰지 않도록 바뀐 컬럼만 UPDATE한다 @DynamicUpdate -// uk_members_active_student_id(V1)·uk_members_active_phone_number(V16)는 generated column -// active_student_id·active_phone_number에 걸려 있다. Entity에 매핑된 컬럼이 아니라 여기서는 선언하지 않는다. +// uk_members_active_student_id(V1)·uk_members_active_phone_number(V16)·uk_members_active_email(V25)는 generated column +// active_student_id·active_phone_number·active_email에 걸려 있다. Entity에 매핑된 컬럼이 아니라 여기서는 선언하지 않는다. @Table(name = "members") @NoArgsConstructor(access = AccessLevel.PROTECTED) public class MemberJpaEntity extends BaseSoftDeleteEntity { diff --git a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/MemberJpaRepository.java b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/MemberJpaRepository.java index 7502c8fe9..541adcdc9 100644 --- a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/MemberJpaRepository.java +++ b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/MemberJpaRepository.java @@ -17,6 +17,8 @@ public interface MemberJpaRepository extends JpaRepository findAllByIdInAndIsDeletedFalse(List ids); // keyword는 LikePatterns.escape로 이스케이프한 검색어다. 쿼리의 ESCAPE 문자는 LikePatterns.ESCAPE와 같아야 한다 diff --git a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/MemberRepositoryImpl.java b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/MemberRepositoryImpl.java index e8a654fe1..884d866ea 100644 --- a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/MemberRepositoryImpl.java +++ b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/MemberRepositoryImpl.java @@ -17,6 +17,7 @@ public class MemberRepositoryImpl implements MemberRepository { private static final String PHONE_NUMBER_UNIQUE_CONSTRAINT = "uk_members_active_phone_number"; + private static final String EMAIL_UNIQUE_CONSTRAINT = "uk_members_active_email"; private final MemberJpaRepository memberJpaRepository; @@ -35,6 +36,11 @@ public boolean existsByPhoneNumber(String phoneNumber) { return memberJpaRepository.existsByPhoneNumberAndIsDeletedFalse(phoneNumber); } + @Override + public boolean existsByEmail(String email) { + return memberJpaRepository.existsByEmailAndIsDeletedFalse(email); + } + @Override public List findAllByIds(List ids) { if (ids.isEmpty()) { @@ -59,6 +65,9 @@ public Member save(Member member) { if (ConstraintViolationUtil.isViolated(e, PHONE_NUMBER_UNIQUE_CONSTRAINT)) { throw new BusinessException(MemberErrorCode.PHONE_NUMBER_ALREADY_EXISTS); } + if (ConstraintViolationUtil.isViolated(e, EMAIL_UNIQUE_CONSTRAINT)) { + throw new BusinessException(MemberErrorCode.EMAIL_ALREADY_EXISTS); + } throw e; } } diff --git a/infrastructure/db/src/main/resources/db/migration/V33__create_email_verifications_table.sql b/infrastructure/db/src/main/resources/db/migration/V33__create_email_verifications_table.sql new file mode 100644 index 000000000..5a9807c8e --- /dev/null +++ b/infrastructure/db/src/main/resources/db/migration/V33__create_email_verifications_table.sql @@ -0,0 +1,15 @@ +-- 회원가입 이메일 인증 코드 발송 기록. 발송할 때마다 행을 쌓고, 인증 여부는 회원의 가장 최근 행으로 판단한다. +CREATE TABLE email_verifications ( + email_verification_id BIGINT AUTO_INCREMENT PRIMARY KEY, + member_id BIGINT NOT NULL, + email VARCHAR(255) NOT NULL, + code_hash VARCHAR(64) NOT NULL, + sent_at DATETIME NOT NULL, + failed_attempts INT NOT NULL DEFAULT 0, + verified_at DATETIME NULL, + created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, + updated_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP +); + +-- 회원의 가장 최근 발송 기록 조회(sent_at DESC), 오늘 발송 횟수 계산(sent_at >= ?) +CREATE INDEX idx_email_verifications_member_id_sent_at ON email_verifications (member_id, sent_at); diff --git a/infrastructure/db/src/main/resources/db/migration/V34__add_active_email_unique_to_members.sql b/infrastructure/db/src/main/resources/db/migration/V34__add_active_email_unique_to_members.sql new file mode 100644 index 000000000..692a428c4 --- /dev/null +++ b/infrastructure/db/src/main/resources/db/migration/V34__add_active_email_unique_to_members.sql @@ -0,0 +1,6 @@ +-- 회원가입 때 인증한 이메일. 이관 회원의 email은 이전 시스템에서 인증한 값이라 그대로 둔다. +-- 활성 회원의 이메일만 유니크 (탈퇴 후 같은 이메일로 재가입 허용) +ALTER TABLE members + ADD COLUMN active_email VARCHAR(255) + GENERATED ALWAYS AS (IF(is_deleted = 0, email, NULL)) VIRTUAL; +CREATE UNIQUE INDEX uk_members_active_email ON members (active_email);