feat: 학생 회원가입 인증 로직 변경

src/main/java/in/koreatech/koin/domain/user/dto/StudentRegisterRequest.java

@@ -81,28 +81,4 @@ public record StudentRegisterRequest(
     String phoneNumber
 ) {
 
-    public Student toStudent(PasswordEncoder passwordEncoder, Clock clock) {
-        User user = User.builder()
-            .password(passwordEncoder.encode(password))
-            .email(email)
-            .name(name)
-            .nickname(nickname)
-            .gender(gender)
-            .phoneNumber(phoneNumber)
-            .isAuthed(false)
-            .isDeleted(false)
-            .userType(UserType.STUDENT)
-            .authToken(UUID.randomUUID().toString())
-            .authExpiredAt(LocalDateTime.now(clock).plusHours(10))
-            .build();
-
-        return Student.builder()
-            .user(user)
-            .anonymousNickname("익명_" + (System.currentTimeMillis()))
-            .isGraduated(isGraduated)
-            .userIdentity(UserIdentity.UNDERGRADUATE)
-            .department(department)
-            .studentNumber(studentNumber)
-            .build();
-    }
 }

src/main/java/in/koreatech/koin/domain/user/model/redis/StudentTemporaryStatus.java

@@ -0,0 +1,88 @@
+package in.koreatech.koin.domain.user.model.redis;
+
+import in.koreatech.koin.domain.user.dto.StudentRegisterRequest;
+import in.koreatech.koin.domain.user.model.*;
+import lombok.Getter;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.redis.core.RedisHash;
+import org.springframework.data.redis.core.TimeToLive;
+import org.springframework.data.redis.core.index.Indexed;
+import org.springframework.security.crypto.password.PasswordEncoder;
+
+@Getter
+@RedisHash(value = "StudentTemporaryStatus")
+public class StudentTemporaryStatus {
+
+    private static final long CACHE_EXPIRE_SECOND = 60 * 60 * 10L;
+
+    @Id
+    @Indexed
+    private String email;
+
+    @Indexed
+    private String authToken;
+
+    @Indexed
+    private String nickname;
+
+    private String name;
+
+    private String password;
+
+    private UserGender gender;
+
+    private boolean isGraduated;
+
+    private String department;
+
+    private String studentNumber;
+
+    private String phoneNumber;
+
+    @TimeToLive
+    private Long expiration;
+
+    public StudentTemporaryStatus(String email, String authToken, String nickname, String name, String password,
+                                  UserGender gender, boolean isGraduated, String department, String studentNumber, String phoneNumber) {
+        this.email = email;
+        this.authToken = authToken;
+        this.nickname = nickname;
+        this.name = name;
+        this.password = password;
+        this.gender = gender;
+        this.isGraduated = isGraduated;
+        this.department = department;
+        this.studentNumber = studentNumber;
+        this.phoneNumber = phoneNumber;
+        this.expiration = CACHE_EXPIRE_SECOND;
+    }
+
+    public static StudentTemporaryStatus of(StudentRegisterRequest request, String authToken) {
+        return new StudentTemporaryStatus(request.email(), authToken, request.nickname(), request.name(), request.password(), request.gender(),
+                request.isGraduated(), request.department(), request.studentNumber(), request.phoneNumber());
+    }
+
+    public Student toStudent(PasswordEncoder passwordEncoder) {
+        User user = User.builder()
+                .password(passwordEncoder.encode(password))
+                .email(email)
+                .name(name)
+                .nickname(nickname)
+                .gender(gender)
+                .phoneNumber(phoneNumber)
+                .isAuthed(true)
+                .isDeleted(false)
+                .userType(UserType.STUDENT)
+                .authToken(authToken)
+                .build();
+
+        return Student.builder()
+                .user(user)
+                .anonymousNickname("익명_" + (System.currentTimeMillis()))
+                .isGraduated(isGraduated)
+                .userIdentity(UserIdentity.UNDERGRADUATE)
+                .department(department)
+                .studentNumber(studentNumber)
+                .build();
+    }
+}

src/main/java/in/koreatech/koin/domain/user/repository/StudentRedisRepository.java

@@ -0,0 +1,19 @@
+package in.koreatech.koin.domain.user.repository;
+
+import in.koreatech.koin.domain.user.model.redis.StudentTemporaryStatus;
+import org.springframework.data.repository.Repository;
+
+import java.util.Optional;
+
+public interface StudentRedisRepository extends Repository<StudentTemporaryStatus, String> {
+
+    StudentTemporaryStatus save(StudentTemporaryStatus studentTemporaryStatus);
+
+    Optional<StudentTemporaryStatus> findById(String email);
+
+    Optional<StudentTemporaryStatus> findByNickname(String nickname);
+
+    Optional<StudentTemporaryStatus> findByAuthToken(String authToken);
+
+    void deleteById(String email);
+}

