Merge pull request #286 from linglong67/feature/review-file-upload

[feat] 리뷰 API 수정 (이전 PR 내 이슈 수정)
Kernel360 · Mar 12, 2024 · 5371c27 · 5371c27
2 parents 1b9f2a6 + 743c8c8
commit 5371c27
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 7 deletions.
diff --git a/module-api/src/main/java/com/kernel360/review/service/ReviewService.java b/module-api/src/main/java/com/kernel360/review/service/ReviewService.java
@@ -113,7 +113,7 @@ public void updateReview(ReviewRequestDto reviewRequestDto, List<MultipartFile>
             reviewRepository.saveAndFlush(reviewRequestDto.toEntityForUpdate());
             log.info("리뷰 수정 -> review_no {}", reviewRequestDto.reviewNo());
 
-            fileRepository.findByReferenceNo(reviewRequestDto.reviewNo())
+            fileRepository.findByReferenceTypeAndReferenceNo(REVIEW_CODE, reviewRequestDto.reviewNo())
                           .stream()
                           .forEach(file -> {
                               if (!reviewRequestDto.files().contains(file.getFileUrl())) {
@@ -138,13 +138,13 @@ public void deleteReview(Long reviewNo) {
         reviewRepository.deleteById(reviewNo);
         log.info("리뷰 삭제 -> review_no {}", reviewNo);
 
-        fileRepository.findByReferenceNo(reviewNo)
+        fileRepository.findByReferenceTypeAndReferenceNo(REVIEW_CODE, reviewNo)
                       .stream()
                       .forEach(file -> {
                           fileUtils.delete(file.getFileKey());
                           log.info("리뷰 파일 삭제 -> file_no {}", file.getFileNo());
                       });
-        fileRepository.deleteByReferenceNo(reviewNo);
+        fileRepository.deleteByReferenceTypeAndReferenceNo(REVIEW_CODE, reviewNo);
     }
 
     private Review isVisibleReview(Long reviewNo) {

diff --git a/module-domain/src/main/java/com/kernel360/file/entity/File.java b/module-domain/src/main/java/com/kernel360/file/entity/File.java
@@ -32,7 +32,7 @@ public class File extends BaseEntity {
     @Column(name = "reference_no", nullable = false)
     private Long referenceNo;
 
-    public File(Long fileNo, String fileName, String fileKey, String fileUrl, String referenceType, Long referenceNo) {
+    private File(Long fileNo, String fileName, String fileKey, String fileUrl, String referenceType, Long referenceNo) {
         this.fileNo = fileNo;
         this.fileName = fileName;
         this.fileKey = fileKey;

diff --git a/module-domain/src/main/java/com/kernel360/file/repository/FileRepositoryJpa.java b/module-domain/src/main/java/com/kernel360/file/repository/FileRepositoryJpa.java
@@ -6,7 +6,7 @@
 import java.util.List;
 
 public interface FileRepositoryJpa extends JpaRepository<File, Long> {
-    List<File> findByReferenceNo(Long referenceNo);
+    List<File> findByReferenceTypeAndReferenceNo(String referenceType, Long referenceNo);
 
-    void deleteByReferenceNo(Long referenceNo);
+    void deleteByReferenceTypeAndReferenceNo(String referenceType, Long referenceNo);
 }
diff --git a/module-domain/src/main/java/com/kernel360/member/entity/Member.java b/module-domain/src/main/java/com/kernel360/member/entity/Member.java
@@ -123,10 +123,16 @@ public void updateFromInfo(int gender, int age) {
         this.age = age;
     }
 
+    /**
+     * review request
+     **/
     private Member (Long memberNo) {
         this.memberNo = memberNo;
     }
 
+    /**
+     * review request
+     **/
     public static Member of(Long memberNo) {
         return new Member(memberNo);
     }

diff --git a/module-domain/src/main/java/com/kernel360/product/entity/Product.java b/module-domain/src/main/java/com/kernel360/product/entity/Product.java
@@ -171,6 +171,9 @@ private Product(
         this.violationInfo = violationInfo;
     }
 
+    /**
+     * review request
+     **/
     private Product(Long productNo) {
         this.productNo = productNo;
     }
@@ -210,6 +213,9 @@ public static Product of(String productName,
                 fluorescentWhitening, manufactureType, manufactureMethod, manufactureNation, violation_info);
     }
 
+    /**
+     * review request
+     **/
     public static Product of(Long productNo) {
         return new Product(productNo);
     }

diff --git a/module-domain/src/main/java/com/kernel360/review/entity/Review.java b/module-domain/src/main/java/com/kernel360/review/entity/Review.java
@@ -51,7 +51,7 @@ private Review(Long reviewNo, Product product, Member member, BigDecimal starRat
         this.isVisible = isVisible;
     }
 
-    public Review(Long reviewNo, BigDecimal starRating, String title, String contents, Boolean isVisible) {
+    private Review(Long reviewNo, BigDecimal starRating, String title, String contents, Boolean isVisible) {
         this.reviewNo = reviewNo;
         this.starRating = starRating;
         this.title = title;