Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[fix] 펀딩 수정하기 PATCH로 수정 개발 #82

Merged
merged 2 commits into from
Aug 30, 2023
Merged

[fix] 펀딩 수정하기 PATCH로 수정 개발 #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9998a54
[fix] 펀딩 수정하기 PATCH로 수정 개발
abi-hong Aug 30, 2023
bb2e680
Merge branch 'main' into fix/addUrl
abi-hong Aug 30, 2023
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
Empty file added 5054777b-90b9-4bcf-b534-62de558ef916
View file
Open in desktop
Empty file.
5 changes: 1 addition & 4 deletions src/main/java/com/habday/server/controller/FundingController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

// 펀딩 삭제
Expand Down
10 changes: 8 additions & 2 deletions src/main/java/com/habday/server/domain/fundingItem/FundingItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

}
29 changes: 13 additions & 16 deletions src/main/java/com/habday/server/service/FundingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
}


Expand Down