src/main/java/in/koreatech/koin/domain/user/service/StudentService.java

@@ -4,9 +4,11 @@
 import java.util.Optional;
 import java.util.UUID;
 
+import in.koreatech.koin.domain.user.model.*;
+import in.koreatech.koin.domain.user.model.redis.StudentTemporaryStatus;
+import in.koreatech.koin.domain.user.repository.StudentRedisRepository;
 import org.joda.time.LocalDateTime;
 import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -24,13 +26,6 @@
 import in.koreatech.koin.domain.user.exception.DuplicationNicknameException;
 import in.koreatech.koin.domain.user.exception.StudentDepartmentNotValidException;
 import in.koreatech.koin.domain.user.exception.StudentNumberNotValidException;
-import in.koreatech.koin.domain.user.model.AuthResult;
-import in.koreatech.koin.domain.user.model.Student;
-import in.koreatech.koin.domain.user.model.StudentDepartment;
-import in.koreatech.koin.domain.user.model.StudentEmailRequestEvent;
-import in.koreatech.koin.domain.user.model.User;
-import in.koreatech.koin.domain.user.model.UserGender;
-import in.koreatech.koin.domain.user.model.UserToken;
 import in.koreatech.koin.domain.user.repository.StudentRepository;
 import in.koreatech.koin.domain.user.repository.UserRepository;
 import in.koreatech.koin.domain.user.repository.UserTokenRepository;
