Travel-in-nanaland · heeeeeseok · Sep 20, 2024 · Sep 20, 2024 · Sep 20, 2024 · Sep 20, 2024
diff --git a/src/main/java/com/jeju/nanaland/domain/experience/controller/ExperienceController.java b/src/main/java/com/jeju/nanaland/domain/experience/controller/ExperienceController.java
@@ -3,8 +3,7 @@
 import static com.jeju.nanaland.global.exception.SuccessCode.EXPERIENCE_DETAIL_SUCCESS;
 import static com.jeju.nanaland.global.exception.SuccessCode.EXPERIENCE_LIST_SUCCESS;
 
-import com.jeju.nanaland.domain.experience.dto.ExperienceResponse.ExperienceDetailDto;
-import com.jeju.nanaland.domain.experience.dto.ExperienceResponse.ExperienceThumbnailDto;
+import com.jeju.nanaland.domain.experience.dto.ExperienceResponse;
 import com.jeju.nanaland.domain.experience.entity.enums.ExperienceType;
 import com.jeju.nanaland.domain.experience.entity.enums.ExperienceTypeKeyword;
 import com.jeju.nanaland.domain.experience.service.ExperienceService;
@@ -41,18 +40,18 @@ public class ExperienceController {
       @ApiResponse(responseCode = "500", description = "서버측 에러", content = @Content)
   })
   @GetMapping("/list")
-  public BaseResponse<ExperienceThumbnailDto> getExperienceList(
+  public BaseResponse<ExperienceResponse.PreviewPageDto> getExperienceList(
       @AuthMember MemberInfoDto memberInfoDto,
       @RequestParam ExperienceType experienceType,
       @RequestParam(defaultValue = "") List<ExperienceTypeKeyword> keywordFilterList,
       @RequestParam(defaultValue = "") List<String> addressFilterList,
       @RequestParam(defaultValue = "0") int page,
       @RequestParam(defaultValue = "12") int size) {
 
-    ExperienceThumbnailDto thumbnailDto = experienceService.getExperienceList(memberInfoDto,
-        experienceType, keywordFilterList, addressFilterList, page, size);
+    ExperienceResponse.PreviewPageDto previewPageDto = experienceService.getExperiencePreviews(
+        memberInfoDto, experienceType, keywordFilterList, addressFilterList, page, size);
 
-    return BaseResponse.success(EXPERIENCE_LIST_SUCCESS, thumbnailDto);
+    return BaseResponse.success(EXPERIENCE_LIST_SUCCESS, previewPageDto);
   }
 
   @Operation(summary = "이색체험 상세 정보 조회", description = "이색체험 상세 정보 조회")
@@ -64,13 +63,13 @@ public BaseResponse<ExperienceThumbnailDto> getExperienceList(
       @ApiResponse(responseCode = "500", description = "서버측 에러", content = @Content)
   })
   @GetMapping("/{id}")
