Skip to content

Refactor/51 커뮤니티 게시글 id로 조회 로직 QueryDSL로 변경 #54

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

Merged
merged 5 commits into from
Nov 26, 2024
Merged

Refactor/51 커뮤니티 게시글 id로 조회 로직 QueryDSL로 변경 #54

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
394a2d2
test(community): CommunityBoard id로 조회 테스트 수정 및 예외 추가
ayoung-dev Nov 26, 2024
6c410fa
test(community): CommunityBoard id로 조회 Service 및 Repository 수정
ayoung-dev Nov 26, 2024
135b111
test(community): CommunityBoard id로 조회 테스트 수정 및 예외 추가
ayoung-dev Nov 26, 2024
a699ffd
Merge branch 'main' into refactor/51-modify-community-board-get
ayoung-dev Nov 26, 2024
e04e611
refactor(community): repository getCommunityBoardWithId -> findById, …
ayoung-dev Nov 26, 2024
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
2 changes: 1 addition & 1 deletion src/main/java/com/somemore/community/repository/CommunityBoardRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

public interface CommunityBoardRepository {
CommunityBoard save(CommunityBoard communityBoard);
Optional<CommunityBoard> findById(Long id);
Optional<CommunityBoard> getCommunityBoardWithId(Long id);
Copy link
Collaborator

@m-a-king m-a-king Nov 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. repository에서 find 키워드를 더 많이 사용하지 않나요?
  2. CommunityBoardRepository라면 findById만 사용하면 되지 않나요?
Suggested change
Optional<CommunityBoard> getCommunityBoardWithId(Long id);
Optional<CommunityBoard> findById(Long id);

Copy link
Collaborator

@m-a-king m-a-king Nov 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2번 설명이 좀 부족했는데, get을 사용하더라도

getById()
getWithId()

로 처리 가능하지 않은지 여쭤본 겁니다!

List<CommunityBoard> getCommunityBoards();
List<CommunityBoard> getCommunityBoardsByWriterId(UUID writerId);
void deleteAllInBatch();
Expand Down
10 changes: 8 additions & 2 deletions src/main/java/com/somemore/community/repository/CommunityRepositoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,14 @@ public CommunityBoard save(CommunityBoard communityBoard) {
}

@Override
public Optional<CommunityBoard> findById(Long id) {
return communityBoardJpaRepository.findById(id);
public Optional<CommunityBoard> getCommunityBoardWithId(Long id) {
QCommunityBoard communityBoard = QCommunityBoard.communityBoard;

return Optional.ofNullable(queryFactory
.selectFrom(communityBoard)
.where(communityBoard.id.eq(id)
.and(communityBoard.deleted.eq(false)))
.fetchOne());
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/somemore/community/service/query/CommunityBoardQueryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public List<CommunityBoardGetResponseDto> getCommunityBoardsByWriterId(UUID writ

@Override
public CommunityBoardGetDetailResponseDto getCommunityBoardDetail(Long id) {
CommunityBoard board = communityBoardRepository.findById(id)
CommunityBoard board = communityBoardRepository.getCommunityBoardWithId(id)
.orElseThrow(() -> new BadRequestException(NOT_EXISTS_COMMUNITY_BOARD.getMessage()));

return CommunityBoardGetDetailResponseDto.fromEntity(board, getWriterDetail(board.getWriterId()));
Expand Down
27 changes: 24 additions & 3 deletions src/test/java/com/somemore/community/repository/CommunityRepositoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ class CommunityRepositoryTest extends IntegrationTestSupport {
@Autowired
private CommunityBoardRepository communityBoardRepository;

@DisplayName("커뮤니티 id로 커뮤니티 상세 정보를 조회할 수 있다. (Repository)")
@DisplayName("커뮤니티 게시글 id로 커뮤니티 상세 정보를 조회할 수 있다. (Repository)")
@Test
void findById() {
void getCommunityBoardById() {
//given
CommunityBoard communityBoard = CommunityBoard.builder()
.title("테스트 커뮤니티 게시글 제목")
Expand All @@ -33,7 +33,7 @@ void findById() {
communityBoardRepository.save(communityBoard);

//when
Optional<CommunityBoard> foundCommunityBoard = communityBoardRepository.findById(communityBoard.getId());
Optional<CommunityBoard> foundCommunityBoard = communityBoardRepository.getCommunityBoardWithId(communityBoard.getId());

//then
assertThat(foundCommunityBoard).isNotNull();
Expand All @@ -43,6 +43,27 @@ void findById() {
assertThat(foundCommunityBoard.get().getWriterId()).isEqualTo(communityBoard.getWriterId());
}

@DisplayName("삭제된 커뮤니티 id로 커뮤니티 상세 정보를 조회할 때 예외를 반환할 수 있다. (Repository)")
@Test
void getCommunityBoardByDeletedId() {
//given
CommunityBoard communityBoard = CommunityBoard.builder()
.title("테스트 커뮤니티 게시글 제목")
.content("테스트 커뮤니티 게시글 내용")
.imgUrl("http://community.example.com/123")
.writerId(UUID.randomUUID())
.build();

communityBoardRepository.save(communityBoard);
communityBoardRepository.deleteAllInBatch();

//when
Optional<CommunityBoard> foundCommunityBoard = communityBoardRepository.getCommunityBoardWithId(communityBoard.getId());

//then
assertThat(foundCommunityBoard).isEmpty();
}

@DisplayName("저장된 전체 커뮤니티 게시글을 목록으로 조회할 수 있다. (Repository)")
@Test
void getCommunityBoards() {
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/somemore/community/service/command/CreateCommunityBoardServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ void createCommunityWithDto() {
Long communityId = createCommunityBoardService.createCommunityBoard(dto, writerId, imgUrl);

//then
Optional<CommunityBoard> communityBoard = communityBoardRepository.findById(communityId);
Optional<CommunityBoard> communityBoard = communityBoardRepository.getCommunityBoardWithId(communityId);

assertThat(communityBoard).isPresent();
assertThat(communityBoard.get().getId()).isEqualTo(communityId);
Expand All @@ -67,7 +67,7 @@ void createCommunityWithoutImgUrl() {
Long communityId = createCommunityBoardService.createCommunityBoard(dto, writerId, imgUrl);

//then
Optional<CommunityBoard> communityBoard = communityBoardRepository.findById(communityId);
Optional<CommunityBoard> communityBoard = communityBoardRepository.getCommunityBoardWithId(communityId);

assertThat(communityBoard).isPresent();
assertThat(communityBoard.get().getId()).isEqualTo(communityId);
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/com/somemore/community/service/query/CommunityBoardQueryServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ void getAllCommunityBoards() {
List<CommunityBoardGetResponseDto> dtos = communityBoardQueryService.getCommunityBoards();

// then
Optional<CommunityBoard> communityBoard1 = communityBoardRepository.findById(communityId1);
Optional<CommunityBoard> communityBoard2 = communityBoardRepository.findById(communityId2);
Optional<CommunityBoard> communityBoard1 = communityBoardRepository.getCommunityBoardWithId(communityId1);
Optional<CommunityBoard> communityBoard2 = communityBoardRepository.getCommunityBoardWithId(communityId2);


assertThat(dtos)
Expand Down Expand Up @@ -135,8 +135,8 @@ void getCommunityBoardsByWriter() {
List<CommunityBoardGetResponseDto> dtos = communityBoardQueryService.getCommunityBoardsByWriterId(volunteer.getId());

//then
Optional<CommunityBoard> communityBoard1 = communityBoardRepository.findById(communityId1);
Optional<CommunityBoard> communityBoard2 = communityBoardRepository.findById(communityId2);
Optional<CommunityBoard> communityBoard1 = communityBoardRepository.getCommunityBoardWithId(communityId1);
Optional<CommunityBoard> communityBoard2 = communityBoardRepository.getCommunityBoardWithId(communityId2);

assertThat(dtos)
.isNotNull()
Expand Down