dev add google search by image

# Conflicts:
#	src/main/java/ru/soune/nocopy/repository/SimilarImageProjection.java
#	src/main/java/ru/soune/nocopy/service/FileSimilarityService.java

build.gradle

@@ -34,6 +34,9 @@ dependencies {
 	implementation 'org.mapstruct:mapstruct:1.5.5.Final'
 	implementation 'commons-validator:commons-validator:1.7'
 
+	implementation group: 'com.google.cloud', name: 'google-cloud-vision', version: '3.55.0'
+	implementation group: 'com.google.api-client', name: 'google-api-client', version: '2.7.2'
+
 	implementation 'org.flywaydb:flyway-core:9.22.0'
 
 	implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.17.0'

docker-compose.yaml

@@ -52,11 +52,12 @@ services:
       resources:
         limits:
           cpus: '1.5'
-          memory: 1G
+          memory: 3G
         reservations:
           cpus: '0.5'
-          memory: 512M
+          memory: 2G
     environment:
+      JAVA_TOOL_OPTIONS: "-Xmx2g -Xms1g -XX:MaxMetaspaceSize=512m -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -XX:+UseContainerSupport -XX:InitialRAMPercentage=50 -XX:MaxRAMPercentage=75"
       FILE_STORAGE_PATH: /data/uploads
       MAX_FILE_SIZE: 10737418240
       FILE_CHUNK_SIZE: 1000000

infrastructure/jenkins/deploy.groovy

@@ -17,6 +17,7 @@ pipeline {
     stages {
         stage('Git pull') {
             steps {
+                cleanWs()
                 script {
                     checkout([
                             $class: 'GitSCM',
@@ -30,7 +31,6 @@ pipeline {
             }
         }
 
-
         stage('Deploy with docker-compose') {
             steps {
                 script {
@@ -44,68 +44,76 @@ pipeline {
                             string(credentialsId: 'DB_PASSWORD', variable: 'DB_PASSWORD')
                     ]) {
                         sh """
-                    echo "Deploying branch: ${params.BRANCH}"
-                    
-                    echo "Copying files to server..."
-                    sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "mkdir -p /opt/deployments/${params.BRANCH}"
-                    sshpass -p '$SSH_PASS' scp -r -o StrictHostKeyChecking=no ./* $SSH_USER@$SERVER:/opt/deployments/${params.BRANCH}/
-                    
-                    sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "
-                        cd /opt/deployments/${params.BRANCH}
-                        
-                        echo '1. Остановка старого приложения...'
-                        docker stop app-backend 2>/dev/null || echo 'Контейнер не найден'
-                        docker rm app-backend 2>/dev/null || echo 'Контейнер не найден'
-                        
-                        echo '2. Удаление старых образов...'
-                        docker images --filter 'reference=*app*' -q | xargs -r docker rmi -f 2>/dev/null || echo 'Нет образов для удаления'
-                        
-                        echo '3. Создание сети если нужно...'
-                        docker network create app-network 2>/dev/null || echo 'Сеть уже существует'
-                        
-                        echo '4. Запуск инфраструктуры...'
-                        docker-compose up -d db storage
-                        
-                        echo '5. Ожидание PostgreSQL...'
-                        sleep 10
-                        
-                        echo '6. Сборка нового образа приложения...'
-                        docker build --no-cache -t app-backend:latest .
-                        
-                        echo '7. Запуск приложения...'
-                        docker run -d \\
-                          --name app-backend \\
-                          --network app-network \\
-                          --network-alias app \\
-                          -p 80:8080 \\
-                          -v uploads_data:/data/uploads:rw \\
-                          -e POSTGRES_DB=no_copy_ \\
-                          -e POSTGRES_USER=$DB_USER \\
-                          -e POSTGRES_PASSWORD=$DB_PASSWORD \\
-                          -e POSTGRES_PORT=5432 \\
-                          -e POSTGRES_HOST=db \\
-                          --restart unless-stopped \\
-                          app-backend:latest
-                        
-                        echo '8. Запуск мониторинга...'
-                        docker-compose up -d grafana prometheus loki tempo alloy
-                        
-                        echo '9. Проверка...'
-                        sleep 5
-                        
-                        echo 'Статус контейнеров:'
-                        docker ps --format 'table {{.Names}}\\t{{.Image}}\\t{{.Status}}'
-                        
-                        echo '10. Проверка health...'
-                        if curl -s -f http://localhost:80/health > /dev/null 2>&1; then
-                            echo 'Приложение работает'
-                            echo 'URL: http://${params.SERVER}:80'
-                        else
-                            echo 'Проверка health не удалась'
-                            docker logs app-backend --tail=20
-                        fi
-                    "
-                """
+                        echo "Deploying branch: ${params.BRANCH}"
+
+                        echo "Copying files to server..."
+                        sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "mkdir -p /opt/deployments/${params.BRANCH}"
+
+                        sshpass -p '$SSH_PASS' rsync -av --delete \\
+                          --exclude=.git \\
+                          --exclude=.gradle \\
+                          --exclude=build \\
+                          --exclude=**/build \\
+                          --exclude=.idea \\
+                          --exclude=out \\
+                          . $SSH_USER@$SERVER:/opt/deployments/${params.BRANCH}/
+
+                        sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "
+                            cd /opt/deployments/${params.BRANCH}
+
+                            echo '1. Остановка старого приложения...'
+                            docker stop app-backend 2>/dev/null || echo 'Контейнер не найден'
+                            docker rm app-backend 2>/dev/null || echo 'Контейнер не найден'
+
+                            echo '2. Удаление старых образов...'
+                            docker images --filter 'reference=*app*' -q | xargs -r docker rmi -f 2>/dev/null || echo 'Нет образов для удаления'
+
+                            echo '3. Создание сети если нужно...'
+                            docker network create app-network 2>/dev/null || echo 'Сеть уже существует'
+
+                            echo '4. Запуск инфраструктуры...'
+                            docker-compose up -d db storage
+
+                            echo '5. Ожидание PostgreSQL...'
+                            sleep 10
+
+                            echo '6. Сборка нового образа приложения...'
+                            docker build --no-cache -t app-backend:latest .
+
+                            echo '7. Запуск приложения...'
+                            docker run -d \\
+                              --name app-backend \\
+                              --network app-network \\
+                              --network-alias app \\
+                              -p 80:8080 \\
+                              -v uploads_data:/data/uploads:rw \\
+                              -e POSTGRES_DB=no_copy_ \\
+                              -e POSTGRES_USER=$DB_USER \\
+                              -e POSTGRES_PASSWORD=$DB_PASSWORD \\
+                              -e POSTGRES_PORT=5432 \\
+                              -e POSTGRES_HOST=db \\
+                              --restart unless-stopped \\
+                              app-backend:latest
+
+                            echo '8. Запуск мониторинга...'
+                            docker-compose up -d grafana prometheus loki tempo alloy
+
+                            echo '9. Проверка...'
+                            sleep 5
+
+                            echo 'Статус контейнеров:'
+                            docker ps --format 'table {{.Names}}\\t{{.Image}}\\t{{.Status}}'
+
+                            echo '10. Проверка health...'
+                            if curl -s -f http://localhost:80/health > /dev/null 2>&1; then
+                                echo 'Приложение работает'
+                                echo 'URL: http://${params.SERVER}:80'
+                            else
+                                echo 'Проверка health не удалась'
+                                docker logs app-backend --tail=20
+                            fi
+                        "
+                        """
                     }
                 }
             }
@@ -124,4 +132,4 @@ pipeline {
             echo "Deployment process finished"
         }
     }
-}
+}

referral/build.gradle.kts

@@ -0,0 +1,26 @@
+plugins {
+    kotlin("jvm") version "2.1.10"
+}
+
+group = "ru.soune"
+version = "1.0.0"
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.2")
+
+    implementation("io.insert-koin:koin-core:4.1.1")
+    implementation("io.insert-koin:koin-core-jvm:4.1.1")
+}
+
+tasks.test {
+    useJUnitPlatform()
+}
+kotlin {
+    jvmToolchain(21)
+}

referral/src/main/kotlin/Main.kt

@@ -0,0 +1,5 @@
+package ru.soune
+
+fun main() {
+    println("Hello World!")
+}

settings.gradle

@@ -1 +1,6 @@
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
+}
 rootProject.name = 'no-copy'
+include 'referral'
+

src/main/java/ru/soune/nocopy/configuration/RestTemplateConfig.java

@@ -0,0 +1,22 @@
+package ru.soune.nocopy.configuration;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.client.SimpleClientHttpRequestFactory;
+import org.springframework.web.client.RestTemplate;
+
+@Configuration
+public class RestTemplateConfig {
+
+    @Bean
+    public RestTemplate restTemplate() {
+        RestTemplate restTemplate = new RestTemplate();
+
+        SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory();
+        requestFactory.setConnectTimeout(30000);
+        requestFactory.setReadTimeout(60000);
+        restTemplate.setRequestFactory(requestFactory);
+
+        return restTemplate;
+    }
+}

src/main/java/ru/soune/nocopy/controller/ApiController.java

@@ -114,7 +114,8 @@ public class ApiController {
             @PathVariable("version") int version,
             @RequestParam(value = "upload_id", required = false) String uploadId,
             @RequestParam(value = "chunk_number", required = false) Integer chunkNumber,
-            @RequestParam(value = "chunk", required = false) MultipartFile chunk) {
+            @RequestParam(value = "chunk", required = false) MultipartFile chunk,
+            @RequestParam(value = "findSimilar", required = false) Integer findSimilar) {
         try {
             if (chunk == null || chunk.isEmpty()) {
                 return buildErrorResponse(uploadId, chunkNumber, "Chunk file null or empty");
@@ -126,39 +127,54 @@ public class ApiController {
                 return buildErrorResponse(uploadId, chunkNumber, "Valid chunk number is required");
             }
 
-            fileUploadService.uploadChunk(uploadId, chunkNumber, chunk);
+            UploadProgressResponse uploadProgressResponse = fileUploadService.uploadChunk(uploadId, chunkNumber,
+                    chunk, findSimilar);
 
-            return buildSuccessResponse(uploadId, chunkNumber, chunk);
+            return buildSuccessResponse(uploadId, chunkNumber, chunk,
+                    fileEntityService.findFileIdByPath(uploadProgressResponse.getFilePath()));
         } catch (DuplicateImageException e) {
-            return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.DUPLICATE_FILE_UPLOAD.getCode(),
+            Map<String, Object> duplicateData = new HashMap<>();
+            duplicateData.put("duplicateFileId", e.duplicateFileId());
+            duplicateData.put("userId", e.userId());
+            duplicateData.put("message", e.getMessage());
+
+            if (uploadId != null) {
+                duplicateData.put("uploadId", uploadId);
+            }
+
+            return ResponseEntity.ok().body(new BaseResponse(
+                    20004,
+                    MessageCode.DUPLICATE_FILE_UPLOAD.getCode(),
                     MessageCode.DUPLICATE_FILE_UPLOAD.getDescription(),
-                    Map.of("duplicateOwnerId", e.userId(), "duplicateFileId", e.duplicateFileId())));
+                    duplicateData
+            ));
         } catch (Exception e) {
             log.error("Error uploading chunk", e);
             return buildErrorResponse(uploadId, chunkNumber, "Failed to upload chunk: " + e.getMessage());
         }
     }
 
-    @GetMapping("/v{version}/files/{fileId}/similar")
+    @GetMapping("/v{version}/files/{fileId}/similar/{authToken}")
     public ResponseEntity<BaseResponse> findSimilarFiles(
             @PathVariable("version") int version,
             @PathVariable String fileId,
+            @PathVariable(required = false) String authToken,
             @RequestParam(required = false) List<String> similarityLevels,
             @PageableDefault(size = 20, sort = "hammingDistance") Pageable pageable) {
         SimilarityFilter filter = SimilarityFilter.builder()
                 .similarityLevels(similarityLevels)
                 .build();
-        Page<SimilarFileDTO> similarFiles = fileSimilarityService.findSimilarFiles(fileId, filter, pageable);
+        Page<SimilarFileDTO> similarFiles = fileSimilarityService.findSimilarFiles(fileId, filter, pageable, authToken);
 
         String messageDesc;
         MessageCode success;
 
         if (similarFiles.isEmpty()) {
             messageDesc = MessageCode.FILE_NOT_FOUND.getDescription();
-            success = MessageCode.FILE_NOT_FOUND;
+            success = MessageCode.SUCCESS;
         } else {
             messageDesc = MessageCode.SIMILAR_FILES_FOUND.getDescription();
-            success = MessageCode.SIMILAR_FILES_FOUND;
+            success = MessageCode.SUCCESS;
         }
 
         Map<String, Object> responseData = new HashMap<>();
@@ -392,7 +408,9 @@ public class ApiController {
 
         FileEntity fileEntity = optionalFileEntity.get();
 
-        Path path = Paths.get(fileEntity.getProtectedFilePath());
+        Path path =  type.toLowerCase().equals("image") ? Paths.get(fileEntity.getFilePath()) :
+                Paths.get(fileEntity.getProtectedFilePath());
+
         File file = path.toFile();
 
         NoCopyCheckResult noCopyCheckResult = noCopyFileService.checkFile(file,
@@ -445,11 +463,13 @@ public class ApiController {
         return null;
     }
 
-    private ResponseEntity<BaseResponse> buildSuccessResponse(String uploadId, Integer chunkNumber, MultipartFile chunk) {
+    private ResponseEntity<BaseResponse> buildSuccessResponse(String uploadId, Integer chunkNumber, MultipartFile chunk,
+                                                              String fileId) {
         ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
                 .uploadId(uploadId)
                 .chunkNumber(chunkNumber)
                 .chunkSize(chunk.getSize())
+                .fileId(fileId)
                 .message("Chunk uploaded successfully")
                 .build();
 

src/main/java/ru/soune/nocopy/controller/HealtCheckController.java

@@ -3,6 +3,9 @@ package ru.soune.nocopy.controller;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @RestController
 @RequestMapping("check/api")
 public class HealtCheckController {
@@ -11,4 +14,22 @@ public class HealtCheckController {
     public HttpStatus healtCheck() {
         return HttpStatus.OK;
     }
+
+    @GetMapping("/api/debug/memory")
+    public Map<String, String> getMemoryInfo() {
+        Runtime runtime = Runtime.getRuntime();
+        long mb = 1024 * 1024;
+
+        Map<String, String> info = new HashMap<>();
+        info.put("maxMemory (MB)", String.valueOf(runtime.maxMemory() / mb));
+        info.put("totalMemory (MB)", String.valueOf(runtime.totalMemory() / mb));
+        info.put("freeMemory (MB)", String.valueOf(runtime.freeMemory() / mb));
+        info.put("usedMemory (MB)", String.valueOf((runtime.totalMemory() - runtime.freeMemory()) / mb));
+        info.put("availableProcessors", String.valueOf(runtime.availableProcessors()));
+
+        info.put("JAVA_TOOL_OPTIONS", System.getenv("JAVA_TOOL_OPTIONS"));
+        info.put("JAVA_OPTS", System.getenv("JAVA_OPTS"));
+
+        return info;
+    }
 }

src/main/java/ru/soune/nocopy/dto/file/ChunkUploadResponse.java

@@ -20,6 +20,9 @@ public class ChunkUploadResponse {
     @JsonProperty("chunk_size")
     private Long chunkSize;
 
+    @JsonProperty("file_id")
+    private String fileId;
+
     @JsonProperty("message")
     private String message;
 }

src/main/java/ru/soune/nocopy/dto/file/FileEntityRequest.java

@@ -17,6 +17,9 @@ public class FileEntityRequest {
     @JsonProperty("file_id")
     private String fileId;
 
+    @JsonProperty("full_delete")
+    private Integer fullDelete;
+
     @JsonProperty("upload_session_id")
     private String uploadSessionId;
 

src/main/java/ru/soune/nocopy/dto/file/FileEntityResponse.java

@@ -31,4 +31,5 @@ public class FileEntityResponse {
     private String downloadUrl;
     private boolean existsOnDisk;
     private Integer supportId;
+    private String protectStatus;
 }

src/main/java/ru/soune/nocopy/dto/file/FileInfoUserResponse.java

@@ -58,4 +58,16 @@ public class FileInfoUserResponse {
 
     @JsonProperty("audios_violations")
     private Integer audiosViolations;
+
+    @JsonProperty("protected_files_count")
+    private Long protectedFilesCount;
+
+    @JsonProperty("protected_audio_files_count")
+    private Long protectedAudioFilesCount;
+
+    @JsonProperty("protected_video_files_count")
+    private Long protectedVideoFilesCount;
+
+    @JsonProperty("protected_image_files_count")
+    private Long protectedImageFilesCount;
 }

src/main/java/ru/soune/nocopy/dto/file/GoogleVisionSearchResponse.java

@@ -0,0 +1,68 @@
+package ru.soune.nocopy.dto.file;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import java.util.List;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class GoogleVisionSearchResponse {
+
+    @JsonProperty("bestGuessLabels")
+    private List<BestGuessLabel> bestGuessLabels;
+
+    @JsonProperty("fullMatchingImages")
+    private List<ImageResult> fullMatchingImages;
+
+    @JsonProperty("visuallySimilarImages")
+    private List<ImageResult> visuallySimilarImages;
+
+    @JsonProperty("pagesWithMatchingImages")
+    private List<PageResult> pagesWithMatchingImages;
+
+    @JsonProperty("partialMatchingImages")
+    private List<ImageResult> partialMatchingImages;
+
+    @Data
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    public static class BestGuessLabel {
+        @JsonProperty("label")
+        private String label;
+
+        @JsonProperty("languageCode")
+        private String languageCode;
+    }
+
+    @Data
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    public static class ImageResult {
+        @JsonProperty("url")
+        private String url;
+
+        @JsonProperty("score")
+        private Float score;
+
+        @JsonProperty("height")
+        private Integer height;
+
+        @JsonProperty("width")
+        private Integer width;
+    }
+
+    @Data
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    public static class PageResult {
+        @JsonProperty("url")
+        private String url;
+
+        @JsonProperty("pageTitle")
+        private String pageTitle;
+
+        @JsonProperty("fullMatchingImages")
+        private List<ImageResult> fullMatchingImages;
+
+        @JsonProperty("partialMatchingImages")
+        private List<ImageResult> partialMatchingImages;
+    }
+}

src/main/java/ru/soune/nocopy/entity/file/FileType.java

@@ -7,7 +7,8 @@ import java.util.List;
 
 @Getter
 public enum FileType {
-    IMAGE("image", Arrays.asList("jpg", "jpeg", "png", "gif", "bmp", "webp", "jfif")),
+//    IMAGE("image", Arrays.asList("jpg", "jpeg", "png", "gif", "bmp", "webp", "jfif")),
+    IMAGE("image", Arrays.asList("jpg", "jpeg", "png", "gif", "bmp")),
     VIDEO("video", Arrays.asList("mp4", "avi", "mov", "wmv", "flv", "mkv", "webm", "m4v", "mpg", "mpeg",
             "3gp", "3g2", "f4v", "m2ts", "mts", "vob", "ogv", "divx")),
     AUDIO("audio", List.of("wav"));

src/main/java/ru/soune/nocopy/entity/file/ImageHashEntity.java

@@ -9,7 +9,11 @@ import lombok.NoArgsConstructor;
 import java.time.LocalDateTime;
 
 @Entity
-@Table(name = "image_hashes")
+@Table(name = "image_hashes", indexes = {
+        @Index(name = "idx_image_hashes_hash64", columnList = "hash64_hi, hash64_lo"),
+        @Index(name = "idx_image_hashes_hash64_hi", columnList = "hash64_hi"),
+        @Index(name = "idx_image_hashes_hash64_lo", columnList = "hash64_lo")
+})
 @Data
 @NoArgsConstructor
 @AllArgsConstructor

src/main/java/ru/soune/nocopy/handler/FileEntityHandler.java

@@ -273,7 +273,7 @@ public class FileEntityHandler implements RequestHandler {
             FileEntity fileEntity = fileEntityRepository.findById(fileId)
                     .orElseThrow(() -> new FileEntityNotFoundException(fileId));
 
-            if (fileEntity.getStatus().equals(FileStatus.DELETED)) {
+            if (fileEntity.getStatus().equals(FileStatus.DELETED) || fileRequest.getFullDelete() == 1) {
                 fileEntityService.deleteFromDisk(fileEntity);
                 response = DeleteFileResponse.builder()
                         .fileId(fileRequest.getFileId())

src/main/java/ru/soune/nocopy/handler/ImageFoundRequestHandler.java

@@ -3,13 +3,14 @@ package ru.soune.nocopy.handler;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import ru.soune.nocopy.dto.BaseRequest;
 import ru.soune.nocopy.dto.BaseResponse;
 import ru.soune.nocopy.dto.MessageCode;
+import ru.soune.nocopy.dto.file.GoogleVisionSearchResponse;
 import ru.soune.nocopy.dto.file.ImageSearchRequest;
 import ru.soune.nocopy.dto.file.YandexSearchResponse;
+import ru.soune.nocopy.service.GoogleVisionSearchService;
 import ru.soune.nocopy.service.YandexSearchService;
 
 @Slf4j
@@ -21,6 +22,8 @@ public class ImageFoundRequestHandler implements RequestHandler {
 
     private final YandexSearchService yandexSearchService;
 
+    private final GoogleVisionSearchService googleVisionSearchService;
+
     @Override
     public BaseResponse handle(BaseRequest request) throws Exception {
         ImageSearchRequest imageSearchRequest = objectMapper.convertValue(request.getMessageBody(),
@@ -30,6 +33,9 @@ public class ImageFoundRequestHandler implements RequestHandler {
 
         YandexSearchResponse response = yandexSearchService.searchByFileEntity(fileId);
 
+        //TODO uncommited when add billing
+//        GoogleVisionSearchResponse googleVisionSearchResponse = googleVisionSearchService.searchByFileEntity(fileId);
+
         return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
                 MessageCode.SUCCESS.getDescription(), response);
     }

src/main/java/ru/soune/nocopy/repository/AuthTokenRepository.java

@@ -1,6 +1,7 @@
 package ru.soune.nocopy.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 import ru.soune.nocopy.entity.AuthToken;
 
@@ -13,4 +14,9 @@ public interface AuthTokenRepository extends JpaRepository<AuthToken, Long> {
     List<AuthToken> findByExpiresAtBefore(LocalDateTime expiresAtBefore);
     Optional<AuthToken> findByLastUsedAtBefore(LocalDateTime lastUsedAt);
     Optional<AuthToken> findByToken(String token);
+    @Query(value = """
+                    SELECT a.user_id FROM auth_tokens a WHERE a.token = :token
+                   """,
+            nativeQuery = true)
+    Long findUserIdByToken(String token);
 }

src/main/java/ru/soune/nocopy/repository/FileEntityRepository.java

@@ -46,5 +46,8 @@ public interface FileEntityRepository extends JpaRepository<FileEntity, String>
     @Query("SELECT f FROM FileEntity f WHERE f.signature = :signature")
     FileEntity findBySignature(@Param("signature") String signature);
 
+    @Query("SELECT f.id FROM FileEntity f WHERE f.filePath = :filePath")
+    String findFileIdByFilePath(@Param("filePath") String filePath);
+
     long countByUserId(Long userId);
 }

src/main/java/ru/soune/nocopy/repository/ImageSimilarityRepository.java

@@ -11,13 +11,12 @@ import java.util.List;
 @Repository
 public interface ImageSimilarityRepository
         extends JpaRepository<FileEntity, String> {
-
     @Query(value = """
-
-            SELECT
-            f.id AS similarFileId,
+        SELECT
+            f.id AS id,
             f.original_file_name AS originalFileName,
             f.file_size AS fileSize,
+            f.user_id AS userId,  
             h.hash64_hi AS hash64Hi,
             h.hash64_lo AS hash64Lo
         FROM image_hashes ref
@@ -32,6 +31,28 @@ public interface ImageSimilarityRepository
             @Param("fileId") String fileId
     );
 
+    @Query(value = """
+        SELECT
+            f.id AS id,
+            f.original_file_name AS originalFileName,
+            f.file_size AS fileSize,
+            f.user_id AS userId,  
+            h.hash64_hi AS hash64Hi,
+            h.hash64_lo AS hash64Lo
+        FROM image_hashes ref
+        JOIN image_hashes h
+            ON ref.file_id <> h.file_id
+        JOIN file_entities f
+            ON f.id = h.file_id
+        WHERE ref.file_id = :fileId AND f.user_id = :userId
+        """,
+            nativeQuery = true)
+    List<SimilarImageProjection> findCandidatesFromUserFiles(
+            @Param("fileId") String fileId,
+            @Param("userId") Long userId
+    );
+
+
     @Query(value = """
     SELECT
         h.hash64_hi AS hash64Hi,

src/main/java/ru/soune/nocopy/repository/SimilarImageProjection.java

@@ -3,7 +3,7 @@ package ru.soune.nocopy.repository;
 public interface SimilarImageProjection {
     Long getHash64Hi();
     Long getHash64Lo();
-    String getFileId();
+    String getId();
     Long getUserId();
     String getOriginalFileName();
     Long getFileSize();

src/main/java/ru/soune/nocopy/service/FileSimilarityService.java

@@ -1,25 +1,26 @@
 package ru.soune.nocopy.service;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import ru.soune.nocopy.dto.file.SimilarFileDTO;
 import ru.soune.nocopy.dto.file.SimilarityFilter;
+import ru.soune.nocopy.entity.file.ImageHashEntity;
+import ru.soune.nocopy.repository.AuthTokenRepository;
 import ru.soune.nocopy.repository.ImageHashRepository;
 import ru.soune.nocopy.repository.ImageSimilarityRepository;
 import ru.soune.nocopy.repository.SimilarImageProjection;
 import ru.soune.nocopy.util.FileUtil;
 
-import java.util.AbstractMap;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
+@Slf4j
 public class FileSimilarityService {
 
     private final ImageSimilarityRepository repository;
@@ -28,6 +29,8 @@ public class FileSimilarityService {
 
     private final FileUtil fileUtil;
 
+    private final AuthTokenRepository authTokenRepository;
+
     public List<SimilarFileDTO> findSimilarFiles(String fileId) {
         var imageHashEntity = hashRepository.findById(fileId)
                 .orElseThrow(() -> new RuntimeException("Hash not found"));
@@ -54,7 +57,8 @@ public class FileSimilarityService {
                     }
 
                     return SimilarFileDTO.builder()
-                            .fileId(c.getFileId())
+                            .fileId(c.getId())
+                            .ownerId(c.getUserId())
                             .originalFileName(c.getOriginalFileName())
                             .fileSize(c.getFileSize())
                             .hammingDistance(hamming)
@@ -70,8 +74,13 @@ public class FileSimilarityService {
                                                                int duplicate, int similar) {
         List<SimilarImageProjection> candidates = repository.findCandidates(fileId);
 
-        var imageHashEntity = hashRepository.findById(fileId)
-                .orElseThrow(() -> new RuntimeException("Hash not found"));
+        Optional<ImageHashEntity> hashOptional = hashRepository.findById(fileId);
+
+        if (hashOptional.isEmpty()) {
+            return Collections.emptyList();
+        }
+
+        var imageHashEntity = hashOptional.get();
 
         Long hash64Hi = imageHashEntity.getHash64Hi();
         Long hash64Lo = imageHashEntity.getHash64Lo();
@@ -101,7 +110,7 @@ public class FileSimilarityService {
                     }
 
                     return SimilarFileDTO.builder()
-                            .fileId(similarImageProjection.getFileId())
+                            .fileId(similarImageProjection.getId())
                             .originalFileName(similarImageProjection.getOriginalFileName())
                             .fileSize(similarImageProjection.getFileSize())
                             .hammingDistance(hamming)
@@ -122,14 +131,15 @@ public class FileSimilarityService {
         return duplicates;
     }
 
-    public Page<SimilarFileDTO> findSimilarFiles(String fileId, SimilarityFilter filter, Pageable pageable) {
+    public Page<SimilarFileDTO> findSimilarFiles(String fileId, SimilarityFilter filter, Pageable pageable, String authToken) {
         var imageHashEntity = hashRepository.findById(fileId)
                 .orElseThrow(() -> new RuntimeException("Hash not found"));
 
         Long hash64Hi = imageHashEntity.getHash64Hi();
         Long hash64Lo = imageHashEntity.getHash64Lo();
 
-        List<SimilarImageProjection> candidates = repository.findCandidates(fileId);
+        List<SimilarImageProjection> candidates = authToken.equals("all") ? repository.findCandidates(fileId):
+                repository.findCandidatesFromUserFiles(fileId, authTokenRepository.findUserIdByToken(authToken));
 
         List<String> similarityLevels = (filter != null && filter.getSimilarityLevels() != null)
                 ? filter.getSimilarityLevels()
@@ -170,7 +180,8 @@ public class FileSimilarityService {
         }
 
         return SimilarFileDTO.builder()
-                .fileId(similarImageProjection.getFileId())
+                .fileId(similarImageProjection.getId())
+                .ownerId(similarImageProjection.getUserId())
                 .originalFileName(similarImageProjection.getOriginalFileName())
                 .fileSize(similarImageProjection.getFileSize())
                 .hammingDistance(hamming)

src/main/java/ru/soune/nocopy/service/GoogleVisionSearchService.java

@@ -0,0 +1,205 @@
+package ru.soune.nocopy.service;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.auth.oauth2.GoogleCredentials;
+import com.google.cloud.vision.v1.*;
+import com.google.protobuf.ByteString;
+import jakarta.annotation.PostConstruct;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.stereotype.Service;
+import ru.soune.nocopy.dto.BaseResponse;
+import ru.soune.nocopy.dto.MessageCode;
+import ru.soune.nocopy.dto.file.GoogleVisionSearchResponse;
+import ru.soune.nocopy.entity.file.FileEntity;
+import ru.soune.nocopy.exception.NotValidFieldException;
+import ru.soune.nocopy.repository.FileEntityRepository;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class GoogleVisionSearchService {
+    private final FileEntityRepository fileEntityRepository;
+
+    private final ObjectMapper objectMapper;
+
+    private ImageAnnotatorClient visionClient;
+
+    @PostConstruct
+    public void init() throws IOException {
+        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        objectMapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
+
+        initVisionClient();
+    }
+
+    private void initVisionClient() throws IOException {
+        try (InputStream credentialsStream = new ClassPathResource("config/google-service-account.json").getInputStream()) {
+            GoogleCredentials credentials = GoogleCredentials.fromStream(credentialsStream);
+
+            ImageAnnotatorSettings settings = ImageAnnotatorSettings.newBuilder()
+                    .setCredentialsProvider(() -> credentials)
+                    .build();
+
+            this.visionClient = ImageAnnotatorClient.create(settings);
+        }
+    }
+
+    public GoogleVisionSearchResponse searchByFileEntity(String fileId) throws IOException {
+        FileEntity fileEntity = fileEntityRepository.findById(fileId)
+                .orElseThrow(() -> {
+                    throw new NotValidFieldException("File not found", new BaseResponse(20007,
+                            MessageCode.FILE_NOT_FOUND.getCode(), MessageCode.FILE_NOT_FOUND.getDescription(),
+                            Map.of("fileId", fileId)));
+                });
+
+        if (!isImageFile(fileEntity)) {
+            throw new NotValidFieldException("File not image", new BaseResponse(20007,
+                    MessageCode.INVALID_FIELD.getCode(), MessageCode.INVALID_FIELD.getDescription(),
+                    Map.of("file_type", fileEntity.getMimeType())));
+        }
+
+        byte[] fileBytes;
+        try {
+            fileBytes = readFileFromDisk(fileEntity);
+        } catch (IOException e) {
+            throw new NotValidFieldException("File not found or cannot read file", new BaseResponse(20007,
+                    MessageCode.FILE_NOT_FOUND.getCode(), MessageCode.FILE_NOT_FOUND.getDescription(),
+                    Map.of("fileId", fileId,
+                            "filePath", fileEntity.getFilePath())));
+        }
+
+        return callGoogleVisionApi(fileBytes);
+    }
+
+    private boolean isImageFile(FileEntity fileEntity) {
+        String mimeType = fileEntity.getMimeType();
+        return mimeType != null && mimeType.startsWith("image");
+    }
+
+    private byte[] readFileFromDisk(FileEntity fileEntity) throws IOException {
+        Path filePath = Path.of(fileEntity.getFilePath());
+
+        if (!Files.exists(filePath) || !Files.isReadable(filePath)) {
+            throw new IOException("Cannot read file: " + fileEntity.getFilePath());
+        }
+
+        return Files.readAllBytes(filePath);
+    }
+
+    private GoogleVisionSearchResponse callGoogleVisionApi(byte[] imageBytes) throws IOException {
+        ByteString imgBytes = ByteString.copyFrom(imageBytes);
+        Image image = Image.newBuilder()
+                .setContent(imgBytes)
+                .build();
+
+        Feature feature = Feature.newBuilder()
+                .setType(Feature.Type.WEB_DETECTION)
+                .setMaxResults(20)
+                .build();
+
+        AnnotateImageRequest request = AnnotateImageRequest.newBuilder()
+                .addFeatures(feature)
+                .setImage(image)
+                .build();
+
+        BatchAnnotateImagesResponse response = visionClient.batchAnnotateImages(List.of(request));
+
+        if (response.getResponsesCount() == 0) {
+            throw new IOException("Empty response from Google Vision API");
+        }
+
+        AnnotateImageResponse singleResponse = response.getResponses(0);
+
+        if (singleResponse.hasError()) {
+            throw new IOException("Google Vision API error: " + singleResponse.getError().getMessage());
+        }
+
+        return convertToResponse(singleResponse.getWebDetection());
+    }
+
+    private GoogleVisionSearchResponse convertToResponse(WebDetection webDetection) {
+        GoogleVisionSearchResponse response = new GoogleVisionSearchResponse();
+
+        if (webDetection.getBestGuessLabelsCount() > 0) {
+            response.setBestGuessLabels(
+                    webDetection.getBestGuessLabelsList().stream()
+                            .map(label -> {
+                                GoogleVisionSearchResponse.BestGuessLabel dtoLabel =
+                                        new GoogleVisionSearchResponse.BestGuessLabel();
+                                dtoLabel.setLabel(label.getLabel());
+                                dtoLabel.setLanguageCode(label.getLanguageCode());
+                                return dtoLabel;
+                            })
+                            .toList()
+            );
+        }
+
+        if (webDetection.getFullMatchingImagesCount() > 0) {
+            response.setFullMatchingImages(
+                    webDetection.getFullMatchingImagesList().stream()
+                            .map(img -> {
+                                GoogleVisionSearchResponse.ImageResult dtoImg =
+                                        new GoogleVisionSearchResponse.ImageResult();
+                                dtoImg.setUrl(img.getUrl());
+                                dtoImg.setScore(img.getScore());
+                                return dtoImg;
+                            })
+                            .toList()
+            );
+        }
+
+        if (webDetection.getVisuallySimilarImagesCount() > 0) {
+            response.setVisuallySimilarImages(
+                    webDetection.getVisuallySimilarImagesList().stream()
+                            .map(img -> {
+                                GoogleVisionSearchResponse.ImageResult dtoImg =
+                                        new GoogleVisionSearchResponse.ImageResult();
+                                dtoImg.setUrl(img.getUrl());
+                                dtoImg.setScore(img.getScore());
+                                return dtoImg;
+                            })
+                            .toList()
+            );
+        }
+
+        if (webDetection.getPagesWithMatchingImagesCount() > 0) {
+            response.setPagesWithMatchingImages(
+                    webDetection.getPagesWithMatchingImagesList().stream()
+                            .map(page -> {
+                                GoogleVisionSearchResponse.PageResult dtoPage =
+                                        new GoogleVisionSearchResponse.PageResult();
+                                dtoPage.setUrl(page.getUrl());
+                                dtoPage.setPageTitle(page.getPageTitle());
+                                return dtoPage;
+                            })
+                            .toList()
+            );
+        }
+
+        if (webDetection.getPartialMatchingImagesCount() > 0) {
+            response.setPartialMatchingImages(
+                    webDetection.getPartialMatchingImagesList().stream()
+                            .map(img -> {
+                                GoogleVisionSearchResponse.ImageResult dtoImg =
+                                        new GoogleVisionSearchResponse.ImageResult();
+                                dtoImg.setUrl(img.getUrl());
+                                dtoImg.setScore(img.getScore());
+                                return dtoImg;
+                            })
+                            .toList()
+            );
+        }
+
+        return response;
+    }
+}

src/main/java/ru/soune/nocopy/service/file/FileEntityService.java

@@ -59,7 +59,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());
                 }
             }
@@ -202,7 +202,8 @@ public class FileEntityService {
 
         Files.delete(path);
 
-        markAsDeleted(fileEntity);
+//        markAsDeleted(fileEntity);
+        fileEntityRepository.delete(fileEntity);
 
         return true;
     }
@@ -248,6 +249,10 @@ public class FileEntityService {
         return fileEntityRepository.findBySignature(signature);
     }
 
+    public String findFileIdByPath(String filePath) {
+        return fileEntityRepository.findFileIdByFilePath(filePath);
+    }
+
     public File getFileById(String id) {
         try {
             FileEntity fileEntity = fileEntityRepository.findById(id).orElseThrow(() ->
@@ -340,6 +345,7 @@ public class FileEntityService {
                 .downloadUrl("/api/v" + version + "/files/download/" + fileEntity.getId())
                 .existsOnDisk(existsOnDisk)
                 .supportId(fileEntity.getSupportId())
+                .protectStatus(fileEntity.getProtectionStatus().toString())
                 .build();
     }
 

src/main/java/ru/soune/nocopy/service/file/FileStatsService.java

@@ -6,6 +6,7 @@ import ru.soune.nocopy.dto.file.FileInfoUserResponse;
 import ru.soune.nocopy.entity.file.FileEntity;
 import ru.soune.nocopy.entity.file.FileStatus;
 import ru.soune.nocopy.entity.file.FileType;
+import ru.soune.nocopy.entity.file.ProtectionStatus;
 import ru.soune.nocopy.repository.FileEntityRepository;
 
 import java.util.List;
@@ -26,23 +27,37 @@ public class FileStatsService {
                 .fileCount(calculateTotalCount(files))
                 .filesCheck(calculateByStatus(files, FileStatus.CHECKED))
                 .filesViolation(calculateByStatus(files, FileStatus.VIOLATION))
+                .protectedFilesCount(protectedUserFiles(files))
 
                 .imagesSize(calculateMediaSize(files, FileType.IMAGE))
                 .imagesCount(calculateMediaCount(files, FileType.IMAGE))
                 .imagesCheck(calculateMediaByStatus(files, FileType.IMAGE, FileStatus.CHECKED))
                 .imagesViolations(calculateMediaByStatus(files, FileType.IMAGE, FileStatus.VIOLATION))
+                .protectedImageFilesCount(protectedUserFiles(files, FileType.IMAGE))
 
                 .videosSize(calculateMediaSize(files, FileType.VIDEO))
                 .videosCount(calculateMediaCount(files, FileType.VIDEO))
                 .videosCheck(calculateMediaByStatus(files, FileType.VIDEO, FileStatus.CHECKED))
                 .videosViolations(calculateMediaByStatus(files, FileType.VIDEO, FileStatus.VIOLATION))
+                .protectedVideoFilesCount(protectedUserFiles(files, FileType.VIDEO))
 
                 .audiosSize(calculateMediaSize(files, FileType.AUDIO))
                 .audiosCount(calculateMediaCount(files, FileType.AUDIO))
                 .audiosCheck(calculateMediaByStatus(files, FileType.AUDIO, FileStatus.CHECKED))
                 .audiosViolations(calculateMediaByStatus(files, FileType.AUDIO, FileStatus.VIOLATION))
+                .protectedAudioFilesCount(protectedUserFiles(files, FileType.AUDIO))
                 .build();
     }
+
+    private Long protectedUserFiles(List<FileEntity> files) {
+        return files.stream().filter(file -> file.getProtectionStatus() == ProtectionStatus.PROTECTED).count();
+    }
+
+    private Long protectedUserFiles(List<FileEntity> files, FileType type) {
+        return files.stream().filter(file -> file.getProtectionStatus() == ProtectionStatus.PROTECTED &&
+                file.getMimeType().equals(type.getDisplayName())).count();
+    }
+
     private Long calculateTotalSize(List<FileEntity> files) {
         return files.stream()
                 .filter(file -> file.getStatus() != FileStatus.DELETED)

src/main/java/ru/soune/nocopy/service/file/FileUploadService.java

@@ -10,12 +10,13 @@ public interface FileUploadService {
     FileUploadSession initUpload(Long userId, String fileName,
                                  String fileType, String extension, long fileSize);
 
-    UploadProgressResponse uploadChunk(String uploadId, Integer chunkNumber,
-                                       MultipartFile chunkFile) throws IOException;
+    void handleExpiredSession(FileUploadSession session);
+
+    void cancelUpload(String uploadId);
+
+    UploadProgressResponse uploadChunk(String uploadId, Integer chunkNumber, MultipartFile chunkFile, Integer findSimilar);
 
     UploadProgressResponse getUploadProgress(String uploadId);
 
-    void handleExpiredSession(FileUploadSession session);
-
-    public void cancelUpload(String uploadId);
+    void completeFileProcessingAsync(FileUploadSession session);
 }

src/main/java/ru/soune/nocopy/service/file/impl/FileUploadServiceImpl.java

@@ -147,10 +147,38 @@ public class FileUploadServiceImpl implements FileUploadService {
         return savedSession;
     }
 
+    @Override
+    @Transactional
+    public void handleExpiredSession(FileUploadSession session) {
+        session.setStatus(UploadStatus.FAILED);
+        session.setLastError("Upload session expired");
+        sessionRepository.save(session);
+
+        CompletableFuture.runAsync(() -> cleanupSessionFiles(session));
+    }
+
+    @Override
+    @Transactional
+    public void cancelUpload(String uploadId) {
+        FileUploadSession session = sessionRepository.findById(uploadId)
+                .orElseThrow(() -> new UploadSessionNotFoundException(uploadId));
+
+        if (session.getStatus() == UploadStatus.COMPLETED || session.getStatus() == UploadStatus.CANCELLED) {
+            throw new FileUploadException("Cannot cancel completed or cancelled upload");
+        }
+
+        session.setStatus(UploadStatus.CANCELLED);
+        sessionRepository.save(session);
+
+        CompletableFuture.runAsync(() -> cleanupSessionFiles(session));
+
+        log.info("Upload cancelled: {}", uploadId);
+    }
+
     @Override
     @Transactional
     public UploadProgressResponse uploadChunk(String uploadId, Integer chunkNumber,
-                                              MultipartFile chunkFile) {
+                            MultipartFile chunkFile, Integer findSimilar) {
         FileUploadSession session = sessionRepository.findById(uploadId)
                 .orElseThrow(() -> new UploadSessionNotFoundException(uploadId));
 
@@ -176,52 +204,7 @@ public class FileUploadServiceImpl implements FileUploadService {
             throw new ChunkSizeExceededException(chunkFile.getSize(), chunkSize);
         }
 
-        return processChunk(session, chunkNumber, chunkFile);
-    }
-
-    @Override
-    @Transactional
-    public void handleExpiredSession(FileUploadSession session) {
-        session.setStatus(UploadStatus.FAILED);
-        session.setLastError("Upload session expired");
-        sessionRepository.save(session);
-
-        CompletableFuture.runAsync(() -> cleanupSessionFiles(session));
-    }
-
-    @Async("fileUploadTaskExecutor")
-    @Transactional
-    public void assembleFileAsync(FileUploadSession session) throws DuplicateImageException {
-        try {
-            assembleFile(session);
-            log.info("File assembly completed successfully for session: {}",
-                    session.getUploadId());
-        } catch (DuplicateImageException e) {
-            throw new DuplicateImageException("DUBL", e.duplicateFileId(), e.userId());
-        } catch (Exception e) {
-            log.error("Failed to assemble file for session {}: {}",
-                    session.getUploadId(), e.getMessage(), e);
-
-            handleAssemblyFailure(session, e);
-        }
-    }
-
-    @Override
-    @Transactional
-    public void cancelUpload(String uploadId) {
-        FileUploadSession session = sessionRepository.findById(uploadId)
-                .orElseThrow(() -> new UploadSessionNotFoundException(uploadId));
-
-        if (session.getStatus() == UploadStatus.COMPLETED || session.getStatus() == UploadStatus.CANCELLED) {
-            throw new FileUploadException("Cannot cancel completed or cancelled upload");
-        }
-
-        session.setStatus(UploadStatus.CANCELLED);
-        sessionRepository.save(session);
-
-        CompletableFuture.runAsync(() -> cleanupSessionFiles(session));
-
-        log.info("Upload cancelled: {}", uploadId);
+        return processChunk(session, chunkNumber, chunkFile, findSimilar);
     }
 
     @Override
@@ -232,37 +215,9 @@ public class FileUploadServiceImpl implements FileUploadService {
         return UploadProgressResponse.fromSession(session);
     }
 
-    private void validateSession(FileUploadSession session) {
-        UploadStatus status = session.getStatus();
-
-        if (status == UploadStatus.FAILED) {
-            if (session.getRetryCount() >= maxRetryAttempts) {
-                throw new FileUploadException(
-                        "Upload failed after maximum retry attempts");
-            }
-            session.setStatus(UploadStatus.UPLOADING);
-            session.setRetryCount(session.getRetryCount() + 1);
-            sessionRepository.save(session);
-            log.info("Retrying failed upload session: {}, attempt: {}",
-                    session.getUploadId(), session.getRetryCount());
-        }
-
-        if (status == UploadStatus.COMPLETED) {
-            throw new FileUploadException("Upload already completed");
-        }
-
-        if (status == UploadStatus.CANCELLED) {
-            throw new FileUploadException("Upload was cancelled");
-        }
-
-        if (status == UploadStatus.INITIATED) {
-            session.setStatus(UploadStatus.UPLOADING);
-            sessionRepository.save(session);
-        }
-    }
-
     @Async("fileUploadTaskExecutor")
     @Transactional
+    @Override
     public void completeFileProcessingAsync(FileUploadSession session) {
         try {
             Path filePath = Paths.get(session.getFilePath());
@@ -301,12 +256,42 @@ public class FileUploadServiceImpl implements FileUploadService {
         }
     }
 
-    private UploadProgressResponse processChunk(FileUploadSession session, Integer chunkNumber, MultipartFile chunkFile) {
+    private void validateSession(FileUploadSession session) {
+        UploadStatus status = session.getStatus();
+
+        if (status == UploadStatus.FAILED) {
+            if (session.getRetryCount() >= maxRetryAttempts) {
+                throw new FileUploadException(
+                        "Upload failed after maximum retry attempts");
+            }
+            session.setStatus(UploadStatus.UPLOADING);
+            session.setRetryCount(session.getRetryCount() + 1);
+            sessionRepository.save(session);
+            log.info("Retrying failed upload session: {}, attempt: {}",
+                    session.getUploadId(), session.getRetryCount());
+        }
+
+        if (status == UploadStatus.COMPLETED) {
+            throw new FileUploadException("Upload already completed");
+        }
+
+        if (status == UploadStatus.CANCELLED) {
+            throw new FileUploadException("Upload was cancelled");
+        }
+
+        if (status == UploadStatus.INITIATED) {
+            session.setStatus(UploadStatus.UPLOADING);
+            sessionRepository.save(session);
+        }
+    }
+
+    private UploadProgressResponse processChunk(FileUploadSession session, Integer chunkNumber, MultipartFile chunkFile,
+                                                Integer findSimilar) {
         String chunkPath = null;
 
         try {
             if (session.getChunkPaths().containsKey(chunkNumber)) {
-                return handleExistingChunk(session, chunkNumber, chunkFile);
+                return handleExistingChunk(session, chunkNumber, chunkFile, findSimilar);
             }
 
             chunkPath = saveChunkWithIntegrityCheck(session, chunkNumber, chunkFile);
@@ -327,7 +312,7 @@ public class FileUploadServiceImpl implements FileUploadService {
 
                 String finalFilePath = assembleFileSynchronously(session);
 
-                if (session.getFileType().startsWith("image")) {
+                if (session.getFileType().startsWith("image") && findSimilar == 0) {
                     checkForDuplicatesSynchronously(finalFilePath);
                 }
 
@@ -382,7 +367,7 @@ public class FileUploadServiceImpl implements FileUploadService {
     }
 
     private void checkForDuplicatesSynchronously(String filePath)
-            throws IOException {
+            throws IOException , DuplicateImageException {
         Path path = Paths.get(filePath);
         Map<String, Long> hash = imageHashService.calculateHash(path);
 
@@ -390,14 +375,15 @@ public class FileUploadServiceImpl implements FileUploadService {
                 hash.get("hi"), hash.get("low"));
 
         if (!duplicates.isEmpty()) {
-            throw new DuplicateImageException("Duplicate", duplicates.get(0).getFileId(),
-                    duplicates.get(0).getUserId());
+            throw new DuplicateImageException("Duplicate", duplicates.getFirst().getId(),
+                    duplicates.getFirst().getUserId());
         }
     }
 
     private UploadProgressResponse handleExistingChunk(FileUploadSession session,
                                                        Integer chunkNumber,
-                                                       MultipartFile chunkFile) throws IOException {
+                                                       MultipartFile chunkFile,
+                                                       Integer findSimilar) throws IOException {
         String existingPath = session.getChunkPaths().get(chunkNumber);
         Path chunkPath = Paths.get(existingPath);
 
@@ -406,7 +392,7 @@ public class FileUploadServiceImpl implements FileUploadService {
             session.setChunksUploaded(session.getChunksUploaded() - 1);
             sessionRepository.save(session);
 
-            return processChunk(session, chunkNumber, chunkFile);
+            return processChunk(session, chunkNumber, chunkFile, findSimilar);
         }
 
         long existingSize = Files.size(chunkPath);
@@ -417,7 +403,7 @@ public class FileUploadServiceImpl implements FileUploadService {
             session.setChunksUploaded(session.getChunksUploaded() - 1);
             sessionRepository.save(session);
 
-            return processChunk(session, chunkNumber, chunkFile);
+            return processChunk(session, chunkNumber, chunkFile, findSimilar);
         }
 
         return UploadProgressResponse.fromSession(session);

src/main/resources/config/google-service-account.json

@@ -0,0 +1,13 @@
+{
+  "type": "service_account",
+  "project_id": "ncp-1-483610",
+  "private_key_id": "94ea762d9a56a3362155ab33f8959bfec5ae8b42",
+  "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCwjY9sYQfeqHwr\nqKgr8sw3Qfao/vzTa9wnmbZvrM6UJ3ukMkj08w50rP0udKxTRWnH6rpSQnD696GS\nY0/qrjEO1LeMdPJ+R0v8B+Z3PlpuQtfmxXALF4QbGQxeWg9NK7o4JM0kANkV80me\nxo6T7WnywQm1SfBIPZjwLBhkn7pfcdTDJFiZkH073yB6/tPsgd6TRQDmlvGsrGmq\nCf8E/DhxaFIHUpoUEGpxeuFPmvAicEWdURCtCXeiAxRQv+Gy0mP7uGGY6C3SeYfJ\n5PNLopgnN2ATCeIp1EjJnH28sAEvE0e/K/9z4ZThgh1mB1CaLkaQweq3YQWoiyGF\nfcoPpJ8LAgMBAAECggEABluSppx35BS9I/VW2P5NTFAbycok4JgpvWNTpoHajos9\ncJQ+/FMkWh9AnsOk0PrW7FQPkZbC6sawEs1wu0q6iYYvdedgNBvtKI5ARlsAdqgB\njlXdywh1wWQNhfhIRMcmVY89s+Yz6w5vwD/2Mm2COzOoXdbjyDYvo7ZyymzWEUnA\nwaxg7aF5cGC+iqf+l2Ym8XdY2ZavvyZ8RwgKfQGfcPuhMogg+H6au4yvXPBNxv0u\nxDCbOm2ezA4cLyKyFqi6S5KiGmk2LnCOoLrkIalmTQhnptFZofGs4ezuOvhZ6ZTi\nQVDayHzbBygmFzJn1wzw83IQ7QgMmWYoEjC+JcRlgQKBgQDg6U3QPxhdvX1dCzBj\nef6yUrIeJhiILvKnAzi6MUhaWP0mU6kcIIn8DS78ojML+leKh2R7JQFFrt87kHjK\npcaTC7wkgNCa6e3d+U95EIVUvPVrvQ5O4zIM7evTiPEeZhN9Dhuh0o3eeYxfIqZO\nsN0y8F/xPWdGW5CcdL7dcTOUkwKBgQDI9Qzr7poRaHM8jzS0M4Q4cVsYdC2P6KgI\nWD9Qbbl1rVi14YLt1FSd4w7U4YJ/kaWOrdtKklqAvM3oq5J0oEQekpixsxFvXdW+\ngJTzOoOq2lgCThBagwVKOFkAH/CwPkhFPwuVBgfVNiajbrcGF6i5VWzIHCXT+IDe\naSw64dqOqQKBgDp9EYpNTjXaeEaBCWVlLVIMZVunxotrwhiiotbwyAMOz05vRTQW\nVivg9c4nFCVSRf+1c/D+T5Vig5UG3hK9B6Xn0Fah1R3kJcKq+frey/2cYipRcO4c\n8UAhg0lwfFvOadUEnTT4/4HSlCmNZjhikDOWBS1ELZ5DY5j8V0JZFPPXAoGAXi0B\nLjw2dbwGbTYLk/ukljMBZvdjNtLolGiO22lghbaEIVCa5Ewij4+OLtO0LYabGL9/\nSnZF9ZkFwmlNjFxjMBSxfG2X2SIXflyR8V7Vv6btob7lyRUn0H2RsA5H5MB7bAA8\ntE0MNK5Y8zR6j19dEeXnwev3ClymQBT3xmx72WkCgYAEhx+piCTvD+2SFBweM3J4\ng6LefBXFWHSlftQF1Er5mI+5kr4i3M5d6zh8lKcLpygSS1q5/03CMUxEiLTZMLmG\nVX/+UgEWzdEe1Dr/7YPYcOSPiBpTRyPiq6KQC/KtPPWHouGyaPO1SAAZhlk97dQs\n9mosf4Re69Re8U6MxxGw9Q==\n-----END PRIVATE KEY-----\n",
+  "client_email": "image-search-service@ncp-1-483610.iam.gserviceaccount.com",
+  "client_id": "105492884344006453429",
+  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+  "token_uri": "https://oauth2.googleapis.com/token",
+  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/image-search-service%40ncp-1-483610.iam.gserviceaccount.com",
+  "universe_domain": "googleapis.com"
+}

src/main/resources/db/migration/V1__add_image_hash_prefix_index.sql

@@ -1,2 +0,0 @@
-CREATE INDEX idx_image_hash_prefix
-    ON image_hashes ((hash_value >> 48));