From ca10d4d13094ceeb8215e4b00bc43cf2b0e8e54d Mon Sep 17 00:00:00 2001 From: vladp Date: Sat, 21 Feb 2026 21:01:23 +0700 Subject: [PATCH] dev comment logic for check max users --- .../java/ru/soune/nocopy/repository/FileEntityRepository.java | 3 +++ .../java/ru/soune/nocopy/service/FileSimilarityService.java | 4 ++-- .../soune/nocopy/service/file/impl/FileUploadServiceImpl.java | 3 +-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/ru/soune/nocopy/repository/FileEntityRepository.java b/src/main/java/ru/soune/nocopy/repository/FileEntityRepository.java index 9e098db..c201496 100644 --- a/src/main/java/ru/soune/nocopy/repository/FileEntityRepository.java +++ b/src/main/java/ru/soune/nocopy/repository/FileEntityRepository.java @@ -55,4 +55,7 @@ public interface FileEntityRepository extends JpaRepository @Query("SELECT f FROM FileEntity f WHERE f.userId = :userId AND f.mimeType = :mimeType") List findByUserIdAndMimeType(Long userId, String mimeType); + + @Query("SELECT f FROM FileEntity f WHERE f.mimeType = :mimeType") + List findByMimeType(String mimeType); } diff --git a/src/main/java/ru/soune/nocopy/service/FileSimilarityService.java b/src/main/java/ru/soune/nocopy/service/FileSimilarityService.java index 4219c9e..c261a20 100644 --- a/src/main/java/ru/soune/nocopy/service/FileSimilarityService.java +++ b/src/main/java/ru/soune/nocopy/service/FileSimilarityService.java @@ -110,9 +110,9 @@ public class FileSimilarityService { return duplicates; } - public void hasDuplicatesByHash(String path, Long userId, String mimeType) throws Exception { + public void hasDuplicatesByHash(String path, String mimeType) throws Exception { String hash = calculateFileHash(path); - List fileEntityList = fileEntityRepository.findByUserIdAndMimeType(userId, mimeType); + List fileEntityList = fileEntityRepository.findByMimeType(mimeType); for (FileEntity file : fileEntityList) { if (calculateFileHash(file.getFilePath()).equals(hash)) { diff --git a/src/main/java/ru/soune/nocopy/service/file/impl/FileUploadServiceImpl.java b/src/main/java/ru/soune/nocopy/service/file/impl/FileUploadServiceImpl.java index 1a09541..2cb7d7d 100644 --- a/src/main/java/ru/soune/nocopy/service/file/impl/FileUploadServiceImpl.java +++ b/src/main/java/ru/soune/nocopy/service/file/impl/FileUploadServiceImpl.java @@ -323,8 +323,7 @@ public class FileUploadServiceImpl implements FileUploadService { if (session.getFileType().startsWith("image")) { checkForDuplicatesSynchronously(finalFilePath); } else if (session.getFileType().startsWith("audio") || session.getFileType().startsWith("document")) { - fileSimilarityService.hasDuplicatesByHash(finalFilePath, session.getUserId(), - session.getFileType()); + fileSimilarityService.hasDuplicatesByHash(finalFilePath ,session.getFileType()); File file = new File(finalFilePath); FileProtector.Type type = "document".equals(session.getFileType()) ?