Merge branch 'develop'

WePlanPlans · Jan 2, 2024 · 95bc6d5 · 95bc6d5
2 parents 7b5af00 + 1174c1b
commit 95bc6d5
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 5 deletions.
diff --git a/src/main/java/org/tenten/tentenbe/domain/tour/dto/response/TourDetailResponse.java b/src/main/java/org/tenten/tentenbe/domain/tour/dto/response/TourDetailResponse.java
@@ -7,6 +7,9 @@ public record TourDetailResponse(
     @Schema(defaultValue = "1")
     Long id,
 
+    @Schema(defaultValue = "카테고리 Id")
+    Long contentTypeId,
+
     @Schema(defaultValue = "여행지 이름")
     String title,
 
@@ -38,6 +41,7 @@ public TourDetailResponse(
     ) {
         this(
             tourItem.getId(),
+            tourItem.getContentTypeId(),
             tourItem.getTitle(),
             liked,
             fullAddress,

diff --git a/src/main/java/org/tenten/tentenbe/domain/tour/dto/response/TourSimpleResponse.java b/src/main/java/org/tenten/tentenbe/domain/tour/dto/response/TourSimpleResponse.java
@@ -6,6 +6,9 @@ public record TourSimpleResponse(
     @Schema(defaultValue = "1")
     Long id,
 
+    @Schema(defaultValue = "카테고리 Id")
+    Long contentTypeId,
+
     @Schema(defaultValue = "여행지 이름")
     String title,
 

diff --git a/src/main/java/org/tenten/tentenbe/domain/tour/model/TourItem.java b/src/main/java/org/tenten/tentenbe/domain/tour/model/TourItem.java
@@ -39,6 +39,8 @@ public class TourItem {
     private String tel; // 전화번호
     private String longitude; // x좌표
     private String latitude; // y좌표
+    private Long reviewTotalCount; // 리뷰 총 개수
+    private Long likedTotalCount;  // 좋아요 총 개수
 
     @OneToMany(mappedBy = "tourItem", fetch = LAZY, cascade = REMOVE)
     private final List<Review> reviews = new ArrayList<>();
@@ -54,4 +56,12 @@ public class TourItem {
 
     @OneToMany(mappedBy = "tourItem", fetch = LAZY, cascade = REMOVE)
     private final List<TripLikedItem> tripLikedItems = new ArrayList<>();
+
+    public void increaseLikedCount() {
+        this.likedTotalCount++;
+    }
+
+    public void decreaseLikedCount() {
+        this.likedTotalCount--;
+    }
 }
diff --git a/src/main/java/org/tenten/tentenbe/domain/tour/repository/TourItemRepository.java b/src/main/java/org/tenten/tentenbe/domain/tour/repository/TourItemRepository.java
@@ -16,6 +16,7 @@ public interface TourItemRepository extends JpaRepository<TourItem, Long>, JpaSp
     List<TourItem> findByAreaCode(Long areaCode);
     @Query("SELECT NEW org.tenten.tentenbe.domain.tour.dto.response.TourSimpleResponse(" +
         "ti.id, " +
+        "ti.contentTypeId, " +
         "ti.title, " +
         "CAST(COALESCE(AVG(r.rating), 0) AS DOUBLE), " +
         "CAST(COALESCE(COUNT(DISTINCT r.id), 0) AS LONG), " +
@@ -30,6 +31,7 @@ public interface TourItemRepository extends JpaRepository<TourItem, Long>, JpaSp
     Page<TourSimpleResponse> findPopularTourItems(@Param("memberId") Long memberId, Pageable pageable);
     @Query("SELECT NEW org.tenten.tentenbe.domain.tour.dto.response.TourSimpleResponse(" +
         "ti.id, " +
+        "ti.contentTypeId, " +
         "ti.title, " +
         "CAST(COALESCE(AVG(r.rating), 0) AS DOUBLE), " +
         "CAST(COALESCE(COUNT(DISTINCT r.id), 0) AS LONG), " +

diff --git a/src/main/java/org/tenten/tentenbe/domain/tour/service/TourService.java b/src/main/java/org/tenten/tentenbe/domain/tour/service/TourService.java
@@ -90,6 +90,7 @@ private List<TourSimpleResponse> getTourSimpleResponses(Member member, List<Tour
         return tourItems.stream()
             .map(tourItem -> new TourSimpleResponse(
                 tourItem.getId(),
+                tourItem.getContentTypeId(),
                 tourItem.getTitle(),
                 tourItem.getReviews().stream()
                     .mapToDouble(Review::getRating)

diff --git a/src/main/resources/data/TourItem.sql b/src/main/resources/data/TourItem.sql
diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql
@@ -69,7 +69,9 @@ create table TourItem
     smallThumbnailUrl    varchar(255) null,
     tel                  varchar(255) null,
     title                varchar(255) null,
-    zipcode              varchar(255) null
+    zipcode              varchar(255) null,
+    reviewTotalCount     bigint       null,
+    likedTotalCount      bigint       null
 );
 
 create table LikedItem