Merge pull request #62 from EFUB-ZEJE/feature/user-kakao-login

Feature/user kakao login
EFUB-ZEJE · Sep 3, 2022 · 97f7d19 · 97f7d19
2 parents af73ca9 + 2ca8ef2
commit 97f7d19
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/main/java/ewha/efub/zeje/service/UserService.java b/src/main/java/ewha/efub/zeje/service/UserService.java
@@ -43,6 +43,10 @@ public User saveUser(KakaoProfile kakaoProfile) {
             user = kakaoProfile.toEntity();
             userRepository.save(user);
         }
+
+        if(user.getDeleteFlag()) {
+            throw new CustomException(ErrorCode.USER_NOT_FOUND);
+        }
         return user;
     }
 
@@ -93,11 +97,12 @@ public UserResponseDTO updateProfile(Long userId,  String nickname, MultipartFil
     }
 
     public User getUserEntity(Long userId) {
-        try{
-            return userRepository.findByUserIdAndDeleteFlagFalse(userId);
-        }catch(Exception e) {
+        User user;
+        user = userRepository.findByUserIdAndDeleteFlagFalse(userId);
+        if(user == null) {
             throw new CustomException(ErrorCode.USER_NOT_FOUND);
         }
+        return user;
     }
 
 }