From a32f08998954a913e387daba3e121202cdabbb62 Mon Sep 17 00:00:00 2001 From: vladp Date: Wed, 28 Jan 2026 19:26:40 +0700 Subject: [PATCH] dev add info for files --- .../soune/nocopy/dto/file/FileEntityResponse.java | 7 +++++++ .../nocopy/service/file/FileEntityService.java | 13 +++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/main/java/ru/soune/nocopy/dto/file/FileEntityResponse.java b/src/main/java/ru/soune/nocopy/dto/file/FileEntityResponse.java index debabc6..b382117 100644 --- a/src/main/java/ru/soune/nocopy/dto/file/FileEntityResponse.java +++ b/src/main/java/ru/soune/nocopy/dto/file/FileEntityResponse.java @@ -32,4 +32,11 @@ public class FileEntityResponse { private boolean existsOnDisk; private Integer supportId; private String protectStatus; + private String ownerName; + private String ownerEmail; + private String ownerCompany; + private String fileName; + private String fileFormat; + private Integer checksCount; + private LocalDateTime fileUploadDate; } diff --git a/src/main/java/ru/soune/nocopy/service/file/FileEntityService.java b/src/main/java/ru/soune/nocopy/service/file/FileEntityService.java index ae1871b..e92337a 100644 --- a/src/main/java/ru/soune/nocopy/service/file/FileEntityService.java +++ b/src/main/java/ru/soune/nocopy/service/file/FileEntityService.java @@ -10,11 +10,12 @@ import ru.soune.nocopy.entity.file.FileEntity; import ru.soune.nocopy.entity.file.FileStatus; import ru.soune.nocopy.entity.file.FileUploadSession; import ru.soune.nocopy.entity.file.ProtectionStatus; +import ru.soune.nocopy.entity.user.User; import ru.soune.nocopy.exception.DuplicateImageException; import ru.soune.nocopy.exception.FileEntityNotFoundException; import ru.soune.nocopy.repository.FileEntityRepository; -import ru.soune.nocopy.repository.ImageHashRepository; import ru.soune.nocopy.repository.SimilarImageProjection; +import ru.soune.nocopy.repository.UserRepository; import ru.soune.nocopy.service.FileSimilarityService; import ru.soune.nocopy.service.ImageHashService; @@ -39,7 +40,7 @@ public class FileEntityService { private final FileSimilarityService fileSimilarityService; - private final ImageHashRepository imageHashRepository; + private final UserRepository userRepository; @Transactional(noRollbackFor = DuplicateImageException.class) public FileEntity createFromUploadSession(FileUploadSession session, String checksum) { @@ -347,6 +348,7 @@ public class FileEntityService { private FileEntityResponse convertToResponse(FileEntity fileEntity, int version) { boolean existsOnDisk = checkFileExistsOnDisk(fileEntity.getFilePath()); + User user = userRepository.findById(fileEntity.getUserId()).get(); return FileEntityResponse.builder() .id(fileEntity.getId()) @@ -367,6 +369,13 @@ public class FileEntityService { .existsOnDisk(existsOnDisk) .supportId(fileEntity.getSupportId()) .protectStatus(fileEntity.getProtectionStatus().toString()) + .fileName(fileEntity.getOriginalFileName()) + .ownerName(user.getFullName()) + .ownerEmail(user.getEmail()) + .ownerCompany(user.getCompany()) + //TODO fix after add logic for check for protect file + .checksCount(0) + .fileUploadDate(fileEntity.getCreatedAt()) .build(); }