Merge remote-tracking branch 'origin/feat/dev_251201' into feat/dev_251201

# Conflicts:
#	src/main/java/com/kamco/cd/kamcoback/mapsheet/dto/MapSheetMngDto.java

src/main/java/com/kamco/cd/kamcoback/postgres/entity/AuditLogEntity.java

@@ -15,13 +15,7 @@ import lombok.NoArgsConstructor;
 @Table(name = "tb_audit_log")
 public class AuditLogEntity extends CommonCreateEntity {
   @Id
-  @GeneratedValue(
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
-      strategy = GenerationType.SEQUENCE,
-      generator = "tb_audit_log_audit_log_uid_seq_gen")
-  @SequenceGenerator(
-      name = "tb_audit_log_audit_log_uid_seq_gen",
-      sequenceName = "tb_audit_log_audit_log_uid_seq",
-      allocationSize = 1)
   @Column(name = "audit_log_uid", nullable = false)
   private Long id;
 

src/main/java/com/kamco/cd/kamcoback/postgres/entity/ErrorLogEntity.java

@@ -5,24 +5,19 @@ import com.kamco.cd.kamcoback.log.dto.EventType;
 import com.kamco.cd.kamcoback.postgres.CommonCreateEntity;
 import jakarta.persistence.*;
 import jakarta.validation.constraints.Size;
-import java.time.ZonedDateTime;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+import java.time.ZonedDateTime;
+
 @Entity
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Table(name = "tb_error_log")
 public class ErrorLogEntity extends CommonCreateEntity {
   @Id
-  @GeneratedValue(
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
-      strategy = GenerationType.SEQUENCE,
-      generator = "tb_error_log_error_log_uid_seq_gen")
-  @SequenceGenerator(
-      name = "tb_error_log_error_log_uid_seq_gen",
-      sequenceName = "tb_error_log_error_log_uid_seq",
-      allocationSize = 1)
   @Column(name = "error_log_uid", nullable = false)
   private Long id;
 

src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetMngHstEntity.java

@@ -103,5 +103,4 @@ public class MapSheetMngHstEntity extends CommonDateEntity {
   @Size(max = 100)
   @Column(name = "sync_check_tfw_file_name", length = 100)
   private String syncCheckTfwFileName;
-
 }

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

@@ -9,7 +9,6 @@ import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetMngHstEntity.mapSh
 import com.kamco.cd.kamcoback.mapsheet.dto.MapSheetMngDto;
 import com.kamco.cd.kamcoback.postgres.entity.MapSheetMngHstEntity;
 import com.querydsl.core.BooleanBuilder;
-import com.querydsl.core.Tuple;
 import com.querydsl.core.types.Projections;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.core.types.dsl.CaseBuilder;
@@ -20,10 +19,7 @@ import com.querydsl.jpa.impl.JPAQueryFactory;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
 import jakarta.validation.Valid;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import org.hibernate.query.Query;
@@ -49,12 +45,12 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
   @Override
   public List<MapSheetMngDto.MngDto> findMapSheetMngList() {
 
-    //Pageable pageable = searchReq.toPageable();
+    // Pageable pageable = searchReq.toPageable();
     BooleanBuilder whereBuilder = new BooleanBuilder();
 
-    //if (searchReq.getMngYyyy() != null) {
+    // if (searchReq.getMngYyyy() != null) {
-      //whereBuilder.and(mapSheetMngEntity.mngYyyy.eq(searchReq.getMngYyyy()));
+    // whereBuilder.and(mapSheetMngEntity.mngYyyy.eq(searchReq.getMngYyyy()));
-    //}
+    // }
 
     NumberExpression<Long> totalCount = mapSheetMngHstEntity.count().as("syncTotCnt");
 
@@ -155,8 +151,8 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
             .leftJoin(mapSheetMngHstEntity)
             .on(mapSheetMngEntity.mngYyyy.eq(mapSheetMngHstEntity.mngYyyy))
             .where(whereBuilder)
-            //.offset(pageable.getOffset())
+            // .offset(pageable.getOffset())
-            //.limit(pageable.getPageSize())
+            // .limit(pageable.getPageSize())
             .orderBy(mapSheetMngEntity.mngYyyy.desc())
             .groupBy(mapSheetMngEntity.mngYyyy)
             .fetch();
@@ -171,7 +167,7 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
     return foundContent;
   }
 
-  public MapSheetMngDto.MngDto findMapSheetMng(int mngYyyy){
+  public MapSheetMngDto.MngDto findMapSheetMng(int mngYyyy) {
 
     BooleanBuilder whereBuilder = new BooleanBuilder();
     whereBuilder.and(mapSheetMngEntity.mngYyyy.eq(mngYyyy));
@@ -330,13 +326,16 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
                     mapSheetMngHstEntity.hstUid,
                     Expressions.stringTemplate(
                             "concat({0},substring({1}, 0, 6))",
-              mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum).as("map50kName"),
+                            mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum)
+                        .as("map50kName"),
                     Expressions.stringTemplate(
                             "concat({0},substring({1}, 6, 8))",
-              mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum).as("map5kName"),
+                            mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum)
+                        .as("map5kName"),
                     Expressions.stringTemplate(
                             "concat({0},substring({1}, 6, 8))",
-              mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum).as("mapSrcName"),
+                            mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum)
+                        .as("mapSrcName"),
                     mapInkx5kEntity.fid,
                     mapSheetMngHstEntity.createdDate,
                     mapSheetMngHstEntity.syncState,
@@ -344,19 +343,16 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
                     mapSheetMngHstEntity.syncTifFileName,
                     mapSheetMngHstEntity.syncCheckState,
                     mapSheetMngHstEntity.syncCheckTfwFileName,
-            mapSheetMngHstEntity.syncCheckTifFileName
+                    mapSheetMngHstEntity.syncCheckTifFileName))
-          )
-        )
             .from(mapSheetMngHstEntity)
-        .innerJoin(mapInkx5kEntity).on(mapSheetMngHstEntity.mapSheetNum.eq(mapInkx5kEntity.mapidcdNo))
+            .innerJoin(mapInkx5kEntity)
+            .on(mapSheetMngHstEntity.mapSheetNum.eq(mapInkx5kEntity.mapidcdNo))
             .where(whereBuilder)
             .orderBy(mapSheetMngHstEntity.createdDate.desc())
             .offset(pageable.getOffset())
             .limit(pageable.getPageSize())
             .fetch();
 
-
-
     Long countQuery =
         queryFactory
             .select(mapSheetMngHstEntity.hstUid.count())

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

@@ -134,8 +134,14 @@ public class MembersRepositoryImpl implements MembersRepositoryCustom {
             .orderBy(memberEntity.createdDttm.desc())
             .fetch();
 
-    long total = queryFactory.select(memberEntity).from(memberEntity).fetchCount();
+    long total =
-
+        Optional.ofNullable(
+                queryFactory
+                    .select(memberEntity.count())
+                    .from(memberEntity)
+                    .where(builder)
+                    .fetchOne())
+            .orElse(0L);
     return new PageImpl<>(content, pageable, total);
   }