Merge pull request #535 from Travel-in-nanaland/fix/#534-favorite

[#534] fix: 이색체험 찜리스트 수정
Travel-in-nanaland · Jan 7, 2025 · a601ad7 · a601ad7
2 parents e95fe5e + 99c5f4c
commit a601ad7
Show file tree

Hide file tree

Showing 4 changed files with 92 additions and 2 deletions.
diff --git a/src/main/java/com/jeju/nanaland/domain/favorite/controller/FavoriteController.java b/src/main/java/com/jeju/nanaland/domain/favorite/controller/FavoriteController.java
@@ -1,13 +1,13 @@
 package com.jeju.nanaland.domain.favorite.controller;
 
-import static com.jeju.nanaland.domain.common.data.Category.EXPERIENCE;
 import static com.jeju.nanaland.domain.common.data.Category.FESTIVAL;
 import static com.jeju.nanaland.domain.common.data.Category.MARKET;
 import static com.jeju.nanaland.domain.common.data.Category.NANA;
 import static com.jeju.nanaland.domain.common.data.Category.NATURE;
 import static com.jeju.nanaland.domain.common.data.Category.RESTAURANT;
 import static com.jeju.nanaland.global.exception.SuccessCode.POST_LIKE_TOGGLE_SUCCESS;
 
+import com.jeju.nanaland.domain.experience.entity.enums.ExperienceType;
 import com.jeju.nanaland.domain.favorite.dto.FavoriteRequest.LikeToggleDto;
 import com.jeju.nanaland.domain.favorite.dto.FavoriteResponse;
 import com.jeju.nanaland.domain.favorite.dto.FavoriteResponse.StatusDto;
@@ -66,11 +66,12 @@ public BaseResponse<FavoriteResponse.PreviewPageDto> getAllFavorites(
   @GetMapping("/experience/list")
   public BaseResponse<FavoriteResponse.PreviewPageDto> getExperienceFavorites(
       @AuthMember MemberInfoDto memberInfoDto,
+      @RequestParam ExperienceType experienceType,
       @RequestParam(defaultValue = "0") int page,
       @RequestParam(defaultValue = "12") int size) {
 
     FavoriteResponse.PreviewPageDto favoritePreviewPageDto =
-        favoriteService.getAllCategoryFavorites(memberInfoDto, EXPERIENCE, page, size);
+        favoriteService.getExperienceFavorites(memberInfoDto, experienceType, page, size);
     return BaseResponse.success(SuccessCode.GET_FAVORITE_LIST_SUCCESS, favoritePreviewPageDto);
   }
 

diff --git a/src/main/java/com/jeju/nanaland/domain/favorite/repository/FavoriteRepositoryCustom.java b/src/main/java/com/jeju/nanaland/domain/favorite/repository/FavoriteRepositoryCustom.java
@@ -1,6 +1,7 @@
 package com.jeju.nanaland.domain.favorite.repository;
 
 import com.jeju.nanaland.domain.common.data.Category;
+import com.jeju.nanaland.domain.experience.entity.enums.ExperienceType;
 import com.jeju.nanaland.domain.favorite.entity.Favorite;
 import com.jeju.nanaland.domain.member.entity.Member;
 import java.util.List;
@@ -14,5 +15,8 @@ public interface FavoriteRepositoryCustom {
   Page<Favorite> findAllFavoritesOrderByModifiedAtDesc(Member member, Category category,
       Pageable pageable);
 
+  Page<Favorite> findAllExperienceFavoritesOrderByModifiedAtDesc(Member member,
+      ExperienceType experienceType, Pageable pageable);
+
   List<Favorite> findAllFavoriteToSendNotification();
 }
diff --git a/src/main/java/com/jeju/nanaland/domain/favorite/repository/FavoriteRepositoryImpl.java b/src/main/java/com/jeju/nanaland/domain/favorite/repository/FavoriteRepositoryImpl.java
@@ -1,8 +1,10 @@
 package com.jeju.nanaland.domain.favorite.repository;
 
+import static com.jeju.nanaland.domain.experience.entity.QExperience.experience;
 import static com.jeju.nanaland.domain.favorite.entity.QFavorite.favorite;
 
 import com.jeju.nanaland.domain.common.data.Category;
+import com.jeju.nanaland.domain.experience.entity.enums.ExperienceType;
 import com.jeju.nanaland.domain.favorite.entity.Favorite;
 import com.jeju.nanaland.domain.member.entity.Member;
 import com.querydsl.core.types.dsl.BooleanExpression;
@@ -73,6 +75,42 @@ public Page<Favorite> findAllFavoritesOrderByModifiedAtDesc(Member member, Categ
     return PageableExecutionUtils.getPage(resultDto, pageable, countQuery::fetchOne);
   }
 
+  @Override
+  public Page<Favorite> findAllExperienceFavoritesOrderByModifiedAtDesc(Member member,
+      ExperienceType experienceType, Pageable pageable) {
+    Category category = Category.EXPERIENCE;
+
+    List<Favorite> resultDto = queryFactory
+        .select(favorite)
+        .from(favorite)
+        .innerJoin(experience)
+        .on(favorite.post.id.eq(experience.id)
+            .and(experience.experienceType.eq(experienceType)))
+        .where(
+            favorite.member.eq(member),
+            favorite.category.eq(category),
+            favorite.status.eq("ACTIVE")
+        )
+        .orderBy(favorite.modifiedAt.desc())
+        .offset(pageable.getOffset())
+        .limit(pageable.getPageSize())
+        .fetch();
+
+    JPAQuery<Long> countQuery = queryFactory
+        .select(favorite.count())
+        .from(favorite)
+        .innerJoin(experience)
+        .on(favorite.post.id.eq(experience.id)
+            .and(experience.experienceType.eq(experienceType)))
+        .where(
+            favorite.member.eq(member),
+            favorite.category.eq(category),
+            favorite.status.eq("ACTIVE")
+        );
+
+    return PageableExecutionUtils.getPage(resultDto, pageable, countQuery::fetchOne);
+  }
+
   @Override
   public List<Favorite> findAllFavoriteToSendNotification() {
     LocalDateTime now = LocalDateTime.now();

diff --git a/src/main/java/com/jeju/nanaland/domain/favorite/service/FavoriteService.java b/src/main/java/com/jeju/nanaland/domain/favorite/service/FavoriteService.java
@@ -4,6 +4,7 @@
 import com.jeju.nanaland.domain.common.data.Language;
 import com.jeju.nanaland.domain.common.dto.PostPreviewDto;
 import com.jeju.nanaland.domain.common.service.PostService;
+import com.jeju.nanaland.domain.experience.entity.enums.ExperienceType;
 import com.jeju.nanaland.domain.favorite.dto.FavoriteRequest;
 import com.jeju.nanaland.domain.favorite.dto.FavoriteResponse;
 import com.jeju.nanaland.domain.favorite.dto.FavoriteResponse.PreviewDto;
@@ -120,6 +121,52 @@ public FavoriteResponse.PreviewPageDto getAllCategoryFavorites(MemberInfoDto mem
         .build();
   }
 
+  /**
+   * 이색체험 찜리스트 조회
+   *
+   * @param memberInfoDto 회원 정보
+   * @param page          페이지
+   * @param size          페이지 크기
+   * @return FavoriteResponse.PreviewPageDto
+   */
+  @Transactional(readOnly = true)
+  public FavoriteResponse.PreviewPageDto getExperienceFavorites(MemberInfoDto memberInfoDto,
+      ExperienceType experienceType, int page, int size) {
+
+    Member member = memberInfoDto.getMember();
+    Category category = Category.EXPERIENCE;
+    Language language = memberInfoDto.getLanguage();
+    Pageable pageable = PageRequest.of(page, size);
+
+    // favorite 테이블에서 해당 유저의 이색체험(액티비티, 문화예술) 찜리스트 페이지 조회
+    Page<Favorite> favoritePage =
+        favoriteRepository.findAllExperienceFavoritesOrderByModifiedAtDesc(member, experienceType
+            , pageable);
+
+    // 각 게시물 조회 쿼리 비동기 요청
+    List<CompletableFuture<FavoriteResponse.PreviewDto>> favoritePreviewFutures = favoritePage.get()
+        .map(favorite -> CompletableFuture.supplyAsync(() -> {
+          Long postId = favorite.getPost().getId();
+          PostPreviewDto postPreviewDto = postService.getPostPreviewDto(postId, category, language);
+          return new FavoriteResponse.PreviewDto(postPreviewDto);
+        }))
+        .toList();
+
+    // 모든 비동기 작업이 완료될 때까지 기다린 후 각 결과를 수집
+    List<FavoriteResponse.PreviewDto> favoritePreviewDtos = CompletableFuture.allOf(
+        favoritePreviewFutures.toArray(new CompletableFuture[0])
+    ).thenApply(v ->
+        favoritePreviewFutures.stream()
+            .map(CompletableFuture::join) // 순서대로 결과 가져오기
+            .collect(Collectors.toList())
+    ).join(); // 최종 결과 리스트
+
+    return FavoriteResponse.PreviewPageDto.builder()
+        .totalElements(favoritePage.getTotalElements())
+        .data(favoritePreviewDtos)
+        .build();
+  }
+
   /**
    * 찜 등록, 취소 토글
    *