상태값 enum 변경, spotlessApply 적용

src/main/java/com/kamco/cd/kamcoback/common/enums/StatusType.java

@@ -7,9 +7,9 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum StatusType implements EnumType {
-  ACTIVE("활성"),
+  ACTIVE("사용"),
   INACTIVE("미사용"),
-  PENDING("보류");
+  PENDING("계정등록");
 
   private final String desc;
 

src/main/java/com/kamco/cd/kamcoback/common/utils/CommonStringUtils.java

@@ -14,7 +14,7 @@ public class CommonStringUtils {
    */
   public static boolean isValidPassword(String password) {
     String passwordPattern =
-        "^(?=.*[A-Za-z])(?=.*\\d)(?=.*[!@#$%^&*()_+\\-\\[\\]{};':\"\\\\|,.<>/?]).{8,20}$";
+        "^(?=.*[A-Za-z])(?=.*\\d)(?=.*[!@#$%^&*()_+\\-\\[\\]{};':\"\\\\|,.<>/?=]).{8,20}$";
     return Pattern.matches(passwordPattern, password);
   }
 

src/main/java/com/kamco/cd/kamcoback/common/utils/FIleChecker.java

@@ -253,8 +253,8 @@ public class FIleChecker {
     List<Basic> fileList = new ArrayList<>();
     SimpleDateFormat dttmFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
-    //int fileTotCnt = 0;
-    //long fileTotSize = 0;
+    // int fileTotCnt = 0;
+    // long fileTotSize = 0;
 
     try (Stream<Path> stream = Files.walk(startPath, maxDepth)) {
 

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

@@ -46,7 +46,8 @@ public class MembersDto {
         ZonedDateTime createdDttm,
         ZonedDateTime firstLoginDttm,
         ZonedDateTime lastLoginDttm,
-        ZonedDateTime statusChgDttm) {
+        ZonedDateTime statusChgDttm,
+        Boolean pwdResetYn) {
       this.id = id;
       this.uuid = uuid;
       this.userRole = userRole;
@@ -54,7 +55,7 @@ public class MembersDto {
       this.name = name;
       this.employeeNo = employeeNo;
       this.status = status;
-      this.statusName = getStatusName(status);
+      this.statusName = getStatusName(status, pwdResetYn);
       this.createdDttm = createdDttm;
       this.firstLoginDttm = firstLoginDttm;
       this.lastLoginDttm = lastLoginDttm;
@@ -66,8 +67,12 @@ public class MembersDto {
       return type.getText();
     }
 
-    private String getStatusName(String status) {
+    private String getStatusName(String status, Boolean pwdResetYn) {
       StatusType type = Enums.fromId(StatusType.class, status);
+      pwdResetYn = pwdResetYn != null && pwdResetYn;
+      if (type.equals(StatusType.PENDING) && pwdResetYn) {
+        type = StatusType.ACTIVE;
+      }
       return type.getText();
     }
   }

src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java

@@ -54,7 +54,8 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
 
     NumberExpression<Long> totalCount = mapSheetMngHstEntity.count().as("syncTotCnt");
 
-    NumberExpression<Long> doneCount = new CaseBuilder()
+    NumberExpression<Long> doneCount =
+        new CaseBuilder()
             .when(mapSheetMngHstEntity.dataState.eq("DONE"))
             .then(1L)
             .otherwise(0L)
@@ -87,8 +88,11 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
                         .otherwise(0L)
                         .sum(),
                     new CaseBuilder()
-                        .when(mapSheetMngHstEntity.syncState.eq("NOFILE")
-                          .or( mapSheetMngHstEntity.syncState.eq("NOTPAIR")))
+                        .when(
+                            mapSheetMngHstEntity
+                                .syncState
+                                .eq("NOFILE")
+                                .or(mapSheetMngHstEntity.syncState.eq("NOTPAIR")))
                         .then(1L)
                         .otherwise(0L)
                         .sum(),
@@ -98,8 +102,11 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
                         .otherwise(0L)
                         .sum(),
                     new CaseBuilder()
-                      .when(mapSheetMngHstEntity.syncState.eq("TYPEERROR")
-                        .or( mapSheetMngHstEntity.syncState.eq("SIZEERROR")))
+                        .when(
+                            mapSheetMngHstEntity
+                                .syncState
+                                .eq("TYPEERROR")
+                                .or(mapSheetMngHstEntity.syncState.eq("SIZEERROR")))
                         .then(1L)
                         .otherwise(0L)
                         .sum(),

src/main/java/com/kamco/cd/kamcoback/postgres/repository/members/MembersRepositoryImpl.java

@@ -125,7 +125,8 @@ public class MembersRepositoryImpl implements MembersRepositoryCustom {
                     memberEntity.createdDttm,
                     memberEntity.firstLoginDttm,
                     memberEntity.lastLoginDttm,
-                    memberEntity.statusChgDttm))
+                    memberEntity.statusChgDttm,
+                    memberEntity.pwdResetYn))
             .from(memberEntity)
             .where(builder)
             .offset(pageable.getOffset())