Skip to content

Commit b4ac063

Browse files
authored
Dev > Main 브랜치 병합
1. 컨벤션에 맞게 Repository 파일명을 수정하였습니다. 파일명 수정 후 Main 브랜치로 병합합니다.
2 parents 8921579 + 0bf86ed commit b4ac063

File tree

3 files changed

+9
-14
lines changed

3 files changed

+9
-14
lines changed

src/main/java/hs/kr/backend/devpals/domain/auth/repository/AuthenticodeRepository.java renamed to src/main/java/hs/kr/backend/devpals/domain/auth/repository/AuthRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import java.util.Optional;
77

8-
public interface AuthenticodeRepository extends JpaRepository<EmailVertificationEntity, Long> {
8+
public interface AuthRepository extends JpaRepository<EmailVertificationEntity, Long> {
99

1010
Optional<EmailVertificationEntity> findTopByUserEmailOrderByExpiresAtDesc(String email);
1111

src/main/java/hs/kr/backend/devpals/domain/auth/service/AuthEmailService.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import hs.kr.backend.devpals.domain.auth.dto.EmailVertificationRequest;
55
import hs.kr.backend.devpals.domain.auth.dto.ResetPasswordRequest;
66
import hs.kr.backend.devpals.domain.auth.entity.EmailVertificationEntity;
7-
import hs.kr.backend.devpals.domain.auth.repository.AuthenticodeRepository;
7+
import hs.kr.backend.devpals.domain.auth.repository.AuthRepository;
88
import hs.kr.backend.devpals.domain.project.entity.ApplicantEntity;
99
import hs.kr.backend.devpals.domain.project.entity.ProjectEntity;
1010
import hs.kr.backend.devpals.domain.user.entity.UserEntity;
@@ -36,7 +36,7 @@
3636
public class AuthEmailService {
3737

3838
private final JavaMailSender javaMailSender;
39-
private final AuthenticodeRepository authenticodeRepository;
39+
private final AuthRepository authRepository;
4040
private final UserRepository userRepository;
4141
private final PasswordEncoder passwordEncoder;
4242
@Qualifier("emailExecutor")
@@ -48,15 +48,15 @@ public ResponseEntity<ApiResponse<String>> emailSend(EmailRequest request) {
4848
String email = request.getEmail();
4949

5050
// 기존 인증 코드 삭제 (중복 방지)
51-
authenticodeRepository.deleteByUserEmail(email);
51+
authRepository.deleteByUserEmail(email);
5252

5353
// 새로운 인증 코드 생성
5454
String verificationCode = generateVerificationCode();
5555
LocalDateTime expiresAt = LocalDateTime.now().plusMinutes(5); // 5분 후 만료
5656

5757
// DB에 저장
5858
EmailVertificationEntity authCode = new EmailVertificationEntity(email, verificationCode, expiresAt);
59-
authenticodeRepository.save(authCode);
59+
authRepository.save(authCode);
6060

6161
// 이메일 전송
6262
try {
@@ -73,7 +73,7 @@ public ResponseEntity<ApiResponse<String>> sendEmailVerification(EmailVertificat
7373
String email = request.getEmail();
7474
String code = request.getCode();
7575

76-
EmailVertificationEntity authCode = authenticodeRepository.findTopByUserEmailOrderByExpiresAtDesc(email)
76+
EmailVertificationEntity authCode = authRepository.findTopByUserEmailOrderByExpiresAtDesc(email)
7777
.orElseThrow(() -> new CustomException(ErrorException.EMAIL_SEND_FAILED));
7878

7979
// 만료 시간 확인
@@ -88,7 +88,7 @@ public ResponseEntity<ApiResponse<String>> sendEmailVerification(EmailVertificat
8888

8989
// 인증 완료 처리
9090
authCode.useCode();
91-
authenticodeRepository.save(authCode);
91+
authRepository.save(authCode);
9292

9393
return ResponseEntity.ok(new ApiResponse<>(200, true, "이메일 인증 성공", null));
9494
}
@@ -141,7 +141,7 @@ public ResponseEntity<ApiResponse<String>> resetPassword(ResetPasswordRequest re
141141
String newPassword = request.getNewPassword();
142142

143143
// 인증 코드 확인
144-
EmailVertificationEntity authCode = authenticodeRepository.findTopByUserEmailOrderByExpiresAtDesc(email)
144+
EmailVertificationEntity authCode = authRepository.findTopByUserEmailOrderByExpiresAtDesc(email)
145145
.orElseThrow(() -> new CustomException(ErrorException.INVALID_CODE));
146146

147147
// 입력된 코드가 저장된 코드와 일치하는지 확인
@@ -164,7 +164,7 @@ public ResponseEntity<ApiResponse<String>> resetPassword(ResetPasswordRequest re
164164

165165
// 인증 코드 사용 처리
166166
authCode.useCode();
167-
authenticodeRepository.save(authCode);
167+
authRepository.save(authCode);
168168

169169
return ResponseEntity.ok(new ApiResponse<>(200, true, "비밀번호가 성공적으로 변경되었습니다.", null));
170170
}

src/main/java/hs/kr/backend/devpals/domain/auth/service/AuthService.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,17 @@
44
import hs.kr.backend.devpals.domain.auth.dto.LoginResponse;
55
import hs.kr.backend.devpals.domain.auth.dto.SignUpRequest;
66
import hs.kr.backend.devpals.domain.auth.dto.TokenResponse;
7-
import hs.kr.backend.devpals.domain.auth.repository.AuthenticodeRepository;
87
import hs.kr.backend.devpals.domain.auth.util.CookieUtil;
98
import hs.kr.backend.devpals.domain.user.dto.LoginUserResponse;
109
import hs.kr.backend.devpals.domain.user.entity.UserEntity;
11-
import hs.kr.backend.devpals.domain.user.principal.CustomUserDetails;
1210
import hs.kr.backend.devpals.domain.user.repository.UserRepository;
1311
import hs.kr.backend.devpals.global.common.ApiResponse;
1412
import hs.kr.backend.devpals.global.exception.CustomException;
1513
import hs.kr.backend.devpals.global.exception.ErrorException;
1614
import hs.kr.backend.devpals.global.jwt.JwtTokenProvider;
1715
import hs.kr.backend.devpals.global.jwt.JwtTokenValidator;
18-
import hs.kr.backend.devpals.infra.redis.RedisConfig;
1916
import jakarta.servlet.http.HttpServletRequest;
2017
import lombok.RequiredArgsConstructor;
21-
import org.slf4j.Logger;
22-
import org.slf4j.LoggerFactory;
2318
import org.springframework.data.redis.core.RedisTemplate;
2419
import org.springframework.http.ResponseCookie;
2520
import org.springframework.http.ResponseEntity;

0 commit comments

Comments
 (0)