Merge pull request #39 from sh1220/dev

fix: User Exception
IT-Pick · Aug 1, 2024 · f57a7e9 · f57a7e9
2 parents d3ec8f3 + 774e53c
commit f57a7e9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/main/java/store/itpick/backend/config/WebConfig.java b/src/main/java/store/itpick/backend/config/WebConfig.java
@@ -23,7 +23,7 @@ public void addInterceptors(InterceptorRegistry registry) {
                 .order(1)
                 .addPathPatterns("/**")
                 .excludePathPatterns("/auth/login", "/auth/signup", "/auth/refresh","/auth/emails/**");
-                 //인터셉터 적용 범위 수정
+
     }
 
     @Override

diff --git a/src/main/java/store/itpick/backend/dto/user/user/PostUserRequest.java b/src/main/java/store/itpick/backend/dto/user/user/PostUserRequest.java
@@ -25,7 +25,7 @@ public class PostUserRequest {
     @NotBlank(message = "password: {NotBlank}")
     @Length(min = 8, max = 20,
             message = "password: 최소 {min}자리 ~ 최대 {max}자리까지 가능합니다")
-    @Pattern(regexp = "(?=.*[a-z])(?=.*[0-9])(?=.*[!#$%^&*+=])(?=\\S+$).{8,20}",
+    @Pattern(regexp = "(?=.*[a-z])(?=.*[0-9])(?=.*[!#@$%^&*+=])(?=\\S+$).{8,20}",
             message = "password: 소문자, 숫자, 특수문자가 적어도 하나씩은 있어야 합니다")
     private String password;
 

diff --git a/src/main/java/store/itpick/backend/service/UserService.java b/src/main/java/store/itpick/backend/service/UserService.java
@@ -28,6 +28,7 @@
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.NoSuchElementException;
 import java.util.Optional;
 import java.util.Random;
 
@@ -63,7 +64,7 @@ public LoginResponse login(LoginRequest authRequest) {
         User user;
         try {
             user = userRepository.getUserByEmail(email).get();
-        } catch (IncorrectResultSizeDataAccessException e) {
+        } catch (NoSuchElementException e) {
             throw new UserException(EMAIL_NOT_FOUND);
         }
         long userId = user.getUserId();
@@ -139,7 +140,7 @@ public void logout(long userId) {
         User user;
         try {
             user = userRepository.getUserByUserId(userId).get();
-        } catch (IncorrectResultSizeDataAccessException e) {
+        } catch (NoSuchElementException e) {
             throw new UserException(USER_NOT_FOUND);
         }
         user.setRefreshToken(null);