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