Merge pull request #59 from BackEndSchoolPlus3th/dev

Dev

Author: seoyeonson

src/main/java/com/jupiter/wyl/domain/member/service/MemberService.java

@@ -99,4 +99,10 @@ public Long getUserIdByEmail(String email) {
                 .map(Member::getId) // 유저 객체에서 ID만 가져옴
                 .orElseThrow(() -> new IllegalArgumentException("해당 이메일의 유저를 찾을 수 없습니다."));
     }
+
+    public String getUserNameById(Long userId) {
+        return memberRepository.findById(userId)
+                .map(Member::getNickname)
+                .orElse("Unknown User");
+    }
 }

src/main/java/com/jupiter/wyl/domain/movie/movie/dto/response/MovieReviewDto.java

@@ -15,14 +15,17 @@ public class MovieReviewDto {
     int rating;
     long userId;
     Long movie;
+    String userName;
 
-    public static MovieReviewDto fromEntity(MovieReview movieReview) {
+
+    public static MovieReviewDto fromEntity(MovieReview movieReview, String userName) {
         return new MovieReviewDto(
                 movieReview.getId(),
                 movieReview.getReviewContent(),
                 movieReview.getRating(),
                 movieReview.getUserId(),
-                movieReview.getMovie().getId() // Movie 엔티티에서 ID 가져오기
+                movieReview.getMovie().getId(), // Movie 엔티티에서 ID 가져오기
+                userName
         );
     }
 }

src/main/java/com/jupiter/wyl/domain/movie/movie/service/MovieReviewService.java

@@ -1,5 +1,6 @@
 package com.jupiter.wyl.domain.movie.movie.service;
 
+import com.jupiter.wyl.domain.member.service.MemberService;
 import com.jupiter.wyl.domain.movie.movie.dto.response.MovieDto;
 import com.jupiter.wyl.domain.movie.movie.dto.response.MovieReviewDto;
 import com.jupiter.wyl.domain.movie.movie.entity.Movie;
@@ -24,6 +25,7 @@ public class MovieReviewService {
     @Autowired
     private final MovieReviewRepository movieReviewRepository;
     private final MovieRepository movieRepository;
+    private final MemberService memberService;
 
     public void saveReview(Long userId, String reviewContent, int rating, Long movieId) {
         Movie movie = movieRepository.findById(movieId)
@@ -39,29 +41,40 @@ public void saveReview(Long userId, String reviewContent, int rating, Long movie
         movieReviewRepository.save(movieReview);
     }
 
+//    public List<MovieReviewDto> findAllByMovieId(Long movieId) {
+//        List<MovieReview> movieReviews = movieReviewRepository.findAllByMovieId(movieId);
+//
+//        if (movieReviews.isEmpty()) {
+//            throw new RuntimeException("해당 영화에 대한 리뷰가 없습니다: " + movieId);
+//        }
+//
+//        return movieReviews.stream()
+//                .map(review -> MovieReviewDto.builder()
+//                        .id(review.getId())
+//                        .reviewContent(review.getReviewContent())
+//                        .rating(review.getRating())
+//                        .movie(review.getMovie().getId())
+//                        .userId(review.getUserId())
+//                        .build())
+//                .collect(Collectors.toList());
+//    }
+
     public List<MovieReviewDto> findAllByMovieId(Long movieId) {
         List<MovieReview> movieReviews = movieReviewRepository.findAllByMovieId(movieId);
 
-        if (movieReviews.isEmpty()) {
-            throw new RuntimeException("해당 영화에 대한 리뷰가 없습니다: " + movieId);
-        }
-
-        return movieReviews.stream()
-                .map(review -> MovieReviewDto.builder()
-                        .id(review.getId())
-                        .reviewContent(review.getReviewContent())
-                        .rating(review.getRating())
-                        .movie(review.getMovie().getId())
-                        .userId(review.getUserId())
-                        .build())
-                .collect(Collectors.toList());
+        return movieReviews.stream().map(review -> {
+            String userName = memberService.getUserNameById(review.getUserId()); // ✅ userId로 userName 조회
+            return MovieReviewDto.fromEntity(review, userName); // ✅ DTO에 userName 추가
+        }).collect(Collectors.toList());
     }
 
     public MovieReviewDto getReviewByUserAndMovie(Long userId, Long movieId) {
         MovieReview movieReview = movieReviewRepository.findByUserIdAndMovieId(userId, movieId)
                 .orElseThrow(() -> new EntityNotFoundException("해당 리뷰를 찾을 수 없습니다."));
 
-        return MovieReviewDto.fromEntity(movieReview); // ✅ DTO로 변환하여 반환
+        String userName = memberService.getUserNameById(userId);
+
+        return MovieReviewDto.fromEntity(movieReview, userName); // ✅ DTO로 변환하여 반환
     }
 
     public void updateReview(Long reviewId, String newContent, int newRating) {