Merge pull request #104 from Team-UMC/refactor/#97/university

[REFACTOR] University API 리펙토링
Team-UMC · May 9, 2024 · 75d9513 · 75d9513
2 parents a2cba16 + 6b879b7
commit 75d9513
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 19 deletions.
diff --git a/...ava/com/umc/networkingService/domain/university/controller/StaffUniversityController.java b/...ava/com/umc/networkingService/domain/university/controller/StaffUniversityController.java
@@ -11,8 +11,10 @@
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.UUID;
 
@@ -27,35 +29,37 @@ public class StaffUniversityController {
     private final UniversityServiceImpl universityService;
 
     @Operation(summary = "학교 생성하기 API",description = "학교 생성하기 API")
-    @PostMapping("")
+    @PostMapping(value = "", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public BaseResponse<UniversityResponse.UniversityId>
     createUniversity(
-            @CurrentMember Member member,
-            @RequestBody @Valid UniversityRequest.universityInfo request
+            @Valid @RequestPart("request") UniversityRequest.universityInfo request,
+            @RequestPart(name = "file", required = false) MultipartFile universityLogo,
+            @RequestPart(name = "file", required = false) MultipartFile semesterLogo
     )
     {
-        return BaseResponse.onSuccess(universityService.createUniversity(request));
+        return BaseResponse.onSuccess(universityService.createUniversity(request, universityLogo, semesterLogo));
     }
 
     @Operation(summary = "학교 삭제하기 API",description = "학교 삭제하기 API")
     @DeleteMapping("/{universityId}")
     public BaseResponse<UniversityResponse.UniversityId>
     deleteUniversity(
-            @CurrentMember Member member,
             @PathVariable @Valid UUID universityId
     ){
         return BaseResponse.onSuccess(universityService.deleteUniversity(universityId));
     }
 
     @Operation(summary = "학교 정보 수정하기 API",description = "학교 정보 수정하기 API")
-    @PatchMapping("/{universityId}")
+    @PatchMapping(value = "/{universityId}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public BaseResponse<UniversityResponse.UniversityId>
     patchUniversity(
-            @CurrentMember Member member,
             @PathVariable @Valid UUID universityId,
-            @RequestBody @Valid UniversityRequest.universityInfo request
+            @Valid @RequestPart("request") UniversityRequest.universityInfo request,
+            @RequestPart(name = "file", required = false) MultipartFile universityLogo,
+            @RequestPart(name = "file", required = false) MultipartFile semesterLogo
+
     ){
-        return BaseResponse.onSuccess(universityService.patchUniversity(request, universityId));
+        return BaseResponse.onSuccess(universityService.patchUniversity(request, universityId, universityLogo, semesterLogo));
     }
 
 }

diff --git a/src/main/java/com/umc/networkingService/domain/university/dto/request/UniversityRequest.java b/src/main/java/com/umc/networkingService/domain/university/dto/request/UniversityRequest.java
@@ -16,8 +16,6 @@ public class UniversityRequest {
     public static class universityInfo {
         //todo: 마스코트 처리
         String universityName;
-        MultipartFile universityLogo;
-        MultipartFile semesterLogo;
         Semester semester;
     }
 

diff --git a/src/main/java/com/umc/networkingService/domain/university/entity/University.java b/src/main/java/com/umc/networkingService/domain/university/entity/University.java
@@ -54,6 +54,21 @@ public void updateUniversity(String name, String universityLogo, String semester
         this.semesterLogo = semesterLogo;
     }
 
+    // 학교 이름 변경
+    public void updateUniversityName(String name) {
+        this.name = name;
+    }
+
+    // 학교 로고 변경
+    public void updateUniversityLogo(String universityLogo) {
+        this.universityLogo = universityLogo;
+    }
+
+    // 기수 로고 변경
+    public void updateSemesterLogo(String semesterLogo) {
+        this.semesterLogo = semesterLogo;
+    }
+
     //레벨 증가
     public void setLevel(Integer level) {
         this.currentLevel=level;

diff --git a/src/main/java/com/umc/networkingService/domain/university/service/UniversityServiceImpl.java b/src/main/java/com/umc/networkingService/domain/university/service/UniversityServiceImpl.java
@@ -163,7 +163,7 @@ public UniversityResponse.JoinUniversityMascotFeed feedUniversityMascot(Member m
     }
 
     @Transactional    //학교 생성
-    public UniversityResponse.UniversityId createUniversity(UniversityRequest.universityInfo request) {
+    public UniversityResponse.UniversityId createUniversity(UniversityRequest.universityInfo request, MultipartFile universityLogo, MultipartFile semesterLogo) {
         if (universityRepository.findByName(request.getUniversityName()).isPresent()) {
             throw new RestApiException(UniversityErrorCode.DUPLICATE_UNIVERSITY_NAME);
         }
@@ -177,8 +177,8 @@ public UniversityResponse.UniversityId createUniversity(UniversityRequest.univer
                                 universityRepository.save(University.builder()
                                         .name(request.getUniversityName())
                                         .mascot(mascotService.getMascotByStartLevel(1, mascotType))
-                                        .universityLogo(uploadImage("university", request.getUniversityLogo()))
-                                        .semesterLogo(uploadImage("semester", request.getSemesterLogo()))
+                                        .universityLogo(uploadImage("university", universityLogo))
+                                        .semesterLogo(uploadImage("semester", semesterLogo))
                                         .build()).getId()
                         ).build();
 
@@ -195,15 +195,20 @@ public UniversityResponse.UniversityId deleteUniversity(UUID universityId) {
     }
 
     @Transactional    //학교 정보 수정
-    public UniversityResponse.UniversityId patchUniversity(UniversityRequest.universityInfo request, UUID universityId) {
+    public UniversityResponse.UniversityId patchUniversity(UniversityRequest.universityInfo request, UUID universityId, MultipartFile universityLogo, MultipartFile semesterLogo) {
 
         University university = universityRepository.findById(universityId)
                 .orElseThrow(() -> new RestApiException(UniversityErrorCode.EMPTY_UNIVERSITY));
 
-        university.updateUniversity(
-                request.getUniversityName()
-                , uploadImage("university", request.getUniversityLogo())
-                , uploadImage("semester", request.getSemesterLogo()));
+        university.updateUniversityName(request.getUniversityName());
+        if(universityLogo != null&&!universityLogo.isEmpty()){
+            deleteImage(university.getUniversityLogo()); //기존 이미지 삭제
+            university.updateUniversityLogo(uploadImage("university", universityLogo)); //새로운 이미지 업로드
+        }
+        if(semesterLogo != null&&!semesterLogo.isEmpty()){
+            deleteImage(university.getSemesterLogo()); //기존 이미지 삭제
+            university.updateSemesterLogo(uploadImage("semester", semesterLogo)); //새로운 이미지 업로드
+        }
 
         return UniversityResponse.UniversityId.builder()
                         .universityId(university.getId())
@@ -218,6 +223,14 @@ public String uploadImage(String category, MultipartFile imageFile) {
         return s3FileComponent.uploadFile(category, imageFile);
     }
 
+    //s3에 이미지 삭제
+    public void deleteImage(String imageUrl) {
+        if (imageUrl == null || imageUrl.isEmpty()) {
+            return;
+        }
+        s3FileComponent.deleteFile(imageUrl);
+    }
+
     //동점자 처리 (기여도) (동점차는 동일한 순위 부여 후 랭킹 건너뛰기)
     private UniversityResponse.JoinContributionRanks handleTiedContributionRanks(UniversityResponse.JoinContributionRanks ranks) {
         int currentRank = 1;