Merge pull request #292 from UMC-Closit/fix/#291-param-name-fix

fix: 파라미터 명 명시 및 차단 목록 조회 코드 수정

Author: yoon9531

build.gradle

@@ -66,11 +66,16 @@ dependencies {
 	implementation 'com.github.ben-manes.caffeine:caffeine:3.1.8'
 }
 
+tasks.withType(JavaCompile) {
+	options.compilerArgs = ['-parameters']
+}
+
 tasks.named('test') {
 	useJUnitPlatform()
 	systemProperty 'file.encoding', 'UTF-8'
 }
 
+
 jar {
 	enabled = false
 }

src/main/java/UMC_7th/Closit/domain/user/controller/UserController.java

@@ -98,10 +98,10 @@ public ApiResponse<String> unblockUser(@RequestBody UserRequestDTO.BlockUserDTO
     @Operation(summary = "사용자 차단 목록 조회", description = "특정 사용자의 차단 목록을 조회합니다.")
     @GetMapping("/blocks")
     public ApiResponse<UserResponseDTO.UserBlockListDTO> getBlockedUserList(
-            @RequestParam(defaultValue = "0") int page,
-            @RequestParam(defaultValue = "10") int size) {
+            @RequestParam(name = "page", defaultValue = "0") int page,
+            @RequestParam(name = "size", defaultValue = "10") int size) {
 
-        Slice<User> blockedUserSlice = userQueryService.getBlockedUserList(PageRequest.of(page, size));
+        Slice<String> blockedUserSlice = userQueryService.getBlockedUserList(PageRequest.of(page, size));
         return ApiResponse.onSuccess(UserConverter.toUserBlockListDTO(blockedUserSlice));
     }
 
@@ -127,8 +127,8 @@ public ApiResponse<UserResponseDTO.IsBlockedDTO> isBlockedBy(@RequestParam("clos
     @GetMapping("/{closit_id}/followers")
     public ApiResponse<UserResponseDTO.UserFollowerSliceDTO> getUserFollowers (
             @PathVariable("closit_id") String closit_id,
-            @RequestParam(defaultValue = "0") int page,
-            @RequestParam(defaultValue = "10") int size) {
+            @RequestParam(name = "page", defaultValue = "0") int page,
+            @RequestParam(name = "size", defaultValue = "10") int size) {
 
         Slice<User> followerSlice = userQueryService.getFollowerList(closit_id, PageRequest.of(page, size));
         return ApiResponse.onSuccess(UserConverter.toUserFollowerSliceDTO(followerSlice));
@@ -150,8 +150,8 @@ public ApiResponse<UserResponseDTO.UserFollowerSliceDTO> getUserFollowers (
     @GetMapping("/{closit_id}/following")
     public ApiResponse<UserResponseDTO.UserFollowingSliceDTO> getUserFollowing(
             @PathVariable("closit_id") String closit_id,
-            @RequestParam(defaultValue = "0") int page,
-            @RequestParam(defaultValue = "10") int size) {
+            @RequestParam(name = "page", defaultValue = "0") int page,
+            @RequestParam(name = "size", defaultValue = "10") int size) {
 
         Slice<User> followingSlice = userQueryService.getFollowingList(closit_id, PageRequest.of(page, size));
         return ApiResponse.onSuccess(UserConverter.toUserFollowingSliceDTO(followingSlice));
@@ -173,8 +173,8 @@ public ApiResponse<UserResponseDTO.UserFollowingSliceDTO> getUserFollowing(
     @GetMapping("/{closit_id}/highlights")
     public ApiResponse<UserResponseDTO.UserHighlightSliceDTO> getUserHighlights(
             @PathVariable("closit_id") String closit_id,
-            @RequestParam(defaultValue = "0") int page,
-            @RequestParam(defaultValue = "10") int size) {
+            @RequestParam(name = "page", defaultValue = "0") int page,
+            @RequestParam(name = "size", defaultValue = "10") int size) {
 
         Slice<Highlight> highlightSlice = userQueryService.getHighlightList(closit_id, PageRequest.of(page, size));
 
@@ -256,8 +256,8 @@ public ApiResponse<String> deactivateUser(@RequestBody @Valid UserRequestDTO.Dea
     @GetMapping("/search")
     public ApiResponse<UserResponseDTO.UserSearchListDTO> searchUsers(
             @RequestParam(name = "keyword") @Size(min = 1, max = 50, message = "검색어는 1자 이상 50자 이하여야 합니다") String keyword,
-            @RequestParam(defaultValue = "0") int page,
-            @RequestParam(defaultValue = "10") int size
+            @RequestParam(name = "page", defaultValue = "0") int page,
+            @RequestParam(name = "size", defaultValue = "10") int size
     ) {
         Slice<User> userSlice = userQueryService.searchUsersByClositId(keyword, PageRequest.of(page, size));
         return ApiResponse.onSuccess(UserConverter.toUserSearchListDTO(userSlice));

src/main/java/UMC_7th/Closit/domain/user/converter/UserConverter.java

@@ -109,13 +109,11 @@ public static UserResponseDTO.UserBlockResponseDTO toUserBlockResponseDTO (Block
                 .build();
     }
 
-    public static UserResponseDTO.UserBlockListDTO toUserBlockListDTO(Slice<User> blockedUserSlice) {
+    public static UserResponseDTO.UserBlockListDTO toUserBlockListDTO(Slice<String> blockedUserSlice) {
         List<UserResponseDTO.UserBlockDTO> blockedUserList =
                 blockedUserSlice.getContent().stream()
-                        .map(user -> UserResponseDTO.UserBlockDTO.builder()
-                                .clositId(user.getClositId())
-                                .name(user.getName())
-                                .profileImage(user.getProfileImage())
+                        .map(clositId -> UserResponseDTO.UserBlockDTO.builder()
+                                .clositId(clositId)
                                 .build())
                         .collect(Collectors.toList());
 

src/main/java/UMC_7th/Closit/domain/user/dto/UserResponseDTO.java

@@ -183,8 +183,6 @@ public static class UserBlockListDTO {
     @AllArgsConstructor
     public static class UserBlockDTO {
         private String clositId;
-        private String name;
-        private String profileImage;
     }
 
     @Builder

src/main/java/UMC_7th/Closit/domain/user/repository/BlockRepository.java

@@ -16,6 +16,6 @@ public interface BlockRepository extends JpaRepository<Block, Long> {
     Optional<Block> findByBlockerIdAndBlockedId (String blockerId, String blockedId);
 
     @Query("SELECT b.blockedId FROM Block b WHERE b.blockerId = :blockerId")
-    Slice<User> findBlockedUsersByBlocker(@Param("blockerId") String blockerId, Pageable pageable);
+    Slice<String> findBlockedUsersByBlocker(@Param("blockerId") String blockerId, Pageable pageable);
 
 }

src/main/java/UMC_7th/Closit/domain/user/service/UserQueryService.java

@@ -22,7 +22,7 @@ public interface UserQueryService {
 
     Slice<Post> getRecentPostList(String clositId, Integer page); // 특정 사용자의 최근 게시글 조회
 
-    Slice<User> getBlockedUserList(Pageable pageable);
+    Slice<String> getBlockedUserList(Pageable pageable);
 
     UserResponseDTO.IsBlockedDTO isBlockedBy(String targetClositId);
 

src/main/java/UMC_7th/Closit/domain/user/service/UserQueryServiceImpl.java

@@ -96,7 +96,7 @@ public Slice<Post> getRecentPostList(String clositId, Integer page) { // 특정
     }
 
     @Override
-    public Slice<User> getBlockedUserList(Pageable pageable) {
+    public Slice<String> getBlockedUserList(Pageable pageable) {
         User currentUser = securityUtil.getCurrentUser();
         return userBlockRepository.findBlockedUsersByBlocker(currentUser.getClositId(), pageable);
     }