Improve/#284 camp, bookmark 도메인 fetch join을 이용한 n+1문제 해결

src/main/java/site/campingon/campingon/bookmark/repository/BookmarkRepository.java

@@ -2,6 +2,8 @@
 
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 import site.campingon.campingon.bookmark.entity.Bookmark;
 
@@ -11,5 +13,11 @@
 public interface BookmarkRepository extends JpaRepository<Bookmark, Long> {
   boolean existsByCampIdAndUserId(Long campId, Long userId);
 
-  Optional<Bookmark> findByCampIdAndUserId(Long campId, Long userId);
+  @Query("SELECT b FROM Bookmark b " +
+          "JOIN FETCH b.camp c " +
+          "JOIN FETCH c.campAddr " +
+          "JOIN FETCH c.campInfo " +
+          "JOIN FETCH b.user " +
+          "WHERE b.camp.id = :campId AND b.user.id = :userId")
+  Optional<Bookmark> findByCampIdAndUserId(@Param("campId") Long campId, @Param("userId") Long userId);
 }

src/main/java/site/campingon/campingon/camp/entity/Camp.java

@@ -2,6 +2,8 @@
 
 import jakarta.persistence.*;
 import lombok.*;
+import org.hibernate.annotations.LazyToOne;
+import org.hibernate.annotations.LazyToOneOption;
 import site.campingon.campingon.bookmark.entity.Bookmark;
 import site.campingon.campingon.common.public_data.dto.GoCampingParsedResponseDto;
 
