Merge pull request #29 from Leets-Official/Refactor-#24

Refactor-#24

src/main/java/leets/weeth/domain/user/dto/UserDTO.java

@@ -12,8 +12,9 @@ public record SignUp (
         @NotBlank        String name,
         @Email @NotBlank String email,
         @NotBlank        String password,
+        @NotBlank String passwordConfirm,
         @NotBlank        String studentId,
-        @NotBlank        String phoneNumber,
+        @NotBlank        String tel,
         @NotNull         Position position,
         @NotNull         Department department,
         @NotNull         Integer cardinal
@@ -23,6 +24,7 @@ public record Response(
             Integer id,
             String name,
             String studentId,
+            String tel,
             Department department,
             String email,
             Integer cardinal,

src/main/java/leets/weeth/domain/user/entity/User.java

@@ -30,7 +30,7 @@ public class User extends BaseEntity {
 
     private String studentId;
 
-    private String phoneNumber;
+    private String tel;
 
     @Enumerated(EnumType.STRING)
     private Position position;

src/main/java/leets/weeth/domain/user/repository/UserRepository.java

@@ -11,6 +11,12 @@ public interface UserRepository extends JpaRepository<User, Long> {
 
     Optional<User> findByEmail(String email);
 
+    boolean existsByEmail(String email);
+
+    boolean existsByStudentId(String studentId);
+
+    boolean existsByTel(String tel);
+
     List<User> findAllByStatusOrderByName(Status status);
 
     Optional<User> findByRefreshToken(String refreshToken);

src/main/java/leets/weeth/domain/user/service/UserService.java

@@ -5,8 +5,8 @@
 import leets.weeth.domain.user.mapper.UserMapper;
 import leets.weeth.domain.user.repository.UserRepository;
 import leets.weeth.global.common.error.exception.custom.BusinessLogicException;
-import leets.weeth.global.common.error.exception.custom.EmailExistsException;
 import leets.weeth.global.common.error.exception.custom.InvalidAccessException;
+import leets.weeth.global.common.error.exception.custom.UserExistsException;
 import leets.weeth.global.common.error.exception.custom.UserNotFoundException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -30,10 +30,10 @@ public class UserService {
     private final PasswordEncoder passwordEncoder;
 
     public void signUp(UserDTO.SignUp requestDto) {
-        if (userRepository.findByEmail(requestDto.email()).isPresent())
-            throw new EmailExistsException();
-
-        // 수정: 아이디 이외 중복 처리
+        if(userRepository.existsByEmail(requestDto.email()) ||  // 이메일 중복
+                userRepository.existsByStudentId(requestDto.studentId()) ||     // 학번 중복
+                userRepository.existsByTel(requestDto.tel()))   // 전화번호 중복
+            throw new UserExistsException();
 
         User user = mapper.from(requestDto, passwordEncoder);
         userRepository.save(user);

src/main/java/leets/weeth/global/common/error/exception/custom/UserExistsException.java

@@ -0,0 +1,9 @@
+package leets.weeth.global.common.error.exception.custom;
+
+import jakarta.persistence.EntityNotFoundException;
+
+public class UserExistsException extends EntityNotFoundException {
+    public UserExistsException() {
+        super("이미 가입된 사용자입니다.");
+    }
+}