모델관리 기본 구조 파일 커밋, 로그관리 수정

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

@@ -0,0 +1,25 @@
+package com.kamco.cd.kamcoback.common.enums;
+
+import com.kamco.cd.kamcoback.config.enums.EnumType;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum DeployStatus implements EnumType {
+  NONE("미배포"),
+  FAILED("배포오류"),
+  COMPLETE("배포완료");
+
+  private final String desc;
+
+  @Override
+  public String getId() {
+    return name();
+  }
+
+  @Override
+  public String getText() {
+    return desc;
+  }
+}

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

@@ -0,0 +1,24 @@
+package com.kamco.cd.kamcoback.common.enums;
+
+import com.kamco.cd.kamcoback.config.enums.EnumType;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum InferenceStatus implements EnumType {
+  ING("분석중"),
+  COMPLETE("완료");
+
+  private final String desc;
+
+  @Override
+  public String getId() {
+    return name();
+  }
+
+  @Override
+  public String getText() {
+    return desc;
+  }
+}

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

@@ -0,0 +1,24 @@
+package com.kamco.cd.kamcoback.common.enums;
+
+import com.kamco.cd.kamcoback.config.enums.EnumType;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum UseType implements EnumType {
+  USED("사용"),
+  NONE("미사용");
+
+  private final String desc;
+
+  @Override
+  public String getId() {
+    return name();
+  }
+
+  @Override
+  public String getText() {
+    return desc;
+  }
+}

src/main/java/com/kamco/cd/kamcoback/log/AuditLogApiController.java

@@ -2,6 +2,7 @@ package com.kamco.cd.kamcoback.log;
 
 import com.kamco.cd.kamcoback.config.api.ApiResponseDto;
 import com.kamco.cd.kamcoback.log.dto.AuditLogDto;
+import com.kamco.cd.kamcoback.log.service.AuditLogService;
 import com.kamco.cd.kamcoback.postgres.core.AuditLogCoreService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -16,10 +17,10 @@ import org.springframework.web.bind.annotation.RestController;
 @Tag(name = "감사 로그", description = "감사 로그 관리 API")
 @RequiredArgsConstructor
 @RestController
