Merge pull request #82 from HAB-DAY/fix/addUrl

[fix] 펀딩 수정하기 PATCH로 수정 개발
HAB-DAY · Aug 30, 2023 · ee055eb · ee055eb
2 parents c515bd3 + bb2e680
commit ee055eb
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 22 deletions.
diff --git a/5054777b-90b9-4bcf-b534-62de558ef916 b/5054777b-90b9-4bcf-b534-62de558ef916
diff --git a/src/main/java/com/habday/server/controller/FundingController.java b/src/main/java/com/habday/server/controller/FundingController.java
@@ -121,14 +121,11 @@ public ResponseEntity<CommonResponse> getParticipatedList(@RequestHeader("") Str
 //    }
 
     // 펀딩 수정
-    @PutMapping("/update/{fundingItemId}")
+    @PatchMapping("/update/{fundingItemId}")
     public ResponseEntity<UpdateFundingItemResponse> updateFundingItem(@RequestHeader("") String accessToken, @PathVariable("fundingItemId") Long fundingItemId, @RequestPart(value="fundingItemImg", required = false) MultipartFile fundingItemImg, @RequestPart(value="fundingItemName", required = false) String fundingItemName, @RequestPart(value = "fundingItemDetail", required = false) String fundingItemDetail) throws IOException {
         Long memberId = jwtService.getMemberIdFromJwt(accessToken);
-        System.out.println("updateFundingItem^^ memberId" + memberId);
         fundingService.updateFundingItem(fundingItemId, fundingItemImg, fundingItemName, fundingItemDetail, memberId);
-        System.out.println("updateFundingItem^^ finish");
         return UpdateFundingItemResponse.newResponse(UPDATE_FUNDING_ITEM_SUCCESS);
-        //return CommonResponse.toResponse(UPDATE_FUNDING_ITEM_SUCCESS, null);
     }
 
     // 펀딩 삭제

diff --git a/src/main/java/com/habday/server/domain/fundingItem/FundingItem.java b/src/main/java/com/habday/server/domain/fundingItem/FundingItem.java
@@ -103,10 +103,16 @@ public void updateIsConfirmTrue() {
     public void updateIsConfirmDone() {
         this.isConfirm = FundingConfirmState.DONE;
     }
-    public FundingItem update(String fundingItemImg, String fundingName, String fundDetail) {
+
+    // 펀딩 수정
+    public void updateFundingItemImg(String fundingItemImg) {
         this.fundingItemImg = fundingItemImg;
+    }
+    public void updateFundingItemName(String fundingName) {
         this.fundingName = fundingName;
+    }
+    public void updateFundDetail(String fundDetail) {
         this.fundDetail = fundDetail;
-        return this;
     }
+
 }
diff --git a/src/main/java/com/habday/server/service/FundingService.java b/src/main/java/com/habday/server/service/FundingService.java
@@ -235,11 +235,10 @@ public ShowConfirmationResponseDto showConfirmation(Long fundingItemId){
     }
 
     @Transactional
-    public void updateFundingItem(Long fundingItemId, MultipartFile fundingItemImg, String fundingItemName, String fundingItemDetail, Long memberId) throws IOException {
+    public void updateFundingItem(Long fundingItemId, MultipartFile fundingItemImgReq, String fundingItemNameReq, String fundingItemDetailReq, Long memberId) throws IOException {
         FundingItem fundingItem = fundingItemRepository.findById(fundingItemId)
                 .orElseThrow(() -> new CustomException(NO_FUNDING_ITEM_ID));
-        System.out.println("updateFundingItem^^ fundingItem " + fundingItem);
-
+
         if (fundingItem.getMember().getId() != memberId){
             log.info("updateFundingItem(): 펀딩 작성자가 아님.");
             throw new CustomException(VALIDATION_FAIL);
@@ -248,19 +247,17 @@ public void updateFundingItem(Long fundingItemId, MultipartFile fundingItemImg,
         if(calculation.isOverFinishDate(fundingItem.getFinishDate())){//마감 당일에는 수정 x
             throw new CustomException(UPDATE_FUNDING_UNAVAILABLE);
         }
-        //ObjectMapper mapper = new ObjectMapper();
-        //System.out.println("updateFundingItem^^ fundingItem" + mapper.writeValueAsString(fundingItem));
-        System.out.println("updateFundingItem^^ fundingItemImg" + fundingItemImg + " fundingItemName" + fundingItemName + " fundingItemDetail" + fundingItemDetail);
-
-
-        String updateFundingItemImgUrl = (fundingItemImg == null) ? fundingItem.getFundingItemImg() : s3Uploader.upload(fundingItemImg, "images");
-        System.out.println("updateFundingItem^^ updateFundingItemImgUrl" + updateFundingItemImgUrl);
-        String updateFundingName = (fundingItemName == null) ? fundingItem.getFundingName() : fundingItemName;
-        System.out.println("updateFundingItem^^ updateFundingName" + updateFundingName);
-        String updateFundDetail = (fundingItemDetail == null) ? fundingItem.getFundDetail() : fundingItemDetail;
-        System.out.println("updateFundingItem^^ updateFundDetail" + updateFundDetail);
-
-        fundingItem.update(updateFundingItemImgUrl, updateFundingName, updateFundDetail);
+
+        if (fundingItemImgReq != null) {
+            fundingItem.updateFundingItemImg(s3Uploader.upload(fundingItemImgReq, "images"));
+        }
+        if (fundingItemNameReq != null) {
+            fundingItem.updateFundingItemName(fundingItemNameReq);
+        }
+        if (fundingItemDetailReq != null) {
+            fundingItem.updateFundDetail(fundingItemDetailReq);
+        }
+        fundingItemRepository.save(fundingItem);
     }