#31 feat : 일정 후기 구현

Journey-Together · Jun 4, 2024 · b6cbbcf · b6cbbcf
1 parent bb1ea52
commit b6cbbcf
Show file tree

Hide file tree

Showing 8 changed files with 72 additions and 11 deletions.
diff --git a/src/main/java/Journey/Together/domain/dairy/controller/PlanController.java b/src/main/java/Journey/Together/domain/dairy/controller/PlanController.java
@@ -1,6 +1,7 @@
 package Journey.Together.domain.dairy.controller;
 
 import Journey.Together.domain.dairy.dto.PlanReq;
+import Journey.Together.domain.dairy.dto.PlanReviewReq;
 import Journey.Together.domain.dairy.service.PlanService;
 import Journey.Together.global.common.ApiResponse;
 import Journey.Together.global.exception.Success;
@@ -35,7 +36,8 @@ public ApiResponse deletePlan(@AuthenticationPrincipal PrincipalDetails principa
     }
 
     @PostMapping("/review/{plan_id}")
-    public ApiResponse savePlanReview(@AuthenticationPrincipal PrincipalDetails principalDetails,@PathVariable("plan_id")Long planId){
+    public ApiResponse savePlanReview(@AuthenticationPrincipal PrincipalDetails principalDetails, @PathVariable("plan_id")Long planId, @RequestBody PlanReviewReq planReviewReq){
+        planService.savePlanReview(principalDetails.getMember(),planId,planReviewReq);
         return ApiResponse.success(Success.CREATE_REVIEW_SUCCESS);
     }
 

diff --git a/src/main/java/Journey/Together/domain/dairy/dto/PlanReviewReq.java b/src/main/java/Journey/Together/domain/dairy/dto/PlanReviewReq.java
@@ -2,11 +2,13 @@
 
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.swing.text.StyledEditorKit;
 import java.util.List;
 
 public record PlanReviewReq(
         float grade,
         String content,
-        List<MultipartFile> images
+        List<MultipartFile> images,
+        Boolean isPublic
 ) {
 }
diff --git a/src/main/java/Journey/Together/domain/dairy/entity/PlanReview.java b/src/main/java/Journey/Together/domain/dairy/entity/PlanReview.java
@@ -19,16 +19,24 @@ public class PlanReview extends BaseTimeEntity {
     @Column(name = "planReview_id",columnDefinition = "bigint")
     private Long planReviewId;
 
+    @Column(name = "grade")
+    private float grade;
+
+    @Column(name = "content",columnDefinition = "varchar(300)")
+    private String content;
+
     @OneToOne(mappedBy = "plan", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY)
     @JoinColumn(name = "plan_id")
     private Plan plan;
 
     @OneToMany(mappedBy = "planReviewImage", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY)
     private List<PlanReviewImage> planReviewImages = new ArrayList<>();
 
-    @Column(name = "grade")
-    private float grade;
-
-    @Column(name = "content",columnDefinition = "varchar(300)")
-    private String content;
+    @Builder
+    public PlanReview(float grade, String content,Plan plan,List<PlanReviewImage> planReviewImages){
+        this.grade = grade;
+        this.content=content;
+        this.plan=plan;
+        this.planReviewImages=planReviewImages;
+    }
 }
diff --git a/src/main/java/Journey/Together/domain/dairy/entity/PlanReviewImage.java b/src/main/java/Journey/Together/domain/dairy/entity/PlanReviewImage.java
@@ -17,4 +17,9 @@ public class PlanReviewImage {
 
     @Column(name = "imageUrl")
     private String imageUrl;
+
+    @Builder
+    public PlanReviewImage(String imageUrl){
+        this.imageUrl=imageUrl;
+    }
 }
diff --git a/src/main/java/Journey/Together/domain/dairy/repository/PlanReviewImageRepository.java b/src/main/java/Journey/Together/domain/dairy/repository/PlanReviewImageRepository.java
@@ -0,0 +1,7 @@
+package Journey.Together.domain.dairy.repository;
+
+import Journey.Together.domain.dairy.entity.PlanReviewImage;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface PlanReviewImageRepository extends JpaRepository<PlanReviewImage,Long> {
+}
diff --git a/src/main/java/Journey/Together/domain/dairy/repository/PlanReviewRepository.java b/src/main/java/Journey/Together/domain/dairy/repository/PlanReviewRepository.java
@@ -0,0 +1,8 @@
+package Journey.Together.domain.dairy.repository;
+
+import Journey.Together.domain.dairy.entity.PlanReview;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+
+public interface PlanReviewRepository extends JpaRepository<PlanReview,Long> {
+}
diff --git a/src/main/java/Journey/Together/domain/dairy/service/PlanService.java b/src/main/java/Journey/Together/domain/dairy/service/PlanService.java
@@ -2,22 +2,31 @@
 
 import Journey.Together.domain.dairy.dto.DailyPlace;
 import Journey.Together.domain.dairy.dto.PlanReq;
+import Journey.Together.domain.dairy.dto.PlanReviewReq;
 import Journey.Together.domain.dairy.entity.Day;
 import Journey.Together.domain.dairy.entity.Plan;
+import Journey.Together.domain.dairy.entity.PlanReview;
+import Journey.Together.domain.dairy.entity.PlanReviewImage;
 import Journey.Together.domain.dairy.repository.DayRepository;
 import Journey.Together.domain.dairy.repository.PlanRepository;
+import Journey.Together.domain.dairy.repository.PlanReviewImageRepository;
+import Journey.Together.domain.dairy.repository.PlanReviewRepository;
 import Journey.Together.domain.member.entity.Member;
 import Journey.Together.domain.member.repository.MemberRepository;
 import Journey.Together.domain.place.entity.Place;
 import Journey.Together.domain.place.repository.PlaceRepository;
 import Journey.Together.global.exception.ApplicationException;
 import Journey.Together.global.exception.ErrorCode;
+import Journey.Together.global.util.S3Client;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.time.LocalDate;
-import java.util.Date;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
 
 @Service
 @Transactional(readOnly = true)
@@ -27,6 +36,9 @@ public class PlanService {
     private final PlanRepository planRepository;
     private final DayRepository dayRepository;
     private final PlaceRepository placeRepository;
+    private final PlanReviewRepository planReviewRepository;
+    private final PlanReviewImageRepository planReviewImageRepository;
+    private final S3Client s3Client;
 
     @Transactional
     public void savePlan(Member member, PlanReq planReq){
@@ -79,13 +91,30 @@ public void deletePlan(Member member,Long planId){
     }
 
     @Transactional
-    public void savePlanReview(Member member,Long planId){
+    public void savePlanReview(Member member, Long planId, PlanReviewReq planReviewReq){
         // Validation
         Plan plan = planRepository.findPlanByMemberAndPlanIdAndEndDateIsAfterAndDeletedAtIsNull(member,planId,LocalDate.now());
         if(plan == null){
             throw new ApplicationException(ErrorCode.NOT_FOUND_EXCEPTION);
         }
-
+        //Business
+        List<PlanReviewImage> list = new ArrayList<>();
+        for(MultipartFile file : planReviewReq.images()){
+            String uuid = UUID.randomUUID().toString();
+            String url = s3Client.upload(file,member.getProfileUuid(),uuid);
+            PlanReviewImage planReviewImage = PlanReviewImage.builder()
+                    .imageUrl(url)
+                    .build();
+            planReviewImageRepository.save(planReviewImage);
+            list.add(planReviewImage);
+        }
+        PlanReview planReview = PlanReview.builder()
+                .grade(planReviewReq.grade())
+                .content(planReviewReq.content())
+                .plan(plan)
+                .planReviewImages(list)
+                .build();
+        planReviewRepository.save(planReview);
 
     }
 }
diff --git a/src/main/java/Journey/Together/global/util/S3Client.java b/src/main/java/Journey/Together/global/util/S3Client.java
@@ -53,7 +53,7 @@ public String upload(MultipartFile multipartFile, String folderName, String imag
         }
 
         // Response
-        return uuid;
+        return baseUrl+url;
     }
 
     public String update(String fileName, MultipartFile newFile) {