♻️ refactor : 다대다 테이블 변환

.gitignore

@@ -6,6 +6,7 @@ build/
 !**/src/test/**/build/
 *.yml
 .env
+data.sql
 
 ### STS ###
 .apt_generated

src/main/java/com/seeat/server/domain/best/application/dto/response/BestReviewListResponse.java

@@ -1,9 +1,11 @@
 package com.seeat.server.domain.best.application.dto.response;
 
 import com.seeat.server.domain.best.domain.entity.BestReviewSnapshot;
-import com.seeat.server.domain.review.domain.entity.HashTag;
+import com.seeat.server.domain.hashtag.domain.entity.HashTag;
 import com.seeat.server.domain.review.domain.entity.Review;
-import com.seeat.server.domain.review.domain.entity.ReviewHashTag;
+import com.seeat.server.domain.hashtag.domain.entity.ReviewHashTag;
+import com.seeat.server.domain.theater.domain.entity.Auditorium;
+import com.seeat.server.domain.theater.domain.entity.Seat;
 import com.seeat.server.domain.user.domain.entity.User;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Builder;
@@ -98,7 +100,10 @@ public static List<BestReviewListResponse> from(List<BestReviewSnapshot> snapsho
     }
 
     /// DB에서 직접 조회 정적 팩토리 메서드
