From 9998a54803c823bef766c0d4126a264c5f931d2d Mon Sep 17 00:00:00 2001 From: abi-hong Date: Wed, 30 Aug 2023 15:36:49 +0900 Subject: [PATCH] =?UTF-8?q?[fix]=20=ED=8E=80=EB=94=A9=20=EC=88=98=EC=A0=95?= =?UTF-8?q?=ED=95=98=EA=B8=B0=20PATCH=EB=A1=9C=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?=EA=B0=9C=EB=B0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 5054777b-90b9-4bcf-b534-62de558ef916 | 0 .../server/controller/FundingController.java | 5 +--- .../domain/fundingItem/FundingItem.java | 10 +++++-- .../habday/server/service/FundingService.java | 26 ++++++++----------- 4 files changed, 20 insertions(+), 21 deletions(-) create mode 100644 5054777b-90b9-4bcf-b534-62de558ef916 diff --git a/5054777b-90b9-4bcf-b534-62de558ef916 b/5054777b-90b9-4bcf-b534-62de558ef916 new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/habday/server/controller/FundingController.java b/src/main/java/com/habday/server/controller/FundingController.java index 72038c9..0050765 100644 --- 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 getParticipatedList(@RequestHeader("") Str // } // 펀딩 수정 - @PutMapping("/update/{fundingItemId}") + @PatchMapping("/update/{fundingItemId}") public ResponseEntity 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); - 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 index 9125ffe..56ae1af 100644 --- 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 index 5615c38..7b4cfe5 100644 --- a/src/main/java/com/habday/server/service/FundingService.java +++ b/src/main/java/com/habday/server/service/FundingService.java @@ -220,23 +220,19 @@ public ShowConfirmationResponseDto showConfirmation(Long fundingItemId){ } @Transactional - public void updateFundingItem(Long fundingItemId, MultipartFile fundingItemImg, String fundingItemName, String fundingItemDetail) throws IOException { + public void updateFundingItem(Long fundingItemId, MultipartFile fundingItemImgReq, String fundingItemNameReq, String fundingItemDetailReq) throws IOException { FundingItem fundingItem = fundingItemRepository.findById(fundingItemId) .orElseThrow(() -> new CustomException(NO_FUNDING_ITEM_ID)); - System.out.println("updateFundingItem^^ fundingItem " + fundingItem); - //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); }