Merge branch 'master' of https://github.com/fernandokkang/todaysbook …

…into release
fernandokkang · May 15, 2024 · ba646b1 · ba646b1
2 parents 1ab00e7 + dc49312
commit ba646b1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/main/java/com/example/todaysbook/controller/ReviewController.java b/src/main/java/com/example/todaysbook/controller/ReviewController.java
@@ -66,8 +66,7 @@ public String addNewReview(@RequestBody ReviewRequestDto requestDto,
     }
 
     @DeleteMapping("/delete")
-    public String deleteReview(@RequestParam(value = "reviewId") long reviewId,
-                               @RequestParam(value = "bookId") long bookId,
+    public String deleteReview(@RequestBody ReviewRequestDto requestDto,
                                @AuthenticationPrincipal CustomUserDetails userDetails,
                                Model model, BindingResult result) {
 
@@ -76,15 +75,15 @@ public String deleteReview(@RequestParam(value = "reviewId") long reviewId,
 
         Map<String, Long> map = new HashMap<>();
         map.put("userId", userId);
-        map.put("reviewOwnerId", reviewService.getReviewOwnerId(reviewId));
+        map.put("reviewOwnerId", reviewService.getReviewOwnerId(requestDto.getReviewId()));
 
         ReviewUpdateDeleteValidator validator = new ReviewUpdateDeleteValidator();
         validator.validate(map, result);
 
-        reviewService.deleteReview(reviewId);
+        reviewService.deleteReview(requestDto.getReviewId());
 
         List<Review> reviews =
-                reviewService.getReviews(bookId, userId, orderBy);
+                reviewService.getReviews(requestDto.getBookId(), userId, orderBy);
         model.addAttribute("reviews", reviews);
         model.addAttribute("userId", userId);
 
@@ -101,7 +100,7 @@ public String updateReview(@RequestBody ReviewRequestDto requestDto,
 
         Map<String, Long> map = new HashMap<>();
         map.put("userId", userId);
-        map.put("reviewOwnerId", requestDto.getReviewId());
+        map.put("reviewOwnerId", reviewService.getReviewOwnerId(requestDto.getReviewId()));
 
         ReviewUpdateDeleteValidator validator = new ReviewUpdateDeleteValidator();
         validator.validate(map, result);

diff --git a/src/main/resources/static/js/review/review.js b/src/main/resources/static/js/review/review.js
@@ -146,10 +146,11 @@ function deleteReview(button) {
     $.ajax({
         url: url,
         type: method,
-        data: {
+        contentType: 'application/json; charset=utf-8',
+        data: JSON.stringify({
             bookId: bookId,
             reviewId: reviewId
-        },
+        }),
         success: function (data) {
             alert("리뷰가 삭제 되었습니다.");
             $('.review-area').html(data);