NCBACK-25 fix check duplicate exception
Test Workflow / test (push) Successful in 3s

This commit is contained in:
vladp
2026-01-25 20:45:29 +07:00
parent 0a4ab562a4
commit 6dacbde522
2 changed files with 7 additions and 4 deletions
@@ -11,13 +11,12 @@ import java.util.List;
@Repository @Repository
public interface ImageSimilarityRepository public interface ImageSimilarityRepository
extends JpaRepository<FileEntity, String> { extends JpaRepository<FileEntity, String> {
@Query(value = """ @Query(value = """
SELECT
SELECT f.id AS id,
f.id AS similarFileId,
f.original_file_name AS originalFileName, f.original_file_name AS originalFileName,
f.file_size AS fileSize, f.file_size AS fileSize,
f.user_id AS userId,
h.hash64_hi AS hash64Hi, h.hash64_hi AS hash64Hi,
h.hash64_lo AS hash64Lo h.hash64_lo AS hash64Lo
FROM image_hashes ref FROM image_hashes ref
@@ -1,6 +1,7 @@
package ru.soune.nocopy.service; package ru.soune.nocopy.service;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
@@ -20,6 +21,7 @@ import java.util.stream.Collectors;
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
@Slf4j
public class FileSimilarityService { public class FileSimilarityService {
private final ImageSimilarityRepository repository; private final ImageSimilarityRepository repository;
@@ -55,6 +57,7 @@ public class FileSimilarityService {
return SimilarFileDTO.builder() return SimilarFileDTO.builder()
.fileId(c.getId()) .fileId(c.getId())
.ownerId(c.getUserId())
.originalFileName(c.getOriginalFileName()) .originalFileName(c.getOriginalFileName())
.fileSize(c.getFileSize()) .fileSize(c.getFileSize())
.hammingDistance(hamming) .hammingDistance(hamming)
@@ -171,6 +174,7 @@ public class FileSimilarityService {
return SimilarFileDTO.builder() return SimilarFileDTO.builder()
.fileId(similarImageProjection.getId()) .fileId(similarImageProjection.getId())
.ownerId(similarImageProjection.getUserId())
.originalFileName(similarImageProjection.getOriginalFileName()) .originalFileName(similarImageProjection.getOriginalFileName())
.fileSize(similarImageProjection.getFileSize()) .fileSize(similarImageProjection.getFileSize())
.hammingDistance(hamming) .hammingDistance(hamming)