#28 [update], #12[update]

북마크, 폴더기능 생성,수정,삭제 리팩토링
리뷰 기능, responseDto point 반올림 처리

src/main/java/com/mpnp/baechelin/bookmark/controller/BookmarkController.java

@@ -3,13 +3,12 @@
 import com.mpnp.baechelin.bookmark.dto.BookmarkRequestDto;
 import com.mpnp.baechelin.bookmark.service.BookmarkService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.security.core.userdetails.User;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RequiredArgsConstructor
 @RestController
@@ -27,4 +26,13 @@ public ResponseEntity<?> bookmark(@RequestBody BookmarkRequestDto bookmarkReques
 
         return new ResponseEntity<>(HttpStatus.OK);
     }
+
+    @DeleteMapping("/bookmark/{bookmarkId}")
+    public ResponseEntity<?> bookmarkDelete(@PathVariable int bookmarkId,
+                                            @AuthenticationPrincipal User user){
+        if(user==null){ throw new IllegalArgumentException("해당하는 회원 정보가 없습니다."); }
+        bookmarkService.bookmarkDelete(bookmarkId, user.getUsername());
+
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
 }

src/main/java/com/mpnp/baechelin/bookmark/controller/FolderController.java

@@ -34,10 +34,11 @@ public ResponseEntity<?> folder (@RequestBody FolderRequestDto folderRequestDto,
 
     /** 폴더 삭제 -> 삭제 시 안에 담긴 모든 북마크가 삭제됨 */
     @DeleteMapping("/folder/{folderId}")
-    public ResponseEntity<?> folderDelete (@PathVariable int folderId) {
+    public ResponseEntity<?> folderDelete (@PathVariable int folderId,
+                                           @AuthenticationPrincipal User user) {
 
+        if(user==null){ throw new IllegalArgumentException("해당하는 회원 정보가 없습니다."); }
         folderService.folderDelete(folderId);
-
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
@@ -46,7 +47,9 @@ public ResponseEntity<?> folderDelete (@PathVariable int folderId) {
     /** 폴더 명 변경 */
     @PutMapping("/folderUpdate/{folderId}")
     public ResponseEntity<?> folderUpdate (@PathVariable int folderId,
-                              @RequestParam String newFolderName){
+                                           @RequestParam String newFolderName,
+                                           @AuthenticationPrincipal User user){
+        if(user==null){ throw new IllegalArgumentException("해당하는 회원 정보가 없습니다."); }
 
         folderService.folderUpdate(folderId, newFolderName);
 

src/main/java/com/mpnp/baechelin/bookmark/service/BookmarkService.java

@@ -12,6 +12,8 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.Optional;
+
 @Service
 @RequiredArgsConstructor
 public class BookmarkService {
@@ -37,4 +39,12 @@ public void bookmark(BookmarkRequestDto bookmarkRequestDto, String socialId) {
         storeRepository.save(store.updateBookmarkCount(1));
         bookmarkRepository.save(bookmark);
     }
+
+    public void bookmarkDelete(int bookmarkId, String socialId) {
+
+        User user = userRepository.findBySocialId(socialId); if(user == null) { throw new IllegalArgumentException("해당하는 유저가 없습니다."); }
+        bookmarkRepository.findById(bookmarkId).orElseThrow(()-> new IllegalArgumentException("해당하는 북마크는 이미 삭제 되었습니다"));
+        bookmarkRepository.deleteById(bookmarkId);
+
+    }
 }

src/main/java/com/mpnp/baechelin/review/controller/ReviewController.java

@@ -10,6 +10,9 @@
 import com.mpnp.baechelin.store.domain.Store;
 import com.mpnp.baechelin.store.repository.StoreRepository;
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.web.PageableDefault;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
@@ -30,7 +33,9 @@ public class ReviewController {
     private final ReviewService reviewService;
 
     @GetMapping("/review/{storeId}")
-    public ResponseEntity<List<ReviewResponseDto>> getStoreReview(@PathVariable int storeId) {
+    public ResponseEntity<List<ReviewResponseDto>> getStoreReview(@PathVariable int storeId
+                                                                  //@PageableDefault(page = 0, size = 10, sort = "id", direction = Sort.Direction.DESC) Pageable pageable
+    ) {
         List<ReviewResponseDto> reviewList = reviewService.getReview(storeId);
         return new ResponseEntity<>(reviewList, HttpStatus.OK);
     }

src/main/java/com/mpnp/baechelin/review/dto/ReviewResponseDto.java

@@ -28,16 +28,16 @@ public class ReviewResponseDto {
     private List<TagResponseDto> tagList;
 
     public ReviewResponseDto(Review review) {
-        this.reviewId = review.getId();
-        this.storeId = review.getStoreId().getId();
-        this.userId = review.getUserId().getId();
-        this.point = review.getPoint();
-        this.content = review.getContent();
-        this.createdAt = review.getCreatedAt();
+        this.reviewId   = review.getId();
+        this.storeId    = review.getStoreId().getId();
+        this.userId     = review.getUserId().getId();
+        this.point      = Math.round(review.getPoint()*10)/10.0; // 반올림
+        this.content    = review.getContent();
+        this.createdAt  = review.getCreatedAt();
         this.modifiedAt = review.getModifiedAt();
-        this.reviewImageUrlList = review.getReviewImageList()
-                .parallelStream().map(ReviewImageResponseDto::new).collect(Collectors.toList());
-        this.tagList = review.getTagList().parallelStream().map(TagResponseDto::new).collect(Collectors.toList());
+
+        this.reviewImageUrlList = review.getReviewImageList().parallelStream().map(ReviewImageResponseDto::new).collect(Collectors.toList());
+        this.tagList            = review.getTagList().parallelStream().map(TagResponseDto::new).collect(Collectors.toList());
     }
     @Builder
     @AllArgsConstructor

src/main/java/com/mpnp/baechelin/review/repository/ReviewImageRepository.java

@@ -6,6 +6,5 @@
 
 public interface ReviewImageRepository extends JpaRepository<ReviewImage, Integer> {
     void deleteAllByReviewId(Review review);
-
     void deleteByReviewId(Review review);
 }

src/main/java/com/mpnp/baechelin/review/service/ReviewService.java

@@ -17,6 +17,8 @@
 import com.mpnp.baechelin.util.AwsS3Manager;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -91,6 +93,7 @@ public List<ReviewResponseDto> getReview(long storeId) {
 
 
 
+    @Transactional
     /** 리뷰 수정 */
     public void reviewUpdate(ReviewRequestDto reviewRequestDto, String socialId, int reviewId) throws IOException {
 
@@ -114,9 +117,10 @@ public void reviewUpdate(ReviewRequestDto reviewRequestDto, String socialId, int
                 awsS3Manager.deleteFile(reviewImage.getReviewImageUrl().substring(reviewImage.getReviewImageUrl().indexOf("com/") + 4));
 
             }
-            reviewImageRepository.deleteByReviewId(review);
+            reviewImageRepository.deleteAllByReviewId(review);
         }
 
+
         // 2.수정할 이미지가 있다면 업로드
         if(newImageFileList != null) {
             System.out.println("newImageFileList != null");