@@ -261,6 +261,7 @@ public class FileEntityService {
|
|||||||
.orElseThrow(() -> new RuntimeException("File not found: " + id));
|
.orElseThrow(() -> new RuntimeException("File not found: " + id));
|
||||||
|
|
||||||
String extension = determineFileExtension(fileExt, fileEntity);
|
String extension = determineFileExtension(fileExt, fileEntity);
|
||||||
|
log.info("EXTENSION: {}", extension);
|
||||||
Path protectedFilePath = prepareProtectedPath(fileEntity, extension);
|
Path protectedFilePath = prepareProtectedPath(fileEntity, extension);
|
||||||
|
|
||||||
if (Files.exists(protectedFilePath)) {
|
if (Files.exists(protectedFilePath)) {
|
||||||
@@ -358,7 +359,7 @@ public class FileEntityService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private String determineFileExtension(String fileExt, FileEntity fileEntity) {
|
private String determineFileExtension(String fileExt, FileEntity fileEntity) {
|
||||||
if (fileExt != null && !fileExt.trim().isEmpty()) {
|
if (fileExt != null) {
|
||||||
return fileExt;
|
return fileExt;
|
||||||
} else {
|
} else {
|
||||||
return fileEntity.getFileExtension();
|
return fileEntity.getFileExtension();
|
||||||
|
|||||||
@@ -23,7 +23,9 @@ public class DocumentLocalSearchImpl implements DocumentLocalSearch {
|
|||||||
@Override
|
@Override
|
||||||
public @Nullable FileProtector.FileInfo findByIds(@NotNull String ownerId, @NotNull String fileId) {
|
public @Nullable FileProtector.FileInfo findByIds(@NotNull String ownerId, @NotNull String fileId) {
|
||||||
FileEntity fileEntity = fileEntityRepository.findByIdAndUserId(fileId, Long.valueOf(ownerId));
|
FileEntity fileEntity = fileEntityRepository.findByIdAndUserId(fileId, Long.valueOf(ownerId));
|
||||||
|
FileProtector.FileInfo fileInfo = fileUtil.createFileInfo(fileEntity);
|
||||||
|
log.info("fileInfo: {}", fileInfo);
|
||||||
|
|
||||||
return fileUtil.createFileInfo(fileEntity);
|
return fileInfo;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user