Revert "refactor: 보호소에 달린 후기 리스트 조회(보호소)를 명세에 맞게 수정한다. (#163)"

This reverts commit fc6c854.
anifriends · Nov 8, 2023 · 386b5c4 · 386b5c4
1 parent f0054eb
commit 386b5c4
Show file tree

Hide file tree

Showing 7 changed files with 1,396 additions and 1,792 deletions.
diff --git a/src/docs/asciidoc/index.adoc b/src/docs/asciidoc/index.adoc
@@ -99,14 +99,6 @@ operation::recruitment-controller-test/register-recruitment[snippets='http-respo
 
 == 5. 봉사 후기
 
-=== 보호소의 후기 리스트 조회
-
-==== Request
-operation::review-controller-test/find-shelter-reviews-by-shelter[snippets='http-request,request-headers,path-parameters,query-parameters']
-
-==== Response
-operation::review-controller-test/find-shelter-reviews-by-shelter[snippets='http-response,response-fields']
-
 == 6. 보호 동물
 
 = 봉사자

diff --git a/src/main/java/com/clova/anifriends/domain/review/controller/ReviewController.java b/src/main/java/com/clova/anifriends/domain/review/controller/ReviewController.java
@@ -4,7 +4,7 @@
 import com.clova.anifriends.domain.review.dto.request.RegisterReviewRequest;
 import com.clova.anifriends.domain.review.dto.response.FindReviewResponse;
 import com.clova.anifriends.domain.review.dto.response.FindShelterReviewsByVolunteerResponse;
-import com.clova.anifriends.domain.review.dto.response.FindShelterReviewsByShelterResponse;
+import com.clova.anifriends.domain.review.dto.response.FindShelterReviewsResponse;
 import com.clova.anifriends.domain.review.dto.response.FindVolunteerReviewsResponse;
 import com.clova.anifriends.domain.review.service.ReviewService;
 import java.net.URI;
@@ -44,11 +44,10 @@ public ResponseEntity<Void> registerReview(
     }
 
     @GetMapping("/shelters/{shelterId}/reviews")
-    public ResponseEntity<FindShelterReviewsByShelterResponse> findShelterReviewsByShelter(
+    public ResponseEntity<FindShelterReviewsResponse> findShelterReviews(
         @PathVariable("shelterId") Long shelterId,
         Pageable pageable) {
-        FindShelterReviewsByShelterResponse response
-            = reviewService.findShelterReviewsByShelter(shelterId, pageable);
+        FindShelterReviewsResponse response = reviewService.findShelterReviews(shelterId, pageable);
         return ResponseEntity.ok(response);
     }
 

diff --git a/.../FindShelterReviewsByShelterResponse.java → .../response/FindShelterReviewsResponse.java b/.../FindShelterReviewsByShelterResponse.java → .../response/FindShelterReviewsResponse.java
@@ -7,18 +7,17 @@
 import java.util.List;
 import org.springframework.data.domain.Page;
 
-public record FindShelterReviewsByShelterResponse(
-    List<FindShelterReviewResponse> reviews,
-    PageInfo pageInfo) {
+public record FindShelterReviewsResponse(List<FindShelterReviewResponse> reviews,
+                                         PageInfo pageInfo) {
 
     public record FindShelterReviewResponse(
         Long reviewId,
-        LocalDateTime reviewCreatedAt,
-        String reviewContent,
+        LocalDateTime createdAt,
+        String content,
         List<String> reviewImageUrls,
 
         String volunteerName,
-        int volunteerTemperature,
+        int temperature,
         String volunteerImageUrl,
         long VolunteerReviewCount) {
 
@@ -37,11 +36,11 @@ public static FindShelterReviewResponse from(Review review) {
         }
     }
 
-    public static FindShelterReviewsByShelterResponse from(Page<Review> reviewPage) {
+    public static FindShelterReviewsResponse from(Page<Review> reviewPage) {
         PageInfo pageInfo = PageInfo.of(reviewPage.getTotalElements(), reviewPage.hasNext());
         List<FindShelterReviewResponse> reviews = reviewPage
             .map(FindShelterReviewResponse::from)
             .stream().toList();
-        return new FindShelterReviewsByShelterResponse(reviews, pageInfo);
+        return new FindShelterReviewsResponse(reviews, pageInfo);
     }
 }
diff --git a/src/main/java/com/clova/anifriends/domain/review/service/ReviewService.java b/src/main/java/com/clova/anifriends/domain/review/service/ReviewService.java
@@ -6,7 +6,7 @@
 import com.clova.anifriends.domain.review.Review;
 import com.clova.anifriends.domain.review.dto.response.FindReviewResponse;
 import com.clova.anifriends.domain.review.dto.response.FindShelterReviewsByVolunteerResponse;
-import com.clova.anifriends.domain.review.dto.response.FindShelterReviewsByShelterResponse;
+import com.clova.anifriends.domain.review.dto.response.FindShelterReviewsResponse;
 import com.clova.anifriends.domain.review.dto.response.FindVolunteerReviewsResponse;
 import com.clova.anifriends.domain.review.exception.ApplicantNotFoundException;
 import com.clova.anifriends.domain.review.exception.ReviewBadRequestException;
@@ -37,11 +37,10 @@ private Review getReview(Long userId, Long reviewId) {
     }
 
     @Transactional(readOnly = true)
-    public FindShelterReviewsByShelterResponse findShelterReviewsByShelter(
-        Long shelterId,
-        Pageable pageable) {
-        Page<Review> reviewPage = reviewRepository.findAllByShelterId(shelterId, pageable);
-        return FindShelterReviewsByShelterResponse.from(reviewPage);
+    public FindShelterReviewsResponse findShelterReviews(Long shelterId, Pageable pageable) {
+        Page<Review> reviewPage
+            = reviewRepository.findAllByShelterId(shelterId, pageable);
+        return FindShelterReviewsResponse.from(reviewPage);
     }
 
     @Transactional