44import lombok .extern .slf4j .Slf4j ;
55import org .springframework .context .ApplicationEventPublisher ;
66import org .springframework .data .domain .Page ;
7- import org .springframework .data .domain .PageRequest ;
87import org .springframework .data .domain .Pageable ;
98import org .springframework .data .domain .Slice ;
10- import org .springframework .data .domain .Sort ;
119import org .springframework .stereotype .Service ;
1210import org .springframework .transaction .annotation .Transactional ;
1311import ssu .eatssu .domain .auth .security .CustomUserDetails ;
1715import ssu .eatssu .domain .menu .persistence .MealRepository ;
1816import ssu .eatssu .domain .menu .persistence .MenuRepository ;
1917import ssu .eatssu .domain .menu .service .MealRatingService ;
18+ import ssu .eatssu .domain .rating .entity .Ratings ;
2019import ssu .eatssu .domain .restaurant .entity .Restaurant ;
2120import ssu .eatssu .domain .review .dto .CreateMealReviewRequest ;
2221import ssu .eatssu .domain .review .dto .CreateMenuReviewRequestV2 ;
@@ -429,7 +428,6 @@ public void deleteReview(CustomUserDetails userDetails, Long reviewId) {
429428 /**
430429 * 내 리뷰 리스트 조회
431430 */
432- @ Transactional (readOnly = true )
433431 public SliceResponse <MyMealReviewResponse > findMyReviews (CustomUserDetails userDetails , Long lastReviewId ,
434432 Pageable pageable ) {
435433 User user = userRepository .findById (userDetails .getId ())
@@ -438,6 +436,17 @@ public SliceResponse<MyMealReviewResponse> findMyReviews(CustomUserDetails userD
438436 Slice <Review > sliceReviews = reviewRepository .findByUserOrderByIdDesc (user , lastReviewId ,
439437 pageable );
440438
439+ sliceReviews .forEach (item -> {
440+ Ratings r = item .getRatings ();
441+ log .info (
442+ "reviewId=" + item .getId ()
443+ + ", ratingCol=" + item .getRating ()
444+ + ", ratingsObj=" + (r == null ? "null" : "not-null" )
445+ + ", main=" + (r == null ? null : r .getMainRating ())
446+ + ", amount=" + (r == null ? null : r .getAmountRating ())
447+ );
448+ });
449+
441450 List <MyMealReviewResponse > myMealReviewResponses = sliceReviews .getContent ().stream ()
442451 .map (MyMealReviewResponse ::from ).toList ();
443452
@@ -448,44 +457,6 @@ public SliceResponse<MyMealReviewResponse> findMyReviews(CustomUserDetails userD
448457 .build ();
449458 }
450459
451- @ Transactional (readOnly = true )
452- public SliceResponse <MyMealReviewResponse > findMyReviewsV2 (
453- CustomUserDetails userDetails ,
454- Long lastReviewId ,
455- Pageable pageable
456- ) {
457- User user = userRepository .findById (userDetails .getId ())
458- .orElseThrow (() -> new BaseException (NOT_FOUND_USER ));
459-
460- // pageSize + 1 로 조회
461- Pageable slicePageable =
462- PageRequest .of (
463- pageable .getPageNumber (),
464- pageable .getPageSize () + 1 ,
465- Sort .by (Sort .Direction .DESC , "id" )
466- );
467-
468- List <Review > reviews =
469- reviewRepository .findMyReviews (user , lastReviewId , slicePageable );
470-
471- boolean hasNext = reviews .size () > pageable .getPageSize ();
472- if (hasNext ) {
473- reviews .remove (pageable .getPageSize ());
474- }
475-
476- List <MyMealReviewResponse > responses =
477- reviews .stream ()
478- .map (MyMealReviewResponse ::from )
479- .toList ();
480-
481- return SliceResponse .<MyMealReviewResponse >builder ()
482- .numberOfElements (responses .size ())
483- .hasNext (hasNext )
484- .dataList (responses )
485- .build ();
486- }
487-
488-
489460 public ValidMenuForViewResponse validMenuForReview (Long mealId ) {
490461 Meal meal = mealRepository .findById (mealId )
491462 .orElseThrow (() -> new BaseException (NOT_FOUND_MEAL ));
0 commit comments