Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ public List<SearchRes> search(String keyword, BookFilterReq req, Member member)
List<BookGenre> filters = req.getGenres();

return response.item().stream()
.filter(item -> matchesGenre(item, filters))
.filter(item -> item.isbn13() != null && !item.isbn13().isBlank()) // ISBN 없는 책 제외
.map(item -> SearchRes.from(
item,
bookmarkedSet.contains(Long.parseLong(item.isbn13())) // 북마크 여부 체크
bookmarkedSet.contains(Long.parseLong(item.isbn13()))
))
.toList();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.hansung.leafly.domain.bookreview.entity;

import com.hansung.leafly.domain.bookreview.web.dto.ReviewReq;
import com.hansung.leafly.domain.bookreview.web.dto.ReviewUpdateReq;
import com.hansung.leafly.domain.member.entity.Member;
import com.hansung.leafly.global.entity.BaseEntity;
import jakarta.persistence.*;
Expand Down Expand Up @@ -61,4 +62,18 @@ public static BookReview toEntity(Member member, ReviewReq req) {
.build();
}

public void update(ReviewUpdateReq req) {
if (req.getTitle() != null) this.title = req.getTitle();
if (req.getAuthor() != null) this.author = req.getAuthor();
if (req.getThumbnail() != null) this.thumbnail = req.getThumbnail();
if (req.getRating() != null) this.rating = req.getRating();
if (req.getReviewTitle() != null) this.reviewTitle = req.getReviewTitle();
if (req.getContent() != null) this.content = req.getContent();
}

public void replaceImages(List<ReviewImage> newImages) {
this.images.clear();
this.images.addAll(newImages);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.hansung.leafly.domain.bookreview.web.dto.ReviewDetailsRes;
import com.hansung.leafly.domain.bookreview.web.dto.ReviewListRes;
import com.hansung.leafly.domain.bookreview.web.dto.ReviewReq;
import com.hansung.leafly.domain.bookreview.web.dto.ReviewUpdateReq;
import com.hansung.leafly.domain.member.entity.Member;

public interface BookReviewService {
Expand All @@ -13,4 +14,6 @@ public interface BookReviewService {
ReviewListRes getList(Member member);

ReviewDetailsRes getDetails(Long reviewId,Member member);

void update(Member member, Long reviewId, ReviewUpdateReq req);
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@
import com.hansung.leafly.domain.bookreview.repository.BookReviewRepository;
import com.hansung.leafly.domain.bookreview.repository.BookTagRepository;
import com.hansung.leafly.domain.bookreview.repository.ReviewImageRepository;
import com.hansung.leafly.domain.bookreview.web.dto.ReviewDetailsRes;
import com.hansung.leafly.domain.bookreview.web.dto.ReviewListRes;
import com.hansung.leafly.domain.bookreview.web.dto.ReviewReq;
import com.hansung.leafly.domain.bookreview.web.dto.ReviewRes;
import com.hansung.leafly.domain.bookreview.web.dto.*;
import com.hansung.leafly.domain.member.entity.Member;
import com.hansung.leafly.infra.s3.S3Service;
import com.hansung.leafly.infra.s3.exception.S3RequestFailedException;
Expand Down Expand Up @@ -82,6 +79,27 @@ public ReviewDetailsRes getDetails(Long reviewId, Member member) {
return ReviewDetailsRes.from(review);
}

@Override
@Transactional
public void update(Member member, Long reviewId, ReviewUpdateReq req) {
BookReview review = bookReviewRepository.findById(reviewId)
.orElseThrow(BookReviewNotFoundException::new);

if (!review.getMember().getId().equals(member.getId())) {
throw new BookReviewAccessDeniedException();
}
review.update(req);

// 이미지 수정이 요청된 경우에만 처리
if (req.getImages() != null && !req.getImages().isEmpty()) {
List<ReviewImage> newImages = processImages(req.getImages(), review);
//기존 이미지 제거 & 새로 교체
review.replaceImages(newImages);
}

bookReviewRepository.save(review);
}

// 카테고리 태그화
private List<BookTag> processTags(String rawTags, BookReview review) {
if (rawTags == null || rawTags.isEmpty()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import com.hansung.leafly.domain.bookreview.web.dto.ReviewDetailsRes;
import com.hansung.leafly.domain.bookreview.web.dto.ReviewListRes;
import com.hansung.leafly.domain.bookreview.web.dto.ReviewReq;
import com.hansung.leafly.domain.bookreview.web.dto.ReviewUpdateReq;
import com.hansung.leafly.global.auth.security.CustomMemberDetails;
import com.hansung.leafly.global.response.SuccessResponse;
import jakarta.validation.Valid;
Expand Down Expand Up @@ -58,4 +59,15 @@ public ResponseEntity<SuccessResponse<ReviewDetailsRes>> getDetails(
ReviewDetailsRes res = bookReviewService.getDetails(reviewId,memberDetails.getMember());
return ResponseEntity.status(HttpStatus.OK).body(SuccessResponse.from(res));
}

//독후감 수정
@PatchMapping("/{reviewId}")
public ResponseEntity<SuccessResponse<?>> update(
@AuthenticationPrincipal CustomMemberDetails memberDetails,
@PathVariable Long reviewId,
@ModelAttribute @Valid ReviewUpdateReq req
){
bookReviewService.update(memberDetails.getMember(), reviewId, req);
return ResponseEntity.status(HttpStatus.OK).body(SuccessResponse.from(null));
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package com.hansung.leafly.domain.bookreview.web.dto;

import jakarta.validation.constraints.Size;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import org.springframework.web.multipart.MultipartFile;

import java.util.List;

@Getter
@Setter
@NoArgsConstructor
public class ReviewUpdateReq {

private String title;
private String author;
private String thumbnail;
private Integer rating;
private String category;

@Size(max = 20)
private String reviewTitle;

@Size(min = 10)
private String content;

@Size(max = 3)
private List<MultipartFile> images;
}