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

src/main/java/com/kamco/cd/kamcoback/postgres/core/ModelMgmtCoreService.java

@@ -1,25 +0,0 @@
-package com.kamco.cd.kamcoback.postgres.core;
-
-import com.kamco.cd.kamcoback.model.dto.ModelMgmtDto;
-import com.kamco.cd.kamcoback.postgres.repository.model.ModelMgmtRepository;
-import java.time.LocalDate;
-import lombok.RequiredArgsConstructor;
-import org.springframework.data.domain.Page;
-import org.springframework.stereotype.Service;
-
-@Service
-@RequiredArgsConstructor
-public class ModelMgmtCoreService {
-
-  private final ModelMgmtRepository modelMgmtRepository;
-
-  public Page<ModelMgmtDto.ModelList> findModelMgmtList(
-      ModelMgmtDto.searchReq searchReq,
-      LocalDate startDate,
-      LocalDate endDate,
-      String modelType,
-      String searchVal) {
-    return modelMgmtRepository.findModelMgmtList(
-        searchReq, startDate, endDate, modelType, searchVal);
-  }
-}

src/main/java/com/kamco/cd/kamcoback/postgres/core/ModelMngCoreService.java

@@ -1,15 +1,8 @@
 package com.kamco.cd.kamcoback.postgres.core;
 
 import com.kamco.cd.kamcoback.model.dto.ModelMngDto;
-import com.kamco.cd.kamcoback.model.dto.ModelVerDto;
-import com.kamco.cd.kamcoback.postgres.entity.ModelMngBakEntity;
-import com.kamco.cd.kamcoback.postgres.entity.ModelVerEntity;
 import com.kamco.cd.kamcoback.postgres.repository.model.ModelMngRepository;
-import com.kamco.cd.kamcoback.postgres.repository.model.ModelVerRepository;
-import jakarta.persistence.EntityNotFoundException;
 import java.time.LocalDate;