@@ -65,10 +67,10 @@ public class Camp{
   @Builder.Default
   private List<CampInduty> induty=new ArrayList<>();  // 업종
 
-  @OneToOne(mappedBy = "camp", cascade = CascadeType.ALL, orphanRemoval = true)
+  @OneToOne(mappedBy = "camp", cascade = CascadeType.ALL, orphanRemoval = true,fetch = FetchType.LAZY)
   private CampAddr campAddr;
 
-  @OneToOne(mappedBy = "camp", cascade = CascadeType.ALL, orphanRemoval = true)
+  @OneToOne(mappedBy = "camp", cascade = CascadeType.ALL, orphanRemoval = true,fetch = FetchType.LAZY)
   private CampInfo campInfo;
 
   @OneToMany(mappedBy = "camp", cascade = CascadeType.ALL, orphanRemoval = true)

src/main/java/site/campingon/campingon/camp/repository/CampInfoRepository.java

@@ -1,12 +1,18 @@
 package site.campingon.campingon.camp.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 import site.campingon.campingon.camp.entity.CampInfo;
 
 import java.util.Optional;
 
 @Repository
 public interface CampInfoRepository extends JpaRepository<CampInfo, Long> {
-    Optional<CampInfo> findByCampId(Long id);
+    @Query("SELECT ci FROM CampInfo ci " +
+            "JOIN FETCH ci.camp c " +
+            "JOIN FETCH c.campAddr " +
+            "WHERE c.id = :campId")
+    Optional<CampInfo> findByCampId(@Param("campId") Long id);
 }

src/main/java/site/campingon/campingon/camp/repository/CampRepository.java

@@ -10,21 +10,39 @@
 import site.campingon.campingon.camp.entity.Camp;
 
 import java.util.List;
+import java.util.Optional;
 
 @Repository
 public interface CampRepository extends JpaRepository<Camp, Long> {
 
   // 캠핑장 정보의 추천수의 내림차순으로 캠핑장 정렬
-  @Query("""
+  @Query(value = """
     SELECT c FROM Camp c
-    JOIN CampInfo ci ON c.id = ci.camp.id
-    ORDER BY ci.recommendCnt DESC
-  """)
+    JOIN FETCH c.campInfo ci
+    JOIN FETCH c.campAddr
+    ORDER BY ci.recommendCnt DESC, c.thumbImage DESC
+    """, countQuery = "SELECT COUNT(c) FROM Camp c"
+  )
   Page<Camp> findPopularCamps(Pageable pageable);
 
+  @Query("""
+          SELECT c FROM Camp c
+          JOIN FETCH c.campInfo
+          JOIN FETCH c.campAddr
+          WHERE c.id= :campId
+          """)
+  Optional<Camp> findById(@Param("campId") Long campId);
+
   // 사용자의 isMarked 된 캠핑장 목록 페이지
-  @Query("SELECT c FROM Camp c JOIN c.bookmarks b WHERE b.user.id = :userId ORDER BY b.createdAt DESC")
-  Page<Camp> findByBookmarks_User_Id(@Param("userId") Long userId, Pageable pageable);
+  @Query(value = """
+          SELECT c FROM Camp c 
+          JOIN FETCH c.campInfo
+          JOIN FETCH c.campAddr
+          JOIN c.bookmarks b 
+          WHERE b.user.id = :userId 
+          ORDER BY b.createdAt DESC
+          """,countQuery = "SELECT COUNT(c) FROM Camp c JOIN c.bookmarks b WHERE b.user.id= :userId")
+  Page<Camp> findByBookmarksUserId(@Param("userId") Long userId, Pageable pageable);
 
   //쿼리 최적화 where in 조건
   @Modifying

src/main/java/site/campingon/campingon/camp/repository/CampSiteRepository.java

@@ -21,8 +21,11 @@ public interface CampSiteRepository extends JpaRepository<CampSite, Long> {
             """)
   List<CampSite> findByCampId(@Param("campId") Long campId);
 
-  @Query("""
+  @Query(value = """
             SELECT cs FROM CampSite cs
+            JOIN FETCH cs.camp c
+            JOIN FETCH c.campInfo
+            JOIN FETCH c.campAddr
             WHERE cs.id = :siteId
             AND cs.camp.id = :campId
             """)

src/main/java/site/campingon/campingon/camp/service/CampService.java

@@ -12,10 +12,8 @@
 import site.campingon.campingon.camp.mapper.CampMapper;
 import site.campingon.campingon.camp.repository.CampRepository;
 import site.campingon.campingon.bookmark.repository.BookmarkRepository;
-import site.campingon.campingon.camp.repository.mongodb.MongoSearchClient;
 import site.campingon.campingon.common.exception.ErrorCode;
 import site.campingon.campingon.common.exception.GlobalException;
-import site.campingon.campingon.user.repository.UserKeywordRepository;
 
 import java.util.Collections;
 import java.util.List;
@@ -62,7 +60,7 @@ public CampDetailResponseDto getCampDetail(Long campId) {
 
   // 사용자의 찜한 캠핑장 목록 조회
   public Page<CampListResponseDto> getBookmarkedCamps(Long userId, Pageable pageable) {
-    Page<Camp> bookmarkedCamps = campRepository.findByBookmarks_User_Id(userId, pageable);
+    Page<Camp> bookmarkedCamps = campRepository.findByBookmarksUserId(userId, pageable);
 
     List<CampListResponseDto> campDtos = bookmarkedCamps.getContent().stream()
         .map(camp -> {

src/test/java/site/campingon/campingon/camp/service/CampServiceTest.java

@@ -295,7 +295,7 @@ void getBookmarkedCamps_success() {
     List<Camp> camps = Arrays.asList(mockCamp);
     Page<Camp> campPage = new PageImpl<>(camps, pageable, camps.size());
 
-    when(campRepository.findByBookmarks_User_Id(userId, pageable))
+    when(campRepository.findByBookmarksUserId(userId, pageable))
         .thenReturn(campPage);
     when(campMapper.toCampListDto(any(Camp.class))).thenReturn(mockCampListDto);
 
@@ -307,7 +307,7 @@ void getBookmarkedCamps_success() {
     assertEquals(1, result.getTotalElements());
     assertTrue(result.getContent().get(0).isMarked());
 
-    verify(campRepository).findByBookmarks_User_Id(userId, pageable);
+    verify(campRepository).findByBookmarksUserId(userId, pageable);
     verify(campMapper).toCampListDto(any(Camp.class));
   }
 
@@ -319,7 +319,7 @@ void getBookmarkedCamps_noBookmarks_returnsEmptyList() {
     Pageable pageable = PageRequest.of(0, 3);
     Page<Camp> emptyPage = new PageImpl<>(Collections.emptyList(), pageable, 0);
 
-    when(campRepository.findByBookmarks_User_Id(userId, pageable))
+    when(campRepository.findByBookmarksUserId(userId, pageable))
         .thenReturn(emptyPage);
 
     // when
@@ -328,7 +328,7 @@ void getBookmarkedCamps_noBookmarks_returnsEmptyList() {
     // then
     assertTrue(result.isEmpty());
     assertEquals(0, result.getTotalElements());
-    verify(campRepository).findByBookmarks_User_Id(userId, pageable);
+    verify(campRepository).findByBookmarksUserId(userId, pageable);
   }
 
   // 캠핑장 관리자 테스트 CRUD

src/test/java/site/campingon/campingon/common/public_data/service/GoCampingServiceTest.java

@@ -6,6 +6,7 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.*;
 import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.web.client.RestTemplate;
 import site.campingon.campingon.camp.repository.*;
 import site.campingon.campingon.common.public_data.GoCampingPath;
@@ -50,7 +51,7 @@ class GoCampingServiceTest {
     @Mock
     private CampIndutyRepository campIndutyRepository;
 
-    @Spy
+    @Mock
     private RestTemplate restTemplate;
 
 
@@ -66,6 +67,8 @@ void testGetAndConvertToGoCampingDataDto_Success() throws Exception {
         String numOfRows = "1";
         String pageNo = "1";
 
+        URI mockUri = new URI("http://example.com"); // 반환할 실제 URI 객체 생성
+
         // Item 객체 생성
         GoCampingDataDto.Item item = GoCampingDataDto.Item.builder()
                 .contentId(123L).facltNm("Sample Camping Site")
@@ -98,10 +101,10 @@ void testGetAndConvertToGoCampingDataDto_Success() throws Exception {
                 )
                 .build();
         System.out.println("goCampingDataDto :" + goCampingDataDto);
+        when(goCampingProviderService.createUri(any(GoCampingPath.class),anyString(), anyString(), anyString(), anyString())).thenReturn(mockUri);
 
-        doReturn(goCampingDataDto).when(restTemplate).getForObject(any(URI.class), eq(GoCampingDataDto.class));
+        doReturn(goCampingDataDto).when(restTemplate).getForObject(eq(mockUri), eq(GoCampingDataDto.class));
 
-        //when
         GoCampingDataDto result = goCampingService.fetchCampData(GoCampingPath.BASED_LIST, "numOfRows", numOfRows, "pageNo", pageNo);
 
         // then