backdev/no-copy
1
0
Fork 0
Code Issues Pull Requests 5 Actions Packages Projects Releases Wiki Activity

dev add violation notion
Test Workflow / test (push) Successful in 5s
Details

Browse Source
This commit is contained in:
vladp
2026-03-19 14:48:07 +07:00
parent 1cdc6ee1c9
commit c5f060d269
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/ru/soune/nocopy/dto/file/SimilarFileDTO.java
+1
View File
@@ -19,4 +19,5 @@ public class SimilarFileDTO {
ProtectionStatus status; ProtectionStatus status;
LocalDateTime uploadDate; LocalDateTime uploadDate;
String url; String url;
Boolean owner;
} }
src/main/java/ru/soune/nocopy/service/FileSimilarityService.java
+11 -8
View File
@@ -155,19 +155,21 @@ public class FileSimilarityService {
.orElseThrow(() -> new RuntimeException("Hash not found for file: " + fileId)); .orElseThrow(() -> new RuntimeException("Hash not found for file: " + fileId));
List<SimilarImageProjection> candidates; List<SimilarImageProjection> candidates;
if (authToken == null || "all".equals(authToken)) { List<Long> userIds;
// if (authToken == null || "all".equals(authToken)) {
candidates = repository.findCandidates(fileId); candidates = repository.findCandidates(fileId);
} else { // } else {
Long userId = authTokenRepository.findUserIdByToken(authToken); Long userId = authTokenRepository.findUserIdByToken(authToken);
User user = userRepository.findById(userId).orElseThrow(() -> new RuntimeException("User not found")); User user = userRepository.findById(userId).orElseThrow(() -> new RuntimeException("User not found"));
Company company = user.getCompany(); Company company = user.getCompany();
if (company != null) { if (company != null) {
Set<Long> userIds = company.getUsers().stream().map(User::getId).collect(Collectors.toSet()); userIds = company.getUsers().stream().map(User::getId).collect(Collectors.toList());
candidates = repository.findCandidatesFromUserFiles(fileId, userIds); // candidates = repository.findCandidatesFromUserFiles(fileId, userIds);
} else { } else {
candidates = repository.findCandidatesFromUserFiles(fileId, userId); userIds = List.of(userId);
} // candidates = repository.findCandidatesFromUserFiles(fileId, userId);
} }
// }
List<String> levels = (similarityLevels != null && !similarityLevels.isEmpty()) List<String> levels = (similarityLevels != null && !similarityLevels.isEmpty())
? similarityLevels ? similarityLevels
@@ -176,7 +178,7 @@ public class FileSimilarityService {
List<SimilarFileDTO> allResults = candidates.stream() List<SimilarFileDTO> allResults = candidates.stream()
.map(c -> createSimilarFileResponse(c, .map(c -> createSimilarFileResponse(c,
imageHashEntity.getHash64Hi(), imageHashEntity.getHash64Hi(),
imageHashEntity.getHash64Lo())) imageHashEntity.getHash64Lo(), userIds))
.filter(dto -> levels.contains(dto.getSimilarityLevel())) .filter(dto -> levels.contains(dto.getSimilarityLevel()))
.sorted(Comparator.comparingInt(SimilarFileDTO::getHammingDistance)) .sorted(Comparator.comparingInt(SimilarFileDTO::getHammingDistance))
.collect(Collectors.toList()); .collect(Collectors.toList());
@@ -211,7 +213,7 @@ public class FileSimilarityService {
} }
private SimilarFileDTO createSimilarFileResponse(SimilarImageProjection similarImageProjection, private SimilarFileDTO createSimilarFileResponse(SimilarImageProjection similarImageProjection,
Long hash64Hi, Long hash64Lo) { Long hash64Hi, Long hash64Lo, List<Long> userIds) {
Long imageProjectionHash64Hi = similarImageProjection.getHash64Hi(); Long imageProjectionHash64Hi = similarImageProjection.getHash64Hi();
Long similarImageProjectionHash64Lo = similarImageProjection.getHash64Lo(); Long similarImageProjectionHash64Lo = similarImageProjection.getHash64Lo();
int hamming = PerceptualHashHelper.INSTANCE.hammingDistance(new PHash(hash64Hi, hash64Lo), int hamming = PerceptualHashHelper.INSTANCE.hammingDistance(new PHash(hash64Hi, hash64Lo),
@@ -238,6 +240,7 @@ public class FileSimilarityService {
.supportId(similarImageProjection.getSupportId()) .supportId(similarImageProjection.getSupportId())
.uploadDate(similarImageProjection.getUploadDate()) .uploadDate(similarImageProjection.getUploadDate())
.status(similarImageProjection.getProtectionStatus()) .status(similarImageProjection.getProtectionStatus())
.owner(userIds.contains(similarImageProjection.getUserId()))
// .url(baseUrl + "/api/files/protected/" + similarImageProjection.getId()) // .url(baseUrl + "/api/files/protected/" + similarImageProjection.getId())
.url(baseUrl + "/api/files/protected/" + similarImageProjection.getId() + "/thumbnail") .url(baseUrl + "/api/files/protected/" + similarImageProjection.getId() + "/thumbnail")
.build(); .build();