dev add info for files
Test Workflow / test (push) Successful in 2s

This commit is contained in:
vladp
2026-01-28 19:26:40 +07:00
parent c019f23777
commit a32f089989
2 changed files with 18 additions and 2 deletions
@@ -32,4 +32,11 @@ public class FileEntityResponse {
private boolean existsOnDisk; private boolean existsOnDisk;
private Integer supportId; private Integer supportId;
private String protectStatus; private String protectStatus;
private String ownerName;
private String ownerEmail;
private String ownerCompany;
private String fileName;
private String fileFormat;
private Integer checksCount;
private LocalDateTime fileUploadDate;
} }
@@ -10,11 +10,12 @@ import ru.soune.nocopy.entity.file.FileEntity;
import ru.soune.nocopy.entity.file.FileStatus; import ru.soune.nocopy.entity.file.FileStatus;
import ru.soune.nocopy.entity.file.FileUploadSession; import ru.soune.nocopy.entity.file.FileUploadSession;
import ru.soune.nocopy.entity.file.ProtectionStatus; 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.DuplicateImageException;
import ru.soune.nocopy.exception.FileEntityNotFoundException; import ru.soune.nocopy.exception.FileEntityNotFoundException;
import ru.soune.nocopy.repository.FileEntityRepository; import ru.soune.nocopy.repository.FileEntityRepository;
import ru.soune.nocopy.repository.ImageHashRepository;
import ru.soune.nocopy.repository.SimilarImageProjection; import ru.soune.nocopy.repository.SimilarImageProjection;
import ru.soune.nocopy.repository.UserRepository;
import ru.soune.nocopy.service.FileSimilarityService; import ru.soune.nocopy.service.FileSimilarityService;
import ru.soune.nocopy.service.ImageHashService; import ru.soune.nocopy.service.ImageHashService;
@@ -39,7 +40,7 @@ public class FileEntityService {
private final FileSimilarityService fileSimilarityService; private final FileSimilarityService fileSimilarityService;
private final ImageHashRepository imageHashRepository; private final UserRepository userRepository;
@Transactional(noRollbackFor = DuplicateImageException.class) @Transactional(noRollbackFor = DuplicateImageException.class)
public FileEntity createFromUploadSession(FileUploadSession session, String checksum) { public FileEntity createFromUploadSession(FileUploadSession session, String checksum) {
@@ -347,6 +348,7 @@ 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();
return FileEntityResponse.builder() return FileEntityResponse.builder()
.id(fileEntity.getId()) .id(fileEntity.getId())
@@ -367,6 +369,13 @@ public class FileEntityService {
.existsOnDisk(existsOnDisk) .existsOnDisk(existsOnDisk)
.supportId(fileEntity.getSupportId()) .supportId(fileEntity.getSupportId())
.protectStatus(fileEntity.getProtectionStatus().toString()) .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(); .build();
} }