[POTATO-50] QueryProjection 방식으로 리팩토링.

potato-api/src/main/java/com/potato/api/controller/board/organization/OrganizationBoardRetrieveController.java

@@ -3,7 +3,7 @@
 import com.potato.api.config.argumentResolver.MemberId;
 import com.potato.api.config.interceptor.auth.Auth;
 import com.potato.api.controller.ApiResponse;
-import com.potato.domain.domain.board.organization.repository.dto.BoardWithOrganizationDto;
+import com.potato.api.service.board.organization.dto.response.OrganizationBoardWithOrganizationResponse;
 import com.potato.api.service.board.organization.OrganizationBoardRetrieveService;
 import com.potato.api.service.board.organization.dto.request.*;
 import com.potato.api.service.board.organization.dto.response.OrganizationBoardInfoResponse;
@@ -34,7 +34,7 @@ public ApiResponse<OrganizationBoardWithCreatorInfoResponse> retrieveBoardWithOr
 
     @Operation(summary = "전체 그룹 게시물을 스크롤 페이지네이션 기반으로 조회하는 API")
     @GetMapping("/api/v2/organization/board/list")
-    public ApiResponse<List<BoardWithOrganizationDto>> retrieveLatestOrganizationBoardList(@Valid RetrieveLatestBoardsRequest request) {
+    public ApiResponse<List<OrganizationBoardWithOrganizationResponse>> retrieveLatestOrganizationBoardList(@Valid RetrieveLatestBoardsRequest request) {
         return ApiResponse.success(organizationBoardRetrieveService.retrieveBoardsWithPagination(request.getType(), request.getLastOrganizationBoardId(), request.getSize()));
     }
 
@@ -52,7 +52,7 @@ public ApiResponse<List<OrganizationBoardInfoResponse>> retrievePopularBoard(@Va
 
     @Operation(summary = "특정 그룹의 게시물을 스크롤 페이지네이션 기반으로 조회하는 API")
     @GetMapping("/api/v2/organization/board/list/in/{subDomain}")
-    public ApiResponse<List<BoardWithOrganizationDto>> getBoardsInOrganization(@PathVariable String subDomain, @Valid RetrieveLatestBoardsRequest request) {
+    public ApiResponse<List<OrganizationBoardWithOrganizationResponse>> getBoardsInOrganization(@PathVariable String subDomain, @Valid RetrieveLatestBoardsRequest request) {
         return ApiResponse.success(organizationBoardRetrieveService.getBoardsInOrganization(subDomain, request.getType(), request.getLastOrganizationBoardId(), request.getSize()));
     }
 

potato-api/src/main/java/com/potato/api/service/board/organization/OrganizationBoardRetrieveService.java

@@ -1,6 +1,6 @@
 package com.potato.api.service.board.organization;
 
-import com.potato.domain.domain.board.organization.repository.dto.BoardWithOrganizationDto;
+import com.potato.api.service.board.organization.dto.response.OrganizationBoardWithOrganizationResponse;
 import com.potato.domain.domain.image.BoardImageRepository;
 import com.potato.domain.domain.board.BoardType;
 import com.potato.domain.domain.board.organization.OrganizationBoard;
@@ -53,9 +53,9 @@ private List<String> getBoardHashTags(Long boardId) {
     }
 
     @Transactional(readOnly = true)
-    public List<BoardWithOrganizationDto> retrieveBoardsWithPagination(OrganizationBoardCategory type, long lastOrganizationBoardId, int size) {
+    public List<OrganizationBoardWithOrganizationResponse> retrieveBoardsWithPagination(OrganizationBoardCategory type, long lastOrganizationBoardId, int size) {
         return organizationBoardRepository.findAllWithOrganizationByTypeLessThanOrderByIdDescLimit(null, type, lastOrganizationBoardId, size).stream()
-            .map(boardWithOrganizationDto -> boardWithOrganizationDto.setImageUrls(OrganizationBoardServiceUtils.findOrganizationBoardImage(boardImageRepository, boardWithOrganizationDto.getBoardId())))
+            .map(boardWithOrganizationDto -> OrganizationBoardWithOrganizationResponse.of(boardWithOrganizationDto, OrganizationBoardServiceUtils.findOrganizationBoardImage(boardImageRepository, boardWithOrganizationDto.getBoardId())))
             .collect(Collectors.toList());
     }
 
@@ -75,9 +75,9 @@ public List<OrganizationBoardInfoResponse> retrievePopularBoard(int size) {
     }
 
     @Transactional(readOnly = true)
-    public List<BoardWithOrganizationDto> getBoardsInOrganization(String subDomain, OrganizationBoardCategory type, long lastOrganizationBoardId, int size) {
+    public List<OrganizationBoardWithOrganizationResponse> getBoardsInOrganization(String subDomain, OrganizationBoardCategory type, long lastOrganizationBoardId, int size) {
         return organizationBoardRepository.findAllWithOrganizationByTypeLessThanOrderByIdDescLimit(subDomain, type, lastOrganizationBoardId, size).stream()
-            .map(boardWithOrganizationDto -> boardWithOrganizationDto.setImageUrls(OrganizationBoardServiceUtils.findOrganizationBoardImage(boardImageRepository, boardWithOrganizationDto.getBoardId())))
+            .map(boardWithOrganizationDto -> OrganizationBoardWithOrganizationResponse.of(boardWithOrganizationDto, OrganizationBoardServiceUtils.findOrganizationBoardImage(boardImageRepository, boardWithOrganizationDto.getBoardId())))
             .collect(Collectors.toList());
     }
 

potato-api/src/main/java/com/potato/api/service/board/organization/dto/response/OrganizationBoardWithOrganizationResponse.java

@@ -0,0 +1,78 @@
+package com.potato.api.service.board.organization.dto.response;
+
+import com.potato.api.service.common.dto.response.BaseTimeResponse;
+import com.potato.domain.domain.board.organization.OrganizationBoardCategory;
+import com.potato.domain.domain.board.organization.repository.dto.BoardWithOrganizationDto;
+import com.potato.domain.domain.organization.OrganizationCategory;
+import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+@ToString
+@Getter
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class OrganizationBoardWithOrganizationResponse extends BaseTimeResponse {
+
+    private String orgSubDomain;
+    private String orgName;
+    private OrganizationCategory orgCategory;
+    private String orgProfileUrl;
+    private String orgDescription;
+    private int orgMembersCount;
+    private int orgFollowersCount;
+
+    private Long boardId;
+    private String boardTitle;
+    private String boardContent;
+    private OrganizationBoardCategory boardCategory;
+    private LocalDateTime boardStartDateTime;
+    private LocalDateTime boardEndDateTime;
+    private final List<String> imageUrls = new ArrayList<>();
+
+    @Builder
+    public OrganizationBoardWithOrganizationResponse(String orgSubDomain, String orgName, OrganizationCategory orgCategory,
+                                                     String orgProfileUrl, String orgDescription, int orgMembersCount, int orgFollowersCount,
+                                                     Long boardId, String boardTitle, String boardContent, OrganizationBoardCategory boardCategory,
+                                                     LocalDateTime boardStartDateTime, LocalDateTime boardEndDateTime) {
+        this.orgSubDomain = orgSubDomain;
+        this.orgName = orgName;
+        this.orgCategory = orgCategory;
+        this.orgProfileUrl = orgProfileUrl;
+        this.orgDescription = orgDescription;
+        this.orgMembersCount = orgMembersCount;
+        this.orgFollowersCount = orgFollowersCount;
+        this.boardId = boardId;
+        this.boardTitle = boardTitle;
+        this.boardContent = boardContent;
+        this.boardCategory = boardCategory;
+        this.boardStartDateTime = boardStartDateTime;
+        this.boardEndDateTime = boardEndDateTime;
+    }
+
+    public static OrganizationBoardWithOrganizationResponse of(BoardWithOrganizationDto dto, List<String> imageUrls) {
+        OrganizationBoardWithOrganizationResponse response = OrganizationBoardWithOrganizationResponse.builder()
+            .orgSubDomain(dto.getOrgSubDomain())
+            .orgName(dto.getOrgName())
+            .orgCategory(dto.getOrgCategory())
+            .orgProfileUrl(dto.getOrgProfileUrl())
+            .orgDescription(dto.getOrgDescription())
+            .orgMembersCount(dto.getOrgMembersCount())
+            .orgFollowersCount(dto.getOrgFollowersCount())
+            .boardId(dto.getBoardId())
+            .boardTitle(dto.getBoardTitle())
+            .boardContent(dto.getBoardContent())
+            .boardCategory(dto.getBoardCategory())
+            .boardStartDateTime(dto.getBoardStartDateTime())
+            .boardEndDateTime(dto.getBoardEndDateTime())
+            .build();
+        response.setBaseTime(dto.getCreatedDateTime(), dto.getLastModifiedDateTime());
+        return response;
+    }
+
+}

potato-api/src/main/java/com/potato/api/service/common/dto/response/BaseTimeResponse.java

@@ -19,4 +19,9 @@ protected void setBaseTime(BaseTimeEntity entity) {
         this.lastModifiedDateTime = entity.getLastModifiedDateTime();
     }
 
+    protected void setBaseTime(LocalDateTime createdDateTime, LocalDateTime lastModifiedDateTime) {
+        this.createdDateTime = createdDateTime;
+        this.lastModifiedDateTime = lastModifiedDateTime;
+    }
+
 }

potato-api/src/test/java/com/potato/api/service/board/OrganizationBoardRetrieveServiceTest.java

@@ -1,10 +1,10 @@
 package com.potato.api.service.board;
 
+import com.potato.api.service.board.organization.dto.response.OrganizationBoardWithOrganizationResponse;
 import com.potato.domain.domain.board.organization.OrganizationBoard;
 import com.potato.domain.domain.board.organization.OrganizationBoardCategory;
 import com.potato.domain.domain.board.organization.OrganizationBoardCreator;
 import com.potato.domain.domain.board.organization.OrganizationBoardRepository;
-import com.potato.domain.domain.board.organization.repository.dto.BoardWithOrganizationDto;
 import com.potato.api.service.OrganizationMemberSetUpTest;
 import com.potato.api.service.board.organization.OrganizationBoardRetrieveService;
 import com.potato.api.service.board.organization.dto.response.OrganizationBoardInfoResponse;
@@ -45,13 +45,13 @@ void cleanUp() {
         organizationBoardRepository.saveAll(Arrays.asList(organizationBoard1, organizationBoard2, organizationBoard3));
 
         //when
-        List<BoardWithOrganizationDto> responses = organizationBoardService.retrieveBoardsWithPagination(null, 0, 3);
+        List<OrganizationBoardWithOrganizationResponse> responses = organizationBoardService.retrieveBoardsWithPagination(null, 0, 3);
 
         //then
         assertThat(responses).hasSize(3);
-        assertOrganizationBoardWithCreatorInfo(responses.get(0), organizationBoard3);
-        assertOrganizationBoardWithCreatorInfo(responses.get(1), organizationBoard2);
-        assertOrganizationBoardWithCreatorInfo(responses.get(2), organizationBoard1);
+        assertOrganizationBoardWithOrganizationResponse(responses.get(0), organizationBoard3);
+        assertOrganizationBoardWithOrganizationResponse(responses.get(1), organizationBoard2);
+        assertOrganizationBoardWithOrganizationResponse(responses.get(2), organizationBoard1);
     }
 
     @DisplayName("게시물 조회시 마지막 게시물의 id가 따로 지정되지 않으면, 가장 최신의 게시물 N개가 조회된다.")
@@ -64,17 +64,17 @@ void cleanUp() {
         organizationBoardRepository.saveAll(Arrays.asList(organizationBoard1, organizationBoard2));
 
         //when
-        List<BoardWithOrganizationDto> responses = organizationBoardService.retrieveBoardsWithPagination(null, 0, 1);
+        List<OrganizationBoardWithOrganizationResponse> responses = organizationBoardService.retrieveBoardsWithPagination(null, 0, 1);
 
         //then
         assertThat(responses).hasSize(1);
-        assertOrganizationBoardWithCreatorInfo(responses.get(0), organizationBoard2);
+        assertOrganizationBoardWithOrganizationResponse(responses.get(0), organizationBoard2);
     }
 
     @Test
     void 게시물_조회시_없을_경우_NULL이_아닌_빈리스트를_반환() {
         //given
-        List<BoardWithOrganizationDto> responses = organizationBoardService.retrieveBoardsWithPagination(null, 0, 3);
+        List<OrganizationBoardWithOrganizationResponse> responses = organizationBoardService.retrieveBoardsWithPagination(null, 0, 3);
 
         //then
         assertThat(responses).isEmpty();
@@ -91,11 +91,11 @@ void cleanUp() {
         organizationBoardRepository.saveAll(Arrays.asList(organizationBoard1, organizationBoard2, organizationBoard3));
 
         //when
-        List<BoardWithOrganizationDto> responses = organizationBoardService.retrieveBoardsWithPagination(null, organizationBoard3.getId(), 1);
+        List<OrganizationBoardWithOrganizationResponse> responses = organizationBoardService.retrieveBoardsWithPagination(null, organizationBoard3.getId(), 1);
 
         //then
         assertThat(responses).hasSize(1);
-        assertOrganizationBoardWithCreatorInfo(responses.get(0), organizationBoard2);
+        assertOrganizationBoardWithOrganizationResponse(responses.get(0), organizationBoard2);
     }
 
     @Test
@@ -108,11 +108,11 @@ void cleanUp() {
         organizationBoardRepository.saveAll(Arrays.asList(organizationBoard1, organizationBoard2, organizationBoard3));
 
         //when
-        List<BoardWithOrganizationDto> responses = organizationBoardService.retrieveBoardsWithPagination(OrganizationBoardCategory.RECRUIT, organizationBoard3.getId(), 1);
+        List<OrganizationBoardWithOrganizationResponse> responses = organizationBoardService.retrieveBoardsWithPagination(OrganizationBoardCategory.RECRUIT, organizationBoard3.getId(), 1);
 
         //then
         assertThat(responses).hasSize(1);
-        assertOrganizationBoardWithCreatorInfo(responses.get(0), organizationBoard1);
+        assertOrganizationBoardWithOrganizationResponse(responses.get(0), organizationBoard1);
     }
 
     @Test
@@ -122,7 +122,7 @@ void cleanUp() {
         organizationBoardRepository.save(organizationBoard1);
 
         //when
-        List<BoardWithOrganizationDto> responses = organizationBoardService.retrieveBoardsWithPagination(null, organizationBoard1.getId(), 3);
+        List<OrganizationBoardWithOrganizationResponse> responses = organizationBoardService.retrieveBoardsWithPagination(null, organizationBoard1.getId(), 3);
 
         //then
         assertThat(responses).isEmpty();
@@ -181,7 +181,7 @@ void cleanUp() {
         assertOrganizationBoardInfo(responses.get(1), organizationBoard2);
     }
 
-    private void assertOrganizationBoardWithCreatorInfo(BoardWithOrganizationDto boardWithOrganizationDto, OrganizationBoard organizationBoard) {
+    private void assertOrganizationBoardWithOrganizationResponse(OrganizationBoardWithOrganizationResponse boardWithOrganizationDto, OrganizationBoard organizationBoard) {
         assertThat(boardWithOrganizationDto.getBoardId()).isEqualTo(organizationBoard.getId());
         assertThat(boardWithOrganizationDto.getOrgSubDomain()).isEqualTo(organizationBoard.getSubDomain());
         assertThat(boardWithOrganizationDto.getBoardTitle()).isEqualTo(organizationBoard.getTitle());

potato-domain/src/main/java/com/potato/domain/domain/board/organization/repository/OrganizationBoardRepositoryCustomImpl.java

@@ -3,7 +3,7 @@
 import com.potato.domain.domain.board.organization.OrganizationBoard;
 import com.potato.domain.domain.board.organization.OrganizationBoardCategory;
 import com.potato.domain.domain.board.organization.repository.dto.BoardWithOrganizationDto;
-import com.querydsl.core.types.Projections;
+import com.potato.domain.domain.board.organization.repository.dto.QBoardWithOrganizationDto;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import lombok.RequiredArgsConstructor;
@@ -41,22 +41,22 @@ public OrganizationBoard findOrganizationBoardByIdAndSubDomain(Long organization
 
     @Override
     public List<BoardWithOrganizationDto> findAllWithOrganizationByTypeLessThanOrderByIdDescLimit(String subDomain, OrganizationBoardCategory category, long lastOrganizationBoardId, int size) {
-        return queryFactory.select(Projections.fields(BoardWithOrganizationDto.class,
-            organizationBoard.subDomain.as("orgSubDomain"),
-            organization.name.as("orgName"),
-            organization.category.as("orgCategory"),
-            organization.profileUrl.as("orgProfileUrl"),
-            organization.description.as("orgDescription"),
-            organization.membersCount.as("orgMembersCount"),
-            organization.followersCount.as("orgFollowersCount"),
-            organizationBoard.id.as("boardId"),
-            organizationBoard.boardInfo.title.as("boardTitle"),
-            organizationBoard.boardInfo.content.as("boardContent"),
-            organizationBoard.category.as("boardCategory"),
-            organizationBoard.dateTimeInterval.startDateTime.as("boardStartDateTime"),
-            organizationBoard.dateTimeInterval.endDateTime.as("boardEndDateTime"),
-            organizationBoard.createdDateTime,
-            organizationBoard.lastModifiedDateTime
+        return queryFactory.select(new QBoardWithOrganizationDto(
+            organization.subDomain,
+            organization.name,
+            organization.category,
+            organization.profileUrl,
+            organization.description,
+            organization.membersCount,
+            organization.followersCount,
+            organizationBoard.id,
+            organizationBoard.boardInfo.title,
+            organizationBoard.boardInfo.content,
+            organizationBoard.category,
+            organizationBoard.dateTimeInterval.startDateTime,
+            organizationBoard.dateTimeInterval.endDateTime,
+            organization.createdDateTime,
+            organization.lastModifiedDateTime
         ))
             .from(organizationBoard)
             .innerJoin(organization).on(organizationBoard.subDomain.eq(organization.subDomain))