From 4c3558dcfafc055e0c7c94f20f4b534b3e3360fa Mon Sep 17 00:00:00 2001 From: vladp Date: Fri, 6 Mar 2026 12:15:39 +0700 Subject: [PATCH] dev add check tokens for monitoring --- .../soune/nocopy/dto/file/FileEntityResponse.java | 1 + .../nocopy/service/file/FileEntityService.java | 14 ++++++++++++++ 2 files changed, 15 insertions(+) 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 e57164c..504e8b3 100644 --- a/src/main/java/ru/soune/nocopy/dto/file/FileEntityResponse.java +++ b/src/main/java/ru/soune/nocopy/dto/file/FileEntityResponse.java @@ -40,4 +40,5 @@ public class FileEntityResponse { private String fileFormat; private Integer checksCount; private LocalDateTime fileUploadDate; + private String monitoring; } 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 92562da..f0425fd 100644 --- a/src/main/java/ru/soune/nocopy/service/file/FileEntityService.java +++ b/src/main/java/ru/soune/nocopy/service/file/FileEntityService.java @@ -10,10 +10,14 @@ 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.monitoring.FileMonitoringEntity; +import ru.soune.nocopy.entity.monitoring.MonitoringType; import ru.soune.nocopy.entity.user.User; import ru.soune.nocopy.exception.DuplicateImageException; import ru.soune.nocopy.exception.FileEntityNotFoundException; +import ru.soune.nocopy.handler.MonitoringHandler; import ru.soune.nocopy.repository.FileEntityRepository; +import ru.soune.nocopy.repository.FileMonitoringRepository; import ru.soune.nocopy.repository.SimilarImageProjection; import ru.soune.nocopy.repository.UserRepository; import ru.soune.nocopy.service.FileSimilarityService; @@ -28,6 +32,7 @@ import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.stream.Collectors; @Slf4j @@ -371,11 +376,19 @@ public class FileEntityService { } } + private final FileMonitoringRepository fileMonitoringRepository; + private FileEntityResponse convertToResponse(FileEntity fileEntity, int version) { boolean existsOnDisk = checkFileExistsOnDisk(fileEntity.getFilePath()); User user = userRepository.findById(fileEntity.getUserId()).get(); String fileName = fileEntity.getOriginalFileName(); String name = fileName; + Optional fileMonitoringRepositoryByFileId = + fileMonitoringRepository.findByFileId(fileEntity.getId()); + + String monitoring = fileMonitoringRepositoryByFileId.map(fileMonitoringEntity -> + fileMonitoringEntity.getMonitoringType().name()) + .orElseGet(MonitoringType.NONE::name); int lastDotIndex = fileName.lastIndexOf("."); if (lastDotIndex > 0) { @@ -405,6 +418,7 @@ public class FileEntityService { .ownerName(user.getFullName()) .ownerEmail(user.getEmail()) .ownerCompany(user.getCompanyName()) + .monitoring(monitoring) //TODO fix after add logic for check for protect file .checksCount(0) .fileUploadDate(fileEntity.getCreatedAt())