@@ -50,6 +45,7 @@
 public class StudentService {
 
     private final StudentRepository studentRepository;
+    private final StudentRedisRepository studentRedisRepository;
     private final UserRepository userRepository;
     private final PasswordEncoder passwordEncoder;
     private final MailService mailService;
@@ -66,12 +62,13 @@ public StudentResponse getStudent(Integer userId) {
     @Transactional
     public StudentLoginResponse studentLogin(StudentLoginRequest request) {
         User user = userRepository.getByEmail(request.email());
+        Optional<StudentTemporaryStatus> studentTemporaryStatus = studentRedisRepository.findById(request.email());
 
         if (!user.isSamePassword(passwordEncoder, request.password())) {
             throw new KoinIllegalArgumentException("비밀번호가 틀렸습니다.");
         }
 
-        if (!user.isAuthed()) {
+        if (studentTemporaryStatus.isPresent()) {
             throw new AuthorizationException("미인증 상태입니다. 아우누리에서 인증메일을 확인해주세요");
         }
 
@@ -114,45 +111,66 @@ public void checkDepartmentValid(String department) {
 
     @Transactional
     public ModelAndView authenticate(AuthTokenRequest request) {
-        Optional<User> user = userRepository.findByAuthToken(request.authToken());
-        return new AuthResult(user, eventPublisher, clock).toModelAndViewForStudent();
+        Optional<StudentTemporaryStatus> studentTemporaryStatus = studentRedisRepository.findByAuthToken(request.authToken());
+
+        if (studentTemporaryStatus.isEmpty()) {
+            ModelAndView modelAndView = new ModelAndView("error_config");
+            modelAndView.addObject("errorMessage", "토큰이 유효하지 않습니다.");
+            return modelAndView;
+        }
+
+        Student student = studentTemporaryStatus.get().toStudent(passwordEncoder);
+
+        studentRepository.save(student);
+        userRepository.save(student.getUser());
+
+        studentRedisRepository.deleteById(student.getUser().getEmail());
+        eventPublisher.publishEvent(new StudentRegisterEvent(student.getUser().getEmail()));
+
+        return new ModelAndView("success_register_config");
     }
 
     @Transactional
     public void studentRegister(StudentRegisterRequest request, String serverURL) {
-        Student student = request.toStudent(passwordEncoder, clock);
-        try {
-            validateStudentRegister(student);
-            studentRepository.save(student);
-            userRepository.save(student.getUser());
-            mailService.sendMail(request.email(), new StudentRegistrationData(serverURL, student.getUser().getAuthToken()));
-            eventPublisher.publishEvent(new StudentEmailRequestEvent(request.email()));
-        } catch (DataIntegrityViolationException e) {
-            // 동시성 문제를 처리하기 위한 코드
-            throw KoinIllegalArgumentException.withDetail("요청이 너무 빠릅니다.");
-        }
+
+        validateStudentRegister(request);
+        String authToken = UUID.randomUUID().toString();
+
+        StudentTemporaryStatus studentTemporaryStatus = StudentTemporaryStatus.of(request, authToken);
+        studentRedisRepository.save(studentTemporaryStatus);
+
+        mailService.sendMail(request.email(), new StudentRegistrationData(serverURL, authToken));
+        eventPublisher.publishEvent(new StudentEmailRequestEvent(request.email()));
     }
 
-    private void validateStudentRegister(Student student) {
-        EmailAddress emailAddress = EmailAddress.from(student.getUser().getEmail());
+    private void validateStudentRegister(StudentRegisterRequest request) {
+        EmailAddress emailAddress = EmailAddress.from(request.email());
         emailAddress.validateKoreatechEmail();
 
-        validateDataExist(student);
-        validateStudentNumber(student.getStudentNumber());
-        checkDepartmentValid(student.getDepartment());
+        validateDataExist(request);
+        validateStudentNumber(request.studentNumber());
+        checkDepartmentValid(request.department());
     }
 
-    private void validateDataExist(Student student) {
-        userRepository.findByEmail(student.getUser().getEmail())
-            .ifPresent(user -> {
-                throw DuplicationEmailException.withDetail("email: " + student.getUser().getEmail());
-            });
-
-        if (student.getUser().getNickname() != null) {
-            userRepository.findByNickname(student.getUser().getNickname())
+    private void validateDataExist(StudentRegisterRequest request) {
+        userRepository.findByEmail(request.email())
                 .ifPresent(user -> {
-                    throw DuplicationNicknameException.withDetail("nickname: " + student.getUser().getNickname());
+                    throw DuplicationEmailException.withDetail("email: " + request.email());
+                });
+        studentRedisRepository.findById(request.email())
+                .ifPresent(studentTemporaryStatus -> {
+                    throw DuplicationEmailException.withDetail("email: " + request.email());
                 });
+
+        if (request.nickname() != null) {
+            userRepository.findByNickname(request.nickname())
+                    .ifPresent(user -> {
+                        throw DuplicationNicknameException.withDetail("nickname: " + request.nickname());
+                    });
+            studentRedisRepository.findByNickname(request.nickname())
+                    .ifPresent(studentTemporaryStatus -> {
+                        throw DuplicationNicknameException.withDetail("nickname: " + request.nickname());
+                    });
         }
     }
 

src/main/java/in/koreatech/koin/domain/user/service/UserService.java

@@ -2,8 +2,11 @@
 
 import java.time.LocalDateTime;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.UUID;
 
+import in.koreatech.koin.domain.user.model.redis.StudentTemporaryStatus;
+import in.koreatech.koin.domain.user.repository.StudentRedisRepository;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
@@ -42,6 +45,7 @@ public class UserService {
     private final JwtProvider jwtProvider;
     private final UserRepository userRepository;
     private final StudentRepository studentRepository;
+    private final StudentRedisRepository studentRedisRepository;
     private final OwnerRepository ownerRepository;
     private final PasswordEncoder passwordEncoder;
     private final UserTokenRepository userTokenRepository;
@@ -51,12 +55,13 @@ public class UserService {
     @Transactional
     public UserLoginResponse login(UserLoginRequest request) {
         User user = userRepository.getByEmail(request.email());
+        Optional<StudentTemporaryStatus> studentTemporaryStatus = studentRedisRepository.findById(request.email());
 
         if (!user.isSamePassword(passwordEncoder, request.password())) {
             throw new KoinIllegalArgumentException("비밀번호가 틀렸습니다.");
         }
 
-        if (!user.isAuthed()) {
+        if (studentTemporaryStatus.isPresent()) {
             throw new AuthorizationException("미인증 상태입니다. 아우누리에서 인증메일을 확인해주세요");
         }
 

src/main/java/in/koreatech/koin/global/config/RedisConfig.java

@@ -7,8 +7,11 @@
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.RedisKeyValueAdapter;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.repository.configuration.EnableRedisRepositories;
 import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
 import org.springframework.http.client.BufferingClientHttpRequestFactory;
 import org.springframework.http.client.SimpleClientHttpRequestFactory;
@@ -19,6 +22,8 @@
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 
 @Configuration
+@EnableRedisRepositories(enableKeyspaceEvents = RedisKeyValueAdapter.EnableKeyspaceEvents.ON_STARTUP)
+@Profile("!test")
 public class RedisConfig {
 
     @Bean