Merge pull request #141 from TaetaetaE01/main

[fix] file update, delete path 수정 및 dto 네이밍 통일
developthreefeet · Oct 17, 2024 · 5105eb5 · 5105eb5
2 parents 40f6bdb + 36362c5
commit 5105eb5
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 24 deletions.
diff --git a/src/main/java/com/example/bigbrotherbe/domain/event/service/EventServiceImpl.java b/src/main/java/com/example/bigbrotherbe/domain/event/service/EventServiceImpl.java
@@ -83,10 +83,10 @@ public void updateEvent(Long eventId, EventUpdateRequest eventUpdateRequest, Lis
             throw new BusinessException(NOT_COUNCIL_MEMBER);
         }
 
-        fileUtil.CheckImageFiles(multipartFiles);
-
         List<File> files = null;
         if (fileService.checkExistRequestFile(multipartFiles)) {
+            fileUtil.CheckImageFiles(multipartFiles);
+
             FileUpdateDTO fileUpdateDTO = FileUpdateDTO.builder()
                     .fileType(EntityType.EVENT_TYPE.getType())
                     .multipartFileList(multipartFiles)

diff --git a/src/main/java/com/example/bigbrotherbe/domain/faq/controller/FAQAdminController.java b/src/main/java/com/example/bigbrotherbe/domain/faq/controller/FAQAdminController.java
@@ -1,6 +1,6 @@
 package com.example.bigbrotherbe.domain.faq.controller;
 
-import com.example.bigbrotherbe.domain.faq.dto.request.FAQModifyRequest;
+import com.example.bigbrotherbe.domain.faq.dto.request.FAQUpdateRequest;
 import com.example.bigbrotherbe.domain.faq.dto.request.FAQRegisterRequest;
 import com.example.bigbrotherbe.domain.faq.dto.response.FAQResponse;
 import com.example.bigbrotherbe.domain.faq.entity.FAQ;
@@ -38,9 +38,9 @@ public ResponseEntity<ApiResponse<Void>> registerFAQ(@RequestPart(value = "faqRe
 
     @PutMapping("/{faqId}")
     public ResponseEntity<ApiResponse<Void>> modifyFAQ(@PathVariable("faqId") Long faqId,
-                                                       @RequestPart(value = "faqModifyRequest") FAQModifyRequest faqModifyRequest,
+                                                       @RequestPart(value = "faqUpdateRequest") FAQUpdateRequest faqUpdateRequest,
                                                        @RequestPart(value = "file", required = false) List<MultipartFile> multipartFiles) {
-        faqService.modify(faqId, faqModifyRequest, multipartFiles);
+        faqService.modify(faqId, faqUpdateRequest, multipartFiles);
         return ResponseEntity.ok(ApiResponse.success(SUCCESS));
     }
 

diff --git a/...ain/faq/dto/request/FAQModifyRequest.java → ...ain/faq/dto/request/FAQUpdateRequest.java b/...ain/faq/dto/request/FAQModifyRequest.java → ...ain/faq/dto/request/FAQUpdateRequest.java
@@ -7,7 +7,7 @@
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-public class FAQModifyRequest {
+public class FAQUpdateRequest {
     private String title;
     private String content;
 }
diff --git a/src/main/java/com/example/bigbrotherbe/domain/faq/service/FAQService.java b/src/main/java/com/example/bigbrotherbe/domain/faq/service/FAQService.java
@@ -1,6 +1,6 @@
 package com.example.bigbrotherbe.domain.faq.service;
 
-import com.example.bigbrotherbe.domain.faq.dto.request.FAQModifyRequest;
+import com.example.bigbrotherbe.domain.faq.dto.request.FAQUpdateRequest;
 import com.example.bigbrotherbe.domain.faq.dto.request.FAQRegisterRequest;
 import com.example.bigbrotherbe.domain.faq.dto.response.FAQResponse;
 import com.example.bigbrotherbe.domain.faq.entity.FAQ;
@@ -13,7 +13,7 @@
 public interface FAQService {
     public void register(FAQRegisterRequest faqRegisterRequest, List<MultipartFile> multipartFiles);
 
-    public void modify(Long faqId, FAQModifyRequest faqModifyRequest, List<MultipartFile> multipartFiles);
+    public void modify(Long faqId, FAQUpdateRequest faqUpdateRequest, List<MultipartFile> multipartFiles);
 
     public void delete(Long faqId);
 

diff --git a/src/main/java/com/example/bigbrotherbe/domain/faq/service/FAQServiceImpl.java b/src/main/java/com/example/bigbrotherbe/domain/faq/service/FAQServiceImpl.java
@@ -1,7 +1,7 @@
 package com.example.bigbrotherbe.domain.faq.service;
 
 import com.example.bigbrotherbe.domain.affiliation.service.AffiliationService;
-import com.example.bigbrotherbe.domain.faq.dto.request.FAQModifyRequest;
+import com.example.bigbrotherbe.domain.faq.dto.request.FAQUpdateRequest;
 import com.example.bigbrotherbe.domain.faq.dto.request.FAQRegisterRequest;
 import com.example.bigbrotherbe.domain.faq.dto.response.FAQResponse;
 import com.example.bigbrotherbe.domain.faq.entity.FAQ;
@@ -69,7 +69,7 @@ public void register(FAQRegisterRequest faqRegisterRequest, List<MultipartFile>
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void modify(Long faqId, FAQModifyRequest faqModifyRequest, List<MultipartFile> multipartFiles) {
+    public void modify(Long faqId, FAQUpdateRequest faqUpdateRequest, List<MultipartFile> multipartFiles) {
         FAQ faq = faqRepository.findById(faqId)
                 .orElseThrow(() -> new BusinessException(NO_EXIST_FAQ));
 
@@ -88,7 +88,7 @@ public void modify(Long faqId, FAQModifyRequest faqModifyRequest, List<Multipart
             files = fileService.updateFile(fileUpdateDTO);
         }
 
-        faq.update(faqModifyRequest.getTitle(), faqModifyRequest.getContent(), files);
+        faq.update(faqUpdateRequest.getTitle(), faqUpdateRequest.getContent(), files);
     }
 
     @Override

diff --git a/src/main/java/com/example/bigbrotherbe/domain/notice/controller/NoticeAdminController.java b/src/main/java/com/example/bigbrotherbe/domain/notice/controller/NoticeAdminController.java
@@ -1,6 +1,6 @@
 package com.example.bigbrotherbe.domain.notice.controller;
 
-import com.example.bigbrotherbe.domain.notice.dto.request.NoticeModifyRequest;
+import com.example.bigbrotherbe.domain.notice.dto.request.NoticeUpdateRequest;
 import com.example.bigbrotherbe.domain.notice.dto.request.NoticeRegisterRequest;
 import com.example.bigbrotherbe.domain.notice.dto.response.NoticeResponse;
 import com.example.bigbrotherbe.domain.notice.entity.Notice;
@@ -38,9 +38,9 @@ public ResponseEntity<ApiResponse<Void>> registerNotice(@RequestPart(value = "no
 
     @PutMapping("/{noticeId}")
     public ResponseEntity<ApiResponse<Void>> modifyNotice(@PathVariable("noticeId") Long noticeId,
-                                                          @RequestPart(value = "noticeModifyRequest") NoticeModifyRequest noticeModifyRequest,
+                                                          @RequestPart(value = "noticeUpdateRequest") NoticeUpdateRequest noticeUpdateRequest,
                                                           @RequestPart(value = "file", required = false) List<MultipartFile> multipartFiles) {
-        noticeService.modify(noticeId, noticeModifyRequest, multipartFiles);
+        noticeService.modify(noticeId, noticeUpdateRequest, multipartFiles);
         return ResponseEntity.ok(ApiResponse.success(SUCCESS));
     }
 

diff --git a/src/main/java/com/example/bigbrotherbe/domain/notice/dto/request/NoticeRegisterRequest.java b/src/main/java/com/example/bigbrotherbe/domain/notice/dto/request/NoticeRegisterRequest.java
@@ -7,7 +7,6 @@
 import java.util.List;
 
 @Getter
-@ToString
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder

diff --git a/...tice/dto/request/NoticeModifyRequest.java → ...tice/dto/request/NoticeUpdateRequest.java b/...tice/dto/request/NoticeModifyRequest.java → ...tice/dto/request/NoticeUpdateRequest.java
@@ -1,14 +1,13 @@
 package com.example.bigbrotherbe.domain.notice.dto.request;
 
-import com.example.bigbrotherbe.domain.notice.entity.Notice;
 import lombok.*;
 
 @Getter
 @ToString
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-public class NoticeModifyRequest {
+public class NoticeUpdateRequest {
     private String title;
     private String content;
 

diff --git a/src/main/java/com/example/bigbrotherbe/domain/notice/service/NoticeService.java b/src/main/java/com/example/bigbrotherbe/domain/notice/service/NoticeService.java
@@ -1,6 +1,6 @@
 package com.example.bigbrotherbe.domain.notice.service;
 
-import com.example.bigbrotherbe.domain.notice.dto.request.NoticeModifyRequest;
+import com.example.bigbrotherbe.domain.notice.dto.request.NoticeUpdateRequest;
 import com.example.bigbrotherbe.domain.notice.dto.request.NoticeRegisterRequest;
 import com.example.bigbrotherbe.domain.notice.dto.response.NoticeResponse;
 import com.example.bigbrotherbe.domain.notice.entity.Notice;
@@ -13,7 +13,7 @@
 public interface NoticeService {
     public void register(NoticeRegisterRequest noticeRegisterRequest, List<MultipartFile> multipartFiles);
 
-    public void modify(Long noticeId, NoticeModifyRequest noticeModifyRequest, List<MultipartFile> multipartFiles);
+    public void modify(Long noticeId, NoticeUpdateRequest noticeUpdateRequest, List<MultipartFile> multipartFiles);
 
     public void delete(Long noticeId);
 

diff --git a/src/main/java/com/example/bigbrotherbe/domain/notice/service/NoticeServiceImpl.java b/src/main/java/com/example/bigbrotherbe/domain/notice/service/NoticeServiceImpl.java
@@ -4,7 +4,7 @@
 import com.example.bigbrotherbe.domain.member.entity.Member;
 import com.example.bigbrotherbe.domain.notice.dto.response.NoticeResponse;
 import com.example.bigbrotherbe.domain.notice.entity.Notice;
-import com.example.bigbrotherbe.domain.notice.dto.request.NoticeModifyRequest;
+import com.example.bigbrotherbe.domain.notice.dto.request.NoticeUpdateRequest;
 import com.example.bigbrotherbe.domain.notice.dto.request.NoticeRegisterRequest;
 import com.example.bigbrotherbe.domain.notice.repository.NoticeRepository;
 import com.example.bigbrotherbe.global.common.exception.BusinessException;
@@ -71,7 +71,7 @@ public void register(NoticeRegisterRequest noticeRegisterRequest, List<Multipart
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void modify(Long noticeId, NoticeModifyRequest noticeModifyRequest, List<MultipartFile> multipartFiles) {
+    public void modify(Long noticeId, NoticeUpdateRequest noticeUpdateRequest, List<MultipartFile> multipartFiles) {
         Notice notice = noticeRepository.findById(noticeId)
                 .orElseThrow(() -> new BusinessException(NO_EXIST_NOTICE));
 
@@ -90,7 +90,7 @@ public void modify(Long noticeId, NoticeModifyRequest noticeModifyRequest, List<
             files = fileService.updateFile(fileUpdateDTO);
         }
 
-        notice.update(noticeModifyRequest.getTitle(), noticeModifyRequest.getContent(), files);
+        notice.update(noticeUpdateRequest.getTitle(), noticeUpdateRequest.getContent(), files);
     }
 
     @Override

diff --git a/src/main/java/com/example/bigbrotherbe/global/file/service/FileServiceImpl.java b/src/main/java/com/example/bigbrotherbe/global/file/service/FileServiceImpl.java
@@ -59,7 +59,7 @@ public List<File> updateFile(FileUpdateDTO fileUpdateDTO) {
         String fileType = fileUpdateDTO.getFileType();
 
         files.forEach(file -> {
-            String fileName = file.getUrl().split("/")[3];
+            String fileName = file.getUrl().split("/")[4];
             s3Util.deleteFile(fileType + "/" + fileName);
         });
 
@@ -82,7 +82,7 @@ public void deleteFile(FileDeleteDTO deleteDTO) {
 
         String fileType = deleteDTO.getFileType();
         files.forEach(file -> {
-            String fileName = file.getUrl().split("/")[3];
+            String fileName = file.getUrl().split("/")[4];
             s3Util.deleteFile(fileType + "/" + fileName);
         });
     }