-@RequestMapping({"/api/log/audit"})
+@RequestMapping("/api/log/audit")
 public class AuditLogApiController {
 
-  private final AuditLogCoreService auditLogCoreService;
+  private final AuditLogService auditLogService;
 
   @Operation(summary = "일자별 로그 조회")
   @GetMapping("/daily")
@@ -32,7 +33,7 @@ public class AuditLogApiController {
         new AuditLogDto.searchReq(page, size, "created_dttm,desc");
 
     Page<AuditLogDto.DailyAuditList> result =
-        auditLogCoreService.getLogByDaily(searchReq, startDate, endDate);
+        auditLogService.getLogByDaily(searchReq, startDate, endDate);
 
     return ApiResponseDto.ok(result);
   }
@@ -46,7 +47,7 @@ public class AuditLogApiController {
     AuditLogDto.searchReq searchReq =
         new AuditLogDto.searchReq(page, size, "created_dttm,desc");
     Page<AuditLogDto.DailyDetail> result =
-        auditLogCoreService.getLogByDailyResult(searchReq, logDate);
+        auditLogService.getLogByDailyResult(searchReq, logDate);
 
     return ApiResponseDto.ok(result);
   }
@@ -59,7 +60,7 @@ public class AuditLogApiController {
       @RequestParam(defaultValue = "20") int size) {
     AuditLogDto.searchReq searchReq =
         new AuditLogDto.searchReq(page, size, "created_dttm,desc");
-    Page<AuditLogDto.MenuAuditList> result = auditLogCoreService.getLogByMenu(searchReq, searchValue);
+    Page<AuditLogDto.MenuAuditList> result = auditLogService.getLogByMenu(searchReq, searchValue);
 
     return ApiResponseDto.ok(result);
   }
@@ -73,7 +74,7 @@ public class AuditLogApiController {
     AuditLogDto.searchReq searchReq =
         new AuditLogDto.searchReq(page, size, "created_dttm,desc");
     Page<AuditLogDto.MenuDetail> result =
-        auditLogCoreService.getLogByMenuResult(searchReq, menuId);
+        auditLogService.getLogByMenuResult(searchReq, menuId);
 
     return ApiResponseDto.ok(result);
   }
@@ -87,7 +88,7 @@ public class AuditLogApiController {
     AuditLogDto.searchReq searchReq =
         new AuditLogDto.searchReq(page, size, "created_dttm,desc");
     Page<AuditLogDto.UserAuditList> result =
-        auditLogCoreService.getLogByAccount(searchReq, searchValue);
+        auditLogService.getLogByAccount(searchReq, searchValue);
 
     return ApiResponseDto.ok(result);
   }
@@ -101,7 +102,7 @@ public class AuditLogApiController {
     AuditLogDto.searchReq searchReq =
         new AuditLogDto.searchReq(page, size, "created_dttm,desc");
     Page<AuditLogDto.UserDetail> result =
-        auditLogCoreService.getLogByAccountResult(searchReq, userUid);
+        auditLogService.getLogByAccountResult(searchReq, userUid);
 
     return ApiResponseDto.ok(result);
   }

src/main/java/com/kamco/cd/kamcoback/log/ErrorLogApiController.java

@@ -3,6 +3,7 @@ package com.kamco.cd.kamcoback.log;
 import com.kamco.cd.kamcoback.config.api.ApiResponseDto;
 import com.kamco.cd.kamcoback.log.dto.ErrorLogDto;
 import com.kamco.cd.kamcoback.log.dto.EventType;
+import com.kamco.cd.kamcoback.log.service.ErrorLogService;
 import com.kamco.cd.kamcoback.postgres.core.ErrorLogCoreService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -20,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping({"/api/log/error"})
 public class ErrorLogApiController {
 
-  private final ErrorLogCoreService errorLogCoreService;
+  private final ErrorLogService errorLogService;
 
   @Operation(summary = "에러로그 조회")
   @GetMapping("/error")
@@ -34,7 +35,7 @@ public class ErrorLogApiController {
     ErrorLogDto.ErrorSearchReq searchReq =
         new ErrorLogDto.ErrorSearchReq(
             logErrorLevel, eventType, startDate, endDate, page, size, "created_dttm,desc");
-    Page<ErrorLogDto.Basic> result = errorLogCoreService.findLogByError(searchReq);
+    Page<ErrorLogDto.Basic> result = errorLogService.findLogByError(searchReq);
 
     return ApiResponseDto.ok(result);
   }

src/main/java/com/kamco/cd/kamcoback/log/service/AuditLogService.java

@@ -0,0 +1,49 @@
+package com.kamco.cd.kamcoback.log.service;
+
+import com.kamco.cd.kamcoback.log.dto.AuditLogDto;
+import com.kamco.cd.kamcoback.postgres.core.AuditLogCoreService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDate;
+
+@Service
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+public class AuditLogService {
+  private final AuditLogCoreService auditLogCoreService;
+
+  public Page<AuditLogDto.DailyAuditList> getLogByDaily(
+    AuditLogDto.searchReq searchRange, LocalDate startDate, LocalDate endDate) {
+    return auditLogCoreService.getLogByDaily(searchRange, startDate, endDate);
+  }
+
+  public Page<AuditLogDto.MenuAuditList> getLogByMenu(
+    AuditLogDto.searchReq searchRange, String searchValue) {
+    return auditLogCoreService.getLogByMenu(searchRange, searchValue);
+  }
+
+  public Page<AuditLogDto.UserAuditList> getLogByAccount(
+    AuditLogDto.searchReq searchRange, String searchValue) {
+    return auditLogCoreService.getLogByAccount(searchRange, searchValue);
+  }
+
+  public Page<AuditLogDto.DailyDetail> getLogByDailyResult(
+    AuditLogDto.searchReq searchRange, LocalDate logDate) {
+    return auditLogCoreService.getLogByDailyResult(searchRange, logDate);
+  }
+
+  public Page<AuditLogDto.MenuDetail> getLogByMenuResult(
+    AuditLogDto.searchReq searchRange, String menuId) {
+    return auditLogCoreService.getLogByMenuResult(searchRange, menuId);
+  }
+
+  public Page<AuditLogDto.UserDetail> getLogByAccountResult(
+    AuditLogDto.searchReq searchRange, Long accountId) {
+    return auditLogCoreService.getLogByAccountResult(searchRange, accountId);
+  }
+
+
+}

src/main/java/com/kamco/cd/kamcoback/log/service/ErrorLogService.java

@@ -0,0 +1,19 @@
+package com.kamco.cd.kamcoback.log.service;
+
+import com.kamco.cd.kamcoback.log.dto.ErrorLogDto;
+import com.kamco.cd.kamcoback.postgres.core.ErrorLogCoreService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+public class ErrorLogService {
+  private final ErrorLogCoreService errorLogCoreService;
+
+  public Page<ErrorLogDto.Basic> findLogByError(ErrorLogDto.ErrorSearchReq searchReq) {
+    return errorLogCoreService.findLogByError(searchReq);
+  }
+}

src/main/java/com/kamco/cd/kamcoback/model/ModelMngApiController.java

@@ -0,0 +1,46 @@
+package com.kamco.cd.kamcoback.model;
+
+import com.kamco.cd.kamcoback.code.dto.CommonCodeDto;
+import com.kamco.cd.kamcoback.config.api.ApiResponseDto;
+import com.kamco.cd.kamcoback.model.dto.ModelMngDto;
+import com.kamco.cd.kamcoback.model.service.ModelMngService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@Tag(name = "모델 관리", description = "모델 관리 API")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/api/model")
+public class ModelMngApiController {
+
+  private final ModelMngService modelMngService;
+
+  @Operation(summary = "목록 조회", description = "모든 모델 조회")
+  @ApiResponses(
+    value = {
+      @ApiResponse(
+        responseCode = "200",
+        description = "조회 성공",
+        content =
+        @Content(
+          mediaType = "application/json",
+          schema = @Schema(implementation = CommonCodeDto.Basic.class))),
+      @ApiResponse(responseCode = "404", description = "코드를 찾을 수 없음", content = @Content),
+      @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
+    })
+  @GetMapping
+  public ApiResponseDto<List<ModelMngDto.Basic>> getFindAll() {
+    return ApiResponseDto.createOK(modelMngService.findModelMngAll());
+  }
+
+}

src/main/java/com/kamco/cd/kamcoback/model/dto/ModelMngDto.java

@@ -0,0 +1,59 @@
+package com.kamco.cd.kamcoback.model.dto;
+
+import com.kamco.cd.kamcoback.common.utils.interfaces.JsonFormatDttm;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+
+import java.time.ZonedDateTime;
+
+public class ModelMngDto {
+
+  @Schema(name = "ModelMng Basic", description = "모델관리 엔티티 기본 정보")
+  @Getter
+  public static class Basic {
+
+    private final Long id;
+    private final String modelNm;
+    private final String modelCate;
+    private final String modelPath;
+
+    @JsonFormatDttm
+    private final ZonedDateTime createdDttm;
+    private final Long createdUid;
+
+    @JsonFormatDttm
+    private final ZonedDateTime updatedDttm;
+    private final Long updatedUid;
+    private final String modelCntnt;
+
+    public Basic(
+      Long id,
+      String modelNm,
+      String modelCate,
+      String modelPath,
+      ZonedDateTime createdDttm,
+      Long createdUid,
+      ZonedDateTime updatedDttm,
+      Long updatedUid,
+      String modelCntnt
+    ) {
+      this.id = id;
+      this.modelNm = modelNm;
+      this.modelCate = modelCate;
+      this.modelPath = modelPath;
+      this.createdDttm = createdDttm;
+      this.createdUid = createdUid;
+      this.updatedDttm = updatedDttm;
+      this.updatedUid = updatedUid;
+      this.modelCntnt = modelCntnt;
+    }
+  }
+
+  @Schema(name = "FinalModelDto", description = "최종 등록 모델")
+  @Getter
+  public static class FinalModelDto {
+    private String modelNm;
+    private String modelCate;
+    private String modelVer;
+  }
+}

src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java

@@ -0,0 +1,22 @@
+package com.kamco.cd.kamcoback.model.service;
+
+import com.kamco.cd.kamcoback.model.dto.ModelMngDto;
+import com.kamco.cd.kamcoback.postgres.core.ModelMngCoreService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+public class ModelMngService {
+
+  private final ModelMngCoreService modelMngCoreService;
+
+  public List<ModelMngDto.Basic> findModelMngAll(){
+    return modelMngCoreService.findModelMngAll();
+  }
+
+}

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

@@ -0,0 +1,22 @@
+package com.kamco.cd.kamcoback.postgres.core;
+
+import com.kamco.cd.kamcoback.model.dto.ModelMngDto;
+import com.kamco.cd.kamcoback.postgres.entity.ModelMngEntity;
+import com.kamco.cd.kamcoback.postgres.repository.model.ModelMngRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+public class ModelMngCoreService {
+
+  private final ModelMngRepository modelMngRepository;
+
+  public List<ModelMngDto.Basic> findModelMngAll() {
+    return modelMngRepository.findModelMngAll().stream().map(ModelMngEntity::toDto).toList();
+  }
+}

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

@@ -1,18 +1,14 @@
 package com.kamco.cd.kamcoback.postgres.entity;
 
-import jakarta.persistence.Column;
+import com.kamco.cd.kamcoback.model.dto.ModelMngDto;
-import jakarta.persistence.Entity;
+import jakarta.persistence.*;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.SequenceGenerator;
-import jakarta.persistence.Table;
 import jakarta.validation.constraints.Size;
-import java.time.Instant;
 import lombok.Getter;
 import lombok.Setter;
 import org.hibernate.annotations.ColumnDefault;
 
+import java.time.ZonedDateTime;
+
 @Getter
 @Setter
 @Entity
@@ -41,18 +37,30 @@ public class ModelMngEntity {
   private String modelPath;
 
   @Column(name = "created_dttm")
-  private Instant createdDttm;
+  private ZonedDateTime createdDttm;
 
   @Column(name = "created_uid")
   private Long createdUid;
 
   @Column(name = "updated_dttm")
-  private Instant updatedDttm;
+  private ZonedDateTime updatedDttm;
 
   @Column(name = "updated_uid")
   private Long updatedUid;
 
-  @Column(name = "model_cntnt", length = Integer.MAX_VALUE)
+  @Column(name = "model_cntnt", columnDefinition = "TEXT")
   private String modelCntnt;
 
+  public ModelMngDto.Basic toDto() {
+    return new ModelMngDto.Basic(
+      this.id,
+      this.modelNm,
+      this.modelCate,
+      this.modelPath,
+      this.createdDttm,
+      this.createdUid,
+      this.updatedDttm,
+      this.updatedUid,
+      this.modelCntnt);
+  }
 }

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

@@ -1,19 +1,14 @@
 package com.kamco.cd.kamcoback.postgres.entity;
 
-import jakarta.persistence.Column;
+import jakarta.persistence.*;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.SequenceGenerator;
-import jakarta.persistence.Table;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
-import java.time.Instant;
 import lombok.Getter;
 import lombok.Setter;
 import org.hibernate.annotations.ColumnDefault;
 
+import java.time.ZonedDateTime;
+
 @Getter
 @Setter
 @Entity
@@ -59,13 +54,13 @@ public class TbModelVerEntity {
 
   @ColumnDefault("now()")
   @Column(name = "created_dttm")
-  private Instant createdDttm;
+  private ZonedDateTime createdDttm;
 
   @Column(name = "created_uid")
   private Long createdUid;
 
   @Column(name = "updated_dttm")
-  private Instant updatedDttm;
+  private ZonedDateTime updatedDttm;
 
   @Column(name = "updated_uid")
   private Long updatedUid;

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

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

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

@@ -0,0 +1,11 @@
+package com.kamco.cd.kamcoback.postgres.repository.model;
+
+import com.kamco.cd.kamcoback.model.dto.ModelMngDto;
+import com.kamco.cd.kamcoback.postgres.entity.ModelMngEntity;
+
+import java.util.List;
+
+public interface ModelMngRepositoryCustom {
+
+  List<ModelMngEntity> findModelMngAll();
+}

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

@@ -0,0 +1,37 @@
+package com.kamco.cd.kamcoback.postgres.repository.model;
+
+import com.kamco.cd.kamcoback.model.dto.ModelMngDto;
+import com.kamco.cd.kamcoback.postgres.entity.ModelMngEntity;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.StringExpression;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import org.springframework.data.jpa.repository.support.QuerydslRepositorySupport;
+
+import static com.kamco.cd.kamcoback.postgres.entity.QModelMngEntity.modelMngEntity;
+
+import java.util.List;
+import java.util.Optional;
+
+public class ModelMngRepositoryImpl extends QuerydslRepositorySupport
+  implements ModelMngRepositoryCustom {
+
+  private final JPAQueryFactory queryFactory;
+  private final StringExpression NULL_STRING = Expressions.stringTemplate("cast(null as text)");
+
+  public ModelMngRepositoryImpl(JPAQueryFactory queryFactory) {
+    super(ModelMngEntity.class);
+    this.queryFactory = queryFactory;
+  }
+
+  @Override
+  public List<ModelMngEntity> findModelMngAll() {
+    return queryFactory
+            .selectFrom(modelMngEntity)
+            .orderBy(modelMngEntity.id.desc())
+            .fetch();
+  }
+
+  public Optional<?> findFinalModel(){
+    return null;
+  }
+}