From 052c1a35d182d87af88b80efddf3ddb4915dba1e Mon Sep 17 00:00:00 2001 From: jjuny-won <101424642+jjuny-won@users.noreply.github.com> Date: Wed, 22 Jan 2025 05:32:47 +0900 Subject: [PATCH] =?UTF-8?q?[CICD]=20API=20=EC=88=98=EC=A0=95=20=EB=B0=B0?= =?UTF-8?q?=ED=8F=AC=20(#135)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * #128 [fix] 이미지 return 값 수정 (#129) * Fix/#128 (#131) * #128 [fix] 이미지 return 값 수정 * #128 [fix] scrap 오류 수정 * #128 [fix] tool scrap 오류 수정 * #133 [fix] board scrap 오류 수정 (#134) * #133 [fix] board scrap 오류 수정 * #133 [fix] board scrap 오류 수정 --------- Co-authored-by: woals2840 <143878241+woals2840@users.noreply.github.com> --- .../domain/community/repository/BoardScrapRepository.java | 4 +++- .../darudaserver/domain/community/service/BoardService.java | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/daruda/darudaserver/domain/community/repository/BoardScrapRepository.java b/src/main/java/com/daruda/darudaserver/domain/community/repository/BoardScrapRepository.java index b069261..e958347 100644 --- a/src/main/java/com/daruda/darudaserver/domain/community/repository/BoardScrapRepository.java +++ b/src/main/java/com/daruda/darudaserver/domain/community/repository/BoardScrapRepository.java @@ -8,6 +8,7 @@ import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; @@ -19,7 +20,8 @@ public interface BoardScrapRepository extends JpaRepository { @Transactional void deleteAllByUserId(@Param("userId") Long userId); - Page findAllByUserId(Long userId, Pageable pageable); + @Query("SELECT bs FROM BoardScrap bs WHERE bs.user.id = :userId AND bs.delYn = false") + Page findAllActiveByUserId(@Param("userId") Long userId, Pageable pageable); Optional findByUserAndBoard(UserEntity user, Board board); } diff --git a/src/main/java/com/daruda/darudaserver/domain/community/service/BoardService.java b/src/main/java/com/daruda/darudaserver/domain/community/service/BoardService.java index 02e19f6..557751a 100644 --- a/src/main/java/com/daruda/darudaserver/domain/community/service/BoardService.java +++ b/src/main/java/com/daruda/darudaserver/domain/community/service/BoardService.java @@ -212,7 +212,7 @@ else if (toolId != null) { public FavoriteBoardsRetrieveResponse getFavoriteBoards(final Long userId, final Pageable pageable){ validateBoard.validateUser(userId); - Page boardScraps = boardScrapRepository.findAllByUserId(userId, pageable); + Page boardScraps = boardScrapRepository.findAllActiveByUserId(userId, pageable); List favoriteBoardsResponses = boardScraps.getContent().stream() .filter(boardScrap -> !boardScrap.isDelYn()) .map(boardScrap -> { @@ -229,7 +229,6 @@ public FavoriteBoardsRetrieveResponse getFavoriteBoards(final Long userId, final }) .toList(); PagenationDto pageInfo = PagenationDto.of(pageable.getPageNumber(), pageable.getPageSize(), boardScraps.getTotalPages()); - log.debug("페이지 번호를 출력합니다" + pageable.getPageNumber()); return new FavoriteBoardsRetrieveResponse(userId, favoriteBoardsResponses, pageInfo); }