Merge pull request #219 from kmw10693/refactor/#218

kmw10693 · web-flow · commit e4912bc86ee1 · 2025-05-08T16:24:07.000+09:00
refactor: UserResponse에 학과 추가 (#218)
diff --git a/src/main/java/ku_rum/backend/domain/auth/application/AuthService.java b/src/main/java/ku_rum/backend/domain/auth/application/AuthService.java
@@ -6,6 +6,10 @@
 import ku_rum.backend.domain.auth.dto.request.ReissueRequest;
 import ku_rum.backend.domain.auth.dto.response.AuthResponse;
 import ku_rum.backend.domain.common.firebase.application.NotificationService;
+import ku_rum.backend.domain.department.application.UserDepartmentService;
+import ku_rum.backend.domain.department.domain.UserDepartment;
+import ku_rum.backend.domain.department.domain.repository.UserDepartmentRepository;
+import ku_rum.backend.domain.department.dto.DepartmentResponse;
 import ku_rum.backend.domain.oauth.handler.TempTokenProvider;
 import ku_rum.backend.domain.user.domain.User;
 import ku_rum.backend.domain.user.domain.repository.UserRepository;
@@ -27,6 +31,9 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 import static ku_rum.backend.global.support.status.BaseExceptionResponseStatus.*;
 
 @Slf4j
@@ -42,6 +49,7 @@ public class AuthService {
     private final NotificationService notificationService;
     private final TempTokenProvider tempTokenProvider;
     private final UserRepository userRepository;
+    private final UserDepartmentRepository userDepartmentRepository;
 
     public AuthResponse login(LoginRequest authRequest) {
         try {
@@ -128,13 +136,20 @@ private User getUser(CustomUserDetails customUserDetails) {
     }
 
     private UserResponse buildUserResponse(User user) {
+        List<UserDepartment> byUserId = userDepartmentRepository.findByUserId(user.getId());
+        List<DepartmentResponse> list = byUserId.stream()
+                .map(UserDepartment::getDepartment)
+                .map(DepartmentResponse::of)
+                .toList();
+
         return UserResponse.of(
                 user.getId(),
                 user.getOauthId(),
                 user.getLoginId(),
                 user.getEmail(),
                 user.getNickname(),
                 user.getStudentId(),
-                user.getImageUrl());
+                user.getImageUrl(),
+                list);
     }
 }
diff --git a/src/main/java/ku_rum/backend/domain/department/domain/repository/UserDepartmentRepository.java b/src/main/java/ku_rum/backend/domain/department/domain/repository/UserDepartmentRepository.java
@@ -3,19 +3,22 @@
 import io.lettuce.core.dynamic.annotation.Param;
 import jakarta.transaction.Transactional;
 import ku_rum.backend.domain.department.domain.UserDepartment;
+import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 
+import java.util.List;
 import java.util.Optional;
 
 public interface UserDepartmentRepository extends JpaRepository<UserDepartment, Long> {
     boolean existsByUserIdAndDepartmentId(Long userId, Long departmentId);
 
-    Optional<UserDepartment> findByUserIdAndDepartmentId(Long userId, Long departmentId);
-
     @Modifying(clearAutomatically = true)
     @Transactional
     @Query("DELETE FROM UserDepartment ud WHERE ud.user.id = :userId AND ud.department.id = :deptId")
     int deleteByUserIdAndDepartmentId(Long userId, Long deptId);
+
+    @EntityGraph(attributePaths = {"user", "department"})
+    List<UserDepartment> findByUserId(Long userId);
 }
diff --git a/src/main/java/ku_rum/backend/domain/department/dto/DepartmentResponse.java b/src/main/java/ku_rum/backend/domain/department/dto/DepartmentResponse.java
@@ -0,0 +1,10 @@
+package ku_rum.backend.domain.department.dto;
+
+import ku_rum.backend.domain.department.domain.Department;
+import ku_rum.backend.domain.department.domain.UserDepartment;
+
+public record DepartmentResponse(Long departmentId, String departmentName) {
+    public static DepartmentResponse of(Department department) {
+        return new DepartmentResponse(department.getId(), department.getName());
+    }
+}
diff --git a/src/main/java/ku_rum/backend/domain/user/dto/response/UserResponse.java b/src/main/java/ku_rum/backend/domain/user/dto/response/UserResponse.java
@@ -1,9 +1,13 @@
 package ku_rum.backend.domain.user.dto.response;
 
+import ku_rum.backend.domain.department.dto.DepartmentResponse;
+
+import java.util.List;
+
 public record UserResponse(Long id, String oauthId, String loginId, String email, String nickname, String studentId,
-                           String imageUrl) {
+                           String imageUrl, List<DepartmentResponse> departmentResponse) {
 
-    public static UserResponse of(Long id, String oauthId, String loginId, String email, String nickname, String studentId, String imageUrl) {
-        return new UserResponse(id, oauthId, loginId, email, nickname, studentId, imageUrl);
+    public static UserResponse of(Long id, String oauthId, String loginId, String email, String nickname, String studentId, String imageUrl, List<DepartmentResponse> departmentResponse) {
+        return new UserResponse(id, oauthId, loginId, email, nickname, studentId, imageUrl, departmentResponse);
     }
 }
diff --git a/src/test/java/ku_rum/backend/domain/auth/presentation/AuthControllerTest.java b/src/test/java/ku_rum/backend/domain/auth/presentation/AuthControllerTest.java
@@ -6,6 +6,10 @@
 import ku_rum.backend.domain.auth.dto.request.LoginRequest;
 import ku_rum.backend.domain.auth.dto.request.ReissueRequest;
 import ku_rum.backend.domain.auth.dto.response.AuthResponse;
+import ku_rum.backend.domain.building.domain.Building;
+import ku_rum.backend.domain.college.domain.College;
+import ku_rum.backend.domain.department.domain.Department;
+import ku_rum.backend.domain.department.dto.DepartmentResponse;
 import ku_rum.backend.domain.user.dto.response.TokenResponse;
 import ku_rum.backend.domain.user.dto.response.UserResponse;
 import ku_rum.backend.global.batch.BatchScheduler;
@@ -23,6 +27,9 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.testcontainers.shaded.org.yaml.snakeyaml.tokens.Token;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import static com.epages.restdocs.apispec.ResourceDocumentation.resource;
 import static org.springframework.restdocs.headers.HeaderDocumentation.headerWithName;
 import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.patch;
@@ -56,11 +63,11 @@ void login() throws Exception {
 
         // TokenResponse 설정
         TokenResponse tokenResponse = TokenResponse.of("accessToken", "refreshToken", 1800000L, 604800000L);
-
+        List<DepartmentResponse> departmentResponses = List.of();
         // UserResponse 설정 (사용자 정보도 포함해야 하므로, 예시로 넣음)
         UserResponse userResponse = UserResponse.of(
                 1L, "oauthId", "kmw10693", "email@example.com", "nickname", "studentId", "imageUrl"
-        );
+        , departmentResponses);
 
         // AuthResponse 설정
         AuthResponse authResponse = AuthResponse.of(tokenResponse, userResponse);
@@ -142,7 +149,10 @@ void login() throws Exception {
                                                         .description("사용자 인덱스"),
                                                 fieldWithPath("data.userResponse.oauthId")
                                                         .type(JsonType.STRING)
-                                                        .description("사용자 oauthId")
+                                                        .description("사용자 oauthId"),
+                                                fieldWithPath("data.userResponse.departmentResponse")
+                                                        .type(JsonType.STRING)
+                                                        .description("사용자 학과")
                                         ).build())));
     }
 
