[Feat] :: user find method add in user util

Team-C0nnect · May 14, 2024 · c62dff7 · c62dff7
1 parent 37e54b2
commit c62dff7
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 21 deletions.
diff --git a/src/main/java/com/project/qvick/domain/user/presentation/api/UserController.java b/src/main/java/com/project/qvick/domain/user/presentation/api/UserController.java
@@ -4,10 +4,12 @@
 import com.project.qvick.domain.user.presentation.dto.request.RoomRequest;
 import com.project.qvick.domain.user.presentation.dto.request.StdIdEditRequest;
 import com.project.qvick.domain.user.service.UserService;
+import com.project.qvick.global.common.util.user.UserUtil;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -24,6 +26,7 @@
 public class UserController {
 
     private final UserService userService;
+    private final UserUtil userUtil;
 
     @Operation(summary = "회원 학번 수정", description = "회원 학번을 수정합니다")
     @PatchMapping("/stdId")
@@ -48,7 +51,7 @@ public void deleteUser(){
     @Operation(summary = "유저 조회", description = "현재 로그인한 유저 정보를 조회합니다")
     @GetMapping("")
     public User findUser(){
-        return userService.findUser();
+        return userUtil.findUser();
     }
 
 }
diff --git a/src/main/java/com/project/qvick/domain/user/service/UserService.java b/src/main/java/com/project/qvick/domain/user/service/UserService.java
@@ -12,8 +12,6 @@ public interface UserService {
 
     void rejectSignUp(UserSignUpRequest request);
 
-    User findUser();
-
     void editUserStdId(StdIdEditRequest request);
 
     void deleteUser();

diff --git a/src/main/java/com/project/qvick/domain/user/service/UserServiceImpl.java b/src/main/java/com/project/qvick/domain/user/service/UserServiceImpl.java
@@ -3,13 +3,11 @@
 import com.project.qvick.domain.user.domain.enums.UserRole;
 import com.project.qvick.domain.user.domain.repository.UserRepository;
 import com.project.qvick.domain.user.exception.UserForbiddenException;
-import com.project.qvick.domain.user.exception.UserNotFoundException;
 import com.project.qvick.domain.user.mapper.UserMapper;
 import com.project.qvick.domain.user.presentation.dto.User;
 import com.project.qvick.domain.user.presentation.dto.request.RoomRequest;
 import com.project.qvick.domain.user.presentation.dto.request.StdIdEditRequest;
 import com.project.qvick.domain.user.presentation.dto.request.UserSignUpRequest;
-import com.project.qvick.global.common.repository.UserSecurity;
 import com.project.qvick.global.common.util.user.UserUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -20,12 +18,11 @@ public class UserServiceImpl implements UserService {
 
     private final UserRepository userRepository;
     private final UserMapper userMapper;
-    private final UserSecurity userSecurity;
     private final UserUtil userUtil;
 
     @Override
     public void acceptSignUp(UserSignUpRequest request) {
-        User user = findUser();
+        User user = userUtil.findUser();
         if(user.getUserRole().equals(UserRole.ADMIN) || user.getUserRole().equals(UserRole.TEACHER)){
             user.setUserRole(UserRole.USER);
         }
@@ -34,7 +31,7 @@ public void acceptSignUp(UserSignUpRequest request) {
 
     @Override
     public void rejectSignUp(UserSignUpRequest request) {
-        User user  = findUser();
+        User user  = userUtil.findUser();
         if(user.getUserRole().equals(UserRole.GUEST)){
             userRepository.deleteById(request.getId());
         }
@@ -43,31 +40,23 @@ public void rejectSignUp(UserSignUpRequest request) {
 
     @Override
     public void editUserStdId(StdIdEditRequest request) {
-        User user = findUser();
+        User user = userUtil.findUser();
         user.setStdId(request.getStdId());
         userRepository.save(userMapper.toEdit(user));
     }
 
     @Override
     public void deleteUser() {
-        Long userId = userSecurity.getUser().getId();
-        userUtil.userCheckById(userId);
-        userRepository.deleteById(userId);
+        User user = userUtil.findUser();
+        userUtil.userCheckById(user.getId());
+        userRepository.deleteById(user.getId());
     }
 
     @Override
     public void editRoom(RoomRequest request){
-        User user = findUser();
+        User user = userUtil.findUser();
         user.setRoom(request.getRoom());
         userRepository.save(userMapper.toEdit(user));
     }
 
-    @Override
-    public User findUser(){
-        return userRepository
-                .findById(userSecurity.getUser().getId())
-                .map(userMapper::toUser)
-                .orElseThrow(()-> UserNotFoundException.EXCEPTION);
-    }
-
 }
diff --git a/src/main/java/com/project/qvick/global/common/util/user/UserUtil.java b/src/main/java/com/project/qvick/global/common/util/user/UserUtil.java
@@ -3,6 +3,10 @@
 import com.project.qvick.domain.user.domain.repository.UserRepository;
 import com.project.qvick.domain.user.exception.UserExistException;
 import com.project.qvick.domain.user.exception.UserNotFoundException;
+import com.project.qvick.domain.user.mapper.UserMapper;
+import com.project.qvick.domain.user.presentation.dto.User;
+import com.project.qvick.domain.user.service.UserService;
+import com.project.qvick.global.common.repository.UserSecurity;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 
@@ -11,6 +15,8 @@
 public class UserUtil {
 
     private final UserRepository userRepository;
+    private final UserSecurity userSecurity;
+    private final UserMapper userMapper;
 
     public void userExistCheck(String email){
         if (userRepository.findByEmail(email).isPresent()){
@@ -30,4 +36,11 @@ public void userCheckById(Long id){
         }
     }
 
+    public User findUser(){
+        return userRepository
+                .findById(userSecurity.getUser().getId())
+                .map(userMapper::toUser)
+                .orElseThrow(()-> UserNotFoundException.EXCEPTION);
+    }
+
 }