Skip to content

Fix/#279 캠핑장 id로 리뷰 페이지를 조회하는 기능 추가 #280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chanjin23 merged 2 commits into from
Dec 10, 2024
Merged

Fix/#279 캠핑장 id로 리뷰 페이지를 조회하는 기능 추가 #280

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e2c632
Fix/#279 캠핑장 id로 리뷰 페이지를 조회하는 기능 추가
ParkYuChan03 Dec 10, 2024
f3703ff
Fix/#279 캠핑장 id로 리뷰 페이지를 조회하는 기능 추가
ParkYuChan03 Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/main/java/site/campingon/campingon/review/controller/ReviewController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.web.PageableDefault;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
Expand All @@ -10,7 +14,6 @@
import site.campingon.campingon.review.dto.ReviewUpdateRequestDto;
import site.campingon.campingon.review.service.ReviewService;

import java.util.List;

@Slf4j
@RestController
Expand Down Expand Up @@ -43,10 +46,11 @@ public ResponseEntity<ReviewResponseDto> updateReview(

// 캠핑장 id로 리뷰 목록 조회
@GetMapping("/{campId}/reviews")
public ResponseEntity<List<ReviewResponseDto>> getReviewsByCampId(
@PathVariable("campId") Long campId
public ResponseEntity<Page<ReviewResponseDto>> getReviewsByCampId(
@PathVariable("campId") Long campId,
@PageableDefault(size = 4, sort = "id", direction = Sort.Direction.DESC) Pageable pageable
) {
List<ReviewResponseDto> reviews = reviewService.getReviewsByCampId(campId);
Page<ReviewResponseDto> reviews = reviewService.getReviewsByCampId(campId, pageable);
return ResponseEntity.ok(reviews);
}

Expand Down
10 changes: 9 additions & 1 deletion src/main/java/site/campingon/campingon/review/mapper/ReviewMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,16 @@ public interface ReviewMapper {
@Mapping(target = "content", source = "requestDto.content", defaultValue = "review.content")
Review updateFromRequest(Review review, ReviewUpdateRequestDto requestDto);*/

List<ReviewResponseDto> toResponseDtoList(List<Review> reviews);
// List<ReviewResponseDto> toResponseDtoList(List<Review> reviews);

@Mapping(target = "isRecommend", expression = "java(!review.isRecommend())")
Review toUpdatedReview(Review review);

@Mapping(target = "reviewId", source = "id")
@Mapping(target = "campId", source = "camp.id")
@Mapping(target = "reservationId", source = "reservation.id")
@Mapping(target = "userId", source = "user.id")
@Mapping(target = "recommended", source = "recommend")
@Mapping(target = "images", expression = "java(review.getReviewImages() != null ? review.getReviewImages().stream().map(image -> image.getImageUrl()).toList() : java.util.List.of())")
ReviewResponseDto toDto(Review review);
}
4 changes: 3 additions & 1 deletion src/main/java/site/campingon/campingon/review/repository/ReviewRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package site.campingon.campingon.review.repository;

import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
Expand All @@ -15,7 +17,7 @@ public interface ReviewRepository extends JpaRepository<Review, Long> {
List<Review> findByCampSiteId(Long campSiteId);

// 특정 캠핑장 하위 모든 리뷰 조회
List<Review> findByCampId(Long campId);
Page<Review> findByCampId(Long campId, Pageable pageable);

boolean existsByReservationId(Long reservationId);

Expand Down
11 changes: 5 additions & 6 deletions src/main/java/site/campingon/campingon/review/service/ReviewService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
Expand Down Expand Up @@ -187,12 +189,9 @@ private void moveReviewImagesToDeletedFolder(Review review) {
}*/

// 캠핑장 id로 리뷰 목록 조회
public List<ReviewResponseDto> getReviewsByCampId(Long campId) {
Camp camp = campRepository.findById(campId)
.orElseThrow(() -> new GlobalException(CAMP_NOT_FOUND_BY_ID));

List<Review> reviews = reviewRepository.findByCampId(camp.getId());
return reviewMapper.toResponseDtoList(reviews);
public Page<ReviewResponseDto> getReviewsByCampId(Long campId, Pageable pageable) {
Page<Review> reviews = reviewRepository.findByCampId(campId, pageable);
return reviews.map(reviewMapper::toDto);
}

// 리뷰 상세 조회
Expand Down
Loading