-  public BaseResponse<ExperienceDetailDto> getExperienceDetail(
+  public BaseResponse<ExperienceResponse.DetailDto> getExperienceDetail(
       @AuthMember MemberInfoDto memberInfoDto,
       @PathVariable Long id,
       @RequestParam(defaultValue = "false") boolean isSearch) {
 
-    ExperienceDetailDto experienceDetail = experienceService.getExperienceDetail(memberInfoDto,
+    ExperienceResponse.DetailDto detailDto = experienceService.getExperienceDetail(memberInfoDto,
         id, isSearch);
-    return BaseResponse.success(EXPERIENCE_DETAIL_SUCCESS, experienceDetail);
+    return BaseResponse.success(EXPERIENCE_DETAIL_SUCCESS, detailDto);
   }
 }
diff --git a/src/main/java/com/jeju/nanaland/domain/experience/dto/ExperienceResponse.java b/src/main/java/com/jeju/nanaland/domain/experience/dto/ExperienceResponse.java
@@ -14,22 +14,22 @@ public class ExperienceResponse {
 
   @Data
   @Builder
-  @Schema(description = "이색체험 게시물 페이징 정보")
-  public static class ExperienceThumbnailDto {
+  @Schema(name = "ExperienceThumbnailDto", description = "이색체험 게시물 페이징 정보")
+  public static class PreviewPageDto {
 
     @Schema(description = "이색체험 전체 게시물 수")
     private Long totalElements;
 
     @Schema(description = "이색체험 게시물 결과 리스트")
-    private List<ExperienceThumbnail> data;
+    private List<PreviewDto> data;
   }
 
   @Data
   @Setter
   @Builder
   @AllArgsConstructor
-  @Schema(description = "이색체험 게시물 정보")
-  public static class ExperienceThumbnail {
+  @Schema(name = "ExperienceThumbnail", description = "이색체험 게시물 정보")
+  public static class PreviewDto {
 
     @Schema(description = "이색체험 게시물 id")
     private Long id;
@@ -53,7 +53,7 @@ public static class ExperienceThumbnail {
     private boolean isFavorite;
 
     @QueryProjection
-    public ExperienceThumbnail(Long id, String originUrl, String thumbnailUrl, String title,
+    public PreviewDto(Long id, String originUrl, String thumbnailUrl, String title,
         String addressTag) {
       this.id = id;
       this.firstImage = new ImageFileDto(originUrl, thumbnailUrl);
@@ -64,8 +64,8 @@ public ExperienceThumbnail(Long id, String originUrl, String thumbnailUrl, Strin
 
   @Data
   @Builder
-  @Schema(description = "이색체험 상세 정보")
-  public static class ExperienceDetailDto {
+  @Schema(name = "ExperienceDetailDto", description = "이색체험 상세 정보")
+  public static class DetailDto {
 
     @Schema(description = "이색체험 게시물 id")
     private Long id;

diff --git a/src/main/java/com/jeju/nanaland/domain/experience/repository/ExperienceRepositoryCustom.java b/src/main/java/com/jeju/nanaland/domain/experience/repository/ExperienceRepositoryCustom.java
@@ -3,7 +3,7 @@
 import com.jeju.nanaland.domain.common.data.Language;
 import com.jeju.nanaland.domain.common.dto.PostPreviewDto;
 import com.jeju.nanaland.domain.experience.dto.ExperienceCompositeDto;
-import com.jeju.nanaland.domain.experience.dto.ExperienceResponse.ExperienceThumbnail;
+import com.jeju.nanaland.domain.experience.dto.ExperienceResponse;
 import com.jeju.nanaland.domain.experience.entity.enums.ExperienceType;
 import com.jeju.nanaland.domain.experience.entity.enums.ExperienceTypeKeyword;
 import com.jeju.nanaland.domain.review.dto.ReviewResponse.SearchPostForReviewDto;
@@ -14,13 +14,14 @@
 
 public interface ExperienceRepositoryCustom {
 
-  ExperienceCompositeDto findCompositeDtoById(Long id, Language language);
+  ExperienceCompositeDto findExperienceCompositeDto(Long id, Language language);
 
   Page<ExperienceCompositeDto> searchCompositeDtoByKeyword(String Keyword, Language language,
       Pageable pageable);
 
-  Page<ExperienceThumbnail> findExperienceThumbnails(Language language,
-      ExperienceType experienceType, List<ExperienceTypeKeyword> keywordFilterList,
+  Page<ExperienceResponse.PreviewDto> findAllExperiencePreviewDtoOrderByPriorityDescAndCreatedAtDesc(
+      Language language, ExperienceType experienceType,
+      List<ExperienceTypeKeyword> keywordFilterList,
       List<String> addressFilterList, Pageable pageable);
 
   Set<ExperienceTypeKeyword> getExperienceTypeKeywordSet(Long postId);

diff --git a/src/main/java/com/jeju/nanaland/domain/experience/repository/ExperienceRepositoryImpl.java b/src/main/java/com/jeju/nanaland/domain/experience/repository/ExperienceRepositoryImpl.java
@@ -11,9 +11,9 @@
 import com.jeju.nanaland.domain.common.dto.PostPreviewDto;
 import com.jeju.nanaland.domain.common.dto.QPostPreviewDto;
 import com.jeju.nanaland.domain.experience.dto.ExperienceCompositeDto;
-import com.jeju.nanaland.domain.experience.dto.ExperienceResponse.ExperienceThumbnail;
+import com.jeju.nanaland.domain.experience.dto.ExperienceResponse;
 import com.jeju.nanaland.domain.experience.dto.QExperienceCompositeDto;
-import com.jeju.nanaland.domain.experience.dto.QExperienceResponse_ExperienceThumbnail;
+import com.jeju.nanaland.domain.experience.dto.QExperienceResponse_PreviewDto;
 import com.jeju.nanaland.domain.experience.entity.enums.ExperienceType;
 import com.jeju.nanaland.domain.experience.entity.enums.ExperienceTypeKeyword;
 import com.jeju.nanaland.domain.review.dto.QReviewResponse_SearchPostForReviewDto;
@@ -39,7 +39,7 @@ public class ExperienceRepositoryImpl implements ExperienceRepositoryCustom {
   private final JPAQueryFactory queryFactory;
 
   @Override
-  public ExperienceCompositeDto findCompositeDtoById(Long id, Language language) {
+  public ExperienceCompositeDto findExperienceCompositeDto(Long id, Language language) {
     return queryFactory
         .select(new QExperienceCompositeDto(
             experience.id,
@@ -61,7 +61,10 @@ public ExperienceCompositeDto findCompositeDtoById(Long id, Language language) {
         .from(experience)
         .leftJoin(experience.firstImageFile, imageFile)
         .leftJoin(experience.experienceTrans, experienceTrans)
-        .where(experience.id.eq(id).and(experienceTrans.language.eq(language)))
+        .where(
+            experience.id.eq(id),
+            experienceTrans.language.eq(language)
+        )
         .fetchOne();
   }
 
@@ -93,10 +96,12 @@ public Page<ExperienceCompositeDto> searchCompositeDtoByKeyword(String keyword,
         .leftJoin(experience.firstImageFile, imageFile)
         .leftJoin(experience.experienceTrans, experienceTrans)
         .on(experienceTrans.language.eq(language))
-        .where(experienceTrans.title.contains(keyword)
-            .or(experienceTrans.addressTag.contains(keyword))
-            .or(experienceTrans.content.contains(keyword))
-            .or(experience.id.in(idListContainAllHashtags)))
+        .where(
+            experienceTrans.title.contains(keyword)
+                .or(experienceTrans.addressTag.contains(keyword))
+                .or(experienceTrans.content.contains(keyword))
+                .or(experience.id.in(idListContainAllHashtags))
+        )
         .orderBy(experienceTrans.createdAt.desc())
         .offset(pageable.getOffset())
         .limit(pageable.getPageSize())
@@ -108,21 +113,24 @@ public Page<ExperienceCompositeDto> searchCompositeDtoByKeyword(String keyword,
         .leftJoin(experience.firstImageFile, imageFile)
         .leftJoin(experience.experienceTrans, experienceTrans)
         .on(experienceTrans.language.eq(language))
-        .where(experienceTrans.title.contains(keyword)
-            .or(experienceTrans.addressTag.contains(keyword))
-            .or(experienceTrans.content.contains(keyword))
-            .or(experience.id.in(idListContainAllHashtags)));
+        .where(
+            experienceTrans.title.contains(keyword)
+                .or(experienceTrans.addressTag.contains(keyword))
+                .or(experienceTrans.content.contains(keyword))
+                .or(experience.id.in(idListContainAllHashtags))
+        );
 
     return PageableExecutionUtils.getPage(resultDto, pageable, countQuery::fetchOne);
   }
 
   @Override
-  public Page<ExperienceThumbnail> findExperienceThumbnails(Language language,
-      ExperienceType experienceType, List<ExperienceTypeKeyword> keywordFilterList,
+  public Page<ExperienceResponse.PreviewDto> findAllExperiencePreviewDtoOrderByPriorityDescAndCreatedAtDesc(
+      Language language, ExperienceType experienceType,
+      List<ExperienceTypeKeyword> keywordFilterList,
       List<String> addressFilterList, Pageable pageable) {
 
-    List<ExperienceThumbnail> resultDto = queryFactory
-        .selectDistinct(new QExperienceResponse_ExperienceThumbnail(
+    List<ExperienceResponse.PreviewDto> resultDto = queryFactory
+        .selectDistinct(new QExperienceResponse_PreviewDto(
             experience.id,
             imageFile.originUrl,
             imageFile.thumbnailUrl,
@@ -134,12 +142,16 @@ public Page<ExperienceThumbnail> findExperienceThumbnails(Language language,
         .innerJoin(experience.experienceTrans, experienceTrans)
         .innerJoin(experienceKeyword)
         .on(experienceKeyword.experience.id.eq(experience.id))
-        .where(experienceTrans.language.eq(language)
-            .and(experience.experienceType.eq(experienceType))  // 이색체험 타입(액티비티/문화예술)
-            .and(addressTagCondition(addressFilterList))  // 지역필터
-            .and(keywordCondition(keywordFilterList)))  // 키워드 필터
-        .orderBy(experience.priority.desc(),  // 우선순위 정렬
-            experience.createdAt.desc())  // 최신순 정렬
+        .where(
+            experienceTrans.language.eq(language),
+            experience.experienceType.eq(experienceType), // 이색체험 타입(액티비티/문화예술)
+            addressTagCondition(addressFilterList), // 지역필터
+            keywordCondition(keywordFilterList)  // 키워드 필터
+        )
+        .orderBy(
+            experience.priority.desc(),  // 우선순위 정렬
+            experience.createdAt.desc()  // 최신순 정렬
+        )
         .offset(pageable.getOffset())
         .limit(pageable.getPageSize())
         .fetch();
@@ -151,10 +163,12 @@ public Page<ExperienceThumbnail> findExperienceThumbnails(Language language,
         .innerJoin(experience.experienceTrans, experienceTrans)
         .innerJoin(experienceKeyword)
         .on(experienceKeyword.experience.id.eq(experience.id))
-        .where(experienceTrans.language.eq(language)
-            .and(experience.experienceType.eq(experienceType))
-            .and(addressTagCondition(addressFilterList))
-            .and(keywordCondition(keywordFilterList)));
+        .where(
+            experienceTrans.language.eq(language),
+            experience.experienceType.eq(experienceType),
+            addressTagCondition(addressFilterList),
+            keywordCondition(keywordFilterList)
+        );
 
     return PageableExecutionUtils.getPage(resultDto, pageable, countQuery::fetchOne);
   }
@@ -214,12 +228,13 @@ private List<Long> getIdListContainAllHashtags(String keyword, Language language
         .select(experience.id)
         .from(experience)
         .leftJoin(hashtag)
-        .on(hashtag.post.id.eq(experience.id)
-            .and(hashtag.category.eq(Category.EXPERIENCE))
-            .and(hashtag.language.eq(language)))
+        .on(hashtag.post.id.eq(experience.id),
+            hashtag.category.eq(Category.EXPERIENCE),
+            hashtag.language.eq(language)
+        )
         .where(hashtag.keyword.content.in(splitKeyword(keyword)))
         .groupBy(experience.id)
-        .having(experience.id.count().eq(splitKeyword(keyword).stream().count()))
+        .having(experience.id.count().eq((long) splitKeyword(keyword).size()))
         .fetch();
   }
 
@@ -234,18 +249,11 @@ private List<String> splitKeyword(String keyword) {
   }
 
   private BooleanExpression addressTagCondition(List<String> addressFilterList) {
-    if (addressFilterList.isEmpty()) {
-      return null;
-    } else {
-      return experienceTrans.addressTag.in(addressFilterList);
-    }
+    return addressFilterList.isEmpty() ? null : experienceTrans.addressTag.in(addressFilterList);
   }
 
   private BooleanExpression keywordCondition(List<ExperienceTypeKeyword> keywordFilterList) {
-    if (keywordFilterList.isEmpty()) {
-      return null;
-    } else {
-      return experienceKeyword.experienceTypeKeyword.in(keywordFilterList);
-    }
+    return keywordFilterList.isEmpty() ? null
+        : experienceKeyword.experienceTypeKeyword.in(keywordFilterList);
   }
 }
diff --git a/src/main/java/com/jeju/nanaland/domain/experience/service/ExperienceService.java b/src/main/java/com/jeju/nanaland/domain/experience/service/ExperienceService.java
@@ -11,9 +11,7 @@
 import com.jeju.nanaland.domain.common.repository.ImageFileRepository;
 import com.jeju.nanaland.domain.common.service.PostService;
 import com.jeju.nanaland.domain.experience.dto.ExperienceCompositeDto;
-import com.jeju.nanaland.domain.experience.dto.ExperienceResponse.ExperienceDetailDto;
-import com.jeju.nanaland.domain.experience.dto.ExperienceResponse.ExperienceThumbnail;
-import com.jeju.nanaland.domain.experience.dto.ExperienceResponse.ExperienceThumbnailDto;
+import com.jeju.nanaland.domain.experience.dto.ExperienceResponse;
 import com.jeju.nanaland.domain.experience.entity.enums.ExperienceType;
 import com.jeju.nanaland.domain.experience.entity.enums.ExperienceTypeKeyword;
 import com.jeju.nanaland.domain.experience.repository.ExperienceRepository;
@@ -79,42 +77,63 @@ public PostPreviewDto getPostPreviewDto(Long postId, Category category, Language
     return postPreviewDto;
   }
 
-  // 이색체험 리스트 조회
-  public ExperienceThumbnailDto getExperienceList(MemberInfoDto memberInfoDto,
+  /**
+   * 이색체험 리스트 조회
+   *
+   * @param memberInfoDto     회원 정보
+   * @param experienceType    이색체험 타입 (ACTIVITY, CULTURE_AND_ARTS)
+   * @param keywordFilterList 키워드 필터 (LAND_LEISURE, WATER_LEISURE, AIR_LEISURE, MARINE_EXPERIENCE,
+   *                          RURAL_EXPERIENCE, HEALING_THERAPY, HISTORY, EXHIBITION, WORKSHOP,
+   *                          ART_MUSEUM, MUSEUM, PARK, PERFORMANCE, RELIGIOUS_FACILITY,
+   *                          THEME_PARK)
+   * @param addressFilterList 지역 필터
+   * @param page              페이지
+   * @param size              페이지 크기
+   * @return ExperienceResponse.PreviewPageDto
+   */
+  public ExperienceResponse.PreviewPageDto getExperiencePreviews(MemberInfoDto memberInfoDto,
       ExperienceType experienceType, List<ExperienceTypeKeyword> keywordFilterList,
       List<String> addressFilterList, int page, int size) {
 
     Language language = memberInfoDto.getLanguage();
     Pageable pageable = PageRequest.of(page, size);
 
     // experienceType(액티비티, 문화예술)에 따른 이색체험 조회
-    Page<ExperienceThumbnail> experienceThumbnailPage = experienceRepository.findExperienceThumbnails(
-        language, experienceType, keywordFilterList, addressFilterList, pageable);
+    Page<ExperienceResponse.PreviewDto> experiencePreviewPage =
+        experienceRepository.findAllExperiencePreviewDtoOrderByPriorityDescAndCreatedAtDesc(
+            language, experienceType, keywordFilterList, addressFilterList, pageable);
 
     // 좋아요 여부
     List<Long> favoriteIds = memberFavoriteService.getFavoritePostIdsWithMember(
         memberInfoDto.getMember());
-    List<ExperienceThumbnail> data = experienceThumbnailPage.getContent();
+    List<ExperienceResponse.PreviewDto> data = experiencePreviewPage.getContent();
 
     // 좋아요 여부, 리뷰 평균 추가
-    for (ExperienceThumbnail experienceThumbnail : data) {
-      Long postId = experienceThumbnail.getId();
-      experienceThumbnail.setFavorite(favoriteIds.contains(postId));
-      experienceThumbnail.setRatingAvg(reviewRepository.findTotalRatingAvg(EXPERIENCE, postId));
+    for (ExperienceResponse.PreviewDto previewDto : data) {
+      Long postId = previewDto.getId();
+      previewDto.setFavorite(favoriteIds.contains(postId));
+      previewDto.setRatingAvg(reviewRepository.findTotalRatingAvg(EXPERIENCE, postId));
     }
 
-    return ExperienceThumbnailDto.builder()
-        .totalElements(experienceThumbnailPage.getTotalElements())
+    return ExperienceResponse.PreviewPageDto.builder()
+        .totalElements(experiencePreviewPage.getTotalElements())
         .data(data)
         .build();
   }
 
-  // 이색체험 상세 정보 조회
-  public ExperienceDetailDto getExperienceDetail(MemberInfoDto memberInfoDto, Long postId,
+  /**
+   * 이색체험 상세정보 조회
+   *
+   * @param memberInfoDto 회원 정보
+   * @param postId        게시물 id
+   * @param isSearch      검색을 통해 들어왔는지 여부
+   * @return ExperienceResponse.DetailDto
+   */
+  public ExperienceResponse.DetailDto getExperienceDetail(MemberInfoDto memberInfoDto, Long postId,
       boolean isSearch) {
 
     Language language = memberInfoDto.getLanguage();
-    ExperienceCompositeDto experienceCompositeDto = experienceRepository.findCompositeDtoById(
+    ExperienceCompositeDto experienceCompositeDto = experienceRepository.findExperienceCompositeDto(
         postId, language);
 
     // 해당 id의 포스트가 없는 경우 404 에러
@@ -144,7 +163,7 @@ public ExperienceDetailDto getExperienceDetail(MemberInfoDto memberInfoDto, Long
             experienceTypeKeyword.getValueByLocale(language)
         ).toList();
 
-    return ExperienceDetailDto.builder()
+    return ExperienceResponse.DetailDto.builder()
         .id(experienceCompositeDto.getId())
         .title(experienceCompositeDto.getTitle())
         .intro(experienceCompositeDto.getIntro())