Fix/#543 experience

src/main/java/com/jeju/nanaland/domain/common/dto/PostPreviewDto.java

@@ -33,6 +33,15 @@ public PostPreviewDto(Long id, String title, String originUrl, String thumbnailU
     this.firstImage = new ImageFileDto(originUrl, thumbnailUrl);
   }
 
+  @QueryProjection
+  public PostPreviewDto(Long id, String title, String category, String originUrl,
+      String thumbnailUrl) {
+    this.id = id;
+    this.title = title;
+    this.category = category;
+    this.firstImage = new ImageFileDto(originUrl, thumbnailUrl);
+  }
+
   public PostPreviewDto(PostPreviewDto postPreviewDto) {
     this.id = postPreviewDto.getId();
     this.title = postPreviewDto.getTitle();

src/main/java/com/jeju/nanaland/domain/experience/dto/ExperienceCompositeDto.java

@@ -2,6 +2,7 @@
 
 import com.jeju.nanaland.domain.common.data.Language;
 import com.jeju.nanaland.domain.common.dto.CompositeDto;
+import com.jeju.nanaland.domain.experience.entity.enums.ExperienceType;
 import com.querydsl.core.annotations.QueryProjection;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -22,17 +23,20 @@ public class ExperienceCompositeDto extends CompositeDto {
   private String details;
   private String amenity;
   private String fee;
+  private ExperienceType experienceType;
 
   @QueryProjection
   public ExperienceCompositeDto(Long id, String originUrl, String thumbnailUrl, String contact,
       String homepage, Language language, String title, String content, String address,
-      String addressTag, String intro, String details, String time, String amenity, String fee) {
+      String addressTag, String intro, String details, String time, String amenity, String fee,
+      ExperienceType experienceType) {
     super(id, originUrl, thumbnailUrl, contact, language, title, content, address, addressTag,
         time);
     this.intro = intro;
     this.details = details;
     this.amenity = amenity;
     this.fee = fee;
     this.homepage = homepage;
+    this.experienceType = experienceType;
   }
 }

src/main/java/com/jeju/nanaland/domain/experience/repository/ExperienceRepositoryImpl.java

@@ -73,7 +73,8 @@ public ExperienceCompositeDto findCompositeDtoById(Long id, Language language) {
             experienceTrans.details,
             experienceTrans.time,
             experienceTrans.amenity,
-            experienceTrans.fee
+            experienceTrans.fee,
+            experience.experienceType
         ))
         .from(experience)
         .leftJoin(experience.firstImageFile, imageFile)
@@ -101,7 +102,8 @@ public ExperienceCompositeDto findCompositeDtoByIdWithPessimisticLock(Long id,
             experienceTrans.details,
             experienceTrans.time,
             experienceTrans.amenity,
-            experienceTrans.fee
+            experienceTrans.fee,
+            experience.experienceType
         ))
         .from(experience)
         .leftJoin(experience.firstImageFile, imageFile)
