dev add check tokens for monitoring
Test Workflow / test (push) Waiting to run

This commit is contained in:
vladp
2026-03-06 12:15:39 +07:00
parent 120408e488
commit 4c3558dcfa
2 changed files with 15 additions and 0 deletions
@@ -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<FileMonitoringEntity> 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())