[REFACTOR] improve efficiency by exists query and utilize lambda API

gabojait · Nov 11, 2023 · 09706d4 · 09706d4
1 parent a6c6327
commit 09706d4
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 18 deletions.
diff --git a/src/main/java/com/gabojait/gabojaitspring/api/service/user/UserService.java b/src/main/java/com/gabojait/gabojaitspring/api/service/user/UserService.java
@@ -56,12 +56,10 @@ public class UserService {
      * @param username 아이디
      */
     public void validateUsername(String username) {
-        if (username.toLowerCase().contains("gabojait") || username.toLowerCase().contains("admin"))
+        if (username.toLowerCase().contains("gabojait"))
             throw new CustomException(UNAVAILABLE_USERNAME);
 
-        Optional<User> user = userRepository.findByUsername(username);
-
-        if (user.isPresent())
+        if (userRepository.existsByUsername(username))
             throw new CustomException(EXISTING_USERNAME);
     }
 
@@ -74,9 +72,7 @@ public void validateNickname(String nickname) {
         if (nickname.contains("가보자잇"))
             throw new CustomException(UNAVAILABLE_NICKNAME);
 
-        Optional<User> user = userRepository.findByNickname(nickname);
-
-        if (user.isPresent())
+        if (userRepository.existsByNickname(nickname))
             throw new CustomException(EXISTING_NICKNAME);
     }
 
@@ -167,15 +163,14 @@ public void createFcm(User user, String fcmToken) {
         if (fcmToken == null || fcmToken.isBlank())
             return;
 
-        Optional<Fcm> fcm = fcmRepository.findByUserAndFcmToken(user, fcmToken);
-        if (fcm.isPresent())
-            return;
-
-        Fcm newFcm = Fcm.builder()
-                .user(user)
-                .fcmToken(fcmToken)
-                .build();
-        fcmRepository.save(newFcm);
+        fcmRepository.findByUserAndFcmToken(user, fcmToken)
+                .ifPresentOrElse(fcm -> {}, () -> {
+                    Fcm fcm = Fcm.builder()
+                            .user(user)
+                            .fcmToken(fcmToken)
+                            .build();
+                    fcmRepository.save(fcm);
+                });
     }
 
     /**

diff --git a/src/main/java/com/gabojait/gabojaitspring/repository/user/ContactRepository.java b/src/main/java/com/gabojait/gabojaitspring/repository/user/ContactRepository.java
@@ -9,9 +9,9 @@ public interface ContactRepository extends JpaRepository<Contact, Long> {
 
     Optional<Contact> findByEmail(String email);
 
-    boolean existsByEmail(String email);
-
     Optional<Contact> findByEmailAndIsVerified(String email, boolean isVerified);
 
+    boolean existsByEmail(String email);
+
     void deleteByEmail(String email);
 }
diff --git a/src/main/java/com/gabojait/gabojaitspring/repository/user/UserRepository.java b/src/main/java/com/gabojait/gabojaitspring/repository/user/UserRepository.java
@@ -13,4 +13,8 @@ public interface UserRepository extends JpaRepository<User, Long>, UserCustomRep
     Optional<User> findByUsername(String username);
 
     Optional<User> findByNickname(String nickname);
+
+    boolean existsByUsername(String username);
+
+    boolean existsByNickname(String nickname);
 }