Merge branch 'develop' into CLAP-369

Author: joowojr

src/main/java/clap/server/adapter/inbound/web/admin/RegisterMemberCsvController.java

@@ -7,14 +7,19 @@
 import clap.server.exception.AdapterException;
 import clap.server.exception.code.FileErrorcode;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.annotation.Secured;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
@@ -27,11 +32,12 @@ public class RegisterMemberCsvController {
     private final RegisterMemberCSVUsecase registerMemberCSVUsecase;
 
     @Operation(summary = "CSV 파일로 회원 등록 API")
-    @PostMapping("/members/upload")
+    @PostMapping(value = "/members/upload", consumes = {MediaType.MULTIPART_FORM_DATA_VALUE})
     @Secured("ROLE_ADMIN")
     public ResponseEntity<String> registerMembersFromCsv(
             @AuthenticationPrincipal SecurityUserDetails userInfo,
-            @RequestParam("file") MultipartFile file) throws IOException {
+            @Parameter(content = @Content(mediaType = MediaType.MULTIPART_FORM_DATA_VALUE))
+            @RequestParam("file") @NotNull MultipartFile file) throws IOException {
         if (!FileTypeValidator.validCSVFile(file.getInputStream())) {
             throw new AdapterException(FileErrorcode.UNSUPPORTED_FILE_TYPE);}
         int addedCount = registerMemberCSVUsecase.registerMembersFromCsv(userInfo.getUserId(), file);

src/main/java/clap/server/adapter/inbound/web/dto/admin/request/FindMemberRequest.java

@@ -3,7 +3,9 @@
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
+import org.springdoc.core.annotations.ParameterObject;
 
+@ParameterObject
 public record FindMemberRequest(
         @NotNull
         @Schema(description = "회원 이름", example = "양시훈")

src/main/java/clap/server/adapter/inbound/web/dto/admin/request/RegisterMemberRequest.java

@@ -24,7 +24,7 @@ public record RegisterMemberRequest(
         Long departmentId,
         @NotNull @Schema(description = "회원 역할")
         MemberRole role,
-        @NotBlank @Schema(description = "회원 직책")
+        @Schema(description = "회원 직책")
         String departmentRole
 ) {
 }

src/main/java/clap/server/adapter/inbound/web/dto/admin/response/FindAllCategoryResponse.java

@@ -1,11 +1,20 @@
 package clap.server.adapter.inbound.web.dto.admin.response;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+
 import java.util.List;
 
 public record FindAllCategoryResponse(
-        Long id,
+        @Schema(description = "메인 카테고리 ID", example = "1")
+        Long mainCategoryId,
+
+        @Schema(description = "카테고리 이름", example = "VM 관련")
         String name,
+
+        @Schema(description = "카테고리 코드", example = "VM")
         String code,
+
+        @Schema(description = "서브 카테고리 목록")
         List<FindSubCategoryResponse> subCategory
 ) {
 }

src/main/java/clap/server/adapter/inbound/web/dto/admin/response/FindMainCategoryResponse.java

@@ -1,8 +1,15 @@
 package clap.server.adapter.inbound.web.dto.admin.response;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+
 public record FindMainCategoryResponse(
-        Long id,
+        @Schema(description = "메인 카테고리 ID", example = "1")
+        Long mainCategoryId,
+
+        @Schema(description = "카테고리 이름", example = "VM 관련")
         String name,
+
+        @Schema(description = "카테고리 코드", example = "VM")
         String code
 ) {
 }

src/main/java/clap/server/adapter/inbound/web/dto/admin/response/FindSubCategoryResponse.java

@@ -1,10 +1,21 @@
 package clap.server.adapter.inbound.web.dto.admin.response;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+
 public record FindSubCategoryResponse(
-        Long id,
+        @Schema(description = "서브 카테고리 ID", example = "4")
+        Long subCategoryId,
+
+        @Schema(description = "메인 카테고리 ID", example = "1")
         Long mainCategoryId,
+
+        @Schema(description = "카테고리 이름", example = "VM 수정")
         String name,
+
+        @Schema(description = "카테고리 코드", example = "VU")
         String code,
+
+        @Schema(description = "카테고리 설명 예시", example = "VM을 수정합니다.")
         String descriptionExample
 ) {
 }

src/main/java/clap/server/adapter/inbound/web/dto/admin/response/RetrieveAllMemberResponse.java

@@ -1,6 +1,7 @@
 package clap.server.adapter.inbound.web.dto.admin.response;
 
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
+import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 import java.time.LocalDateTime;
@@ -31,7 +32,10 @@ public record RetrieveAllMemberResponse(
         String departmentRole,
 
         @Schema(description = "가입일", example = "2024-01-01T12:00:00")
-        LocalDateTime createdAt
+        LocalDateTime createdAt,
+
+        @Schema(description = "회원 상태", example = "ACTIVE")
+        MemberStatus memberStatus
 
 
 ) {}

src/main/java/clap/server/adapter/inbound/web/dto/history/request/EditCommentRequest.java

@@ -3,6 +3,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 
+@Deprecated
 public record EditCommentRequest(
         @Schema(description = "댓글 내용")
         @NotBlank

src/main/java/clap/server/adapter/inbound/web/dto/log/request/FilterLogRequest.java

@@ -3,17 +3,18 @@
 import clap.server.adapter.outbound.persistense.entity.log.constant.LogStatus;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
+import org.springdoc.core.annotations.ParameterObject;
 
 import java.util.List;
 
+@ParameterObject
 public record FilterLogRequest(
         @Schema(description = "검색 기간 (단위: 시간)",
                 example = "1, 24, 168, 730, 2190 (1시간, 24시간, 1주일, 1개월, 3개월)")
         Integer term,
 
         @NotNull
-        @Schema(description = "로그 상태 목록",
-                example = "[\"LOGIN\", \"ASSIGNER_CHANGED\", \"COMMENT_ADDED\"]")
+        @Schema(description = "로그 상태 목록")
         List<LogStatus> logStatus,
 
         @NotNull

src/main/java/clap/server/adapter/inbound/web/dto/member/request/SendVerificationCodeRequest.java

@@ -2,6 +2,7 @@
 
 import jakarta.validation.constraints.NotBlank;
 
+@Deprecated
 public record SendVerificationCodeRequest(
         @NotBlank
         String nickname,