From cb4ef91c72cd2880d4144a5cd351fc5630b34c6c Mon Sep 17 00:00:00 2001 From: changha Date: Sun, 26 Nov 2023 01:32:25 +0900 Subject: [PATCH] =?UTF-8?q?feat=20:=20=EC=96=B4=EB=93=9C=EB=AF=BC=20?= =?UTF-8?q?=EB=8F=99=EC=95=84=EB=A6=AC=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20?= =?UTF-8?q?=EC=97=86=EC=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../back/controller/AdminController.java | 4 ++-- .../donggram/back/service/AdminService.java | 19 ++++++++----------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/donggram/back/controller/AdminController.java b/src/main/java/com/donggram/back/controller/AdminController.java index 030b5ea..144f47b 100644 --- a/src/main/java/com/donggram/back/controller/AdminController.java +++ b/src/main/java/com/donggram/back/controller/AdminController.java @@ -89,9 +89,9 @@ public ResponseEntity rejectClubJoin(@RequestParam Long memberId, @RequestParam } @PutMapping("/clubs/{id}") - public ResponseEntity updateSelecetedClub(@PathVariable("id") Long clubId, @RequestPart("ImageClub") MultipartFile imageFile, @RequestPart("ClubProfileUpdateDto") ClubProfileUpdateDto clubProfileUpdateDto){ + public ResponseEntity updateSelecetedClub(@PathVariable("id") Long clubId, @RequestPart("ClubProfileUpdateDto") ClubProfileUpdateDto clubProfileUpdateDto){ - ResponseDto responseDto = adminService.updateClubDetails(clubId, clubProfileUpdateDto, imageFile); + ResponseDto responseDto = adminService.updateClubDetails(clubId, clubProfileUpdateDto); return ResponseEntity.ok(responseDto); } diff --git a/src/main/java/com/donggram/back/service/AdminService.java b/src/main/java/com/donggram/back/service/AdminService.java index 62131db..351c9db 100644 --- a/src/main/java/com/donggram/back/service/AdminService.java +++ b/src/main/java/com/donggram/back/service/AdminService.java @@ -277,26 +277,23 @@ public ResponseDto getAllMemberBySelectedClub(Long clubRequestId){ } @Transactional - public ResponseDto updateClubDetails(Long clubRequestId, ClubProfileUpdateDto clubProfileUpdateDto, MultipartFile multipartFile){ + public ResponseDto updateClubDetails(Long clubRequestId, ClubProfileUpdateDto clubProfileUpdateDto){ ClubRequest clubRequest = clubRequestRepository.findById(clubRequestId).orElseThrow(() -> new RuntimeException("해당 동아리생성 엔티티가 존재하지 않습니다.")); Club club = clubRequest.getClub(); club.updateClubProfile(clubProfileUpdateDto, collegeRepository, divisionRepository); - System.out.println("1111111111111111"); - ImageClub imageClub = imageClubRepository.findByClubId(club.getId()).orElseThrow(() -> new RuntimeException("해당 동아리이미지 엔티티가 존재하지 않습니다.")); +// ImageClub imageClub = imageClubRepository.findByClubId(club.getId()).orElseThrow(() -> new RuntimeException("해당 동아리이미지 엔티티가 존재하지 않습니다.")); - if (!multipartFile.isEmpty() && multipartFile != null){ - System.out.println("akdljf,x.cnvklzcjiajgi;e"); - String updateImageUrl = uploadImage(multipartFile, clubRequest); - imageClub.uploadCustomImage(updateImageUrl); - } else { - System.out.println("imageProfile Null"); - imageClub.uploadCustomImage(club.getImageClub().getUrl()); - } +// if (!multipartFile.isEmpty() && multipartFile != null){ +// String updateImageUrl = uploadImage(multipartFile, clubRequest); +// imageClub.uploadCustomImage(updateImageUrl); +// } else { +// imageClub.uploadCustomImage(club.getImageClub().getUrl()); +// } ClubDetailsDto clubDetailsDto = ClubDetailsDto.builder() .clubId(club.getId())