Refactor/60 커뮤니티 게시글 조회 기능 리팩토링

src/main/java/com/somemore/center/repository/CenterRepository.java

@@ -14,6 +14,5 @@ default boolean doesNotExistById(UUID id) {
         return !existsById(id);
     }
     Optional<Center> findCenterById(UUID id);
-    String findNameById(UUID id);
     void deleteAllInBatch();
 }

src/main/java/com/somemore/center/repository/CenterRepositoryImpl.java

@@ -1,8 +1,6 @@
 package com.somemore.center.repository;
 
-import com.querydsl.jpa.impl.JPAQueryFactory;
 import com.somemore.center.domain.Center;
-import com.somemore.center.domain.QCenter;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 
@@ -14,7 +12,6 @@
 public class CenterRepositoryImpl implements CenterRepository {
 
     private final CenterJpaRepository centerJpaRepository;
-    private final JPAQueryFactory queryFactory;
 
     @Override
     public Center save(Center center) {
@@ -31,17 +28,6 @@ public Optional<Center> findCenterById(UUID id) {
         return centerJpaRepository.findCenterById(id);
     }
 
-    @Override
-    public String findNameById(UUID id) {
-        QCenter center = QCenter.center;
-
-        return queryFactory
-                .select(center.name)
-                .from(center)
-                .where(center.id.eq(id))
-                .fetchOne();
-    }
-
     @Override
     public void deleteAllInBatch() {
         centerJpaRepository.deleteAllInBatch();

src/main/java/com/somemore/center/service/query/CenterQueryService.java

@@ -1,7 +1,6 @@
 package com.somemore.center.service.query;
 
 import com.somemore.center.domain.Center;
-import com.somemore.center.dto.response.CenterForCommunityResponseDto;
 import com.somemore.center.dto.response.CenterProfileResponseDto;
 import com.somemore.center.dto.response.PreferItemResponseDto;
 import com.somemore.center.repository.CenterRepository;
@@ -45,15 +44,4 @@ private Center getCenterById(UUID centerId) {
         return centerRepository.findCenterById(centerId)
                 .orElseThrow(() -> new BadRequestException(NOT_EXISTS_CENTER.getMessage()));
     }
-
-    @Override
-    public String getNameById(UUID id) {
-        return centerRepository.findNameById(id);
-    }
-
-    @Override
-    public CenterForCommunityResponseDto getCenterDetailForCommunity(UUID id) {
-        Center center = getCenterById(id);
-        return CenterForCommunityResponseDto.fromEntity(center);
-    }
 }

src/main/java/com/somemore/center/usecase/query/CenterQueryUseCase.java

@@ -1,6 +1,5 @@
 package com.somemore.center.usecase.query;
 
-import com.somemore.center.dto.response.CenterForCommunityResponseDto;
 import com.somemore.center.dto.response.CenterProfileResponseDto;
 
 import java.util.UUID;
@@ -9,6 +8,4 @@ public interface CenterQueryUseCase {
 
     CenterProfileResponseDto getCenterProfileByCenterId(UUID centerId);
     void validateCenterExists(UUID centerId);
-    String getNameById(UUID id);
-    CenterForCommunityResponseDto getCenterDetailForCommunity(UUID id);
 }

src/main/java/com/somemore/community/domain/CommunityBoardWithNickname.java

@@ -0,0 +1,11 @@
+package com.somemore.community.domain;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public class CommunityBoardWithNickname {
+    private final CommunityBoard communityBoard;
+    private final String writerNickname;
+}

src/main/java/com/somemore/community/dto/response/CommunityBoardGetDetailResponseDto.java

@@ -5,26 +5,27 @@
 import com.somemore.community.domain.CommunityBoard;
 
 import java.time.LocalDateTime;
+import java.util.UUID;
 
 @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 public record CommunityBoardGetDetailResponseDto(
         Long id,
+        UUID writerId,
         String title,
         String content,
         String imageUrl,
         LocalDateTime createdAt,
-        LocalDateTime updatedAt,
-        WriterDetailDto writerDetailDto
+        LocalDateTime updatedAt
 ) {
-    public static CommunityBoardGetDetailResponseDto fromEntity(CommunityBoard board, WriterDetailDto writer) {
+    public static CommunityBoardGetDetailResponseDto fromEntity(CommunityBoard board) {
         return new CommunityBoardGetDetailResponseDto(
                 board.getId(),
+                board.getWriterId(),
                 board.getTitle(),
                 board.getContent(),
                 board.getImgUrl(),
                 board.getCreatedAt(),
-                board.getUpdatedAt(),
-                writer
+                board.getUpdatedAt()
         );
     }
 }

src/main/java/com/somemore/community/dto/response/CommunityBoardGetResponseDto.java

@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.databind.PropertyNamingStrategies.SnakeCaseStrategy;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
-import com.somemore.community.domain.CommunityBoard;
+import com.somemore.community.domain.CommunityBoardWithNickname;
 
 import java.time.LocalDateTime;
 
@@ -13,12 +13,12 @@ public record CommunityBoardGetResponseDto(
         String writerNickname,
         LocalDateTime createdAt
 ) {
-    public static CommunityBoardGetResponseDto fromEntity(CommunityBoard board, String writerNickname) {
+    public static CommunityBoardGetResponseDto fromEntity(CommunityBoardWithNickname board) {
         return new CommunityBoardGetResponseDto(
-                board.getId(),
-                board.getTitle(),
-                writerNickname,
-                board.getCreatedAt()
+                board.getCommunityBoard().getId(),
+                board.getCommunityBoard().getTitle(),
+                board.getWriterNickname(),
+                board.getCommunityBoard().getCreatedAt()
         );
     }
 }

src/main/java/com/somemore/community/repository/CommunityBoardRepository.java

@@ -1,6 +1,7 @@
 package com.somemore.community.repository;
 
 import com.somemore.community.domain.CommunityBoard;
+import com.somemore.community.domain.CommunityBoardWithNickname;
 
 import java.util.List;
 import java.util.Optional;
@@ -9,7 +10,7 @@
 public interface CommunityBoardRepository {
     CommunityBoard save(CommunityBoard communityBoard);
     Optional<CommunityBoard> findById(Long id);
-    List<CommunityBoard> getCommunityBoards();
-    List<CommunityBoard> findByWriterId(UUID writerId);
+    List<CommunityBoardWithNickname> getCommunityBoards();
+    List<CommunityBoardWithNickname> findByWriterId(UUID writerId);
     void deleteAllInBatch();
 }

src/main/java/com/somemore/community/repository/CommunityRepositoryImpl.java

@@ -1,8 +1,11 @@
 package com.somemore.community.repository;
 
+import com.querydsl.core.types.Projections;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import com.somemore.community.domain.CommunityBoard;
+import com.somemore.community.domain.CommunityBoardWithNickname;
 import com.somemore.community.domain.QCommunityBoard;
+import com.somemore.volunteer.domain.QVolunteer;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 
@@ -34,22 +37,32 @@ public Optional<CommunityBoard> findById(Long id) {
     }
 
     @Override
-    public List<CommunityBoard> getCommunityBoards() {
+    public List<CommunityBoardWithNickname> getCommunityBoards() {
         QCommunityBoard communityBoard = QCommunityBoard.communityBoard;
+        QVolunteer volunteer = QVolunteer.volunteer;
 
         return queryFactory
-                .selectFrom(communityBoard)
+                .select(Projections.constructor(CommunityBoardWithNickname.class,
+                        communityBoard,
+                        volunteer.nickname))
+                .from(communityBoard)
+                .join(volunteer).on(communityBoard.writerId.eq(volunteer.id))
                 .where(communityBoard.deleted.eq(false))
                 .orderBy(communityBoard.createdAt.desc())
                 .fetch();
     }
 
     @Override
-    public List<CommunityBoard> findByWriterId(UUID writerId) {
+    public List<CommunityBoardWithNickname> findByWriterId(UUID writerId) {
         QCommunityBoard communityBoard = QCommunityBoard.communityBoard;
+        QVolunteer volunteer = QVolunteer.volunteer;
 
         return queryFactory
-                .selectFrom(communityBoard)
+                .select(Projections.constructor(CommunityBoardWithNickname.class,
+                        communityBoard,
+                        volunteer.nickname))
+                .from(communityBoard)
+                .join(volunteer).on(communityBoard.writerId.eq(volunteer.id))
                 .where(communityBoard.writerId.eq(writerId)
                         .and(communityBoard.deleted.eq(false))
                 )

src/main/java/com/somemore/community/service/CommunityBoardQueryService.java

@@ -1,15 +1,12 @@
 package com.somemore.community.service;
 
-import com.somemore.center.usecase.query.CenterQueryUseCase;
 import com.somemore.community.domain.CommunityBoard;
+import com.somemore.community.domain.CommunityBoardWithNickname;
 import com.somemore.community.dto.response.CommunityBoardGetDetailResponseDto;
 import com.somemore.community.dto.response.CommunityBoardGetResponseDto;
-import com.somemore.community.dto.response.WriterDetailDto;
 import com.somemore.community.repository.CommunityBoardRepository;
 import com.somemore.community.usecase.CommunityBoardQueryUseCase;
 import com.somemore.global.exception.BadRequestException;
-import com.somemore.volunteer.dto.response.VolunteerForCommunityResponseDto;
-import com.somemore.volunteer.usecase.query.FindVolunteerIdUseCase;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -26,54 +23,29 @@
 public class CommunityBoardQueryService implements CommunityBoardQueryUseCase {
 
     private final CommunityBoardRepository communityBoardRepository;
-    private final CenterQueryUseCase centerQueryUseCase;
-    private final FindVolunteerIdUseCase findVolunteerIdUseCase;
 
     @Override
     public List<CommunityBoardGetResponseDto> getCommunityBoards() {
-        List<CommunityBoard> boards = communityBoardRepository.getCommunityBoards();
+        List<CommunityBoardWithNickname> boards = communityBoardRepository.getCommunityBoards();
 
         return boards.stream()
-                .map(board -> {
-                    String writerNickname = getWriterNickname(board.getWriterId());
-                    return CommunityBoardGetResponseDto.fromEntity(board, writerNickname);
-                })
+                .map(CommunityBoardGetResponseDto::fromEntity)
                 .toList();
     }
 
     @Override
     public List<CommunityBoardGetResponseDto> getCommunityBoardsByWriterId(UUID writerId) {
-        List<CommunityBoard> boards = communityBoardRepository.findByWriterId(writerId);
-        String writerNickname = getWriterNickname(writerId);
+        List<CommunityBoardWithNickname> boards = communityBoardRepository.findByWriterId(writerId);
 
         return boards.stream()
-                .map(board -> CommunityBoardGetResponseDto.fromEntity(board, writerNickname))
+                .map(CommunityBoardGetResponseDto::fromEntity)
                 .toList();
     }
 
     @Override
     public CommunityBoardGetDetailResponseDto getCommunityBoardDetail(Long id) {
         CommunityBoard board = communityBoardRepository.findById(id)
                 .orElseThrow(() -> new BadRequestException(NOT_EXISTS_COMMUNITY_BOARD.getMessage()));
-
-        return CommunityBoardGetDetailResponseDto.fromEntity(board, getWriterDetail(board.getWriterId()));
-    }
-
-    private String getWriterNickname(UUID writerId) {
-        String nickname = findVolunteerIdUseCase.getNicknameById(writerId);
-
-        if (nickname == null) {
-            nickname = centerQueryUseCase.getNameById(writerId);
-        }
-        return nickname;
-    }
-
-    private WriterDetailDto getWriterDetail(UUID writerId) {
-        VolunteerForCommunityResponseDto volunteer = findVolunteerIdUseCase.getVolunteerDetailForCommunity(writerId);
-
-        if (volunteer == null) {
-            return centerQueryUseCase.getCenterDetailForCommunity(writerId);
-        }
-        return volunteer;
+        return CommunityBoardGetDetailResponseDto.fromEntity(board);
     }
 }

src/main/java/com/somemore/volunteer/repository/VolunteerDetailRepository.java

@@ -7,6 +7,5 @@
 import java.util.UUID;
 
 public interface VolunteerDetailRepository extends JpaRepository<VolunteerDetail, Long> {
-
     Optional<VolunteerDetail> findByVolunteerId(UUID volunteerId);
 }

src/main/java/com/somemore/volunteer/repository/VolunteerJpaRepository.java

@@ -4,9 +4,7 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.Optional;
-import java.util.UUID;
 
 public interface VolunteerJpaRepository extends JpaRepository<Volunteer, Long> {
-    Volunteer findById(UUID id);
     Optional<Volunteer> findByOauthId(String oauthId);
 }

src/main/java/com/somemore/volunteer/repository/VolunteerRepository.java

@@ -9,7 +9,6 @@
 @Repository
 public interface VolunteerRepository {
     Volunteer save(Volunteer volunteer);
-    Volunteer findById(UUID id);
     String findNicknameById(UUID id);
     Optional<Volunteer> findByOauthId(String oauthId);
     void deleteAllInBatch();