Merge pull request #56 from f-lab-edu/feature/25

[#25] 사용자 차단 목록 불러오기 기능 구현
f-lab-edu · Mar 18, 2021 · 07bbcec · 07bbcec
2 parents 54746c9 + 024f0c0
commit 07bbcec
Show file tree

Hide file tree

Showing 8 changed files with 73 additions and 6 deletions.
diff --git a/src/main/java/me/soo/helloworld/controller/BlockUserController.java b/src/main/java/me/soo/helloworld/controller/BlockUserController.java
@@ -6,6 +6,8 @@
 import me.soo.helloworld.service.BlockUserService;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/block-users")
@@ -24,4 +26,11 @@ public void blockUser(@CurrentUser String userId, @PathVariable String targetId)
     public void unBlockUser(@CurrentUser String userId, @PathVariable String targetId) {
         blockUserService.unblockUser(userId, targetId);
     }
+
+    @LoginRequired
+    @GetMapping
+    public List<String> getBlockUserList(@CurrentUser String userId,
+                                         @RequestParam(defaultValue = "1") Integer pageNumber) {
+        return blockUserService.getBlockUserList(userId, pageNumber);
+    }
 }
diff --git a/src/main/java/me/soo/helloworld/mapper/BlockUserMapper.java b/src/main/java/me/soo/helloworld/mapper/BlockUserMapper.java
@@ -1,7 +1,10 @@
 package me.soo.helloworld.mapper;
 
+import me.soo.helloworld.model.blockuser.BlockUserListRequest;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface BlockUserMapper {
 
@@ -10,4 +13,6 @@ public interface BlockUserMapper {
     public boolean isUserBlocked(String userId, String targetId);
 
     public void deleteBlockUser(String userId, String targetId);
+
+    public List<String> getBlockUserList(BlockUserListRequest request);
 }
diff --git a/src/main/java/me/soo/helloworld/model/blockuser/BlockUserListRequest.java b/src/main/java/me/soo/helloworld/model/blockuser/BlockUserListRequest.java
@@ -0,0 +1,26 @@
+package me.soo.helloworld.model.blockuser;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import me.soo.helloworld.util.Pagination;
+
+@Builder
+@AllArgsConstructor
+public class BlockUserListRequest {
+
+    private final String userId;
+
+    private final int offset;
+
+    private final int limit;
+
+    static public BlockUserListRequest create(String userId, int pageNumber, Pagination pagination) {
+        int pageLimit = pagination.getMaxPageBlockUser();
+
+        return BlockUserListRequest.builder()
+                                    .userId(userId)
+                                    .offset(pagination.calculateOffset(pageLimit, pageNumber))
+                                    .limit(pageLimit)
+                                    .build();
+    }
+}
diff --git a/src/main/java/me/soo/helloworld/model/friend/FriendListRequest.java b/src/main/java/me/soo/helloworld/model/friend/FriendListRequest.java
@@ -21,11 +21,12 @@ public class FriendListRequest {
         Math.max(pageNumber, 1): pageNumber 가 음수로 들어와도 기본값을 1로 설정해서 맨 첫 페이지가 보이도록 설정
      */
     static public FriendListRequest create(String userId, int pageNumber, Pagination pagination, FriendStatus status) {
+        int pageLimit = pagination.getMaxPageFriend();
 
         return FriendListRequest.builder()
                                 .userId(userId)
-                                .offset(pagination.getMaxPageFriend() * (Math.max(pageNumber, 1) - 1))
-                                .limit(pagination.getMaxPageFriend())
+                                .offset(pagination.calculateOffset(pageLimit, pageNumber))
+                                .limit(pageLimit)
                                 .status(status)
                                 .build();
     }

diff --git a/src/main/java/me/soo/helloworld/service/BlockUserService.java b/src/main/java/me/soo/helloworld/service/BlockUserService.java
@@ -5,8 +5,13 @@
 import me.soo.helloworld.exception.InvalidRequestException;
 import me.soo.helloworld.mapper.BlockUserMapper;
 import me.soo.helloworld.mapper.FriendMapper;
+import me.soo.helloworld.model.blockuser.BlockUserListRequest;
+import me.soo.helloworld.util.Pagination;
 import me.soo.helloworld.util.TargetValidator;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 @Service
 @RequiredArgsConstructor
@@ -18,6 +23,8 @@ public class BlockUserService {
 
     private final BlockUserMapper blockUserMapper;
 
+    private final Pagination pagination;
+
     public void blockUser(String userId, String targetId) {
         TargetValidator.targetNotSelf(userId, targetId);
         TargetValidator.targetExistence(userService.isUserIdExist(targetId));
@@ -51,4 +58,10 @@ public void unblockUser(String userId, String targetId) {
 
         blockUserMapper.deleteBlockUser(userId, targetId);
     }
+
+    @Transactional(readOnly = true)
+    public List<String> getBlockUserList(String userId, int pageNumber) {
+        BlockUserListRequest request = BlockUserListRequest.create(userId, pageNumber, pagination);
+        return blockUserMapper.getBlockUserList(request);
+    }
 }
diff --git a/src/main/java/me/soo/helloworld/service/FriendService.java b/src/main/java/me/soo/helloworld/service/FriendService.java
@@ -96,9 +96,6 @@ private void validateFriendStatusDetail(FriendStatus status) {
                 throw new DuplicateRequestException("이미 해당 사용자로부터 친구추가 요청을 받은 상태입니다. 받은 친구 요청을 다시 확인해주세요.");
             case FRIEND:
                 throw new DuplicateRequestException("이미 친구로 등록된 사용자에게 다시 친구 요청을 보낼 수 없습니다.");
-            case NONE:
-            default:
-                break;
         }
     }
 }
diff --git a/src/main/java/me/soo/helloworld/util/Pagination.java b/src/main/java/me/soo/helloworld/util/Pagination.java
@@ -10,7 +10,16 @@ public class Pagination {
 
     private final int maxPageFriend;
 
-    public Pagination(@Value("${friend.max.page:30}") int maxPageFriend) {
+    private final int maxPageBlockUser;
+
+    public Pagination(@Value("${friend.max.page:30}") int maxPageFriend,
+                      @Value("${block_user.max.page:30}") int maxPageBlockUser) {
+
         this.maxPageFriend = maxPageFriend;
+        this.maxPageBlockUser = maxPageBlockUser;
+    }
+
+    public int calculateOffset(int pageLimit, int pageNumber) {
+        return pageLimit * (Math.max(pageNumber, 1) - 1);
     }
 }
diff --git a/src/main/resources/mappers/BlockUserMapper.xml b/src/main/resources/mappers/BlockUserMapper.xml
@@ -14,4 +14,11 @@
     <delete id="deleteBlockUser" parameterType="String">
         DELETE FROM block WHERE userId = #{userId} AND blockId = #{targetId}
     </delete>
+
+    <select id="getBlockUserList" parameterType="me.soo.helloworld.model.blockuser.BlockUserListRequest" resultType="String">
+
+        SELECT blockId FROM block WHERE userId = #{userId}
+        ORDER BY id DESC
+        LIMIT #{offset}, #{limit}
+    </select>
 </mapper>