fix 1 hot spot (#140)

khanhduzz · Sep 26, 2024 · 86539d3 · 86539d3
1 parent 33b4521
commit 86539d3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/src/main/java/com/fjb/sunrise/services/impl/UserServiceImpl.java b/src/main/java/com/fjb/sunrise/services/impl/UserServiceImpl.java
@@ -23,7 +23,6 @@
 import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
@@ -216,7 +215,7 @@ public boolean checkPhoneIsDuplicate(String phone) {
     public User getUserByEmailOrPhone(String emailOrPhone) {
         User user = userRepository.findByEmailOrPhone(emailOrPhone);
         if (user == null) {
-            throw new UsernameNotFoundException(String.format("User not found with email or phone: %s", emailOrPhone));
+            throw new NotFoundException("User not found with email or phone: ", emailOrPhone);
         }
         return user;
     }

diff --git a/src/test/java/com/fjb/sunrise/services/UserServiceTest.java b/src/test/java/com/fjb/sunrise/services/UserServiceTest.java
@@ -33,12 +33,6 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.jpa.domain.Specification;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
@@ -261,7 +255,7 @@ void getUserByEmailOrPhone_WhenUserDoesNotExist_ShouldThrowUsernameNotFoundExcep
 
         Mockito.when(userRepository.findByEmailOrPhone(emailOrPhone)).thenReturn(null);
 
-        assertThrows(UsernameNotFoundException.class, () -> userService.getUserByEmailOrPhone(emailOrPhone));
+        assertThrows(NotFoundException.class, () -> userService.getUserByEmailOrPhone(emailOrPhone));
     }
 
     @Test