전이학습 상세 - before dataset 추가

src/main/java/com/kamco/cd/training/model/dto/ModelTrainDetailDto.java

@@ -179,6 +179,7 @@ public class ModelTrainDetailDto {
     private ModelConfigDto.Basic etcConfig;
     private TransferHyperSummary modelTrainHyper;
     private List<SelectDataSet> modelTrainDataset;
+    private List<SelectDataSet> beforeTrainDataset;
   }
 
   @Getter

src/main/java/com/kamco/cd/training/model/dto/ModelTrainMngDto.java

@@ -47,6 +47,8 @@ public class ModelTrainMngDto {
     private ZonedDateTime packingStrtDttm;
     private ZonedDateTime packingEndDttm;
 
+    private Long beforeModelId;
+
     public String getStatusName() {
       if (this.statusCd == null || this.statusCd.isBlank()) return null;
       try {

src/main/java/com/kamco/cd/training/model/service/ModelTrainDetailService.java

@@ -96,10 +96,34 @@ public class ModelTrainDetailService {
       dataSets = mngCoreService.getDatasetSelectG2G3List(datasetReq);
     }
 
+    DatasetReq beforeDatasetReq = new DatasetReq();
+    List<Long> beforeDatasetIds = new ArrayList<>();
+    List<SelectDataSet> beforeDataSets = new ArrayList<>();
+
+    Long beforeModelId = modelInfo.getBeforeModelId();
+    if (beforeModelId != null) {
+      Basic beforeInfo = modelTrainDetailCoreService.findByModelBeforeId(beforeModelId);
+      List<MappingDataset> beforeDatasets =
+          modelTrainDetailCoreService.getByModelMappingDataset(beforeInfo.getUuid());
+
+      for (MappingDataset before : beforeDatasets) {
+        beforeDatasetIds.add(before.getDatasetId());
+      }
+      beforeDatasetReq.setIds(beforeDatasetIds);
+      beforeDatasetReq.setModelNo(modelInfo.getModelNo());
+
+      if (beforeInfo.getModelNo().equals(ModelType.G1.getId())) {
+        beforeDataSets = mngCoreService.getDatasetSelectG1List(beforeDatasetReq);
+      } else {
+        beforeDataSets = mngCoreService.getDatasetSelectG2G3List(beforeDatasetReq);
+      }
+    }
+
     TransferDetailDto transferDetailDto = new TransferDetailDto();
     transferDetailDto.setEtcConfig(configInfo);
     transferDetailDto.setModelTrainHyper(hyperSummary);
     transferDetailDto.setModelTrainDataset(dataSets);
+    transferDetailDto.setBeforeTrainDataset(beforeDataSets);
 
     return transferDetailDto;
   }

src/main/java/com/kamco/cd/training/postgres/core/ModelTrainDetailCoreService.java

@@ -107,4 +107,9 @@ public class ModelTrainDetailCoreService {
   public List<ModelProgressStepDto> findModelTrainProgressInfo(UUID uuid) {
     return modelDetailRepository.findModelTrainProgressInfo(uuid);
   }
+
+  public Basic findByModelBeforeId(Long beforeModelId) {
+    ModelMasterEntity entity = modelDetailRepository.findByModelBeforeId(beforeModelId);
+    return entity.toDto();
+  }
 }

src/main/java/com/kamco/cd/training/postgres/entity/ModelMasterEntity.java

@@ -140,6 +140,7 @@ public class ModelMasterEntity {
         this.requestPath,
         this.packingState,
         this.packingStrtDttm,
-        this.packingEndDttm);
+        this.packingEndDttm,
+        this.beforeModelId);
   }
 }

src/main/java/com/kamco/cd/training/postgres/repository/model/ModelDetailRepositoryCustom.java

@@ -40,4 +40,6 @@ public interface ModelDetailRepositoryCustom {
   ModelFileInfo getModelTrainFileInfo(UUID uuid);
 
   List<ModelProgressStepDto> findModelTrainProgressInfo(UUID uuid);
+
+  ModelMasterEntity findByModelBeforeId(Long beforeModelId);
 }

src/main/java/com/kamco/cd/training/postgres/repository/model/ModelDetailRepositoryImpl.java

@@ -355,4 +355,12 @@ public class ModelDetailRepositoryImpl implements ModelDetailRepositoryCustom {
 
     return steps;
   }
+
+  @Override
+  public ModelMasterEntity findByModelBeforeId(Long beforeModelId) {
+    return queryFactory
+        .selectFrom(modelMasterEntity)
+        .where(modelMasterEntity.id.eq(beforeModelId))
+        .fetchOne();
+  }
 }