회원관리 관리 수정

src/main/java/com/kamco/cd/kamcoback/members/dto/MembersDto.java

@@ -1,7 +1,5 @@
 package com.kamco.cd.kamcoback.members.dto;
 
-import com.kamco.cd.kamcoback.common.enums.RoleType;
-import com.kamco.cd.kamcoback.common.utils.interfaces.EnumValid;
 import com.kamco.cd.kamcoback.common.utils.interfaces.JsonFormatDttm;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
@@ -23,33 +21,47 @@ public class MembersDto {
 
     private Long id;
     private UUID uuid;
-    private String employeeNo;
+    private String userRole;
     private String name;
-    private String email;
+    private String userId;
+    private String employeeNo;
+    private String tempPassword;
     private String status;
-    private String roleName;
-    @JsonFormatDttm private ZonedDateTime createdDttm;
-    @JsonFormatDttm private ZonedDateTime updatedDttm;
+    @JsonFormatDttm
+    private ZonedDateTime createdDttm;
+    @JsonFormatDttm
+    private ZonedDateTime updatedDttm;
+    @JsonFormatDttm
+    private ZonedDateTime firstLoginDttm;
+    @JsonFormatDttm
+    private ZonedDateTime lastLoginDttm;
 
     public Basic(
-        Long id,
-        UUID uuid,
-        String employeeNo,
-        String name,
-        String email,
-        String status,
-        String roleName,
-        ZonedDateTime createdDttm,
-        ZonedDateTime updatedDttm) {
+      Long id,
+      UUID uuid,
+      String userRole,
+      String name,
+      String userId,
+      String employeeNo,
+      String tempPassword,
+      String status,
+      ZonedDateTime createdDttm,
+      ZonedDateTime updatedDttm,
+      ZonedDateTime firstLoginDttm,
+      ZonedDateTime lastLoginDttm
+    ) {
       this.id = id;
       this.uuid = uuid;
-      this.employeeNo = employeeNo;
+      this.userRole = userRole;
       this.name = name;
-      this.email = email;
+      this.userId = userId;
+      this.employeeNo = employeeNo;
+      this.tempPassword = tempPassword;
       this.status = status;
-      this.roleName = roleName;
       this.createdDttm = createdDttm;
       this.updatedDttm = updatedDttm;
+      this.firstLoginDttm = firstLoginDttm;
+      this.lastLoginDttm = lastLoginDttm;
     }
   }
 
@@ -59,21 +71,12 @@ public class MembersDto {
   @AllArgsConstructor
   public static class SearchReq {
 
-    @Schema(description = "이름(name), 이메일(email), 사번(employeeNo)", example = "name")
-    private String field;
+    @Schema(description = "전체, 관리자(ROLE_ADMIN), 라벨러(ROLE_LABELER), 검수자(ROLE_REVIEWER)", example = "")
+    private String userRole;
 
     @Schema(description = "키워드", example = "홍길동")
     private String keyword;
 
-    @Schema(description = "라벨러 포함 여부", example = "true")
-    private boolean labeler = true;
-
-    @Schema(description = "검수자 포함 여부", example = "true")
-    private boolean reviewer = true;
-
-    @Schema(description = "운영자 포함 여부", example = "true")
-    private boolean admin = true;
-
     // 페이징 파라미터
     @Schema(description = "페이지 번호 (0부터 시작) ", example = "0")
     private int page = 0;
@@ -112,7 +115,7 @@ public class MembersDto {
     private String employeeNo;
 
     public AddReq(
-        String userRole, String name, String userId, String tempPassword, String employeeNo) {
+      String userRole, String name, String userId, String tempPassword, String employeeNo) {
       this.userRole = userRole;
       this.name = name;
       this.userId = userId;
@@ -146,29 +149,10 @@ public class MembersDto {
 
   @Getter
   @Setter
-  public static class RolesDto {
+  public static class InitReq {
 
-    @Schema(description = "UUID", example = "4e89e487-c828-4a34-a7fc-0d5b0e3b53b5")
-    private UUID uuid;
-
-    @Schema(description = "역할 ROLE_ADMIN, ROLE_LABELER, ROLE_REVIEWER", example = "ROLE_ADMIN")
-    @EnumValid(enumClass = RoleType.class)
-    private String roleName;
-
-    public RolesDto(UUID uuid, String roleName) {
-      this.uuid = uuid;
-      this.roleName = roleName;
-    }
-  }
-
-  @Getter
-  @Setter
-  @NoArgsConstructor
-  @AllArgsConstructor
-  public static class StatusDto {
-
-    @Schema(description = "변경할 상태값 ACTIVE, INACTIVE, ARCHIVED", example = "ACTIVE")
-    @NotBlank
-    private String status;
+    @Schema(description = "패스워드", example = "")
+    @Size(max = 255)
+    private String password;
   }
 }