@@ -245,7 +255,8 @@ void reissue() throws Exception {
     void exchangeToken() throws Exception {
         // given
         String tempToken = "temporary_token_value";
-        UserResponse userResponse = new UserResponse(1L, "oauthId", "loginId", "email", "nickname", "studentId", "imageUrl");
+        List<DepartmentResponse> list = new ArrayList<>();
+        UserResponse userResponse = new UserResponse(1L, "oauthId", "loginId", "email", "nickname", "studentId", "imageUrl", list);
         TokenResponse tokenResponse = new TokenResponse("accessToken", "refreshToken", 1800000L, 604800000L);
         AuthResponse authResponse = new AuthResponse(
                 tokenResponse,
@@ -293,7 +304,8 @@ void exchangeToken() throws Exception {
                                                 fieldWithPath("data.userResponse.email").description("사용자 이메일"),
                                                 fieldWithPath("data.userResponse.nickname").description("사용자 닉네임"),
                                                 fieldWithPath("data.userResponse.studentId").description("사용자 학생 ID"),
-                                                fieldWithPath("data.userResponse.imageUrl").description("사용자 이미지 URL")
+                                                fieldWithPath("data.userResponse.imageUrl").description("사용자 이미지 URL"),
+                                                fieldWithPath("data.userResponse.departmentResponse").description("사용자 학과 정보")
                                         )
                                         .build()
                         )
