Merge pull request #53 from Gamegoo-repo/feat/49

[Feat/49] 차단한 회원 목록 조회 API 구현

src/main/java/com/gamegoo/apiPayload/code/status/ErrorStatus.java

@@ -20,6 +20,9 @@ public enum ErrorStatus implements BaseErrorCode {
     // 테스트
     TEMP_EXCEPTION(HttpStatus.BAD_REQUEST, "TEMP4001", "테스트"),
 
+    // 페이징 관련 에러
+    PAGE_NOT_VALID(HttpStatus.BAD_REQUEST, "PAGE401", "페이지 값은 1 이상이어야 합니다."),
+
     // Member 관련 에러
     PASSWORD_INVALID(HttpStatus.BAD_REQUEST, "MEMBER400", "비밀번호가 불일치합니다."),
     MEMBER_NOT_FOUND(HttpStatus.NOT_FOUND, "MEMBER404", "해당 사용자를 찾을 수 없습니다."),

src/main/java/com/gamegoo/apiPayload/exception/handler/PageHandler.java

@@ -0,0 +1,10 @@
+package com.gamegoo.apiPayload.exception.handler;
+
+import com.gamegoo.apiPayload.code.BaseErrorCode;
+import com.gamegoo.apiPayload.exception.GeneralException;
+
+public class PageHandler extends GeneralException {
+    public PageHandler(BaseErrorCode code) {
+        super(code);
+    }
+}

src/main/java/com/gamegoo/config/SecurityConfig.java

@@ -38,7 +38,7 @@ public AuthenticationManager authenticationManager(AuthenticationConfiguration c
 
     @Bean
     public JWTFilter jwtFilter() {
-        List<String> excludedPaths = Arrays.asList("/api/member/join", "/api/member/login", "/api/member/email", "/api/member/refresh");
+        List<String> excludedPaths = Arrays.asList("/swagger-ui/", "/v3/api-docs", "/api/member/join", "/api/member/login", "/api/member/email", "/api/member/refresh");
         return new JWTFilter(jwtUtil, excludedPaths, customUserDetailService);
 
     }
@@ -58,6 +58,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
 
                 .authorizeHttpRequests((auth) -> auth
                         .antMatchers("/api/member/join", "/api/member/login", "/api/member/email/**", "/api/member/refresh").permitAll()
+                        .antMatchers("/", "/swagger-ui/**", "/v3/api-docs/**").permitAll()
                         .anyRequest().authenticated())
                 .addFilterBefore(new JWTExceptionHandlerFilter(), UsernamePasswordAuthenticationFilter.class)
                 .addFilterAt(new LoginFilter(authenticationManager(authenticationConfiguration), jwtUtil, memberRepository), UsernamePasswordAuthenticationFilter.class)

src/main/java/com/gamegoo/controller/member/MemberController.java

@@ -1,17 +1,17 @@
 package com.gamegoo.controller.member;
 
 import com.gamegoo.apiPayload.ApiResponse;
+import com.gamegoo.converter.MemberConverter;
+import com.gamegoo.domain.Member;
 import com.gamegoo.service.member.MemberService;
 import com.gamegoo.util.JWTUtil;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.data.domain.Page;
+import org.springframework.web.bind.annotation.*;
 
 @Slf4j
 @Tag(name = "Member", description = "회원 관련 API")
@@ -31,4 +31,15 @@ public ApiResponse<String> blockMember(@PathVariable(name = "memberId") Long tar
 
         return ApiResponse.onSuccess("회원 차단 성공");
     }
+
+    @Operation(summary = "차단한 회원 목록 조회 API", description = "내가 차단한 회원의 목록을 조회하는 API 입니다.")
+    @Parameter(name = "page", description = "페이지 번호, 1 이상의 숫자를 입력해 주세요.")
+    @GetMapping("/block")
+    public ApiResponse<Object> getBlockList(@RequestParam(name = "page") Integer page) {
+        Long memberId = JWTUtil.getCurrentUserId();
+
+        Page<Member> blockList = memberService.getBlockList(memberId, page - 1);
+
+        return ApiResponse.onSuccess(MemberConverter.toBlockListDto(blockList));
+    }
 }

src/main/java/com/gamegoo/converter/MemberConverter.java

@@ -0,0 +1,35 @@
+package com.gamegoo.converter;
+
+import com.gamegoo.domain.Member;
+import com.gamegoo.dto.member.MemberResponse;
+import org.springframework.data.domain.Page;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class MemberConverter {
+
+    public static MemberResponse.blockListDto toBlockListDto(Page<Member> blockList) {
+        List<MemberResponse.blockedMemberDto> blockedMemberDtoList = blockList.stream()
+                .map(MemberConverter::toBlockedMemberDto)
+                .collect(Collectors.toList());
+
+        return MemberResponse.blockListDto.builder()
+                .blockedMemberDtoList(blockedMemberDtoList)
+                .listSize(blockedMemberDtoList.size())
+                .totalPage(blockList.getTotalPages())
+                .totalElements(blockList.getTotalElements())
+                .isFirst(blockList.isFirst())
+                .isLast(blockList.isLast())
+                .build();
+    }
+
+    public static MemberResponse.blockedMemberDto toBlockedMemberDto(Member membr) {
+        return MemberResponse.blockedMemberDto.builder()
+                .memberId(membr.getId())
+                .profileImg(membr.getProfileImage())
+                .email(membr.getEmail())
+                .name(membr.getGameuserName())
+                .build();
+    }
+}

src/main/java/com/gamegoo/dto/member/MemberResponse.java

@@ -0,0 +1,34 @@
+package com.gamegoo.dto.member;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+public class MemberResponse {
+    @Builder
+    @Getter
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class blockListDto {
+        List<blockedMemberDto> blockedMemberDtoList;
+        Integer listSize;
+        Integer totalPage;
+        Long totalElements;
+        Boolean isFirst;
+        Boolean isLast;
+    }
+
+    @Builder
+    @Getter
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class blockedMemberDto {
+        Long memberId;
+        String profileImg;
+        String email;
+        String name;
+    }
+}

src/main/java/com/gamegoo/repository/member/MemberRepository.java

@@ -1,7 +1,11 @@
 package com.gamegoo.repository.member;
 
 import com.gamegoo.domain.Member;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import java.util.Optional;
 
@@ -12,4 +16,8 @@ public interface MemberRepository extends JpaRepository<Member, Long> {
 
     Optional<Member> findByRefreshToken(String refresh_token);
 
+    @Query("SELECT m FROM Member m INNER JOIN Block b ON m.id = b.blockedMember.id WHERE b.blockerMember.id = :blockerId AND m.blind = false ORDER BY b.createdAt DESC")
+    Page<Member> findBlockedMembersByBlockerIdAndNotBlind(@Param("blockerId") Long blockerId, Pageable pageable);
+
+
 }

src/main/java/com/gamegoo/service/member/MemberService.java

@@ -3,11 +3,14 @@
 import com.gamegoo.apiPayload.code.status.ErrorStatus;
 import com.gamegoo.apiPayload.exception.handler.BlockHandler;
 import com.gamegoo.apiPayload.exception.handler.MemberHandler;
+import com.gamegoo.apiPayload.exception.handler.PageHandler;
 import com.gamegoo.domain.Block;
 import com.gamegoo.domain.Member;
 import com.gamegoo.repository.member.BlockRepository;
 import com.gamegoo.repository.member.MemberRepository;
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -19,6 +22,8 @@ public class MemberService {
     private final MemberRepository memberRepository;
     private final BlockRepository blockRepository;
 
+    Integer pageSize = 10;
+
     /**
      * memberId에 해당하는 회원이 targetMemberId에 해당하는 회원을 차단
      *
@@ -51,14 +56,35 @@ public Member blockMember(Long memberId, Long targetMemberId) {
         return member;
     }
 
+    /**
+     * memberId에 해당하는 회원이 차단한 회원 목록 조회
+     *
+     * @param memberId
+     * @param pageIdx  0 이상의 값이어야 함
+     * @return
+     */
+    public Page<Member> getBlockList(Long memberId, Integer pageIdx) {
+        // 페이지 값 검증
+        if (pageIdx < 0) {
+            throw new PageHandler(ErrorStatus.PAGE_NOT_VALID);
+        }
+
+        // member 엔티티 조회
+        Member member = memberRepository.findById(memberId).orElseThrow(() -> new MemberHandler(ErrorStatus.MEMBER_NOT_FOUND));
+        PageRequest pageRequest = PageRequest.of(pageIdx, pageSize);
+
+        return memberRepository.findBlockedMembersByBlockerIdAndNotBlind(member.getId(), pageRequest);
+    }
+
     /**
      * 해당 회원이 탈퇴했는지 검증
      *
      * @param member
      */
-    void checkBlind(Member member) {
+    public static boolean checkBlind(Member member) {
         if (member.getBlind()) {
             throw new MemberHandler(ErrorStatus.USER_DEACTIVATED);
         }
+        return false;
     }
 }