diff --git a/src/main/java/com/kri/gwcf/review/back/dto/performance/PerformanceReviewDto.java b/src/main/java/com/kri/gwcf/review/back/dto/performance/PerformanceReviewDto.java index e2a2e52..170068b 100644 --- a/src/main/java/com/kri/gwcf/review/back/dto/performance/PerformanceReviewDto.java +++ b/src/main/java/com/kri/gwcf/review/back/dto/performance/PerformanceReviewDto.java @@ -36,7 +36,7 @@ public class PerformanceReviewDto { private String uploadFileName; @Schema(description = "pdf로 변환성공 여부") - private Boolean pdfConvert; + private Short pdfConvert; @Schema(description = "pdf로 변환된 파일명") private String pdfFileName; diff --git a/src/main/java/com/kri/gwcf/review/back/persistence/entity/TPerformanceReviewEntity.java b/src/main/java/com/kri/gwcf/review/back/persistence/entity/TPerformanceReviewEntity.java index 770c03e..1db368b 100644 --- a/src/main/java/com/kri/gwcf/review/back/persistence/entity/TPerformanceReviewEntity.java +++ b/src/main/java/com/kri/gwcf/review/back/persistence/entity/TPerformanceReviewEntity.java @@ -36,7 +36,7 @@ public class TPerformanceReviewEntity { @NotNull @Column(name = "is_pdf_convert", nullable = false) - private Boolean pdfConvert; + private Short pdfConvert; @NotNull @Column(name = "pdf_file_name", nullable = false, length = 512) diff --git a/src/main/java/com/kri/gwcf/review/back/service/ReviewPdfConvertService.java b/src/main/java/com/kri/gwcf/review/back/service/ReviewPdfConvertService.java index bb85b6b..e1988a9 100644 --- a/src/main/java/com/kri/gwcf/review/back/service/ReviewPdfConvertService.java +++ b/src/main/java/com/kri/gwcf/review/back/service/ReviewPdfConvertService.java @@ -11,7 +11,6 @@ import java.util.concurrent.TimeUnit; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @Slf4j @@ -19,12 +18,14 @@ import org.springframework.stereotype.Service; @RequiredArgsConstructor public class ReviewPdfConvertService { + private static final short PDF_CONVERT_COMPLETE = 1; + private static final short PDF_CONVERT_FAILED = 9; + private final PerformanceReviewRepository performanceReviewRepository; @Value("${kri.file.pdf-converter-command:soffice}") private String pdfConverterCommand; - @Async("pdfConvertTaskExecutor") public void convertReviewFileToPdf( Integer performanceId, Integer reviewType, @@ -35,6 +36,7 @@ public class ReviewPdfConvertService { ) { String pdfFileName = convertToPdfIfPossible(source, dir); if (StringUtil.isNullOrBlank(pdfFileName)) { + updatePdfConvertFailure(performanceId, reviewType, userId, uploadFileName); log.warn( "Review PDF conversion failed. performanceId={}, reviewType={}, userId={}, uploadFileName={}", performanceId, @@ -62,11 +64,27 @@ public class ReviewPdfConvertService { } private void updatePdfConvertResult(TPerformanceReviewEntity entity, String pdfFileName) { - entity.setPdfConvert(true); + entity.setPdfConvert(PDF_CONVERT_COMPLETE); entity.setPdfFileName(pdfFileName); performanceReviewRepository.save(entity); } + private void updatePdfConvertFailure( + Integer performanceId, + Integer reviewType, + String userId, + String uploadFileName + ) { + performanceReviewRepository + .findByIdPerformanceIdAndIdReviewTypeAndIdRegUser(performanceId, reviewType, userId) + .filter(entity -> uploadFileName.equals(entity.getUploadFileName())) + .ifPresent(entity -> { + entity.setPdfConvert(PDF_CONVERT_FAILED); + entity.setPdfFileName(""); + performanceReviewRepository.save(entity); + }); + } + private String convertToPdfIfPossible(Path source, Path dir) { String extension = extractExtension(source.getFileName().toString()).toLowerCase(); Set targets = new HashSet<>(Set.of(".docx", ".hwpx", ".hwp", ".pptx", ".xlsx")); diff --git a/src/main/java/com/kri/gwcf/review/back/service/ReviewService.java b/src/main/java/com/kri/gwcf/review/back/service/ReviewService.java index 3e89946..2d93518 100644 --- a/src/main/java/com/kri/gwcf/review/back/service/ReviewService.java +++ b/src/main/java/com/kri/gwcf/review/back/service/ReviewService.java @@ -16,10 +16,11 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.concurrent.Executor; import java.util.stream.Collectors; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.core.io.PathResource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -28,12 +29,28 @@ import org.springframework.transaction.support.TransactionSynchronizationManager import org.springframework.web.multipart.MultipartFile; @Service -@RequiredArgsConstructor public class ReviewService extends AbstractFileService { + private static final short PDF_CONVERT_PENDING = 0; + private static final short PDF_CONVERT_COMPLETE = 1; + private static final short PDF_CONVERT_NOT_TARGET = 8; + private final PerformanceReviewRepository performanceReviewRepository; private final FileStorageProperties fileStorageProperties; private final ReviewPdfConvertService reviewPdfConvertService; + private final Executor pdfConvertTaskExecutor; + + public ReviewService( + PerformanceReviewRepository performanceReviewRepository, + FileStorageProperties fileStorageProperties, + ReviewPdfConvertService reviewPdfConvertService, + @Qualifier("pdfConvertTaskExecutor") Executor pdfConvertTaskExecutor + ) { + this.performanceReviewRepository = performanceReviewRepository; + this.fileStorageProperties = fileStorageProperties; + this.reviewPdfConvertService = reviewPdfConvertService; + this.pdfConvertTaskExecutor = pdfConvertTaskExecutor; + } @Override protected Path getBaseDir() { @@ -74,7 +91,7 @@ public class ReviewService extends AbstractFileService { .regUser(userId) .build()) .uploadFileName("") - .pdfConvert(false) + .pdfConvert(PDF_CONVERT_NOT_TARGET) .pdfFileName("") .regDt(now) .build()); @@ -107,7 +124,7 @@ public class ReviewService extends AbstractFileService { .regUser(userId) .build()) .uploadFileName("") - .pdfConvert(false) + .pdfConvert(PDF_CONVERT_NOT_TARGET) .pdfFileName("") .regDt(now) .build()); @@ -137,8 +154,10 @@ public class ReviewService extends AbstractFileService { saveFile(dir, file, uploadFileName); Path uploadPath = dir.resolve(uploadFileName).normalize(); - String pdfFileName = isPdf(uploadFileName) ? uploadFileName : ""; - boolean pdfConvert = StringUtil.hasText(pdfFileName); + boolean pdfFile = isPdf(uploadFileName); + boolean pdfConvertTarget = isPdfConvertTarget(uploadFileName); + String pdfFileName = pdfFile ? uploadFileName : ""; + Short pdfConvert = resolveInitialPdfConvertStatus(pdfFile, pdfConvertTarget); TPerformanceReviewEntity entity = performanceReviewRepository .findByIdPerformanceIdAndIdReviewTypeAndIdRegUser(performanceId, reviewType, userId) @@ -164,7 +183,7 @@ public class ReviewService extends AbstractFileService { } TPerformanceReviewEntity saved = performanceReviewRepository.save(entity); - if (!pdfConvert && isPdfConvertTarget(uploadFileName)) { + if (pdfConvert == PDF_CONVERT_PENDING) { convertPdfAfterCommit(performanceId, reviewType, userId, uploadFileName, uploadPath, dir); } @@ -199,13 +218,13 @@ public class ReviewService extends AbstractFileService { TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() { @Override public void afterCommit() { - task.run(); + pdfConvertTaskExecutor.execute(task); } }); return; } - task.run(); + pdfConvertTaskExecutor.execute(task); } public PathResource getOriginalFileResource(Integer performanceId, Integer reviewType, String userId) { @@ -343,6 +362,13 @@ public class ReviewService extends AbstractFileService { return ".pdf".equalsIgnoreCase(extractExtension(fileName)); } + private Short resolveInitialPdfConvertStatus(boolean pdfFile, boolean pdfConvertTarget) { + if (pdfFile) { + return PDF_CONVERT_COMPLETE; + } + return pdfConvertTarget ? PDF_CONVERT_PENDING : PDF_CONVERT_NOT_TARGET; + } + private boolean isPdfConvertTarget(String fileName) { String extension = extractExtension(fileName).toLowerCase(); return Set.of(".docx", ".hwpx", ".hwp", ".pptx", ".xlsx").contains(extension);