Merge pull request #171 from urinaner/feature/170

[BE] 교수, 논문 update 기능에 파일 형식 추가
urinaner · Nov 24, 2024 · 5184d16 · 5184d16
2 parents 0246d2e + 199698f
commit 5184d16
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/backend/src/main/java/org/example/backend/professor/controller/ProfessorController.java b/backend/src/main/java/org/example/backend/professor/controller/ProfessorController.java
@@ -68,8 +68,9 @@ public ResponseDto<List<ProfessorResDto>> getAllBoards(Pageable pageable) {
     @Operation(summary = "교수 정보 업데이트 API", description = "교수 정보 업데이트")
     @PostMapping("/{professorId}")
     public ResponseEntity<ProfessorResDto> updateProfessor(@PathVariable(name = "professorId") Long professorId,
-                                                           @RequestBody ProfessorReqDto professorReqDto) {
-        ProfessorResDto professorResDto = professorService.updateProfessor(professorId, professorReqDto);
+                                                           @RequestPart(value = "professorReqDto") ProfessorReqDto professorReqDto,
+                                                           @RequestPart(value = "profileImage") MultipartFile multipartFile) {
+        ProfessorResDto professorResDto = professorService.updateProfessor(professorId, professorReqDto, multipartFile);
         return new ResponseEntity<>(professorResDto, HttpStatus.OK);
     }
 

diff --git a/backend/src/main/java/org/example/backend/professor/service/ProfessorService.java b/backend/src/main/java/org/example/backend/professor/service/ProfessorService.java
@@ -70,7 +70,11 @@ public Page<ProfessorResDto> getAllProfessors(Pageable pageable) {
     }
 
     @Transactional
-    public ProfessorResDto updateProfessor(Long professorId, ProfessorReqDto professorReqDto) {
+    public ProfessorResDto updateProfessor(Long professorId, ProfessorReqDto professorReqDto, MultipartFile multipartFile) {
+        if (!multipartFile.isEmpty()) {
+            String uploadImageUrl = s3Uploader.upload(multipartFile, dirName);
+            professorReqDto.setProfileImage(uploadImageUrl);
+        }
         Professor professor = findProfessorById(professorId);
         professor.update(professorReqDto);
         return ProfessorResDto.of(professor);

diff --git a/backend/src/main/java/org/example/backend/thesis/controller/ThesisController.java b/backend/src/main/java/org/example/backend/thesis/controller/ThesisController.java
@@ -57,8 +57,9 @@ public ResponseDto<List<ThesisResDto>> getAllBoards(Pageable pageable) {
     @Operation(summary = "논문 정보 업데이트 API", description = "논문 정보 업데이트")
     @PostMapping("/{thesisId}")
     public ResponseEntity<ThesisResDto> updateThesis(@PathVariable(name = "thesisId") Long thesisId,
-                                                     @RequestBody ThesisReqDto thesisReqDto) {
-        ThesisResDto thesisResDto = thesisService.updateThesis(thesisId, thesisReqDto);
+                                                     @RequestPart(value = "thesisReqDto") ThesisReqDto thesisReqDto,
+                                                     @RequestPart(value = "thesis_image") MultipartFile multipartFile) {
+        ThesisResDto thesisResDto = thesisService.updateThesis(thesisId, thesisReqDto, multipartFile);
         return new ResponseEntity<>(thesisResDto, HttpStatus.OK);
     }
 

diff --git a/backend/src/main/java/org/example/backend/thesis/service/ThesisService.java b/backend/src/main/java/org/example/backend/thesis/service/ThesisService.java
@@ -65,7 +65,12 @@ public Page<ThesisResDto> getAllTheses(Pageable pageable) {
     }
 
     @Transactional
-    public ThesisResDto updateThesis(Long thesisId, ThesisReqDto thesisReqDto) {
+    public ThesisResDto updateThesis(Long thesisId, ThesisReqDto thesisReqDto, MultipartFile multipartFile) {
+        if (!multipartFile.isEmpty()) {
+            String uploadImageUrl = s3Uploader.upload(multipartFile, dirName);
+            thesisReqDto.setThesisImage(uploadImageUrl);
+        }
+
         Thesis thesis = findThesisById(thesisId);
         Professor professor = findProfessorById(thesisReqDto.getProfessorId());
         thesis.update(thesisReqDto, professor);