Skip to content

Commit a7b3424

Browse files
committed
hotfix: log추가
1 parent 3844769 commit a7b3424

2 files changed

Lines changed: 15 additions & 44 deletions

File tree

src/main/java/ssu/eatssu/domain/review/presentation/ReviewControllerV2.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,9 @@ public BaseResponse<SliceResponse<MyMealReviewResponse>> getMyReviews(
222222
@Parameter(description = "마지막으로 조회된 reviewId값(첫 조회시 값 필요 없음)", in = ParameterIn.QUERY) @RequestParam(required = false) Long lastReviewId,
223223
@ParameterObject @PageableDefault(size = 20, sort = "date", direction = Sort.Direction.DESC) Pageable pageable,
224224
@AuthenticationPrincipal CustomUserDetails customUserDetails) {
225-
SliceResponse<MyMealReviewResponse> myReviews = reviewServiceV2.findMyReviewsV2(customUserDetails,
226-
lastReviewId,
227-
pageable);
225+
SliceResponse<MyMealReviewResponse> myReviews = reviewServiceV2.findMyReviews(customUserDetails,
226+
lastReviewId,
227+
pageable);
228228
return BaseResponse.success(myReviews);
229229
}
230230

src/main/java/ssu/eatssu/domain/review/service/ReviewServiceV2.java

Lines changed: 12 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
44
import lombok.extern.slf4j.Slf4j;
55
import org.springframework.context.ApplicationEventPublisher;
66
import org.springframework.data.domain.Page;
7-
import org.springframework.data.domain.PageRequest;
87
import org.springframework.data.domain.Pageable;
98
import org.springframework.data.domain.Slice;
10-
import org.springframework.data.domain.Sort;
119
import org.springframework.stereotype.Service;
1210
import org.springframework.transaction.annotation.Transactional;
1311
import ssu.eatssu.domain.auth.security.CustomUserDetails;
@@ -17,6 +15,7 @@
1715
import ssu.eatssu.domain.menu.persistence.MealRepository;
1816
import ssu.eatssu.domain.menu.persistence.MenuRepository;
1917
import ssu.eatssu.domain.menu.service.MealRatingService;
18+
import ssu.eatssu.domain.rating.entity.Ratings;
2019
import ssu.eatssu.domain.restaurant.entity.Restaurant;
2120
import ssu.eatssu.domain.review.dto.CreateMealReviewRequest;
2221
import 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

Comments
 (0)