@@ -374,12 +374,18 @@ public class FileEntityService {
|
|||||||
private FileEntityResponse convertToResponse(FileEntity fileEntity, int version) {
|
private FileEntityResponse convertToResponse(FileEntity fileEntity, int version) {
|
||||||
boolean existsOnDisk = checkFileExistsOnDisk(fileEntity.getFilePath());
|
boolean existsOnDisk = checkFileExistsOnDisk(fileEntity.getFilePath());
|
||||||
User user = userRepository.findById(fileEntity.getUserId()).get();
|
User user = userRepository.findById(fileEntity.getUserId()).get();
|
||||||
String[] splitName = fileEntity.getOriginalFileName().split(".");
|
String fileName = fileEntity.getOriginalFileName();
|
||||||
|
String name = fileName;
|
||||||
|
|
||||||
|
int lastDotIndex = fileName.lastIndexOf(".");
|
||||||
|
if (lastDotIndex > 0) {
|
||||||
|
name = fileName.substring(0, lastDotIndex);
|
||||||
|
}
|
||||||
|
|
||||||
return FileEntityResponse.builder()
|
return FileEntityResponse.builder()
|
||||||
.id(fileEntity.getId())
|
.id(fileEntity.getId())
|
||||||
.userId(fileEntity.getUserId())
|
.userId(fileEntity.getUserId())
|
||||||
.originalFileName(splitName[0] + "_nocopy_protected" + "." + fileEntity.getFileExtension())
|
.originalFileName(name + "_nocopy_protected" + "." + fileEntity.getFileExtension())
|
||||||
.storedFileName(fileEntity.getStoredFileName())
|
.storedFileName(fileEntity.getStoredFileName())
|
||||||
.filePath(fileEntity.getProtectedFilePath())
|
.filePath(fileEntity.getProtectedFilePath())
|
||||||
.fileSize(fileEntity.getFileSize())
|
.fileSize(fileEntity.getFileSize())
|
||||||
@@ -395,7 +401,7 @@ public class FileEntityService {
|
|||||||
.existsOnDisk(existsOnDisk)
|
.existsOnDisk(existsOnDisk)
|
||||||
.supportId(fileEntity.getSupportId())
|
.supportId(fileEntity.getSupportId())
|
||||||
.protectStatus(fileEntity.getProtectionStatus().toString())
|
.protectStatus(fileEntity.getProtectionStatus().toString())
|
||||||
.fileName(splitName[0] + "_nocopy_protected" + "." + fileEntity.getFileExtension())
|
.fileName(name + "_nocopy_protected" + "." + fileEntity.getFileExtension())
|
||||||
.ownerName(user.getFullName())
|
.ownerName(user.getFullName())
|
||||||
.ownerEmail(user.getEmail())
|
.ownerEmail(user.getEmail())
|
||||||
.ownerCompany(user.getCompanyName())
|
.ownerCompany(user.getCompanyName())
|
||||||
|
|||||||
Reference in New Issue
Block a user