From 2f167a01500778f971a0aa22bd2a12f58cbc0931 Mon Sep 17 00:00:00 2001 From: backdev-1 Date: Thu, 23 Apr 2026 12:37:14 +0700 Subject: [PATCH] dev add cold storage --- src/main/java/ru/soune/nocopy/controller/ApiController.java | 6 +++--- .../java/ru/soune/nocopy/service/FileSimilarityService.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/ru/soune/nocopy/controller/ApiController.java b/src/main/java/ru/soune/nocopy/controller/ApiController.java index aed2408..6a550ce 100644 --- a/src/main/java/ru/soune/nocopy/controller/ApiController.java +++ b/src/main/java/ru/soune/nocopy/controller/ApiController.java @@ -254,7 +254,7 @@ public class ApiController { fileId, similarityLevels, pageable, authToken); response = buildSuccessResponse(similarFilesPage, MessageCode.SIMILAR_FILES_FOUND); } else { - List results = processNonImageFile(fileEntity, authToken); + List results = processNonImageFile(fileEntity, true); log.info("results: {}", results); response = buildSuccessResponse(results, MessageCode.SIMILAR_FILES_FOUND); checkCounterService.incrementCheckCount(fileEntity.getUserId(), fileEntity.getMimeType()); @@ -275,11 +275,11 @@ public class ApiController { } } - private List processNonImageFile(FileEntity fileEntity, String authToken) throws Exception { + private List processNonImageFile(FileEntity fileEntity, boolean cloud) throws Exception { List results = new ArrayList<>(); FileEntity duplicateByHash = fileSimilarityService.findDuplicateByHash(fileEntity.getFilePath(), - fileEntity.getMimeType(), fileEntity.getUserId()); + fileEntity.getMimeType(), fileEntity.getUserId(), cloud); log.info("duplicateByHash: {}", duplicateByHash); if (duplicateByHash != null) { results.add(fileSimilarityService.buildDTO(duplicateByHash)); diff --git a/src/main/java/ru/soune/nocopy/service/FileSimilarityService.java b/src/main/java/ru/soune/nocopy/service/FileSimilarityService.java index b6a0ca4..1a3c74f 100644 --- a/src/main/java/ru/soune/nocopy/service/FileSimilarityService.java +++ b/src/main/java/ru/soune/nocopy/service/FileSimilarityService.java @@ -109,15 +109,15 @@ public class FileSimilarityService { } public void hasDuplicatesByHash(String path, String mimeType, Long userId) throws Exception { - FileEntity duplicateByHash = findDuplicateByHash(path, mimeType, userId); + FileEntity duplicateByHash = findDuplicateByHash(path, mimeType, userId, false); if (duplicateByHash != null) { throw new DuplicateImageException("Duplicate", duplicateByHash.getId(), duplicateByHash.getUserId()); } } - public FileEntity findDuplicateByHash(String path, String mimeType, Long userId) throws Exception { - String hash = calculateFileHash(path, false); + public FileEntity findDuplicateByHash(String path, String mimeType, Long userId, boolean cloud) throws Exception { + String hash = calculateFileHash(path, cloud); User user = userRepository.findById(userId).orElseThrow(); Company company = user.getCompany();