-import java.util.List;
-import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
@@ -19,72 +12,14 @@ import org.springframework.stereotype.Service;
 public class ModelMngCoreService {
 
   private final ModelMngRepository modelMngRepository;
-  private final ModelVerRepository modelVerRepository;
 
-  public List<ModelMngDto.Basic> findModelMngAll() {
-    return modelMngRepository.findModelMngAll().stream().map(ModelMngBakEntity::toDto).toList();
-  }
-
-  public Optional<ModelMngDto.FinalModelDto> getFinalModelInfo() {
-    return modelMngRepository.getFinalModelInfo();
-  }
-
-  public ModelVerDto.Basic save(ModelMngDto.AddReq addReq) {
-    ModelMngBakEntity modelMngBakEntity =
-        new ModelMngBakEntity(
-            addReq.getModelNm(),
-            addReq.getModelCate(),
-            addReq.getModelPath(),
-            1L,
-            1L,
-            addReq.getModelCntnt()); // TODO: 로그인 기능 붙이면 Uid 넣어야 함
-
-    ModelMngBakEntity saved = modelMngRepository.save(modelMngBakEntity);
-    ModelVerEntity modelVerEntity =
-        new ModelVerEntity(
-            saved.getId(),
-            addReq.getModelCate(),
-            addReq.getModelVer(),
-            "NONE",
-            "NONE",
-            0.0,
-            "NONE",
-            addReq.getModelPath(),
-            1L,
-            1L);
-    return modelVerRepository.save(modelVerEntity).toDto();
-  }
-
-  public Long update(Long id, ModelMngDto.AddReq addReq) {
-    // 조회
-    ModelVerEntity existData =
-        modelVerRepository
-            .findModelVerById(id)
-            .orElseThrow(EntityNotFoundException::new); // 데이터 없는 경우 exception
-    existData.update(addReq);
-    // TODO: 추후 수정 단계에서 도커파일 업로드하면 버전 업데이트 하는 로직 필요
-    return existData.getId();
-  }
-
-  public Long delete(Long id) {
-    // 조회
-    ModelVerEntity verEntity =
-        modelVerRepository
-            .findModelVerById(id)
-            .orElseThrow(() -> new EntityNotFoundException("버전 id 에 대한 정보를 찾을 수 없습니다. id : " + id));
-
-    // usedState가 USED 이거나 이미 삭제된 상태이면 삭제 불가
-    if (verEntity.getUsedState().equals("USED") || verEntity.isDeleted().equals(true)) {
-      throw new IllegalStateException("해당 모델이 사용중이라 삭제 불가"); // TODO: 추후 규칙 정의되면 수정 필요
-    }
-
-    // id 코드 deleted = true 업데이트
-    verEntity.deleted();
-    return verEntity.getId();
-  }
-
-  public Page<ModelMngDto.ModelRegHistory> getRegHistoryList(
-      ModelMngDto.searchReq searchReq, LocalDate startDate, LocalDate endDate, String searchVal) {
-    return modelMngRepository.getRegHistoryList(searchReq, startDate, endDate, searchVal);
+  public Page<ModelMngDto.ModelList> findModelMgmtList(
+      ModelMngDto.searchReq searchReq,
+      LocalDate startDate,
+      LocalDate endDate,
+      String modelType,
+      String searchVal) {
+    return modelMngRepository.findModelMgmtList(
+        searchReq, startDate, endDate, modelType, searchVal);
   }
 }

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

@@ -1,6 +1,5 @@
 package com.kamco.cd.kamcoback.postgres.entity;
 
-import com.kamco.cd.kamcoback.model.dto.ModelMngDto;
 import com.kamco.cd.kamcoback.postgres.CommonDateEntity;
 import jakarta.persistence.*;
 import jakarta.validation.constraints.Size;
@@ -63,17 +62,4 @@ public class ModelMngBakEntity extends CommonDateEntity {
     this.createdUid = createdUid;
     this.updatedUid = updatedUid;
   }
-
-  public ModelMngDto.Basic toDto() {
-    return new ModelMngDto.Basic(
-        this.id,
-        this.modelNm,
-        this.modelCate,
-        this.modelPath,
-        super.getCreatedDate(),
-        this.createdUid,
-        super.getModifiedDate(),
-        this.updatedUid,
-        this.modelCntnt);
-  }
 }

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

@@ -10,7 +10,7 @@ import lombok.Setter;
 @Setter
 @Entity
 @Table(name = "tb_model_mgmt")
