관리자 관리 수정

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

@@ -28,9 +28,7 @@ public class MembersDto {
     private String userRole;
     private String userRoleName;
     private String name;
-    private String userId;
     private String employeeNo;
-    private String tempPassword;
     private String status;
     private String statusName;
     @JsonFormatDttm private ZonedDateTime createdDttm;
@@ -43,9 +41,7 @@ public class MembersDto {
         UUID uuid,
         String userRole,
         String name,
-        String userId,
         String employeeNo,
-        String tempPassword,
         String status,
         ZonedDateTime createdDttm,
         ZonedDateTime updatedDttm,
@@ -56,9 +52,7 @@ public class MembersDto {
       this.userRole = userRole;
       this.userRoleName = getUserRoleName(userRole);
       this.name = name;
-      this.userId = userId;
       this.employeeNo = employeeNo;
-      this.tempPassword = tempPassword;
       this.status = status;
       this.statusName = getStatusName(status);
       this.createdDttm = createdDttm;
@@ -120,14 +114,16 @@ public class MembersDto {
     @Size(min = 2, max = 100)
     private String name;
 
-    @Schema(description = "임시 비밀번호", example = "q!w@e#r4")
-    private String tempPassword;
+    @NotBlank
+    @Schema(description = "패스워드", example = "")
+    @Size(max = 255)
+    private String password;
 
-    public AddReq(String userRole, String employeeNo, String name, String tempPassword) {
+    public AddReq(String userRole, String employeeNo, String name, String password) {
       this.userRole = userRole;
       this.employeeNo = employeeNo;
       this.name = name;
-      this.tempPassword = tempPassword;
+      this.password = password;
     }
   }
 
@@ -139,18 +135,18 @@ public class MembersDto {
     @Size(min = 2, max = 100)
     private String name;
 
-    @Schema(description = "패스워드", example = "")
-    @Size(max = 255)
-    private String tempPassword;
-
     @Schema(description = "상태", example = "ACTIVE")
     @EnumValid(enumClass = StatusType.class, message = "status는 ACTIVE, INACTIVE, DELETED 만 가능합니다.")
     private String status;
 
-    public UpdateReq(String name, String tempPassword, String status) {
+    @Schema(description = "패스워드", example = "")
+    @Size(max = 255)
+    private String password;
+
+    public UpdateReq(String name, String status, String password) {
       this.name = name;
-      this.tempPassword = tempPassword;
       this.status = status;
+      this.password = password;
     }
   }
 
@@ -158,14 +154,15 @@ public class MembersDto {
   @Setter
   public static class InitReq {
 
-    @Schema(description = "변경 패스워드", example = "")
+    @Schema(description = "기존 패스워드", example = "")
     @Size(max = 255)
     @NotBlank
-    private String password;
+    private String oldPassword;
 
-    @Schema(description = "초기 패스워드", example = "")
+    @Schema(description = "신규 패스워드", example = "")
+    @Size(max = 255)
     @NotBlank
-    private String tempPassword;
+    private String newPassword;
   }
 
   @Getter