This commit is contained in:
@@ -40,4 +40,5 @@ public class FileEntityResponse {
|
|||||||
private String fileFormat;
|
private String fileFormat;
|
||||||
private Integer checksCount;
|
private Integer checksCount;
|
||||||
private LocalDateTime fileUploadDate;
|
private LocalDateTime fileUploadDate;
|
||||||
|
private String monitoring;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,10 +10,14 @@ 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.monitoring.FileMonitoringEntity;
|
||||||
|
import ru.soune.nocopy.entity.monitoring.MonitoringType;
|
||||||
import ru.soune.nocopy.entity.user.User;
|
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.handler.MonitoringHandler;
|
||||||
import ru.soune.nocopy.repository.FileEntityRepository;
|
import ru.soune.nocopy.repository.FileEntityRepository;
|
||||||
|
import ru.soune.nocopy.repository.FileMonitoringRepository;
|
||||||
import ru.soune.nocopy.repository.SimilarImageProjection;
|
import ru.soune.nocopy.repository.SimilarImageProjection;
|
||||||
import ru.soune.nocopy.repository.UserRepository;
|
import ru.soune.nocopy.repository.UserRepository;
|
||||||
import ru.soune.nocopy.service.FileSimilarityService;
|
import ru.soune.nocopy.service.FileSimilarityService;
|
||||||
@@ -28,6 +32,7 @@ import java.time.LocalDateTime;
|
|||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.Optional;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@@ -371,11 +376,19 @@ public class FileEntityService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private final FileMonitoringRepository fileMonitoringRepository;
|
||||||
|
|
||||||
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 fileName = fileEntity.getOriginalFileName();
|
String fileName = fileEntity.getOriginalFileName();
|
||||||
String name = fileName;
|
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(".");
|
int lastDotIndex = fileName.lastIndexOf(".");
|
||||||
if (lastDotIndex > 0) {
|
if (lastDotIndex > 0) {
|
||||||
@@ -405,6 +418,7 @@ public class FileEntityService {
|
|||||||
.ownerName(user.getFullName())
|
.ownerName(user.getFullName())
|
||||||
.ownerEmail(user.getEmail())
|
.ownerEmail(user.getEmail())
|
||||||
.ownerCompany(user.getCompanyName())
|
.ownerCompany(user.getCompanyName())
|
||||||
|
.monitoring(monitoring)
|
||||||
//TODO fix after add logic for check for protect file
|
//TODO fix after add logic for check for protect file
|
||||||
.checksCount(0)
|
.checksCount(0)
|
||||||
.fileUploadDate(fileEntity.getCreatedAt())
|
.fileUploadDate(fileEntity.getCreatedAt())
|
||||||
|
|||||||
Reference in New Issue
Block a user