TODO: 데이터셋 서비스 분리

main
bjkim 9 months ago
parent fcd4f6b1f6
commit bfbf8842c2

@ -6,18 +6,14 @@ import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.enums.ParameterIn;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import kr.re.etri.autoflow.entity.TrainingScriptAttachmentEntity; import kr.re.etri.autoflow.entity.TrainingScriptAttachmentEntity;
import kr.re.etri.autoflow.entity.TrainingScriptAttachmentEntity;
import kr.re.etri.autoflow.entity.WorkflowEntity;
import kr.re.etri.autoflow.payload.request.BaseSearchRequest; import kr.re.etri.autoflow.payload.request.BaseSearchRequest;
import kr.re.etri.autoflow.payload.request.ProjectRequest;
import kr.re.etri.autoflow.repository.TrainingScriptAttachmentRepository; import kr.re.etri.autoflow.repository.TrainingScriptAttachmentRepository;
import kr.re.etri.autoflow.service.TrainingScriptService; import kr.re.etri.autoflow.service.TrainingScriptAttachmentService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springdoc.core.annotations.ParameterObject; import org.springdoc.core.annotations.ParameterObject;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
@ -32,10 +28,10 @@ import java.util.*;
@RequiredArgsConstructor @RequiredArgsConstructor
@Slf4j @Slf4j
@Tag(name = "트레이닝 스크립트", description = "트레이닝 스크립트 MinIO 버킷/파일 관리 API") @Tag(name = "트레이닝 스크립트", description = "트레이닝 스크립트 MinIO 버킷/파일 관리 API")
public class TrainingScriptController { public class TrainingScriptAttachmentController {
private final MinioClient minioClient; private final MinioClient minioClient;
private final TrainingScriptAttachmentRepository trainingScriptAttachmentRepository; private final TrainingScriptAttachmentRepository trainingScriptAttachmentRepository;
private final TrainingScriptService trainingScriptService; private final TrainingScriptAttachmentService trainingScriptAttachmentService;
@ -50,7 +46,7 @@ public class TrainingScriptController {
@Operation(summary = "전체 트레이닝 스크립트 목록 조회") @Operation(summary = "전체 트레이닝 스크립트 목록 조회")
@GetMapping @GetMapping
public ResponseEntity<List<TrainingScriptAttachmentEntity>> getAllTrainingScripts() { public ResponseEntity<List<TrainingScriptAttachmentEntity>> getAllTrainingScripts() {
return ResponseEntity.ok(trainingScriptService.findAll()); return ResponseEntity.ok(trainingScriptAttachmentService.findAll());
} }
@Operation(summary = "ID로 트레이닝 스크립트 조회") @Operation(summary = "ID로 트레이닝 스크립트 조회")
@ -59,7 +55,7 @@ public class TrainingScriptController {
@Parameter(description = "조회할 트레이닝 스크립트 ID", required = true, in = ParameterIn.PATH) @Parameter(description = "조회할 트레이닝 스크립트 ID", required = true, in = ParameterIn.PATH)
@PathVariable("id") Long id) { @PathVariable("id") Long id) {
return trainingScriptService.findById(id) return trainingScriptAttachmentService.findById(id)
.map(ResponseEntity::ok) .map(ResponseEntity::ok)
.orElse(ResponseEntity.notFound().build()); .orElse(ResponseEntity.notFound().build());
} }
@ -68,7 +64,7 @@ public class TrainingScriptController {
@GetMapping("/search") @GetMapping("/search")
public ResponseEntity<Page<TrainingScriptAttachmentEntity>> searchTrainingScripts( public ResponseEntity<Page<TrainingScriptAttachmentEntity>> searchTrainingScripts(
@ParameterObject @ModelAttribute BaseSearchRequest request) { @ParameterObject @ModelAttribute BaseSearchRequest request) {
Page<TrainingScriptAttachmentEntity> page = trainingScriptService.search(request); Page<TrainingScriptAttachmentEntity> page = trainingScriptAttachmentService.search(request);
return ResponseEntity.ok(page); return ResponseEntity.ok(page);
} }
@ -77,7 +73,7 @@ public class TrainingScriptController {
public ResponseEntity<Void> deleteTrainingScript( public ResponseEntity<Void> deleteTrainingScript(
@Parameter(description = "삭제할 트레이닝 스크립트 ID", required = true, in = ParameterIn.PATH) @Parameter(description = "삭제할 트레이닝 스크립트 ID", required = true, in = ParameterIn.PATH)
@PathVariable("id") Long id) { @PathVariable("id") Long id) {
if (trainingScriptService.delete(id)) { if (trainingScriptAttachmentService.delete(id)) {
return ResponseEntity.noContent().build(); return ResponseEntity.noContent().build();
} }
return ResponseEntity.notFound().build(); return ResponseEntity.notFound().build();

@ -24,7 +24,7 @@ import java.util.Optional;
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
@Transactional(readOnly = true) @Transactional(readOnly = true)
public class TrainingScriptService { public class TrainingScriptAttachmentService {
private final TrainingScriptAttachmentRepository trainingScriptAttachmentRepository; private final TrainingScriptAttachmentRepository trainingScriptAttachmentRepository;
Loading…
Cancel
Save