From 349edbeb91543301084f06dbdd3233ab2fbe498a Mon Sep 17 00:00:00 2001 From: vladp Date: Sat, 24 Jan 2026 11:32:02 +0700 Subject: [PATCH] fix --- .../java/ru/soune/nocopy/controller/ApiController.java | 7 +++---- .../ru/soune/nocopy/service/file/FileEntityService.java | 2 +- .../soune/nocopy/service/file/FileUploadServiceImpl.java | 2 +- 3 files changed, 5 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 3ae0515..854b77a 100644 --- a/src/main/java/ru/soune/nocopy/controller/ApiController.java +++ b/src/main/java/ru/soune/nocopy/controller/ApiController.java @@ -17,16 +17,15 @@ import org.springframework.web.multipart.MultipartFile; import ru.soune.nocopy.dto.BaseRequest; import ru.soune.nocopy.dto.BaseResponse; import ru.soune.nocopy.dto.MessageCode; +import ru.soune.nocopy.dto.file.*; import ru.soune.nocopy.dto.register.RegAnswer; -import ru.soune.nocopy.dto.file.ChunkUploadResponse; -import ru.soune.nocopy.dto.file.CompleteUploadResponse; -import ru.soune.nocopy.dto.file.FileEntityResponse; -import ru.soune.nocopy.dto.file.UploadProgress; +import ru.soune.nocopy.entity.file.FileEntity; import ru.soune.nocopy.entity.file.FileStatus; import ru.soune.nocopy.entity.file.UploadStatus; import ru.soune.nocopy.exception.*; import ru.soune.nocopy.handler.*; import ru.soune.nocopy.repository.FileEntityRepository; +import ru.soune.nocopy.service.FileSimilarityService; import ru.soune.nocopy.service.register.AuthService; import ru.soune.nocopy.service.file.FileEntityService; import ru.soune.nocopy.service.file.FileUploadService; diff --git a/src/main/java/ru/soune/nocopy/service/file/FileEntityService.java b/src/main/java/ru/soune/nocopy/service/file/FileEntityService.java index 1f3464e..bfc8123 100644 --- a/src/main/java/ru/soune/nocopy/service/file/FileEntityService.java +++ b/src/main/java/ru/soune/nocopy/service/file/FileEntityService.java @@ -57,7 +57,7 @@ public class FileEntityService { if (!duplicatedByHash.isEmpty()) { SimilarImageProjection similarImageProjection = duplicatedByHash.get(0); - throw new DuplicateImageException("Duplicate", similarImageProjection.getFileId(), + throw new DuplicateImageException("Duplicate", similarImageProjection.getId(), similarImageProjection.getUserId()); } } diff --git a/src/main/java/ru/soune/nocopy/service/file/FileUploadServiceImpl.java b/src/main/java/ru/soune/nocopy/service/file/FileUploadServiceImpl.java index 587cdc1..05b5dcd 100644 --- a/src/main/java/ru/soune/nocopy/service/file/FileUploadServiceImpl.java +++ b/src/main/java/ru/soune/nocopy/service/file/FileUploadServiceImpl.java @@ -375,7 +375,7 @@ public class FileUploadServiceImpl implements FileUploadService { hash.get("hi"), hash.get("low")); if (!duplicates.isEmpty()) { - throw new DuplicateImageException("Duplicate", duplicates.get(0).getFileId(), + throw new DuplicateImageException("Duplicate", duplicates.get(0).getId(), duplicates.get(0).getUserId()); } }