Fix/calendar setting (#770)

### 🚩 관련사항 ### 📢 전달사항 기존에 파일과 같이 업로드 할 경우, json 데이터에 대해 application/octet-stream 으로 자동 변경이 되어 데이터를 처리할 수 없는 문제상황을 발견하여 해당 문제를 해결하는 설정파일을 추가하였습니다. swagger와 postman 모두 정상 작동 확인하였습니다. ### 📸 스크린샷 <img width="1280" alt="image" src="https://github.com/user-attachments/assets/946e1c20-41f8-4f10-b400-fdaca29ff817"> <img width="1665" alt="image" src="https://github.com/user-attachments/assets/9aa5aee7-0d92-4002-86a3-4a22beae688a"> ### 📃 진행사항 - [ ] done1 - [ ] done2 (진행되었어야 하는데 미처 하지 못한 부분 혹은 관련하여 앞으로 진행되어야 하는 부분도 전부 적어서 체크 표시로 관리해주세요.) ### ⚙️ 기타사항 기타 참고사항을 적어주세요. 개발기간:
CAUCSE · Nov 27, 2024 · c50a9c5 · c50a9c5
2 parents b962756 + 2400c58
commit c50a9c5
Show file tree

Hide file tree

Showing 9 changed files with 76 additions and 14 deletions.
diff --git a/src/main/java/net/causw/adapter/web/CalendarController.java b/src/main/java/net/causw/adapter/web/CalendarController.java
@@ -14,6 +14,7 @@
 import net.causw.application.dto.calendar.CalendarsResponseDto;
 import net.causw.domain.exceptions.BadRequestException;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -68,7 +69,7 @@ public CalendarResponseDto findHomeCalendar() {
         return calendarService.findCalendar();
     }
 
-    @PostMapping
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
     @ResponseStatus(value = HttpStatus.CREATED)
     @Operation(summary = "캘린더 생성 API", description = "캘린더 생성 API 입니다.")
     @PreAuthorize("@securityService.isActiveAndNotNoneUserAndAcademicRecordCertified() and " +
@@ -87,7 +88,7 @@ public CalendarResponseDto createCalendar(
         return calendarService.createCalendar(calendarCreateRequestDto, image);
     }
 
-    @PutMapping("/{calendarId}")
+    @PutMapping(value = "/{calendarId}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
     @Operation(summary = "캘린더 수정 API", description = "캘린더 수정 API 입니다.")
     @PreAuthorize("@securityService.isActiveAndNotNoneUserAndAcademicRecordCertified() and " +
             "hasAnyRole('ADMIN','PERSIDENT', 'VICE_PRESIDENT')")

diff --git a/src/main/java/net/causw/adapter/web/CircleController.java b/src/main/java/net/causw/adapter/web/CircleController.java
@@ -31,6 +31,7 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
@@ -240,7 +241,7 @@ public List<CircleMemberResponseDto> findCircleMemberList(
      * @param  circleCreateRequestDto 동아리 생성 정보
      * @return Long
      */
-    @PostMapping
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
     @ResponseStatus(value = HttpStatus.CREATED)
     @PreAuthorize("@securityService.isActiveAndNotNoneUserAndAcademicRecordCertified() and " +
             "hasAnyRole('ADMIN','PERSIDENT', 'VICE_PRESIDENT')")
@@ -279,7 +280,7 @@ public void create(
      * @param  circleUpdateRequestDto 동아리 생성 정보
      * @return Long
      */
-    @PutMapping(value = "/{circleId}")
+    @PutMapping(value = "/{circleId}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
     @ResponseStatus(value = HttpStatus.OK)
     @PreAuthorize("@securityService.isActiveAndNotNoneUserAndAcademicRecordCertified() and " +
             "hasAnyRole('ADMIN','PERSIDENT', 'VICE_PRESIDENT', 'LEADER_CIRCLE')")

diff --git a/src/main/java/net/causw/adapter/web/EventController.java b/src/main/java/net/causw/adapter/web/EventController.java
@@ -13,6 +13,7 @@
 import net.causw.application.dto.event.EventsResponseDto;
 import net.causw.application.event.EventService;
 import net.causw.domain.exceptions.BadRequestException;
+import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -37,7 +38,7 @@ public EventsResponseDto findEvents() {
         return eventService.findEvents();
     }
 
-    @PostMapping
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
     @Operation(summary = "이벤트 생성 API", description = "이벤트 생성 API 입니다.")
     @ApiResponses({
             @ApiResponse(responseCode = "201", description = "CREATED", content = @Content(mediaType = "application/json", schema = @Schema(implementation = String.class))),
@@ -54,7 +55,7 @@ public EventResponseDto createEvent(
         return eventService.createEvent(eventCreateRequestDto, eventImage);
     }
 
-    @PutMapping("/{eventId}")
+    @PutMapping(value = "/{eventId}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
     @Operation(summary = "이벤트 수정 API", description = "이벤트 수정 API 입니다.")
     @ApiResponses({
             @ApiResponse(responseCode = "200", description = "OK", content = @Content(mediaType = "application/json", schema = @Schema(implementation = String.class))),

diff --git a/src/main/java/net/causw/adapter/web/PostController.java b/src/main/java/net/causw/adapter/web/PostController.java
@@ -14,6 +14,7 @@
 import net.causw.domain.exceptions.InternalServerException;
 import net.causw.domain.exceptions.UnauthorizedException;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
@@ -126,7 +127,7 @@ public BoardPostsResponseDto findAllAppNotice(
         return this.postService.findAllAppNotice(userDetails.getUser(), pageNum);
     }
 
-    @PostMapping
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
     @ResponseStatus(value = HttpStatus.CREATED)
     @PreAuthorize("@securityService.isActiveAndNotNoneUserAndAcademicRecordCertified()")
     @Operation(summary = "게시글 생성 API(완료)",
@@ -157,7 +158,7 @@ public PostCreateResponseDto createPost(
         return this.postService.createPost(userDetails.getUser(), postCreateRequestDto, attachImageList);
     }
 
-    @PostMapping("/form")
+    @PostMapping(value = "/form", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
     @ResponseStatus(value = HttpStatus.CREATED)
     @PreAuthorize("@securityService.isActiveAndNotNoneUserAndAcademicRecordCertified()")
     @Operation(summary = "신청서 첨부 게시글 생성 API(완료)",
@@ -220,7 +221,7 @@ public void deletePost(
         postService.deletePost(userDetails.getUser(), id);
     }
 
-    @PutMapping(value = "/{id}")
+    @PutMapping(value = "/{id}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
     @ResponseStatus(value = HttpStatus.OK)
     @PreAuthorize("@securityService.isActiveAndNotNoneUserAndAcademicRecordCertified()")
     @Operation(summary = "게시글 업데이트 API(완료)",
@@ -263,7 +264,7 @@ public void updatePost(
         );
     }
 
-    @PutMapping(value = "/{id}/form")
+    @PutMapping(value = "/{id}/form", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
     @ResponseStatus(value = HttpStatus.OK)
     @PreAuthorize("@securityService.isActiveAndNotNoneUserAndAcademicRecordCertified()")
     @Operation(summary = "신청서 첨부 게시글 업데이트 API(완료)",

diff --git a/src/main/java/net/causw/adapter/web/StorageController.java b/src/main/java/net/causw/adapter/web/StorageController.java
@@ -4,6 +4,7 @@
 import net.causw.application.dto.file.FileResponseDto;
 import net.causw.application.uuidFile.UuidFileService;
 import net.causw.domain.model.enums.uuidFile.FilePath;
+import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -17,7 +18,7 @@ public class StorageController {
 
     private final UuidFileService uuidFileService;
 
-    @PostMapping(value = "/upload", consumes = "multipart/form-data")
+    @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
     @PreAuthorize("hasRole('ADMIN')")
     public FileResponseDto post(
             @RequestPart("file") MultipartFile multipartFile,

diff --git a/src/main/java/net/causw/adapter/web/UserAcademicRecordApplicationController.java b/src/main/java/net/causw/adapter/web/UserAcademicRecordApplicationController.java
@@ -14,6 +14,7 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
@@ -214,7 +215,7 @@ public CurrentUserAcademicRecordApplicationResponseDto getCurrentUserAcademicRec
      * @param imageFileList
      * @return
      */
-    @PostMapping(value = "/application/create")
+    @PostMapping(value = "/application/create", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
     @ResponseStatus(value = HttpStatus.CREATED)
     @PreAuthorize("@securityService.isActiveAndNotNoneUser()")
     @Operation(summary = "사용자 본인의 학적 증빙 서류 제출",

diff --git a/src/main/java/net/causw/adapter/web/UserController.java b/src/main/java/net/causw/adapter/web/UserController.java
@@ -18,6 +18,7 @@
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.data.domain.Page;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
@@ -301,7 +302,7 @@ public DuplicatedCheckResponseDto isDuplicatedStudentId(@PathVariable("studentId
      * @param userUpdateDto
      * @return UserResponseDto
      */
-    @PutMapping
+    @PutMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
     @ResponseStatus(value = HttpStatus.OK)
     @PreAuthorize("@securityService.isActiveAndNotNoneUserAndAcademicRecordCertified()")
     @Operation(summary = "사용자 정보 업데이트 API (완료)")
@@ -479,7 +480,7 @@ public Page<UserAdmissionsResponseDto> findAllAdmissions(
         return this.userService.findAllAdmissions(userDetails.getUser(), name, pageNum);
     }
 
-    @PostMapping(value = "/admissions/apply")
+    @PostMapping(value = "/admissions/apply", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
     @ResponseStatus(value = HttpStatus.CREATED)
     @Operation(summary = "승인 신청서 작성 API (완료)", description = "가입 신청 api입니다.")
     @ApiResponses({

diff --git a/src/main/java/net/causw/config/security/OctetStreamReadMsgConverter.java b/src/main/java/net/causw/config/security/OctetStreamReadMsgConverter.java
@@ -0,0 +1,32 @@
+package net.causw.config.security;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.json.AbstractJackson2HttpMessageConverter;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Type;
+
+@Component
+public class OctetStreamReadMsgConverter extends AbstractJackson2HttpMessageConverter {
+    @Autowired
+    public OctetStreamReadMsgConverter(ObjectMapper objectMapper) {
+        super(objectMapper, MediaType.APPLICATION_OCTET_STREAM);
+    }
+
+    @Override
+    public boolean canWrite(Class<?> clazz, MediaType mediaType) {
+        return false;
+    }
+
+    @Override
+    public boolean canWrite(Type type, Class<?> clazz, MediaType mediaType) {
+        return false;
+    }
+
+    @Override
+    protected boolean canWrite(MediaType mediaType) {
+        return false;
+    }
+}
diff --git a/src/main/java/net/causw/config/security/WebConfig.java b/src/main/java/net/causw/config/security/WebConfig.java
@@ -0,0 +1,23 @@
+package net.causw.config.security;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import java.util.List;
+
+@Configuration
+public class WebConfig implements WebMvcConfigurer {
+    private OctetStreamReadMsgConverter octetStreamReadMsgConverter;
+
+    @Autowired
+    public WebConfig(OctetStreamReadMsgConverter octetStreamReadMsgConverter) {
+        this.octetStreamReadMsgConverter = octetStreamReadMsgConverter;
+    }
+
+    @Override
+    public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
+        converters.add(octetStreamReadMsgConverter);
+    }
+}