[REFACTOR] Extracted user-related operations into a dedicated UserService and updated controller methods to use it

src/main/java/kr/re/etri/autoflow/controllers/AuthController.java

@@ -8,6 +8,7 @@ import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
 
 import kr.re.etri.autoflow.service.AuthService;
+import kr.re.etri.autoflow.service.UserService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
@@ -60,6 +61,7 @@ public class AuthController {
   RefreshTokenService refreshTokenService;
 
   private final AuthService authService;
+  private final UserService userService;
 
     @Operation(summary = "로그인", description = "사용자 인증 후 JWT 및 리프레시 토큰 쿠키를 반환합니다.")
     @ApiResponses({
@@ -164,47 +166,26 @@ public class AuthController {
     return ResponseEntity.badRequest().body(new MessageResponse(false,"Refresh Token is empty!"));
   }
 
-  @Operation(summary = "사용자 조회", description = "사용자 ID로 등록된 사용자 정보를 조회합니다.")
+    @Operation(summary = "사용자 조회", description = "사용자 ID로 등록된 사용자 정보를 조회합니다.")
-  @ApiResponses({
+    @ApiResponses({
-          @ApiResponse(responseCode = "200", description = "사용자 조회 성공"),
+            @ApiResponse(responseCode = "200", description = "사용자 조회 성공"),
-          @ApiResponse(responseCode = "404", description = "해당 ID의 사용자를 찾을 수 없음")
+            @ApiResponse(responseCode = "404", description = "해당 ID의 사용자를 찾을 수 없음")
-  })
+    })
-  @GetMapping("/users/{id}")
+    @GetMapping("/users/{id}")
-  public ResponseEntity<UserInfoResponse> getUserById(
+    public ResponseEntity<UserInfoResponse> getUserById(
-          @Parameter(description = "사용자 ID", example = "1") @PathVariable Long id) {
+            @Parameter(description = "사용자 ID", example = "1") @PathVariable Long id) {
-
+
-    return userRepository.findById(id)
+        return userService.getUserById(id)
-            .map(user -> new UserInfoResponse(
+                .map(ResponseEntity::ok)
-                    user.getId(),
+                .orElse(ResponseEntity.notFound().build());
-                    user.getUsername(),
+    }
-                    user.getEmail(),
+
-                    user.getRoles().stream()
+    @Operation(summary = "전체 사용자 조회", description = "등록된 모든 사용자 목록을 조회합니다.")
-                            .map(role -> role.getName().name())
+    @GetMapping("/users")
-                            .toList()
+    public ResponseEntity<List<UserInfoResponse>> getAllUsers() {
-            ))
+        return ResponseEntity.ok(userService.getAllUsers());
-            .map(ResponseEntity::ok)
+    }
-            .orElse(ResponseEntity.notFound().build());
-  }
 
-  @Operation(summary = "전체 사용자 조회", description = "등록된 모든 사용자 목록을 조회합니다.")
-  @ApiResponses({
-          @ApiResponse(responseCode = "200", description = "사용자 목록 조회 성공")
-  })
-  @GetMapping("/users")
-  public ResponseEntity<List<UserInfoResponse>> getAllUsers() {
-    List<UserInfoResponse> users = userRepository.findAll().stream()
-            .map(user -> new UserInfoResponse(
-                    user.getId(),
-                    user.getUsername(),
-                    user.getEmail(),
-                    user.getRoles().stream()
-                            .map(role -> role.getName().name())
-                            .toList()
-            ))
-            .toList();
-
-    return ResponseEntity.ok(users);
-  }
 
     @Operation(summary = "사용자 수정", description = "사용자 정보를 수정합니다.")
     @ApiResponses({

src/main/java/kr/re/etri/autoflow/controllers/ProjectPermissionController.java

@@ -5,9 +5,10 @@ import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.enums.ParameterIn;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import kr.re.etri.autoflow.entity.ProjectPermission;
-import kr.re.etri.autoflow.entity.UserProjectMapEntity;
+import kr.re.etri.autoflow.payload.response.UserProjectResponse;
 import kr.re.etri.autoflow.payload.request.UserPermissionRequest;
 import kr.re.etri.autoflow.service.ProjectPermissionService;
+import kr.re.etri.autoflow.service.UserService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -22,6 +23,7 @@ import java.util.Set;
 public class ProjectPermissionController {
 
     private final ProjectPermissionService projectPermissionService;
+    private final UserService userService;
     //private final AuthService authService;
 
     @Operation(summary = "프로젝트에 사용자 권한 추가")
@@ -35,14 +37,14 @@ public class ProjectPermissionController {
         return ResponseEntity.ok().build();
     }
 
-    @Operation(summary = "사용자 프로젝트 조회", description = "특정 사용자가 속한 모든 프로젝트와 권한을 조회합니다.")
+//    @Operation(summary = "사용자 프로젝트 조회", description = "특정 사용자가 속한 모든 프로젝트와 권한을 조회합니다.")
-    @GetMapping("/user/{userId}/projects")
+//    @GetMapping("/user/{userId}/projects")
-    public ResponseEntity<List<UserProjectMapEntity>> getUserProjects(
+//    public ResponseEntity<List<UserProjectMapEntity>> getUserProjects(
-            @Parameter(description = "유저 ID") @PathVariable Long userId
+//            @Parameter(description = "유저 ID") @PathVariable Long userId
-    ) {
+//    ) {
-        List<UserProjectMapEntity> projects = projectPermissionService.getUserProjects(userId);
+//        List<UserProjectMapEntity> projects = projectPermissionService.getUserProjects(userId);
-        return ResponseEntity.ok(projects);
+//        return ResponseEntity.ok(projects);
-    }
+//    }
 
     @Operation(summary = "사용자 권한 조회")
     @GetMapping("/{projectId}/users/{userId}/permissions")
@@ -57,6 +59,15 @@ public class ProjectPermissionController {
         return ResponseEntity.ok(permissions);
     }
 
+    @Operation(summary = "사용자 프로젝트 조회")
+    @GetMapping("/users/{userId}/projects")
+    public ResponseEntity<List<UserProjectResponse>> getUserProjects(
+            @Parameter(name = "userId", description = "사용자 ID", example = "100", required = true)
+            @PathVariable Long userId) {
+
+        List<UserProjectResponse> projects = userService.getUserProjects(userId);
+        return ResponseEntity.ok(projects);
+    }
     @Operation(summary = "사용자 권한 수정")
     @PutMapping("/{projectId}/users/{userId}/permissions")
     public ResponseEntity<?> updateUserPermissions(

src/main/java/kr/re/etri/autoflow/payload/response/UserProjectResponse.java

@@ -0,0 +1,17 @@
+package kr.re.etri.autoflow.payload.response;
+
+import kr.re.etri.autoflow.entity.ProjectPermission;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Set;
+
+@Getter
+@Setter
+@AllArgsConstructor
+public class UserProjectResponse {
+    private Long projectId;
+    private String projectName;
+    private Set<ProjectPermission> permissions;
+}

src/main/java/kr/re/etri/autoflow/repository/UserProjectMapRepository.java

@@ -3,6 +3,7 @@ package kr.re.etri.autoflow.repository;
 import kr.re.etri.autoflow.entity.ProjectEntity;
 import kr.re.etri.autoflow.entity.UserProjectMapEntity;
 import kr.re.etri.autoflow.models.User;
+import kr.re.etri.autoflow.payload.response.UserInfoResponse;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
@@ -14,7 +15,5 @@ public interface UserProjectMapRepository extends JpaRepository<UserProjectMapEn
 
     List<UserProjectMapEntity> findAllByProject(ProjectEntity project);
 
-    List<UserProjectMapEntity> findAllByUser(User user);
+    List<UserProjectMapEntity> findAllByUserId(Long userId);
-
-    boolean existsByProjectAndUser(ProjectEntity project, User user);
 }

src/main/java/kr/re/etri/autoflow/service/ProjectPermissionService.java

@@ -12,7 +12,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collections;
-import java.util.List;
 import java.util.Set;
 
 @Service
@@ -50,12 +49,6 @@ public class ProjectPermissionService {
                 .orElse(Collections.emptySet());
     }
 
-    @Transactional(readOnly = true)
-    public List<UserProjectMapEntity> getUserProjects(Long userId) {
-        User user = getUser(userId);
-        return userProjectMapRepository.findAllByUser(user);
-    }
-
     public void updateUserPermissions(Long projectId, Long userId, Set<ProjectPermission> newPermissions) {
         ProjectEntity project = getProject(projectId);
         User user = getUser(userId);

src/main/java/kr/re/etri/autoflow/service/UserService.java

@@ -0,0 +1,61 @@
+package kr.re.etri.autoflow.service;
+
+import kr.re.etri.autoflow.payload.response.UserProjectResponse;
+import kr.re.etri.autoflow.payload.response.UserInfoResponse;
+import kr.re.etri.autoflow.repository.UserProjectMapRepository;
+import kr.re.etri.autoflow.repository.UserRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+@Service
+@RequiredArgsConstructor
+public class UserService {
+
+    private final UserRepository userRepository;
+    private final UserProjectMapRepository userProjectMapRepository;
+
+    /**
+     * 사용자 ID로 조회
+     */
+    public Optional<UserInfoResponse> getUserById(Long id) {
+        return userRepository.findById(id)
+                .map(user -> new UserInfoResponse(
+                        user.getId(),
+                        user.getUsername(),
+                        user.getEmail(),
+                        user.getRoles().stream()
+                                .map(role -> role.getName().name())
+                                .toList()
+                ));
+    }
+
+    /**
+     * 전체 사용자 조회
+     */
+    public List<UserInfoResponse> getAllUsers() {
+        return userRepository.findAll().stream()
+                .map(user -> new UserInfoResponse(
+                        user.getId(),
+                        user.getUsername(),
+                        user.getEmail(),
+                        user.getRoles().stream()
+                                .map(role -> role.getName().name())
+                                .toList()
+                ))
+                .toList();
+    }
+
+    public List<UserProjectResponse> getUserProjects(Long userId) {
+        return userProjectMapRepository.findAllByUserId(userId).stream()
+                .map(mapping -> new UserProjectResponse(
+                        mapping.getProject().getId(),
+                        mapping.getProject().getPrjNm(),
+                        mapping.getPermissions()
+                ))
+                .collect(Collectors.toList());
+    }
+}

src/main/resources/data.sql

@@ -12,3 +12,7 @@ INSERT INTO tb_role (id, name)
 SELECT 3, 'ROLE_ADMIN'
 WHERE NOT EXISTS (SELECT 1 FROM tb_role WHERE id = 3);
 
+INSERT INTO autoflow.tb_user (id, username, email, password) VALUES (1, 'admin', 'admin123@naver.com', '$2a$10$Nqkjg2IpDoTzrbHEgZGiceSOBXy1f6jI7AC/JIIuaLOLs.3FcODdm');
+INSERT INTO autoflow.tb_user (id, username, email, password) VALUES (2, 'test', 'test@naver.com', '$2a$10$LJ/Ln/tP976l/z6RO3o1AuT/BQDHEHO7D7wA.YFIHbdGDI3B5avju');
+INSERT INTO autoflow.tb_user (id, username, email, password) VALUES (3, 'testuser', 'test@example.com', '$2a$10$iSpdIsx17F7qrHLhkRAtWe79QqZYUmKWkyAJsp1FwIXQV.Jb6e6ym');
+INSERT INTO autoflow.tb_user (id, username, email, password) VALUES (4, 'cuuva', 'cuuva@cuuva.com', '$2a$10$bVqcCLeCATq8GIO29H53qep3ALXA.qtXZrtVqXpXcik1vDrsSFZwC');