Merge branch 'release' of https://github.com/TaskFlow-CLAP/TaskFlow-Server into develop

Author: hyoseong-Choi

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

@@ -14,8 +14,7 @@ public record FilterLogRequest(
         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,

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

@@ -3,6 +3,7 @@
 
 import jakarta.validation.constraints.NotBlank;
 
+@Deprecated
 public record VerifyCodeRequest(
         @NotBlank
         String email,

src/main/java/clap/server/adapter/outbound/persistense/repository/log/AnonymousLogCustomRepositoryImpl.java

@@ -29,9 +29,6 @@ public Page<AnonymousLogEntity> filterAnonymousLogs(FilterLogRequest request, Pa
             LocalDateTime fromDate = LocalDateTime.now().minusHours(request.term());
             builder.and(anonymousLogEntity.requestAt.after(fromDate));
         }
-        if (!request.logStatus().isEmpty()) {
-            builder.and(anonymousLogEntity.logStatus.in(request.logStatus()));
-        }
         if (!request.nickName().isEmpty()) {
             builder.and(anonymousLogEntity.loginNickname.contains(request.nickName()));
         }

src/main/java/clap/server/application/mapper/response/AdminResponseMapper.java

@@ -5,6 +5,7 @@
 
 import java.util.List;
 
+
 public class AdminResponseMapper {
     private AdminResponseMapper() {
         throw new IllegalStateException("Utility class");
@@ -26,7 +27,8 @@ public static RetrieveAllMemberResponse toRetrieveAllMemberResponse(Member membe
                 member.getMemberInfo().getDepartment().getName(),
                 member.getMemberInfo().getRole(),
                 member.getMemberInfo().getDepartmentRole(),
-                member.getCreatedAt()
+                member.getCreatedAt(),
+                member.getStatus()
         );
     }
 }