-public class ModelMgmtEntity extends CommonDateEntity {
+public class ModelMngEntity extends CommonDateEntity {
   @Id
   @GeneratedValue(strategy = GenerationType.IDENTITY)
   @Column(name = "model_uid")

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

@@ -1,6 +1,6 @@
 package com.kamco.cd.kamcoback.postgres.entity;
 
-import com.kamco.cd.kamcoback.model.dto.ModelMngDto;
+import com.kamco.cd.kamcoback.model.dto.ModelMngBakDto;
 import com.kamco.cd.kamcoback.model.dto.ModelVerDto;
 import com.kamco.cd.kamcoback.postgres.CommonDateEntity;
 import jakarta.persistence.*;
@@ -161,7 +161,7 @@ public class ModelVerEntity extends CommonDateEntity {
         this.updatedUid);
   }
 
-  public void update(ModelMngDto.AddReq addReq) {
+  public void update(ModelMngBakDto.AddReq addReq) {
     this.modelCate = addReq.getModelCate();
     this.modelVer = addReq.getModelVer();
     this.modelPath = addReq.getModelPath();

src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMgmtRepository.java

@@ -1,7 +0,0 @@
-package com.kamco.cd.kamcoback.postgres.repository.model;
-
-import com.kamco.cd.kamcoback.postgres.entity.ModelMgmtEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-public interface ModelMgmtRepository
-    extends JpaRepository<ModelMgmtEntity, Integer>, ModelMgmtRepositoryCustom {}

src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMgmtRepositoryCustom.java

@@ -1,15 +0,0 @@
-package com.kamco.cd.kamcoback.postgres.repository.model;
-
-import com.kamco.cd.kamcoback.model.dto.ModelMgmtDto;
-import java.time.LocalDate;
-import org.springframework.data.domain.Page;
-
-public interface ModelMgmtRepositoryCustom {
-
-  Page<ModelMgmtDto.ModelList> findModelMgmtList(
-      ModelMgmtDto.searchReq searchReq,
-      LocalDate startDate,
-      LocalDate endDate,
-      String modelType,
-      String searchVal);
-}

src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMgmtRepositoryImpl.java

@@ -1,155 +0,0 @@
-package com.kamco.cd.kamcoback.postgres.repository.model;
-
-import static com.kamco.cd.kamcoback.postgres.entity.QModelMgmtEntity.modelMgmtEntity;
-import static com.kamco.cd.kamcoback.postgres.entity.QModelResultMetricEntity.modelResultMetricEntity;
-
-import com.kamco.cd.kamcoback.model.dto.ModelMgmtDto;
-import com.kamco.cd.kamcoback.postgres.QuerydslOrderUtil;
-import com.kamco.cd.kamcoback.postgres.entity.ModelMgmtEntity;
-import com.querydsl.core.BooleanBuilder;
-import com.querydsl.core.types.Expression;
-import com.querydsl.core.types.Projections;
-import com.querydsl.core.types.dsl.BooleanExpression;
-import com.querydsl.core.types.dsl.Expressions;
-import com.querydsl.core.types.dsl.NumberPath;
-import com.querydsl.core.types.dsl.StringExpression;
-import com.querydsl.jpa.impl.JPAQueryFactory;
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.jpa.repository.support.QuerydslRepositorySupport;
-
-public class ModelMgmtRepositoryImpl extends QuerydslRepositorySupport
-    implements ModelMgmtRepositoryCustom {
-
-  private final JPAQueryFactory queryFactory;
-  private final StringExpression NULL_STRING = Expressions.stringTemplate("cast(null as text)");
-
-  public ModelMgmtRepositoryImpl(JPAQueryFactory queryFactory) {
-    super(ModelMgmtEntity.class);
-    this.queryFactory = queryFactory;
-  }
-
-  @Override
-  public Page<ModelMgmtDto.ModelList> findModelMgmtList(
-      ModelMgmtDto.searchReq searchReq,
-      LocalDate startDate,
-      LocalDate endDate,
-      String modelType,
-      String searchVal) {
-    Pageable pageable = searchReq.toPageable();
-    Sort sort = pageable.getSort();
-    String property = "createCompleteDttm"; // 기본으로 생성완료일 기준
-
-    Map<String, Expression<?>> sortColumnMap =
-        Map.of(
-            "createCompleteDttm", modelMgmtEntity.createCompleteDttm,
-            "recentUseDttm", modelMgmtEntity.recentUseDttm);
-
-    if (sort.isSorted()) {
-      Sort.Order order = sort.iterator().next();
-      property = order.getProperty();
-    }
-
-    Expression<?> sortColumn = sortColumnMap.get(property);
-
-    List<ModelMgmtDto.ModelList> foundContent =
-        queryFactory
-            .select(
-                Projections.constructor(
-                    ModelMgmtDto.ModelList.class,
-                    Expressions.numberTemplate(
-                        Integer.class, "row_number() over(order by {0} desc)", sortColumn),
-                    Expressions.stringTemplate(
-                            "concat({0}, {1}, {2}, {3}, {4})",
-                            modelMgmtEntity.modelVer,
-                            ".",
-                            modelMgmtEntity.hyperVer,
-                            ".",
-                            modelMgmtEntity.epochVer)
-                        .as("modelVer"),
-                    modelMgmtEntity.dockerFileNm,
-                    modelMgmtEntity.modelVer.as("modelType"),
-                    Expressions.stringTemplate(
-                        "to_char({0}, 'YYYY-MM-DD')", modelMgmtEntity.createCompleteDttm),
-                    Expressions.stringTemplate(
-                        "to_char({0}, 'YYYY-MM-DD')", modelMgmtEntity.recentUseDttm),
-                    roundNumericToPercent(modelResultMetricEntity.f1Score),
-                    roundNumericToPercent(modelResultMetricEntity.precision),
-                    roundNumericToPercent(modelResultMetricEntity.recall),
-                    roundNumericToPercent(modelResultMetricEntity.loss),
-                    roundNumericToPercent(modelResultMetricEntity.iou),
-                    modelMgmtEntity.deleted))
-            .from(modelMgmtEntity)
-            .innerJoin(modelResultMetricEntity)
-            .on(modelMgmtEntity.modelUid.longValue().eq(modelResultMetricEntity.modelUid))
-            .where(
-                eventEndedAtBetween(startDate, endDate, property),
-                searchModelVersion(modelType, searchVal))
-            .offset(pageable.getOffset())
-            .limit(pageable.getPageSize())
-            .orderBy(
-                QuerydslOrderUtil.getOrderSpecifiers(
-                    pageable, ModelMgmtEntity.class, "modelMgmtEntity"))
-            .fetch();
-
-    Long countQuery =
-        queryFactory
-            .select(modelMgmtEntity.modelUid.count())
-            .from(modelMgmtEntity)
-            .where(
-                eventEndedAtBetween(startDate, endDate, property),
-                searchModelVersion(modelType, searchVal))
-            .fetchOne();
-
-    return new PageImpl<>(foundContent, pageable, countQuery);
-  }
-
-  private BooleanExpression eventEndedAtBetween(
-      LocalDate startDate, LocalDate endDate, String sortColumn) {
-    if (Objects.isNull(startDate) || Objects.isNull(endDate)) {
-      return null;
-    }
-    ZoneId zone = ZoneId.systemDefault();
-    LocalDateTime startDateTime = startDate.atStartOfDay();
-    LocalDateTime endDateTime = endDate.plusDays(1).atStartOfDay();
-
-    if (sortColumn.equals("createCompleteDttm")) {
-      return modelMgmtEntity
-          .createCompleteDttm
-          .goe(startDateTime.atZone(zone))
-          .and(modelMgmtEntity.createCompleteDttm.lt(endDateTime.atZone(zone)));
-    } else {
-      return modelMgmtEntity
-          .recentUseDttm
-          .goe(startDateTime.atZone(zone))
-          .and(modelMgmtEntity.recentUseDttm.lt(endDateTime.atZone(zone)));
-    }
-  }
-
-  private BooleanBuilder searchModelVersion(String modelType, String searchVal) {
-    BooleanBuilder builder = new BooleanBuilder();
-
-    if (Objects.nonNull(modelType)) {
-      builder.and(modelMgmtEntity.modelVer.eq(modelType));
-    }
-
-    if (Objects.nonNull(searchVal)) {
-      builder.and(modelMgmtEntity.dockerFileNm.likeIgnoreCase("%" + searchVal + "%"));
-    }
-
-    return builder;
-  }
-
-  private Expression<BigDecimal> roundNumericToPercent(NumberPath<Double> ratio) {
-    return Expressions.numberTemplate(BigDecimal.class, "function('round', {0} * 100, 2)", ratio);
-  }
-}

src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepository.java

@@ -1,7 +1,7 @@
 package com.kamco.cd.kamcoback.postgres.repository.model;
 
-import com.kamco.cd.kamcoback.postgres.entity.ModelMngBakEntity;
+import com.kamco.cd.kamcoback.postgres.entity.ModelMngEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface ModelMngRepository
-    extends JpaRepository<ModelMngBakEntity, Long>, ModelMngRepositoryCustom {}
+    extends JpaRepository<ModelMngEntity, Integer>, ModelMngRepositoryCustom {}

src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepositoryCustom.java

@@ -1,18 +1,15 @@
 package com.kamco.cd.kamcoback.postgres.repository.model;
 
 import com.kamco.cd.kamcoback.model.dto.ModelMngDto;
-import com.kamco.cd.kamcoback.postgres.entity.ModelMngBakEntity;
 import java.time.LocalDate;
-import java.util.List;
-import java.util.Optional;
 import org.springframework.data.domain.Page;
 
 public interface ModelMngRepositoryCustom {
 
-  List<ModelMngBakEntity> findModelMngAll();
-
-  Optional<ModelMngDto.FinalModelDto> getFinalModelInfo();
-
-  Page<ModelMngDto.ModelRegHistory> getRegHistoryList(
-      ModelMngDto.searchReq searchReq, LocalDate startDate, LocalDate endDate, String searchVal);
+  Page<ModelMngDto.ModelList> findModelMgmtList(
+      ModelMngDto.searchReq searchReq,
+      LocalDate startDate,
+      LocalDate endDate,
+      String modelType,
+      String searchVal);
 }

src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepositoryImpl.java

@@ -1,28 +1,30 @@
 package com.kamco.cd.kamcoback.postgres.repository.model;
 
-import static com.kamco.cd.kamcoback.postgres.entity.QModelDeployHstEntity.modelDeployHstEntity;
-import static com.kamco.cd.kamcoback.postgres.entity.QModelMngBakEntity.modelMngBakEntity;
-import static com.kamco.cd.kamcoback.postgres.entity.QModelVerEntity.modelVerEntity;
+import static com.kamco.cd.kamcoback.postgres.entity.QModelMngEntity.modelMngEntity;
+import static com.kamco.cd.kamcoback.postgres.entity.QModelResultMetricEntity.modelResultMetricEntity;
 
 import com.kamco.cd.kamcoback.model.dto.ModelMngDto;
 import com.kamco.cd.kamcoback.postgres.QuerydslOrderUtil;
-import com.kamco.cd.kamcoback.postgres.entity.ModelMngBakEntity;
-import com.kamco.cd.kamcoback.postgres.entity.ModelVerEntity;
+import com.kamco.cd.kamcoback.postgres.entity.ModelMngEntity;
+import com.querydsl.core.BooleanBuilder;
+import com.querydsl.core.types.Expression;
 import com.querydsl.core.types.Projections;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberPath;
 import com.querydsl.core.types.dsl.StringExpression;
 import com.querydsl.jpa.impl.JPAQueryFactory;
-import io.micrometer.common.util.StringUtils;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.time.ZonedDateTime;
+import java.time.ZoneId;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
-import java.util.Optional;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.repository.support.QuerydslRepositorySupport;
 
 public class ModelMngRepositoryImpl extends QuerydslRepositorySupport
@@ -32,113 +34,122 @@ public class ModelMngRepositoryImpl extends QuerydslRepositorySupport
   private final StringExpression NULL_STRING = Expressions.stringTemplate("cast(null as text)");
 
   public ModelMngRepositoryImpl(JPAQueryFactory queryFactory) {
-    super(ModelMngBakEntity.class);
+    super(ModelMngEntity.class);
     this.queryFactory = queryFactory;
   }
 
   @Override
-  public List<ModelMngBakEntity> findModelMngAll() {
-    return queryFactory.selectFrom(modelMngBakEntity).orderBy(modelMngBakEntity.id.desc()).fetch();
-  }
-
-  @Override
-  public Optional<ModelMngDto.FinalModelDto> getFinalModelInfo() {
-    return queryFactory
-        .select(
-            Projections.constructor(
-                ModelMngDto.FinalModelDto.class,
-                modelMngBakEntity.id.as("modelUid"),
-                modelMngBakEntity.modelNm,
-                modelMngBakEntity.modelCate,
-                modelVerEntity.id.as("modelVerUid"),
-                modelVerEntity.modelVer,
-                Expressions.stringTemplate(
-                    "fn_codenm_to_misc({0}, {1})", 51, modelVerEntity.usedState), // 사용여부 한글 명칭
-                Expressions.stringTemplate(
-                    "fn_codenm_to_misc({0}, {1})", 51, modelVerEntity.modelState), // 모델상태 한글 명칭
-                modelVerEntity.qualityProb,
-                Expressions.stringTemplate(
-                    "fn_codenm_to_misc({0}, {1})", 52, modelVerEntity.deployState), // 배포상태 한글 명칭
-                modelVerEntity.modelPath))
-        .from(modelMngBakEntity)
-        .innerJoin(modelVerEntity)
-        .on(modelMngBakEntity.id.eq(modelVerEntity.modelUid))
-        .where(modelVerEntity.usedState.eq("USED")) // USED 인 것 중에
-        .orderBy(modelVerEntity.modelVer.desc()) // Version 높은 것 기준
-        .stream()
-        .findFirst();
-  }
-
-  @Override
-  public Page<ModelMngDto.ModelRegHistory> getRegHistoryList(
-      ModelMngDto.searchReq searchReq, LocalDate startDate, LocalDate endDate, String searchVal) {
-
+  public Page<ModelMngDto.ModelList> findModelMgmtList(
+      ModelMngDto.searchReq searchReq,
+      LocalDate startDate,
+      LocalDate endDate,
+      String modelType,
+      String searchVal) {
     Pageable pageable = searchReq.toPageable();
-    List<ModelMngDto.ModelRegHistory> foundContent =
+    Sort sort = pageable.getSort();
+    String property = "createCompleteDttm"; // 기본으로 생성완료일 기준
+
+    Map<String, Expression<?>> sortColumnMap =
+        Map.of(
+            "createCompleteDttm", modelMngEntity.createCompleteDttm,
+            "recentUseDttm", modelMngEntity.recentUseDttm);
+
+    if (sort.isSorted()) {
+      Sort.Order order = sort.iterator().next();
+      property = order.getProperty();
+    }
+
+    Expression<?> sortColumn = sortColumnMap.get(property);
+
+    List<ModelMngDto.ModelList> foundContent =
         queryFactory
             .select(
                 Projections.constructor(
-                    ModelMngDto.ModelRegHistory.class,
-                    modelMngBakEntity.modelNm,
-                    modelMngBakEntity.modelCate,
-                    modelVerEntity.modelVer,
+                    ModelMngDto.ModelList.class,
+                    Expressions.numberTemplate(
+                        Integer.class, "row_number() over(order by {0} desc)", sortColumn),
                     Expressions.stringTemplate(
-                            "to_char({0}, 'YYYY-MM-DD')", modelVerEntity.createdDate)
-                        .as("createdDttm"),
+                            "concat({0}, {1}, {2}, {3}, {4})",
+                            modelMngEntity.modelVer,
+                            ".",
+                            modelMngEntity.hyperVer,
+                            ".",
+                            modelMngEntity.epochVer)
+                        .as("modelVer"),
+                    modelMngEntity.dockerFileNm,
+                    modelMngEntity.modelVer.as("modelType"),
                     Expressions.stringTemplate(
-                        "fn_codenm_to_misc({0}, {1})", 51, modelVerEntity.usedState), // 사용여부 한글 명칭
+                        "to_char({0}, 'YYYY-MM-DD')", modelMngEntity.createCompleteDttm),
                     Expressions.stringTemplate(
-                        "fn_codenm_to_misc({0}, {1})",
-                        52, modelVerEntity.deployState), // 배포상태 한글 명칭
-                    Expressions.stringTemplate(
-                            "to_char({0}, 'YYYY-MM-DD')", modelDeployHstEntity.deployDttm)
-                        .as("deployDttm")))
-            .from(modelMngBakEntity)
-            .innerJoin(modelVerEntity)
-            .on(modelMngBakEntity.id.eq(modelVerEntity.modelUid))
-            .leftJoin(modelDeployHstEntity)
-            .on(
-                modelVerEntity
-                    .id
-                    .eq(modelDeployHstEntity.modelVerUid)
-                    .and(modelDeployHstEntity.serverId.eq(1L)) // 1건만 조회해야 하기에 1번 서버만 조회하기
-                )
-            .where(eventEndedAtBetween(startDate, endDate), searchModelVerLike(searchVal))
+                        "to_char({0}, 'YYYY-MM-DD')", modelMngEntity.recentUseDttm),
+                    roundNumericToPercent(modelResultMetricEntity.f1Score),
+                    roundNumericToPercent(modelResultMetricEntity.precision),
+                    roundNumericToPercent(modelResultMetricEntity.recall),
+                    roundNumericToPercent(modelResultMetricEntity.loss),
+                    roundNumericToPercent(modelResultMetricEntity.iou),
+                    modelMngEntity.deleted))
+            .from(modelMngEntity)
+            .innerJoin(modelResultMetricEntity)
+            .on(modelMngEntity.modelUid.longValue().eq(modelResultMetricEntity.modelUid))
+            .where(
+                eventEndedAtBetween(startDate, endDate, property),
+                searchModelVersion(modelType, searchVal))
             .offset(pageable.getOffset())
             .limit(pageable.getPageSize())
             .orderBy(
                 QuerydslOrderUtil.getOrderSpecifiers(
-                    pageable, ModelVerEntity.class, "modelVerEntity"))
+                    pageable, ModelMngEntity.class, "modelMngEntity"))
             .fetch();
 
     Long countQuery =
         queryFactory