@@ -357,6 +359,7 @@ public PostPreviewDto findPostPreviewDto(Long postId, Language language) {
         .select(new QPostPreviewDto(
             experience.id,
             experienceTrans.title,
+            experience.experienceType.stringValue(),
             imageFile.originUrl,
             imageFile.thumbnailUrl
         ))

src/main/java/com/jeju/nanaland/domain/experience/service/ExperienceService.java

@@ -5,7 +5,6 @@
 import com.jeju.nanaland.domain.common.data.AddressTag;
 import com.jeju.nanaland.domain.common.data.Category;
 import com.jeju.nanaland.domain.common.data.Language;
-import com.jeju.nanaland.domain.common.data.PostCategory;
 import com.jeju.nanaland.domain.common.dto.ImageFileDto;
 import com.jeju.nanaland.domain.common.dto.PostPreviewDto;
 import com.jeju.nanaland.domain.common.entity.Post;
@@ -79,7 +78,6 @@ public PostPreviewDto getPostPreviewDto(Long postId, Category category, Language
     Optional.ofNullable(postPreviewDto)
         .orElseThrow(() -> new NotFoundException("해당 게시물을 찾을 수 없습니다."));
 
-    postPreviewDto.setCategory(PostCategory.EXPERIENCE.toString());
     return postPreviewDto;
   }
 

src/main/java/com/jeju/nanaland/domain/member/controller/MemberController.java

@@ -180,8 +180,8 @@ public BaseResponse<List<PopularPostPreviewDto>> getPopularPosts(
   }
 
   @Operation(
-      summary = "랜덤 추천 게시물 2개 반환",
-      description = "홈에서 보여질 랜덤 추천 게시물 2개 반환")
+      summary = "랜덤 추천 게시물 3개 반환",
+      description = "홈에서 보여질 랜덤 추천 게시물 3개 반환")
   @ApiResponses(value = {
       @ApiResponse(responseCode = "200", description = "성공"),
       @ApiResponse(responseCode = "400", description = "결과 타입에 없는 값으로 요청", content = @Content),

src/main/java/com/jeju/nanaland/domain/member/dto/MemberResponse.java

@@ -1,6 +1,5 @@
 package com.jeju.nanaland.domain.member.dto;
 
-import com.jeju.nanaland.domain.common.data.Category;
 import com.jeju.nanaland.domain.common.data.Language;
 import com.jeju.nanaland.domain.common.dto.ImageFileDto;
 import com.jeju.nanaland.domain.member.entity.Member;
@@ -41,7 +40,7 @@ public static class RecommendPostDto {
         description = "게시물 카테고리",
         example = "NATURE",
         allowableValues = {
-            "NATURE", "EXPERIENCE", "FESTIVAL", "MARKET", "RESTAURANT"
+            "NATURE", "ACTIVITY", "CULTURE_AND_ARTS", "FESTIVAL", "MARKET", "RESTAURANT"
         })
     private String category;
 
@@ -58,10 +57,10 @@ public static class RecommendPostDto {
     private boolean isFavorite;
 
     @QueryProjection
-    public RecommendPostDto(Long id, Category categoryContent, String originUrl,
+    public RecommendPostDto(Long id, String category, String originUrl,
         String thumbnailUrl, String title, String introduction) {
       this.id = id;
-      this.category = categoryContent.name();
+      this.category = category;
       this.firstImage = new ImageFileDto(originUrl, thumbnailUrl);
       this.title = title;
       this.introduction = introduction;

src/main/java/com/jeju/nanaland/domain/member/repository/RecommendRepositoryImpl.java

@@ -19,6 +19,8 @@
 import com.jeju.nanaland.domain.member.dto.MemberResponse;
 import com.jeju.nanaland.domain.member.dto.QMemberResponse_RecommendPostDto;
 import com.jeju.nanaland.domain.member.entity.enums.TravelType;
+import com.querydsl.core.types.dsl.CaseBuilder;
+import com.querydsl.core.types.dsl.Expressions;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
@@ -35,7 +37,7 @@ public MemberResponse.RecommendPostDto findNatureRecommendPostDto(Long postId, L
     return queryFactory
         .select(new QMemberResponse_RecommendPostDto(
             recommend.post.id,
-            recommend.category,
+            recommend.category.stringValue(),
             imageFile.originUrl,
             imageFile.thumbnailUrl,
             recommendTrans.title.coalesce(natureTrans.title),
@@ -65,7 +67,11 @@ public MemberResponse.RecommendPostDto findExperienceRecommendPostDto(Long postI
     return queryFactory
         .select(new QMemberResponse_RecommendPostDto(
             recommend.post.id,
-            recommend.category,
+            Expressions.asString("")
+                .append(new CaseBuilder()
+                    .when(experience.experienceType.stringValue().eq("ACTIVITY"))
+                    .then("ACTIVITY")
+                    .otherwise("CULTURE_AND_ARTS")),
             imageFile.originUrl,
             imageFile.thumbnailUrl,
             recommendTrans.title.coalesce(experienceTrans.title),
@@ -94,7 +100,7 @@ public MemberResponse.RecommendPostDto findMarketRecommendPostDto(Long postId, L
     return queryFactory
         .select(new QMemberResponse_RecommendPostDto(
             recommend.post.id,
-            recommend.category,
+            recommend.category.stringValue(),
             imageFile.originUrl,
             imageFile.thumbnailUrl,
             recommendTrans.title.coalesce(marketTrans.title),
@@ -124,7 +130,7 @@ public MemberResponse.RecommendPostDto findFestivalRecommendPostDto(Long postId,
     return queryFactory
         .select(new QMemberResponse_RecommendPostDto(
             recommend.post.id,
-            recommend.category,
+            recommend.category.stringValue(),
             imageFile.originUrl,
             imageFile.thumbnailUrl,
             recommendTrans.title.coalesce(festivalTrans.title),
@@ -152,7 +158,7 @@ public MemberResponse.RecommendPostDto findNanaRecommendPostDto(Long postId, Lan
     return queryFactory
         .select(new QMemberResponse_RecommendPostDto(
             recommend.post.id,
-            recommend.category,
+            recommend.category.stringValue(),
             imageFile.originUrl,
             imageFile.thumbnailUrl,
             recommendTrans.title.coalesce(nanaTitle.heading),

src/main/java/com/jeju/nanaland/domain/member/service/MemberTypeService.java

@@ -170,7 +170,7 @@ private MemberResponse.RecommendPostDto getExperiencePostDto(Member member, Long
         language);
     MemberResponse.RecommendPostDto recommendPostDto = MemberResponse.RecommendPostDto.builder()
         .id(compositeDto.getId())
-        .category(Category.EXPERIENCE.name())
+        .category(compositeDto.getExperienceType().name())
         .title(compositeDto.getTitle())
         .firstImage(compositeDto.getFirstImage())
         .build();