@@ -17,16 +17,15 @@ import org.springframework.web.multipart.MultipartFile;
|
|||||||
import ru.soune.nocopy.dto.BaseRequest;
|
import ru.soune.nocopy.dto.BaseRequest;
|
||||||
import ru.soune.nocopy.dto.BaseResponse;
|
import ru.soune.nocopy.dto.BaseResponse;
|
||||||
import ru.soune.nocopy.dto.MessageCode;
|
import ru.soune.nocopy.dto.MessageCode;
|
||||||
|
import ru.soune.nocopy.dto.file.*;
|
||||||
import ru.soune.nocopy.dto.register.RegAnswer;
|
import ru.soune.nocopy.dto.register.RegAnswer;
|
||||||
import ru.soune.nocopy.dto.file.ChunkUploadResponse;
|
import ru.soune.nocopy.entity.file.FileEntity;
|
||||||
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.FileStatus;
|
import ru.soune.nocopy.entity.file.FileStatus;
|
||||||
import ru.soune.nocopy.entity.file.UploadStatus;
|
import ru.soune.nocopy.entity.file.UploadStatus;
|
||||||
import ru.soune.nocopy.exception.*;
|
import ru.soune.nocopy.exception.*;
|
||||||
import ru.soune.nocopy.handler.*;
|
import ru.soune.nocopy.handler.*;
|
||||||
import ru.soune.nocopy.repository.FileEntityRepository;
|
import ru.soune.nocopy.repository.FileEntityRepository;
|
||||||
|
import ru.soune.nocopy.service.FileSimilarityService;
|
||||||
import ru.soune.nocopy.service.register.AuthService;
|
import ru.soune.nocopy.service.register.AuthService;
|
||||||
import ru.soune.nocopy.service.file.FileEntityService;
|
import ru.soune.nocopy.service.file.FileEntityService;
|
||||||
import ru.soune.nocopy.service.file.FileUploadService;
|
import ru.soune.nocopy.service.file.FileUploadService;
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ public class FileEntityService {
|
|||||||
if (!duplicatedByHash.isEmpty()) {
|
if (!duplicatedByHash.isEmpty()) {
|
||||||
SimilarImageProjection similarImageProjection = duplicatedByHash.get(0);
|
SimilarImageProjection similarImageProjection = duplicatedByHash.get(0);
|
||||||
|
|
||||||
throw new DuplicateImageException("Duplicate", similarImageProjection.getFileId(),
|
throw new DuplicateImageException("Duplicate", similarImageProjection.getId(),
|
||||||
similarImageProjection.getUserId());
|
similarImageProjection.getUserId());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -375,7 +375,7 @@ public class FileUploadServiceImpl implements FileUploadService {
|
|||||||
hash.get("hi"), hash.get("low"));
|
hash.get("hi"), hash.get("low"));
|
||||||
|
|
||||||
if (!duplicates.isEmpty()) {
|
if (!duplicates.isEmpty()) {
|
||||||
throw new DuplicateImageException("Duplicate", duplicates.get(0).getFileId(),
|
throw new DuplicateImageException("Duplicate", duplicates.get(0).getId(),
|
||||||
duplicates.get(0).getUserId());
|
duplicates.get(0).getUserId());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user