-            .select(modelVerEntity.id.count())
-            .from(modelMngBakEntity)
-            .innerJoin(modelVerEntity)
-            .on(modelMngBakEntity.id.eq(modelVerEntity.modelUid))
-            .where(eventEndedAtBetween(startDate, endDate), searchModelVerLike(searchVal))
+            .select(modelMngEntity.modelUid.count())
+            .from(modelMngEntity)
+            .where(
+                eventEndedAtBetween(startDate, endDate, property),
+                searchModelVersion(modelType, searchVal))
             .fetchOne();
 
     return new PageImpl<>(foundContent, pageable, countQuery);
   }
 
-  private BooleanExpression eventEndedAtBetween(LocalDate startDate, LocalDate endDate) {
+  private BooleanExpression eventEndedAtBetween(
+      LocalDate startDate, LocalDate endDate, String sortColumn) {
     if (Objects.isNull(startDate) || Objects.isNull(endDate)) {
       return null;
     }
+    ZoneId zone = ZoneId.systemDefault();
     LocalDateTime startDateTime = startDate.atStartOfDay();
     LocalDateTime endDateTime = endDate.plusDays(1).atStartOfDay();
-    return modelMngBakEntity
-        .createdDate
-        .goe(ZonedDateTime.from(startDateTime))
-        .and(modelMngBakEntity.modifiedDate.lt(ZonedDateTime.from(endDateTime)));
+
+    if (sortColumn.equals("createCompleteDttm")) {
+      return modelMngEntity
+          .createCompleteDttm
+          .goe(startDateTime.atZone(zone))
+          .and(modelMngEntity.createCompleteDttm.lt(endDateTime.atZone(zone)));
+    } else {
+      return modelMngEntity
+          .recentUseDttm
+          .goe(startDateTime.atZone(zone))
+          .and(modelMngEntity.recentUseDttm.lt(endDateTime.atZone(zone)));
+    }
   }
 
-  private BooleanExpression searchModelVerLike(String searchVal) {
-    if (StringUtils.isBlank(searchVal)) {
-      return null;
+  private BooleanBuilder searchModelVersion(String modelType, String searchVal) {
+    BooleanBuilder builder = new BooleanBuilder();
+
+    if (Objects.nonNull(modelType)) {
+      builder.and(modelMngEntity.modelVer.eq(modelType));
     }
-    return modelVerEntity.modelVer.contains(searchVal);
+
+    if (Objects.nonNull(searchVal)) {
+      builder.and(modelMngEntity.dockerFileNm.likeIgnoreCase("%" + searchVal + "%"));
+    }
+
+    return builder;
+  }
+
+  private Expression<BigDecimal> roundNumericToPercent(NumberPath<Double> ratio) {
+    return Expressions.numberTemplate(BigDecimal.class, "function('round', {0} * 100, 2)", ratio);
   }
 }