-    public static BestReviewListResponse from(Review review, List<ReviewHashTag> hashTags, Long heartCount) {
+    public static BestReviewListResponse from(Review review, List<ReviewHashTag> hashTags, Long heartCount, List<Seat> seats) {
+
+        /// 좌석에 따른 상영관
+        Auditorium auditorium = seats.get(0).getAuditorium();
 
         /// 해시태그들 정리
         List<String> hashtags = hashTags.stream()
@@ -114,7 +119,7 @@ public static BestReviewListResponse from(Review review, List<ReviewHashTag> has
                 .thumbnailUrl(review.getThumbnailUrl())
                 .hashtags(hashtags)
                 .movieTitle(review.getMovieTitle())
-                .theaterName(review.getSeat().getAuditorium().getTheater().getName())
+                .theaterName(auditorium.getTheater().getName() + auditorium.getName())
                 .title(review.getTitle())
                 .content(review.getContent())
                 .userId(user.getId())

src/main/java/com/seeat/server/domain/review/application/dto/response/AuditoriumHashTagResponse.java → src/main/java/com/seeat/server/domain/hashtag/application/dto/response/AuditoriumHashTagResponse.java

@@ -1,7 +1,6 @@
-package com.seeat.server.domain.review.application.dto.response;
+package com.seeat.server.domain.hashtag.application.dto.response;
 
-import com.seeat.server.domain.review.domain.entity.ReviewHashTag;
-import com.seeat.server.domain.review.domain.repository.dto.ReviewHashTagWithCount;
+import com.seeat.server.domain.hashtag.domain.repository.ReviewHashTagWithCount;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Builder;
 import java.util.List;

src/main/java/com/seeat/server/domain/review/application/dto/response/HashTagResponse.java → src/main/java/com/seeat/server/domain/hashtag/application/dto/response/HashTagResponse.java

@@ -1,6 +1,6 @@
-package com.seeat.server.domain.review.application.dto.response;
+package com.seeat.server.domain.hashtag.application.dto.response;
 
-import com.seeat.server.domain.review.domain.entity.HashTag;
+import com.seeat.server.domain.hashtag.domain.entity.HashTag;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Builder;
 import java.util.List;

src/main/java/com/seeat/server/domain/review/application/dto/response/ReviewHashTagResponse.java → src/main/java/com/seeat/server/domain/hashtag/application/dto/response/ReviewHashTagResponse.java

@@ -1,7 +1,7 @@
-package com.seeat.server.domain.review.application.dto.response;
+package com.seeat.server.domain.hashtag.application.dto.response;
 
 
-import com.seeat.server.domain.review.domain.entity.ReviewHashTag;
+import com.seeat.server.domain.hashtag.domain.entity.ReviewHashTag;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Builder;
 

src/main/java/com/seeat/server/domain/review/application/service/HashTagService.java → src/main/java/com/seeat/server/domain/hashtag/application/service/HashTagService.java

@@ -1,21 +1,15 @@
-package com.seeat.server.domain.review.application.service;
-
-import com.seeat.server.domain.review.application.dto.response.HashTagResponse;
-import com.seeat.server.domain.review.application.usecase.HashTagUseCase;
-import com.seeat.server.domain.review.domain.entity.HashTag;
-import com.seeat.server.domain.review.domain.entity.Review;
-import com.seeat.server.domain.review.domain.entity.ReviewHashTag;
-import com.seeat.server.domain.review.domain.repository.HashTagRepository;
-import com.seeat.server.domain.review.domain.repository.ReviewHashTagRepository;
+package com.seeat.server.domain.hashtag.application.service;
+
+import com.seeat.server.domain.hashtag.application.dto.response.HashTagResponse;
+import com.seeat.server.domain.hashtag.application.usecase.HashTagUseCase;
+import com.seeat.server.domain.hashtag.domain.entity.HashTag;
+import com.seeat.server.domain.hashtag.domain.repository.HashTagRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 @Service
 @Transactional

src/main/java/com/seeat/server/domain/review/application/service/ReviewHashTagService.java → src/main/java/com/seeat/server/domain/hashtag/application/service/ReviewHashTagService.java

@@ -1,14 +1,14 @@
-package com.seeat.server.domain.review.application.service;
+package com.seeat.server.domain.hashtag.application.service;
 
-import com.seeat.server.domain.review.application.dto.response.AuditoriumHashTagResponse;
-import com.seeat.server.domain.review.application.usecase.ReviewHashTagUseCase;
-import com.seeat.server.domain.review.domain.entity.HashTag;
-import com.seeat.server.domain.review.domain.entity.HashTagType;
+import com.seeat.server.domain.hashtag.application.dto.response.AuditoriumHashTagResponse;
+import com.seeat.server.domain.hashtag.application.usecase.ReviewHashTagUseCase;
+import com.seeat.server.domain.hashtag.domain.entity.HashTag;
+import com.seeat.server.domain.hashtag.domain.entity.HashTagType;
 import com.seeat.server.domain.review.domain.entity.Review;
-import com.seeat.server.domain.review.domain.entity.ReviewHashTag;
-import com.seeat.server.domain.review.domain.repository.HashTagRepository;
-import com.seeat.server.domain.review.domain.repository.ReviewHashTagRepository;
-import com.seeat.server.domain.review.domain.repository.dto.ReviewHashTagWithCount;
+import com.seeat.server.domain.hashtag.domain.entity.ReviewHashTag;
+import com.seeat.server.domain.hashtag.domain.repository.HashTagRepository;
+import com.seeat.server.domain.hashtag.domain.repository.ReviewHashTagRepository;
+import com.seeat.server.domain.hashtag.domain.repository.ReviewHashTagWithCount;
 import com.seeat.server.domain.theater.application.usecase.TheaterUseCase;
 import com.seeat.server.domain.theater.domain.entity.Auditorium;
 import com.seeat.server.global.response.ErrorCode;

src/main/java/com/seeat/server/domain/review/application/usecase/HashTagUseCase.java → src/main/java/com/seeat/server/domain/hashtag/application/usecase/HashTagUseCase.java

@@ -1,7 +1,6 @@
-package com.seeat.server.domain.review.application.usecase;
+package com.seeat.server.domain.hashtag.application.usecase;
 
-import com.seeat.server.domain.review.application.dto.response.HashTagResponse;
-import com.seeat.server.domain.review.domain.entity.Review;
+import com.seeat.server.domain.hashtag.application.dto.response.HashTagResponse;
 
 import java.util.List;
 

src/main/java/com/seeat/server/domain/review/application/usecase/ReviewHashTagUseCase.java → src/main/java/com/seeat/server/domain/hashtag/application/usecase/ReviewHashTagUseCase.java

@@ -1,8 +1,8 @@
-package com.seeat.server.domain.review.application.usecase;
+package com.seeat.server.domain.hashtag.application.usecase;
 
-import com.seeat.server.domain.review.application.dto.response.AuditoriumHashTagResponse;
+import com.seeat.server.domain.hashtag.application.dto.response.AuditoriumHashTagResponse;
 import com.seeat.server.domain.review.domain.entity.Review;
-import com.seeat.server.domain.review.domain.entity.ReviewHashTag;
+import com.seeat.server.domain.hashtag.domain.entity.ReviewHashTag;
 
 import java.util.*;
 

src/main/java/com/seeat/server/domain/review/domain/entity/HashTag.java → src/main/java/com/seeat/server/domain/hashtag/domain/entity/HashTag.java

@@ -1,4 +1,4 @@
-package com.seeat.server.domain.review.domain.entity;
+package com.seeat.server.domain.hashtag.domain.entity;
 
 import com.seeat.server.domain.BaseEntity;
 import jakarta.persistence.*;

src/main/java/com/seeat/server/domain/review/domain/entity/HashTagType.java → src/main/java/com/seeat/server/domain/hashtag/domain/entity/HashTagType.java

@@ -1,4 +1,4 @@
-package com.seeat.server.domain.review.domain.entity;
+package com.seeat.server.domain.hashtag.domain.entity;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

src/main/java/com/seeat/server/domain/review/domain/entity/ReviewHashTag.java → src/main/java/com/seeat/server/domain/hashtag/domain/entity/ReviewHashTag.java

@@ -1,6 +1,7 @@
-package com.seeat.server.domain.review.domain.entity;
+package com.seeat.server.domain.hashtag.domain.entity;
 
 import com.seeat.server.domain.BaseEntity;
+import com.seeat.server.domain.review.domain.entity.Review;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/com/seeat/server/domain/review/domain/repository/HashTagRepository.java → src/main/java/com/seeat/server/domain/hashtag/domain/repository/HashTagRepository.java

@@ -1,6 +1,6 @@
-package com.seeat.server.domain.review.domain.repository;
+package com.seeat.server.domain.hashtag.domain.repository;
 
-import com.seeat.server.domain.review.domain.entity.HashTag;
+import com.seeat.server.domain.hashtag.domain.entity.HashTag;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;

src/main/java/com/seeat/server/domain/review/domain/repository/ReviewHashTagRepository.java → src/main/java/com/seeat/server/domain/hashtag/domain/repository/ReviewHashTagRepository.java

@@ -1,8 +1,7 @@
-package com.seeat.server.domain.review.domain.repository;
+package com.seeat.server.domain.hashtag.domain.repository;
 
 import com.seeat.server.domain.review.domain.entity.Review;
-import com.seeat.server.domain.review.domain.entity.ReviewHashTag;
-import com.seeat.server.domain.review.domain.repository.dto.ReviewHashTagWithCount;
+import com.seeat.server.domain.hashtag.domain.entity.ReviewHashTag;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
@@ -34,11 +33,19 @@ public interface ReviewHashTagRepository extends JpaRepository<ReviewHashTag, Lo
      * @param auditoriumId 상영관
      * @return List<Review>
      */
-    @Query("SELECT rh.hashTag.id as hashTagId, rh.hashTag.name as hashTagName, COUNT(rh) AS count " +
-            "FROM Review r LEFT JOIN ReviewHashTag rh ON rh.review.id = r.id " +
-            "WHERE r.seat.auditorium.id = :auditoriumId " +
-            "GROUP BY rh.hashTag.id, rh.hashTag.name " +
-            "ORDER BY COUNT(rh) DESC, rh.hashTag.id DESC")
+    @Query("""
+    SELECT rh.hashTag.id as hashTagId,
+        rh.hashTag.name as hashTagName,
+        COUNT(DISTINCT r.id) AS count
+    FROM Auditorium a
+    LEFT JOIN Seat s ON s.auditorium = a
+    LEFT JOIN ReviewSeat rs ON rs.seat = s
+    LEFT JOIN Review r ON rs.review = r
+    LEFT JOIN ReviewHashTag rh ON rh.review = r
+    WHERE a.id = :auditoriumId
+    GROUP BY rh.hashTag.id, rh.hashTag.name
+    ORDER BY COUNT(DISTINCT r.id) DESC, rh.hashTag.id DESC
+    """)
     List<ReviewHashTagWithCount> findByAuditorium_Id(@Param("auditoriumId") String auditoriumId);
 
 

src/main/java/com/seeat/server/domain/review/domain/repository/dto/ReviewHashTagWithCount.java → src/main/java/com/seeat/server/domain/hashtag/domain/repository/ReviewHashTagWithCount.java

@@ -1,4 +1,4 @@
-package com.seeat.server.domain.review.domain.repository.dto;
+package com.seeat.server.domain.hashtag.domain.repository;
 
 public interface ReviewHashTagWithCount {
 

src/main/java/com/seeat/server/domain/review/presentation/HashTagController.java → src/main/java/com/seeat/server/domain/hashtag/presentation/HashTagController.java

@@ -1,10 +1,10 @@
-package com.seeat.server.domain.review.presentation;
+package com.seeat.server.domain.hashtag.presentation;
 
-import com.seeat.server.domain.review.application.dto.response.AuditoriumHashTagResponse;
-import com.seeat.server.domain.review.application.dto.response.HashTagResponse;
-import com.seeat.server.domain.review.application.usecase.HashTagUseCase;
-import com.seeat.server.domain.review.application.usecase.ReviewHashTagUseCase;
-import com.seeat.server.domain.review.presentation.swagger.HashTagControllerSpec;
+import com.seeat.server.domain.hashtag.application.dto.response.AuditoriumHashTagResponse;
+import com.seeat.server.domain.hashtag.application.dto.response.HashTagResponse;
+import com.seeat.server.domain.hashtag.application.usecase.HashTagUseCase;
+import com.seeat.server.domain.hashtag.application.usecase.ReviewHashTagUseCase;
+import com.seeat.server.domain.hashtag.presentation.swagger.HashTagControllerSpec;
 import com.seeat.server.global.response.ApiResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/java/com/seeat/server/domain/review/presentation/swagger/HashTagControllerSpec.java → src/main/java/com/seeat/server/domain/hashtag/presentation/swagger/HashTagControllerSpec.java

@@ -1,7 +1,7 @@
-package com.seeat.server.domain.review.presentation.swagger;
+package com.seeat.server.domain.hashtag.presentation.swagger;
 
-import com.seeat.server.domain.review.application.dto.response.AuditoriumHashTagResponse;
-import com.seeat.server.domain.review.application.dto.response.HashTagResponse;
+import com.seeat.server.domain.hashtag.application.dto.response.AuditoriumHashTagResponse;
+import com.seeat.server.domain.hashtag.application.dto.response.HashTagResponse;
 import com.seeat.server.global.response.ApiResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

src/main/java/com/seeat/server/domain/image/application/service/ReviewImageService.java

@@ -84,7 +84,7 @@ public List<String> saveReviewImage(Review review, List<String> imageUrls) throw
     public List<ReviewImage> getReviewImagesByReview(Review review) {
 
         /// 리뷰에 해당하는 이미지 주소 순서대로 가져오기
-        List<ReviewImage> images = repository.findByReview(review);
+        List<ReviewImage> images = repository.findByReview_Id(review.getId());
 
         /// 순서대로 정렬한 내용 출력
         return images.stream()
@@ -96,13 +96,13 @@ public List<ReviewImage> getReviewImagesByReview(Review review) {
     /// 삭제하기
     /**
      * 리뷰에 존재하는 모든 이미지 삭제
-     * @param review    리뷰
+     * @param reviewId    리뷰
      */
     @Override
-    public void deleteReviewImage(Review review) throws IOException {
+    public void deleteReviewImage(Long reviewId) throws IOException {
 
         /// 리뷰에 해당하는 파일 이름 다 가져오기
-        List<ReviewImage> images = repository.findByReview(review);
+        List<ReviewImage> images = repository.findByReview_Id(reviewId);
 
         /// 파일 이름만 추출하기
         List<String> imagesList = images.stream()

src/main/java/com/seeat/server/domain/image/application/usecase/ReviewImageUseCase.java

@@ -21,7 +21,7 @@ public interface ReviewImageUseCase {
     List<ReviewImage> getReviewImagesByReview(Review review);
 
     /// 삭제
-    void deleteReviewImage(Review review) throws IOException;
+    void deleteReviewImage(Long reviewId) throws IOException;
 
 
 

src/main/java/com/seeat/server/domain/image/domain/repository/ReviewImageRepository.java

@@ -1,13 +1,12 @@
 package com.seeat.server.domain.image.domain.repository;
 
-import com.seeat.server.domain.review.domain.entity.Review;
 import com.seeat.server.domain.image.domain.entity.ReviewImage;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
 
 public interface ReviewImageRepository extends JpaRepository<ReviewImage, Long> {
-    List<ReviewImage> findByReview(Review review);
+    List<ReviewImage> findByReview_Id(Long reviewId);
 
     void deleteAllByImageUrlIn(List<String> imageUrls);
 }

src/main/java/com/seeat/server/domain/manage/application/dto/response/FeedbackDetailResponse.java

@@ -2,6 +2,8 @@
 
 import com.seeat.server.domain.manage.domain.entity.Feedback;
 import com.seeat.server.domain.user.application.dto.response.UserResponse;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.Builder;
 
 
@@ -14,7 +16,10 @@
 
 
 @Builder
+@Schema(name = "[응답][피드백] 피드백 상세 조회 Response",description = "피드백 상세 조회에 대한 DTO 입니다.")
 public record FeedbackDetailResponse(
+
+        @Schema(description = "피드백 내용", example = "메가박스 강남에 대한 정보가 틀린것 같아요!")
         String content,
         UserResponse user
 ) {

src/main/java/com/seeat/server/domain/review/application/dto/response/ReviewDetailResponse.java

@@ -1,7 +1,8 @@
 package com.seeat.server.domain.review.application.dto.response;
 
+import com.seeat.server.domain.hashtag.application.dto.response.ReviewHashTagResponse;
 import com.seeat.server.domain.review.domain.entity.Review;
-import com.seeat.server.domain.review.domain.entity.ReviewHashTag;
+import com.seeat.server.domain.hashtag.domain.entity.ReviewHashTag;
 import com.seeat.server.domain.image.domain.entity.ReviewImage;
 import com.seeat.server.domain.theater.domain.entity.Seat;
 import com.seeat.server.domain.user.application.dto.response.UserResponse;
@@ -10,7 +11,6 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Builder;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -67,8 +67,8 @@ public static ReviewDetailResponse from(
             List<ReviewHashTag> hashTags, Long heartCount, List<ReviewImage> images, List<Seat> seats
     ) {
 
-        /// 좌석 정보
-        Seat seat = review.getSeat();
+        /// 같은 상영관의 좌석이기에,
+        Seat seat = seats.get(0);
 
         return ReviewDetailResponse.builder()
                 .movieTitle(review.getMovieTitle())

src/main/java/com/seeat/server/domain/review/application/dto/response/ReviewListResponse.java

@@ -1,7 +1,8 @@
 package com.seeat.server.domain.review.application.dto.response;
 
+import com.seeat.server.domain.hashtag.application.dto.response.ReviewHashTagResponse;
 import com.seeat.server.domain.review.domain.entity.Review;
-import com.seeat.server.domain.review.domain.entity.ReviewHashTag;
+import com.seeat.server.domain.hashtag.domain.entity.ReviewHashTag;
 import com.seeat.server.domain.user.application.dto.response.UserResponse;
 import com.seeat.server.global.util.DateFormatUtil;
 import io.swagger.v3.oas.annotations.media.Schema;

src/main/java/com/seeat/server/domain/review/application/dto/response/ReviewSaveResponse.java

@@ -0,0 +1,25 @@
+package com.seeat.server.domain.review.application.dto.response;
+
+import com.seeat.server.domain.review.domain.entity.Review;
+import lombok.Builder;
+import java.util.List;
+
+@Builder
+public record ReviewSaveResponse(Long reviewId) {
+
+
+    /// 정적 팩토리 메서드
+    public static ReviewSaveResponse from(Review review) {
+        return ReviewSaveResponse.builder()
+                .reviewId(review.getId())
+                .build();
+    }
+
+    /// 정적 팩토리 메서드
+    public static List<ReviewSaveResponse> from(List<Review> reviews){
+        return reviews.stream()
+                .map(ReviewSaveResponse::from)
+                .toList();
+    }
+
+}

src/main/java/com/seeat/server/domain/review/application/dto/response/ReviewSeatListResponse.java

@@ -1,6 +1,6 @@
 package com.seeat.server.domain.review.application.dto.response;
 
-import com.seeat.server.domain.review.domain.repository.dto.SeatReviewStats;
+import com.seeat.server.domain.review.domain.repository.dto.ReviewSeatStats;
 import com.seeat.server.domain.theater.domain.entity.Seat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Builder;
@@ -38,7 +38,7 @@ public record ReviewSeatListResponse(
 ) {
 
     /// 정적 팩토리 메서드
-    public static ReviewSeatListResponse from(SeatReviewStats stats, List<ReviewListResponse> reviews) {
+    public static ReviewSeatListResponse from(ReviewSeatStats stats, List<ReviewListResponse> reviews) {
 
         Seat seat = stats.getSeat();