관리자 관리 수정

src/main/java/com/kamco/cd/kamcoback/members/service/AdminService.java

@@ -1,9 +1,13 @@
 package com.kamco.cd.kamcoback.members.service;
 
+import com.kamco.cd.kamcoback.common.enums.StatusType;
+import com.kamco.cd.kamcoback.common.exception.CustomApiException;
+import com.kamco.cd.kamcoback.common.utils.CommonStringUtils;
 import com.kamco.cd.kamcoback.members.dto.MembersDto;
 import com.kamco.cd.kamcoback.postgres.core.MembersCoreService;
 import java.util.UUID;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -22,6 +26,10 @@ public class AdminService {
    */
   @Transactional
   public Long saveMember(MembersDto.AddReq addReq) {
+    if (!CommonStringUtils.isValidPassword(addReq.getTempPassword())) {
+      throw new CustomApiException("WRONG_PASSWORD", HttpStatus.BAD_REQUEST);
+    }
+
     return membersCoreService.saveMembers(addReq);
   }
 
@@ -33,16 +41,12 @@ public class AdminService {
    */
   @Transactional
   public void updateMembers(UUID uuid, MembersDto.UpdateReq updateReq) {
-    membersCoreService.updateMembers(uuid, updateReq);
-  }
-
-  /**
-   * 관리자 계정 미사용 처리
-   *
-   * @param uuid
-   */
-  @Transactional
-  public void deleteAccount(UUID uuid) {
-    membersCoreService.deleteAccount(uuid);
+    if (StatusType.INACTIVE.getId().equals(updateReq.getStatus())) {
+      // 미사용 처리
+      membersCoreService.deleteMember(uuid);
+    } else {
+      // 수정
+      membersCoreService.updateMembers(uuid, updateReq);
+    }
   }
 }

src/main/java/com/kamco/cd/kamcoback/members/service/MembersService.java

@@ -1,10 +1,10 @@
 package com.kamco.cd.kamcoback.members.service;
 
 import com.kamco.cd.kamcoback.common.exception.CustomApiException;
+import com.kamco.cd.kamcoback.common.utils.CommonStringUtils;
 import com.kamco.cd.kamcoback.members.dto.MembersDto;
 import com.kamco.cd.kamcoback.members.dto.MembersDto.Basic;
 import com.kamco.cd.kamcoback.postgres.core.MembersCoreService;
-import java.util.regex.Pattern;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.http.HttpStatus;
@@ -37,21 +37,9 @@ public class MembersService {
   @Transactional
   public void resetPassword(String id, MembersDto.InitReq initReq) {
 
-    if (!isValidPassword(initReq.getPassword())) {
+    if (!CommonStringUtils.isValidPassword(initReq.getPassword())) {
       throw new CustomApiException("WRONG_PASSWORD", HttpStatus.BAD_REQUEST);
     }
     membersCoreService.resetPassword(id, initReq);
   }
-
-  /**
-   * 영문, 숫자, 특수문자를 모두 포함하여 8~20자 이내의 비밀번호
-   *
-   * @param password
-   * @return
-   */
-  private boolean isValidPassword(String password) {
-    String passwordPattern =
-        "^(?=.*[A-Za-z])(?=.*\\d)(?=.*[!@#$%^&*()_+\\-\\[\\]{};':\"\\\\|,.<>/?]).{8,20}$";
-    return Pattern.matches(passwordPattern, password);
-  }
 }