Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor: 공동저자로 되어있는 다이어리를 포함하여 저자의 다이어리 조회할때 첫페이지에 5개씩 반환 안되던 오류 수정 #130

Merged
merged 1 commit into from
Aug 10, 2024
Merged

Refactor: 공동저자로 되어있는 다이어리를 포함하여 저자의 다이어리 조회할때 첫페이지에 5개씩 반환 안되던 오류 수정 #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 17 additions & 22 deletions src/main/java/com/codiary/backend/global/service/PostService/PostQueryServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,25 +80,34 @@ public Page<Post> getPostsByCategories(Optional<String> optSearch, int page, int
// return postRepository.findByMemberOrderByCreatedAtDescPostIdDesc(member, request);
// }


@Override
public Page<Post> getPostsByMember(Long memberId, int page, int size) {
PageRequest request = PageRequest.of(page, size);
Member member = memberRepository.findById(memberId)
.orElseThrow(() -> new IllegalArgumentException("Member not found"));
Page<Post> postsByMember = postRepository.findByMemberOrderByCreatedAtDescPostIdDesc(member, request);
Page<Post> postsByCoauthor = postRepository.findByAuthorsList_MemberOrderByCreatedAtDescPostIdDesc(member, request);
List<Post> postsByMember = postRepository.findByMemberOrderByCreatedAtDescPostIdDesc(member, PageRequest.of(0, Integer.MAX_VALUE)).getContent();
List<Post> postsByCoauthor = postRepository.findByAuthorsList_MemberOrderByCreatedAtDescPostIdDesc(member, PageRequest.of(0, Integer.MAX_VALUE)).getContent();

List<Post> combinedPosts = new ArrayList<>();
combinedPosts.addAll(postsByMember);
combinedPosts.addAll(postsByCoauthor);

if (postsByMember.isEmpty() && postsByCoauthor.isEmpty()) {
if (combinedPosts.isEmpty()) {
throw new PostHandler(ErrorStatus.POST_NOT_EXIST_BY_MEMBER);
}
// 두 개의 결과를 하나의 리스트로 병합
List<Post> combinedPosts = new ArrayList<>();
combinedPosts.addAll(postsByMember.getContent());
combinedPosts.addAll(postsByCoauthor.getContent());
return new PageImpl<>(combinedPosts, request, combinedPosts.size());
combinedPosts.sort(Comparator.comparing(Post::getCreatedAt).reversed());

int start = Math.min(page * size, combinedPosts.size());
int end = Math.min((page + 1) * size, combinedPosts.size());

return new PageImpl<>(combinedPosts.subList(start, end), request, combinedPosts.size());
}





@Override
public Page<Post> getPostsByTeam(Long teamId, int page, int size) {
PageRequest request = PageRequest.of(page, size);
Expand Down Expand Up @@ -140,20 +149,6 @@ public Page<Post> getPostsByTeamInProject(Long projectId, Long teamId, int page,
return postRepository.findByProjectAndTeamOrderByCreatedAtDescPostIdDesc(project, team, request);
}

// @Override
// public Page<Post> getPostsByMemberInTeam(Long teamId, Long memberId, int page, int size) {
// PageRequest request = PageRequest.of(page, size);
// Team team = teamRepository.findById(teamId).get();
// Member member = memberRepository.findById(memberId).get();
//
// if (!postRepository.existsByTeam(team)){
// throw new PostHandler(ErrorStatus.POST_NOT_EXIST_BY_TEAM);
// }
// if (!postRepository.existsByMember(member)){
// throw new PostHandler(ErrorStatus.POST_NOT_EXIST_BY_MEMBER);
// }
// return postRepository.findByTeamAndMemberOrderByCreatedAtDescPostIdDesc(team, member, request);
// }

@Override
public Page<Post> getPostsByMemberInTeam(Long teamId, Long memberId, int page, int size) {
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/codiary/backend/global/web/controller/PostController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public ApiResponse<PostResponseDTO.MemberPostPreviewListDTO> findPostByMember(@P
// 팀의 다이어리 리스트 페이징 조회
@GetMapping("/team/{teamId}/paging")
@Operation(summary = "팀의 다이어리 리스트 페이징 조회 API", description = "팀의 다이어리 리스트를 페이징으로 조회하기 위해 'Path Variable'로 해당 팀의 'teamId'를 받습니다. **첫 페이지는 0부터 입니다.**", security = @SecurityRequirement(name = "accessToken"))
public ApiResponse<PostResponseDTO.TeamPostPreviewListDTO> findPostByTeam(@PathVariable Long teamId, @RequestParam @Min(0) Integer page, @RequestParam @Min(1) @Max(5) Integer size){
public ApiResponse<PostResponseDTO.TeamPostPreviewListDTO> findPostByTeam(@PathVariable Long teamId, @RequestParam @Min(0) Integer page, @RequestParam @Min(1) @Max(6) Integer size){
Page<Post> posts = postQueryService.getPostsByTeam(teamId, page, size);
return ApiResponse.onSuccess(SuccessStatus.POST_OK, PostConverter.toTeamPostPreviewListDTO(posts));
}
Expand All @@ -133,7 +133,7 @@ public ApiResponse<PostResponseDTO.TeamPostPreviewListDTO> findPostByTeam(@PathV
// 프로젝트별 저자의 다이어리 리스트 페이징 조회
@GetMapping("/project/{projectId}/member/{memberId}/paging")
@Operation(summary = "프로젝트별 저자의 다이어리 리스트 페이징 조회 API", description = "프로젝트별 저자의 다이어리 리스트를 페이징으로 조회하기 위해 'Path Variable'로 해당 프로젝트의 'projectId'와 저자의 'memberId'를 받습니다. **첫 페이지는 0부터 입니다.**", security = @SecurityRequirement(name = "accessToken"))
public ApiResponse<PostResponseDTO.MemberPostInProjectPreviewListDTO> findPostByMemberInProject(@PathVariable Long projectId, @PathVariable Long memberId, @RequestParam @Min(0) Integer page, @RequestParam @Min(1) @Max(5) Integer size){
public ApiResponse<PostResponseDTO.MemberPostInProjectPreviewListDTO> findPostByMemberInProject(@PathVariable Long projectId, @PathVariable Long memberId, @RequestParam @Min(0) Integer page, @RequestParam @Min(1) @Max(6) Integer size){
Page<Post> posts = postQueryService.getPostsByMemberInProject(projectId, memberId, page, size);
return ApiResponse.onSuccess(SuccessStatus.POST_OK, PostConverter.toMemberPostInProjectPreviewListDTO(posts));
}
Expand All @@ -142,7 +142,7 @@ public ApiResponse<PostResponseDTO.MemberPostInProjectPreviewListDTO> findPostBy
// 프로젝트별 팀의 다이어리 리스트 페이징 조회
@GetMapping("/project/{projectId}/team/{teamId}/paging")
@Operation(summary = "프로젝트별 팀의 다이어리 리스트 페이징 조회 API", description = "프로젝트별 팀의 다이어리 리스트를 페이징으로 조회하기 위해 'Path Variable'로 해당 프로젝트의 'projectId'와 팀의 'teamId'를 받습니다. **첫 페이지는 0부터 입니다.**", security = @SecurityRequirement(name = "accessToken"))
public ApiResponse<PostResponseDTO.TeamPostInProjectPreviewListDTO> findPostByTeamInProject(@PathVariable Long projectId, @PathVariable Long teamId, @RequestParam @Min(0) Integer page, @RequestParam @Min(1) @Max(5) Integer size){
public ApiResponse<PostResponseDTO.TeamPostInProjectPreviewListDTO> findPostByTeamInProject(@PathVariable Long projectId, @PathVariable Long teamId, @RequestParam @Min(0) Integer page, @RequestParam @Min(1) @Max(6) Integer size){
Page<Post> posts = postQueryService.getPostsByTeamInProject(projectId, teamId, page, size);
return ApiResponse.onSuccess(SuccessStatus.POST_OK, PostConverter.toTeamPostInProjectPreviewListDTO(posts));
}
Expand All @@ -151,7 +151,7 @@ public ApiResponse<PostResponseDTO.TeamPostInProjectPreviewListDTO> findPostByTe
// 팀별 저자의 다이어리 리스트 페이징 조회
@GetMapping("/team/{teamId}/member/{memberId}/paging")
@Operation(summary = "팀별 저자의 다이어리 리스트 페이징 조회 API", description = "팀별 저자의 다이어리 리스트를 페이징으로 조회하기 위해 'Path Variable'로 해당 팀의 'teamId'와 저자의 'memberId'를 받습니다. **첫 페이지는 0부터 입니다.**", security = @SecurityRequirement(name = "accessToken"))
public ApiResponse<PostResponseDTO.MemberPostInTeamPreviewListDTO> findPostByMemberInTeam(@PathVariable Long teamId, @PathVariable Long memberId, @RequestParam @Min(0) Integer page, @RequestParam @Min(1) @Max(5) Integer size){
public ApiResponse<PostResponseDTO.MemberPostInTeamPreviewListDTO> findPostByMemberInTeam(@PathVariable Long teamId, @PathVariable Long memberId, @RequestParam @Min(0) Integer page, @RequestParam @Min(1) @Max(6) Integer size){
Page<Post> posts = postQueryService.getPostsByMemberInTeam(teamId, memberId, page, size);
return ApiResponse.onSuccess(SuccessStatus.POST_OK, PostConverter.toMemberPostInTeamPreviewListDTO(posts));
}
Expand Down
Loading