NCBACK-33

# Conflicts:
#	src/main/java/ru/soune/nocopy/entity/file/ImageProtection.java
#	src/main/java/ru/soune/nocopy/entity/user/User.java
#	src/main/java/ru/soune/nocopy/handler/ImageFoundRequestHandler.java
#	src/main/java/ru/soune/nocopy/repository/AuthTokenRepository.java
#	src/main/java/ru/soune/nocopy/service/file/impl/FileUploadServiceImpl.java

.env

@@ -1,10 +1,19 @@
+# Postgres
 POSTGRES_DB=no_copy_
-POSTGRES_USER=postgres
+POSTGRES_USER=ncp_db
-POSTGRES_PASSWORD=postgres
+POSTGRES_PASSWORD=ncpDbApp
 POSTGRES_PORT=5432
 POSTGRES_HOST=postgres
 
+# Redis
 REDIS_HOST=redis
 REDIS_PORT=6379
 
+# Backend server
 SERVER_PORT=8080
+
+# Postfix
+MAIL_HOST_PROD=postfix-production
+MAIL_PORT_PROD=25
+MAIL_USERNAME_PROD=noreply@nocopy.com
+SMTP_PASSWORD_PROD=nocopy!nocopy!

README.md

@@ -0,0 +1,78 @@
+Создаем сеть:
+docker network create app-network
+
+Войти в БД:
+docker exec -it postgres psql -U ncp_db -d no_copy_
+
+Выполнить команду:
+\du
+
+Должен быть один пользователь:
+                                    List of roles
+Role name |                         Attributes
+-----------+------------------------------------------------------------
+ncp_db    | Superuser, Create role, Create DB, Replication, Bypass RLS
+
+суперпользователь БД:
+postgres/postgres 
+пользователь бд для бэка
+ncp_db / ncpDbApp
+
+Подключение к БД для приложения,если volume не существует :
+
+Создаться автоматически.
+
+Если уже существует volume :
+
+docker exec -it postgres psql -U postgres -d postgres
+
+CREATE USER ncp_db WITH PASSWORD 'ncpDbApp';
+
+GRANT ALL PRIVILEGES ON DATABASE no_copy_ TO ncp_db;
+
+\du
+
+\q
+
+-------
+
+psql -U postgres -d no_copy_
+
+-- база
+
+GRANT CONNECT ON DATABASE no_copy_ TO ncp_db;
+
+-- схема
+
+GRANT USAGE ON SCHEMA public TO ncp_db;
+
+-- существующие таблицы
+
+GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO ncp_db;
+
+-- существующие sequence (очень важно для id)
+
+GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public TO ncp_db;
+
+-- будущие таблицы
+
+ALTER DEFAULT PRIVILEGES IN SCHEMA public
+GRANT ALL ON TABLES TO ncp_db;
+
+ALTER DEFAULT PRIVILEGES IN SCHEMA public
+GRANT ALL ON SEQUENCES TO ncp_db;
+
+
+Зайти в контейнер:
+docker exec -it {name} bash
+
+------
+
+Создать для сущности FileEntity sequence для икремента индетификатора
+
+CREATE SEQUENCE IF NOT EXISTS file_support_id_seq START 1;
+
+ALTER TABLE file_entities
+ALTER COLUMN support_id
+SET DEFAULT nextval('file_support_id_seq');
+

build.gradle

@@ -21,6 +21,9 @@ configurations {
 
 repositories {
 	mavenCentral()
+	flatDir {
+		dirs 'libs'
+	}
 }
 
 dependencies {
@@ -30,6 +33,12 @@ dependencies {
 	implementation 'org.springframework.security:spring-security-crypto:6.5.3'
 	implementation 'org.mapstruct:mapstruct:1.5.5.Final'
 	implementation 'commons-validator:commons-validator:1.7'
+	implementation group: 'org.springframework.boot', name: 'spring-boot-starter-mail', version: '4.0.1'
+
+	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'
 	implementation 'tools.jackson.core:jackson-core:3.0.3'
@@ -49,6 +58,9 @@ dependencies {
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.mockito:mockito-core:5.3.1'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+
+	implementation name: 'testlib-fat-0.2.1-all'
+
 }
 
 tasks.named('test') {

docker-compose.yaml

@@ -17,8 +17,31 @@ services:
     command: tail -f /dev/null
     restart: unless-stopped
 
+#  postfix:
+#    image: boky/postfix:latest
+#    container_name: postfix-production
+#    hostname: ${DOMAIN:-no-copy.ru}
+#    environment:
+#      - DOMAIN=${DOMAIN:-no-copy.ru}
+#      - ALLOWED_SENDER_DOMAINS=*
+#      - RELAYHOST=
+#      - DISABLE_SMTP_AUTH=
+#      - SMTP_USERNAME=${MAIL_USERNAME:-noreply@no-copy.ru}
+#      - SMTP_PASSWORD=${SMTP_PASSWORD:-nocopy!nocopy!}
+#      - RELAY_NETWORKS=172.16.0.0/12
+#      - POSTFIX_mynetworks=127.0.0.0/8 172.17.0.0/16 172.16.0.0/12
+#      - POSTFIX_smtpd_relay_restrictions=permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination
+#      - POSTFIX_smtpd_recipient_restrictions=permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination
+#      - DISABLE_SIGNING=true
+#    ports:
+#      - "25:25"
+#      - "587:587"
+#    networks:
+#      - app-network
+#    restart: unless-stopped
+
   db:
-    image: postgres:17
+    image: postgres:17.7
     restart: always
     deploy:
       resources:
@@ -30,14 +53,17 @@ services:
           memory: 1G
     environment:
       POSTGRES_DB: no_copy_
-      POSTGRES_USER: postgres
+      #      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: postgres
+      #      POSTGRES_PASSWORD: postgres
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       POSTGRES_SHARED_BUFFERS: 512MB
       POSTGRES_EFFECTIVE_CACHE_SIZE: 1536MB
     ports:
       - "54320:5432"
     volumes:
       - pgdata:/var/lib/postgresql/data
+      - ./init-scripts:/docker-entrypoint-initdb.d:ro
     container_name: postgres
     networks:
       app-network:
@@ -51,25 +77,35 @@ 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: 1048576
+      #      FILE_CHUNK_SIZE: 1048576
       FILE_CHUNK_SIZE: 1000000
       POSTGRES_DB: no_copy_
-      POSTGRES_USER: postgres
+      #      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: postgres
+      #      POSTGRES_PASSWORD: postgres
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       POSTGRES_PORT: 5432
       POSTGRES_HOST: db
+      STORAGE_SERVICE_URL: http://storage:8081
+      SPRING_PROFILES_ACTIVE: docker
       YANDEX_API_KEY: AQVNyaVaUmgUb1GMCtf5zSEqFxy0woXrcMOOB43q
       YANDEX_FOLDER_ID: b1gokpdbm6qfpsou8pcd
       YANDEX_SEARCH_URL: "https://searchapi.api.cloud.yandex.net/v2/image/search_by_image"
-      STORAGE_SERVICE_URL: http://storage:8081
+#      MAIL_HOST: postfix
-      SPRING_PROFILES_ACTIVE: docker
+#      MAIL_PORT: 25
+#      MAIL_USERNAME: noreply@no-copy.ru
+#      SMTP_PASSWORD: nocopy!nocopy!
+#      SPRING_MAIL_PROPERTIES_MAIL_SMTP_STARTTLS_ENABLE: "false"
+#      SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH: "false"
+#      SPRING_MAIL_PROPERTIES_MAIL_DEBUG: "true"
     depends_on:
       - db
     ports:
@@ -82,6 +118,10 @@ services:
           - api
     volumes:
       - uploads_data:/data/uploads:rw
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d no_copy_" ]
+      interval: 10s
+      retries: 5
 
   grafana:
     image: grafana/grafana:10.3.1
@@ -234,7 +274,7 @@ volumes:
   loki_rules:
   uploads_data:
   prometheus_data:
-
+#  postfix-data:
 networks:
   app-network:
     external: true

infrastructure/jenkins/deploy.groovy

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

init-scripts/01-init.sql

@@ -0,0 +1,19 @@
+DO $$
+BEGIN
+   IF NOT EXISTS (SELECT FROM pg_roles WHERE rolname = 'ncp_db') THEN
+      CREATE USER ncp_db WITH PASSWORD 'ncpDbApp';
+END IF;
+END
+$$;
+
+GRANT CONNECT ON DATABASE no_copy_ TO ncp_db;
+GRANT USAGE ON SCHEMA public TO ncp_db;
+
+GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO ncp_db;
+GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public TO ncp_db;
+
+ALTER DEFAULT PRIVILEGES IN SCHEMA public
+GRANT ALL ON TABLES TO ncp_db;
+
+ALTER DEFAULT PRIVILEGES IN SCHEMA public
+GRANT ALL ON SEQUENCES TO ncp_db;

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/ApplicationConfig.java

@@ -1,17 +1,49 @@
 package ru.soune.nocopy.configuration;
 
+import com.vrt.AudioFilePathProvider;
+import com.vrt.fileprotection.FileProtector;
+import com.vrt.fileprotection.audio.AudioLocalSearch;
+import com.vrt.fileprotection.image.ImageLocalSearch;
+import com.vrt.fileprotection.image.ImageUniqueCheck;
+import com.vrt.fileprotection.image.phash.PerceptualHashHelper;
+import lombok.AllArgsConstructor;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 
+import java.util.Collections;
+
 @Configuration
 @EnableAutoConfiguration
+@AllArgsConstructor
 public class ApplicationConfig {
 
     @Bean
     PasswordEncoder passwordEncoder() {
         return new BCryptPasswordEncoder();
     }
+
+    @Bean
+    public com.vrt.
+            NoCopyFileService noCopyFileService(
+            FileProtector.FileProvider fileProvider,
+            FileProtector.ProcessingListener processingListener,
+            ImageUniqueCheck imageUniqueCheck,
+            ImageLocalSearch imageLocalSearch,
+            AudioLocalSearch audioLocalSearch,
+            AudioFilePathProvider audioFilePathProvider) {
+
+        return new com.vrt.NoCopyFileService(
+                Collections.emptyList(),
+                fileProvider,
+                processingListener,
+                imageUniqueCheck,
+                imageLocalSearch,
+                audioLocalSearch,
+                audioFilePathProvider
+        );
+    }
 }
+

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

@@ -17,7 +17,9 @@ public class HandlerConfig {
             FileUploadHandler upload,
             FileEntityHandler file,
             LogoutRequestHandler logoutHandler,
-            ImageFoundRequestHandler imageFoundRequestHandler
+            ImageFoundRequestHandler imageFoundRequestHandler,
+            VerifyRegisterUserHandler verifyRegisterUser,
+            AuthRequestHandler authRequestHandler
     ) {
         Map<Integer, RequestHandler> map = new HashMap<>();
         map.put(20001, login);
@@ -26,6 +28,8 @@ public class HandlerConfig {
         map.put(20005, file);
         map.put(20006, logoutHandler);
         map.put(20007, imageFoundRequestHandler);
+        map.put(20008, authRequestHandler);
+        map.put(20009, verifyRegisterUser);
 
         return map;
     }

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/configuration/file/NoCopyInitializer.java

@@ -0,0 +1,19 @@
+package ru.soune.nocopy.configuration.file;
+
+import lombok.AllArgsConstructor;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Component;
+import ru.soune.nocopy.service.file.FileProcessingOrchestrator;
+
+@Component
+@AllArgsConstructor
+public class NoCopyInitializer {
+
+    private final FileProcessingOrchestrator orchestrator;
+
+    @EventListener(ApplicationReadyEvent.class)
+    public void initializeOnStartup() {
+        orchestrator.initializeProcessingQueue();
+    }
+}

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

@@ -1,9 +1,15 @@
 package ru.soune.nocopy.controller;
 
+import com.vrt.NoCopyFileService;
+import com.vrt.fileprotection.FileProtector;
+import com.vrt.fileprotection.NoCopyCheckResult;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.UrlResource;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.web.PageableDefault;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -14,20 +20,22 @@ 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.RegAnswer;
+import ru.soune.nocopy.dto.file.*;
-import ru.soune.nocopy.dto.file.ChunkUploadResponse;
+import ru.soune.nocopy.dto.register.RegAnswer;
-import ru.soune.nocopy.dto.file.CompleteUploadResponse;
+import ru.soune.nocopy.entity.file.FileEntity;
-import ru.soune.nocopy.dto.file.FileEntityResponse;
-import ru.soune.nocopy.dto.file.UploadProgress;
-import ru.soune.nocopy.entity.AuthToken;
 import ru.soune.nocopy.entity.file.FileStatus;
+import ru.soune.nocopy.entity.file.ProtectionStatus;
 import ru.soune.nocopy.entity.file.UploadStatus;
 import ru.soune.nocopy.exception.*;
 import ru.soune.nocopy.handler.*;
-import ru.soune.nocopy.repository.AuthTokenRepository;
+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;
+import ru.soune.nocopy.util.FileUtil;
 
+import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -35,6 +43,7 @@ import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -48,7 +57,15 @@ public class ApiController {
 
     private final FileEntityService fileEntityService;
 
-    private final AuthTokenRepository authTokenRepository;
+    private final AuthService authService;
+
+    private final FileSimilarityService fileSimilarityService;
+
+    private final FileEntityRepository fileEntityRepository;
+
+    private final NoCopyFileService noCopyFileService;
+
+    private final FileUtil fileUtil;
 
     @PostMapping("/v{version}/data")
     public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request,
@@ -71,6 +88,12 @@ public class ApiController {
             return ResponseEntity.ok().body(response);
         } catch (ValidationException e) {
             return createValidationErrorResponse(e.getBindingResult(), e.getMsgId());
+        } catch (UserNotFoundException e) {
+            return ResponseEntity.ok().body(new BaseResponse(msgId, MessageCode.USER_NOT_FOUND.getCode(),
+                    MessageCode.USER_NOT_FOUND.getDescription(), new HashMap<>()));
+        } catch (NotFoundAuthToken e) {
+            return ResponseEntity.ok().body(new BaseResponse(msgId, MessageCode.AUTH_TOKEN_NOT_FOUND.getCode(),
+                    MessageCode.AUTH_TOKEN_NOT_FOUND.getDescription(), new HashMap<>()));
         } catch (NotValidFieldException e) {
             throw e;
         } catch (Exception e) {
@@ -90,57 +113,82 @@ 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, defaultValue = "0") Integer findSimilar) {
         try {
             if (chunk == null || chunk.isEmpty()) {
-                return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
+                return buildErrorResponse(uploadId, chunkNumber, "Chunk file null or empty");
-                        "Chunk file null or empty", ChunkUploadResponse.builder()
-                        .uploadId(uploadId)
-                        .chunkNumber(chunkNumber)
-                        .build()));
             }
-
             if (uploadId == null || uploadId.isBlank()) {
-                return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
+                return buildErrorResponse(uploadId, chunkNumber, "Upload ID is required");
-                        "Upload ID is required", ChunkUploadResponse.builder()
-                        .uploadId(uploadId)
-                        .chunkNumber(chunkNumber)
-                        .build()));
             }
-
             if (chunkNumber == null || chunkNumber < 0) {
-                return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
+                return buildErrorResponse(uploadId, chunkNumber, "Valid chunk number is required");
-                        "Valid chunk number is required", ChunkUploadResponse.builder()
-                        .uploadId(uploadId)
-                        .chunkNumber(chunkNumber)
-                        .build()));
             }
 
-            fileUploadService.uploadChunk(uploadId, chunkNumber, chunk);
+            UploadProgressResponse uploadProgressResponse = fileUploadService.uploadChunk(uploadId, chunkNumber,
+                    chunk, findSimilar);
 
-            ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
+            return buildSuccessResponse(uploadId, chunkNumber, chunk,
-                    .uploadId(uploadId)
+                    fileEntityService.findFileIdByPath(uploadProgressResponse.getFilePath()));
-                    .chunkNumber(chunkNumber)
+        } catch (DuplicateImageException e) {
-                    .chunkSize(chunk.getSize())
+            Map<String, Object> duplicateData = new HashMap<>();
-                    .message("Chunk uploaded successfully")
+            duplicateData.put("duplicateFileId", e.duplicateFileId());
-                    .build();
+            duplicateData.put("userId", e.userId());
+            duplicateData.put("message", e.getMessage());
 
-            return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.SUCCESS.getCode(),
+            if (uploadId != null) {
-                    "Chunk uploaded successfully", responseBody));
+                duplicateData.put("uploadId", uploadId);
-        } catch (Exception e) {
+            }
-            log.error("Error uploading chunk", e);
-
-            ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
-                    .uploadId(uploadId)
-                    .chunkNumber(chunkNumber)
-                    .build();
 
             return ResponseEntity.ok().body(new BaseResponse(
-                    20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
+                    20004,
-                    "Failed to upload chunk: " + e.getMessage(), responseBody));
+                    MessageCode.DUPLICATE_FILE_UPLOAD.getCode(),
+                    MessageCode.DUPLICATE_FILE_UPLOAD.getDescription(),
+                    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")
+    public ResponseEntity<BaseResponse> findSimilarFiles(
+            @PathVariable("version") int version,
+            @PathVariable String fileId,
+            @RequestParam(value = "auth_token",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, authToken);
+
+        String messageDesc;
+        MessageCode success;
+
+        if (similarFiles.isEmpty()) {
+            messageDesc = MessageCode.FILE_NOT_FOUND.getDescription();
+            success = MessageCode.SUCCESS;
+        } else {
+            messageDesc = MessageCode.SIMILAR_FILES_FOUND.getDescription();
+            success = MessageCode.SUCCESS;
+        }
+
+        Map<String, Object> responseData = new HashMap<>();
+        responseData.put("content", similarFiles.getContent());
+        responseData.put("page", similarFiles.getNumber());
+        responseData.put("size", similarFiles.getSize());
+        responseData.put("totalElements", similarFiles.getTotalElements());
+        responseData.put("totalPages", similarFiles.getTotalPages());
+        responseData.put("hasNext", similarFiles.hasNext());
+        responseData.put("hasPrevious", similarFiles.hasPrevious());
+
+        return ResponseEntity.ok()
+                .body(new BaseResponse(20004, success.getCode(), messageDesc, responseData));
+    }
+
     @GetMapping("/v{version}/files/progress/{uploadId}")
     public ResponseEntity<BaseResponse> getUploadProgress(
             @PathVariable("version") int version,
@@ -164,7 +212,6 @@ public class ApiController {
 
             return ResponseEntity.ok().body(new BaseResponse(
                     20004, MessageCode.SUCCESS.getCode(), MessageCode.SUCCESS.getDescription(), responseBody));
-
         } catch (Exception e) {
             log.error("Error getting progress for upload: {}", uploadId, e);
 
@@ -257,7 +304,7 @@ public class ApiController {
                         errorData));
             }
 
-            Long userId = getUserIdFromToken(tokenHeader);
+            Long userId = authService.useUserAuthToken(tokenHeader);
             FileEntityResponse entityResponse = fileEntityService.getById(fileId, version);
 
             if (!entityResponse.getUserId().equals(userId)) {
@@ -332,6 +379,119 @@ public class ApiController {
         }
     }
 
+    @GetMapping("/protect/{fileId}")
+    public ResponseEntity<?> protect( @PathVariable(required = false) String fileId) {
+        Optional<FileEntity> optionalFileEntity = fileEntityRepository.findById(fileId);
+
+        if (!optionalFileEntity.isPresent()) {
+            return ResponseEntity.notFound().build();
+        }
+        FileEntity fileEntity = optionalFileEntity.get();
+        FileProtector.FileInfo fileInfo = fileUtil.createFileInfo(fileEntity);
+
+        noCopyFileService.addFile(fileInfo);
+
+        fileEntity.setProtectionStatus(ProtectionStatus.PROCESSING);
+        fileEntityRepository.save(fileEntity);
+
+        return ResponseEntity.ok().build();
+    }
+
+    @GetMapping("/check/{fileId}/{type}")
+    public ResponseEntity<?> check(@PathVariable(required = false) String fileId,
+                                   @PathVariable(required = false) String type) {
+        Optional<FileEntity> optionalFileEntity = fileEntityRepository.findById(fileId);
+        if (!optionalFileEntity.isPresent()) {
+            return ResponseEntity.notFound().build();
+        }
+
+        FileEntity fileEntity = optionalFileEntity.get();
+
+        Path path =  type.toLowerCase().equals("image") ? Paths.get(fileEntity.getFilePath()) :
+                Paths.get(fileEntity.getProtectedFilePath());
+
+        File file = path.toFile();
+
+        NoCopyCheckResult noCopyCheckResult = noCopyFileService.checkFile(file,
+                FileProtector.Type.valueOf(type.toUpperCase()));
+
+        return ResponseEntity.ok().body(noCopyCheckResult);
+    }
+
+    private ResponseEntity<BaseResponse> checkForDuplicates(String uploadId) throws IOException {
+        Optional<FileEntity> uploadedFile = fileEntityRepository.findByUploadSessionId(uploadId);
+
+        if (uploadedFile.isEmpty() || !uploadedFile.get().getMimeType().equals("image")) {
+            return null;
+        }
+
+        FileEntity fileEntity = uploadedFile.get();
+        List<SimilarFileDTO> similarFiles = fileSimilarityService.findSimilarFiles(fileEntity.getId());
+
+        if (hasDuplicate(similarFiles)) {
+            return handleDuplicate(fileEntity, similarFiles);
+        }
+
+        return null;
+    }
+
+    private boolean hasDuplicate(List<SimilarFileDTO> similarFiles) {
+        return similarFiles.stream().anyMatch(f -> f.getHammingDistance() <= 5);
+    }
+
+    private ResponseEntity<BaseResponse> handleDuplicate(FileEntity fileEntity, List<SimilarFileDTO> similarFiles)
+            throws IOException {
+        fileEntityService.deleteFromDisk(fileEntity);
+
+        fileEntityService.softDeleteFileWithHash(fileEntity);
+
+        Optional<FileEntity> originalFile = fileEntityRepository.findById(similarFiles.get(0).getFileId());
+
+        if (originalFile.isPresent()) {
+            Map<String, String> duplicateInfo = Map.of(
+                    "duplicate_file_id", originalFile.get().getId(),
+                    "owner_user_id", String.valueOf(originalFile.get().getUserId()));
+
+            return ResponseEntity.ok().body(new BaseResponse(
+                    20004,
+                    MessageCode.DUPLICATE_FILE_UPLOAD.getCode(),
+                    "Failed to upload chunk, duplicate",
+                    duplicateInfo));
+        }
+
+        return null;
+    }
+
+    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();
+
+        return ResponseEntity.ok().body(new BaseResponse(
+                20000,
+                MessageCode.SUCCESS.getCode(),
+                "Chunk uploaded successfully",
+                responseBody));
+    }
+
+    private ResponseEntity<BaseResponse> buildErrorResponse(String uploadId, Integer chunkNumber, String errorMessage) {
+        ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
+                .uploadId(uploadId)
+                .chunkNumber(chunkNumber)
+                .build();
+
+        return ResponseEntity.ok().body(new BaseResponse(
+                20004,
+                MessageCode.FILE_UPLOAD_ERROR.getCode(),
+                errorMessage,
+                responseBody));
+    }
+
     private ResponseEntity<BaseResponse> createValidationErrorResponse(BindingResult bindingResult, Integer msgId) {
         List<Map<String, String>> fieldErrors = bindingResult.getFieldErrors()
                 .stream()
@@ -367,11 +527,4 @@ public class ApiController {
         }
         return contentType;
     }
-
-    private Long getUserIdFromToken(String tokenHeader) {
-        String token = tokenHeader.replace("Bearer ", "");
-        AuthToken authToken = authTokenRepository.findByToken(token)
-                .orElseThrow(() -> new NotFoundAuthToken("Token not found"));
-        return authToken.getUser().getId();
-    }
 }

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/controller/UserContentController.java

@@ -1,11 +0,0 @@
-package ru.soune.nocopy.controller;
-
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("v1/api/content")
-@AllArgsConstructor
-public class UserContentController {
-}

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

@@ -2,20 +2,29 @@ package ru.soune.nocopy.controller;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.web.bind.annotation.*;
-import ru.soune.nocopy.dto.ChangePasswordRequest;
+import ru.soune.nocopy.dto.BaseResponse;
-import ru.soune.nocopy.dto.UserDTO;
+import ru.soune.nocopy.dto.MessageCode;
-import ru.soune.nocopy.dto.UserRequest;
+import ru.soune.nocopy.dto.register.ChangePasswordRequest;
-import ru.soune.nocopy.entity.AuthToken;
+import ru.soune.nocopy.dto.register.RegAnswer;
-import ru.soune.nocopy.entity.User;
+import ru.soune.nocopy.dto.register.RegRequest;
+import ru.soune.nocopy.dto.user.UserDTO;
+import ru.soune.nocopy.dto.user.UserRequest;
+import ru.soune.nocopy.entity.user.AuthToken;
+import ru.soune.nocopy.entity.user.User;
 import ru.soune.nocopy.exception.InvalidUserEmail;
 import ru.soune.nocopy.exception.NotFoundAuthToken;
+import ru.soune.nocopy.exception.NotValidFieldException;
 import ru.soune.nocopy.mapper.UserMapper;
 import ru.soune.nocopy.repository.AuthTokenRepository;
 import ru.soune.nocopy.repository.UserRepository;
-import ru.soune.nocopy.service.UserService;
+import ru.soune.nocopy.service.register.AuthService;
+import ru.soune.nocopy.service.user.UserService;
 
+import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 @RestController
@@ -31,10 +40,14 @@ public class UserController {
 
     private final UserMapper userMapper;
 
+    private final PasswordEncoder passwordEncoder;
+
+    private final AuthService authService;
+
     @GetMapping("/all")
     public ResponseEntity<List<UserDTO>> getAllUsers() {
         List<UserDTO> allUsers = userRepository.findAll().stream()
-                .map(u -> new UserDTO(u.getFullName(), u.getCompany(), u.getEmail(), u.getIsActive(),
+                .map(u -> new UserDTO(u.getFullName(), u.getCompany(), u.getEmail(), u.isActive(),
                         u.getPhone(), u.getGenderType(),
                         u.getBirthday(), u.getCreatedAt(), u.getSubscriptionType()))
                 .toList();
@@ -52,19 +65,19 @@ public class UserController {
         AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
 
         if (authToken != null) {
-            Optional<User> user = userRepository.findByEmail(email);
+            User user = userRepository.findByEmail(email);
             //TODO add mapper
-            if (user.isPresent()) {
+            if (user != null) {
-                UserDTO userDTO = userMapper.toDTO(user.get());
+                UserDTO userDTO = userMapper.toDTO(user);
                 userDTO.setEmail(email);
-                userDTO.setFullName(user.get().getFullName());
+                userDTO.setFullName(user.getFullName());
-                userDTO.setCompany(user.get().getCompany());
+                userDTO.setCompany(user.getCompany());
-                userDTO.setPhone(user.get().getPhone());
+                userDTO.setPhone(user.getPhone());
-                userDTO.setGenderType(user.get().getGenderType());
+                userDTO.setGenderType(user.getGenderType());
-                userDTO.setBirthday(user.get().getBirthday());
+                userDTO.setBirthday(user.getBirthday());
-                userDTO.setCreatedAt(user.get().getCreatedAt());
+                userDTO.setCreatedAt(user.getCreatedAt());
-                userDTO.setSubscriptionType(user.get().getSubscriptionType());
+                userDTO.setSubscriptionType(user.getSubscriptionType());
-                userDTO.setActive(user.get().getIsActive());
+                userDTO.setActive(user.isActive());
 
                 return ResponseEntity.ok(userDTO);
             }
@@ -108,4 +121,50 @@ public class UserController {
 
         return ResponseEntity.ok(userService.updateUser(userRequest, user));
     }
+
+    @PostMapping("/create-user")
+    public ResponseEntity<User> addUser(@RequestBody RegRequest registerRequest) {
+
+        if (userRepository.existsByEmail(registerRequest.getEmail()) ||
+                userRepository.existsByPhone(registerRequest.getPhone())) {
+            RegAnswer regAnswer = new RegAnswer();
+            regAnswer.setFieldErrors(Arrays.asList(Map.of("email", registerRequest.getEmail())));
+            regAnswer.setFieldErrors(Arrays.asList(Map.of("phone", registerRequest.getPhone())));
+
+            throw new NotValidFieldException("User already exists with email:" + registerRequest.getEmail() + " or phone: " +
+                    registerRequest.getPhone(), new BaseResponse(2,
+                    MessageCode.REG_EMAIL_OR_PHONE_EXISTS.getCode(),
+                    MessageCode.REG_EMAIL_OR_PHONE_EXISTS.getDescription(), regAnswer));
+        }
+
+        User user = new User();
+        user.setFullName(registerRequest.getFullName());
+        user.setEmail(registerRequest.getEmail());
+        user.setPassword(passwordEncoder.encode(registerRequest.getPassword()));
+        user.setActive(true);
+        user.setEmailVerified(true);
+
+        if (registerRequest.getCompanyName() != null) {
+            user.setCompany(registerRequest.getCompanyName());
+        }
+
+        if (registerRequest.getPhone() != null) {
+            user.setPhone(registerRequest.getPhone());
+        }
+
+        User savedUser = userRepository.save(user);
+
+        AuthToken authToken = authService.generateAuthToken(savedUser);
+
+        authTokenRepository.save(authToken);
+
+        return ResponseEntity.ok().body(savedUser);
+    }
+
+    @DeleteMapping("/delete-user/{userId}")
+    public ResponseEntity<?> addUser(@PathVariable Long userId) {
+        userRepository.deleteById(userId);
+        return ResponseEntity.ok().body(Map.of("userId", userId, "deleted", "true"));
+    }
+
 }

src/main/java/ru/soune/nocopy/dto/AuthResponse.java

@@ -1,10 +0,0 @@
-package ru.soune.nocopy.dto;
-
-import java.time.LocalDateTime;
-
-public record AuthResponse (
-        boolean success,
-        String message,
-        String token,
-        LocalDateTime expiresAt
-) {}

src/main/java/ru/soune/nocopy/dto/BaseRequest.java

@@ -1,9 +1,11 @@
 package ru.soune.nocopy.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 @Data
+@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
 public class BaseRequest {
     @JsonProperty("version")
     Integer version;

src/main/java/ru/soune/nocopy/dto/BaseResponse.java

@@ -1,11 +1,13 @@
 package ru.soune.nocopy.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
 @Data
 @AllArgsConstructor
+@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
 public class BaseResponse {
     @JsonProperty("msg_id")
     private Integer msgId;

src/main/java/ru/soune/nocopy/dto/MessageCode.java

@@ -6,9 +6,13 @@ public enum MessageCode {
     REG_EMAIL_OR_PHONE_EXISTS(1, "Email or phone already registered"),
     INVALID_FIELD(2, "Invalid field"),
     INVALID_TOKEN(2, "Invalid token"),
+    TOKEN_IS_ALIVE(2, "Token is alive"),
     INVALID_ACTION(2, "Invalid action"),
     FILE_UPLOAD_ERROR(2, "File upload error"),
+    DUPLICATE_FILE_UPLOAD(2, "Duplicate file upload"),
     FILE_DOWNLOAD_ERROR(2, "File download error"),
+    USER_NOT_VERIFIED(2, "User not verified"),
+    USER_NOT_FOUND(2, "User not found"),
     FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD(2, "Not correct field"),
     IMAGE_FOUND_ERROR(2, "Image found error"),
     INVALID_JSON_BODY(2, "Invalid fields in JSON object"),
@@ -19,8 +23,11 @@ public enum MessageCode {
     AUTH_EMAIL_NOT_FOUND(4, "Email not found"),
     AUTH_EMAIL_OR_TOKEN_NOT_FOUND(4, "Email or Token not found "),
     AUTH_TOKEN_MISMATCH(4, "Token mismatch"),
+    AUTH_TOKEN_NOT_FOUND(4, "Token not found"),
     FILE_NOT_FOUND(4, "File not found"),
-    AUTH_PASSWORD_NOT_MATCHES(2, "Password does not match");
+    AUTH_PASSWORD_NOT_MATCHES(2, "Password does not match"),
+    SEND_EMAIL_EXCEPTION(2, "Send email exception"),
+    SIMILAR_FILES_FOUND(0, "Similar files found");
 
     private final Integer code;
 

src/main/java/ru/soune/nocopy/dto/TokenProcessRequest.java

@@ -0,0 +1,11 @@
+package ru.soune.nocopy.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
+public class TokenProcessRequest {
+
+    @JsonProperty("token")
+    private String token;
+}

src/main/java/ru/soune/nocopy/dto/UserContentDTO.java

@@ -1,14 +0,0 @@
-package ru.soune.nocopy.dto;
-
-import lombok.Data;
-
-@Data
-public class UserContentDTO {
-    String fileName;
-    String originalFilename;
-    String fileType;
-    String fileExtension;
-    Long fileSize;
-    String filePath;
-    Integer protectionLevel;
-}

src/main/java/ru/soune/nocopy/dto/UserContentResponse.java

@@ -1,17 +0,0 @@
-package ru.soune.nocopy.dto;
-
-import ru.soune.nocopy.entity.ContentStatus;
-import ru.soune.nocopy.entity.file.FileType;
-
-import java.time.LocalDateTime;
-
-public record UserContentResponse(
-        Long id,
-        String filename,
-        String originalFilename,
-        FileType fileType,
-        long fileSize,
-        String filePath,
-        ContentStatus status,
-        LocalDateTime uploadDate
-) {}

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/FileApiResponse.java

@@ -1,41 +0,0 @@
-package ru.soune.nocopy.dto.file;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class FileApiResponse<T> {
-
-    private boolean success;
-    private String message;
-    private T data;
-    private String error;
-
-    public static <T> FileApiResponse<T> success(T data) {
-        return FileApiResponse.<T>builder()
-                .success(true)
-                .message("Operation completed successfully")
-                .data(data)
-                .build();
-    }
-
-    public static <T> FileApiResponse<T> success(String message, T data) {
-        return FileApiResponse.<T>builder()
-                .success(true)
-                .message(message)
-                .data(data)
-                .build();
-    }
-
-    public static <T> FileApiResponse<T> error(String error) {
-        return FileApiResponse.<T>builder()
-                .success(false)
-                .error(error)
-                .build();
-    }
-}

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

@@ -30,4 +30,6 @@ public class FileEntityResponse {
     private String formattedSize;
     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/dto/file/SimilarFileDTO.java

@@ -0,0 +1,15 @@
+package ru.soune.nocopy.dto.file;
+
+import lombok.Builder;
+import lombok.Value;
+
+@Value
+@Builder
+public class SimilarFileDTO {
+    String fileId;
+    String originalFileName;
+    Long fileSize;
+    Integer hammingDistance;
+    String similarityLevel;
+    Long ownerId;
+}

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

@@ -0,0 +1,18 @@
+package ru.soune.nocopy.dto.file;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SimilarityFilter {
+    private List<String> similarityLevels;
+    private Integer page;
+    private Integer size;
+}

src/main/java/ru/soune/nocopy/dto/register/ChangePasswordRequest.java

@@ -1,4 +1,4 @@
-package ru.soune.nocopy.dto;
+package ru.soune.nocopy.dto.register;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/ru/soune/nocopy/dto/register/LogOutAnswer.java

@@ -1,4 +1,4 @@
-package ru.soune.nocopy.dto;
+package ru.soune.nocopy.dto.register;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/ru/soune/nocopy/dto/register/LoginAnswer.java

@@ -1,4 +1,4 @@
-package ru.soune.nocopy.dto;
+package ru.soune.nocopy.dto.register;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -13,5 +13,9 @@ import java.util.Map;
 public class LoginAnswer {
     private String Token;
 
+    private boolean isActive;
+
+    private boolean isVerified;
+
     private List<Map<String, String>> fieldErrors;
 }

src/main/java/ru/soune/nocopy/dto/register/LoginRequest.java

@@ -1,5 +1,6 @@
-package ru.soune.nocopy.dto;
+package ru.soune.nocopy.dto.register;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;
@@ -10,6 +11,7 @@ import lombok.NoArgsConstructor;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
+@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
 public class LoginRequest {
 
     @NotBlank(message = "error.not.blank") @Email(message = "error.not.email") @Size(max = 128)

src/main/java/ru/soune/nocopy/dto/register/LogoutRequest.java

@@ -1,4 +1,4 @@
-package ru.soune.nocopy.dto;
+package ru.soune.nocopy.dto.register;
 
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;

src/main/java/ru/soune/nocopy/dto/register/RegAnswer.java

@@ -1,4 +1,4 @@
-package ru.soune.nocopy.dto;
+package ru.soune.nocopy.dto.register;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -13,5 +13,13 @@ import java.util.Map;
 public class RegAnswer {
     private String Token;
 
+    private boolean isActive;
+
+    private boolean isVerified;
+
+    private Long userId;
+
+    private String email;
+
     private List<Map<String, String>> fieldErrors;
 }

src/main/java/ru/soune/nocopy/dto/register/RegRequest.java

@@ -1,10 +1,12 @@
-package ru.soune.nocopy.dto;
+package ru.soune.nocopy.dto.register;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.validation.constraints.*;
 import lombok.Data;
 
 
 @Data
+@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
 public class RegRequest {
     @NotEmpty(message = "Full name is required")
     private String fullName;

src/main/java/ru/soune/nocopy/dto/register/VerifyUserRequest.java

@@ -0,0 +1,20 @@
+package ru.soune.nocopy.dto.register;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class VerifyUserRequest {
+    @JsonProperty("verify_token")
+    private String verifyToken;
+
+    @JsonProperty("user_id")
+    private Long userId;
+
+    @JsonProperty("resend")
+    private Integer resend;
+}

src/main/java/ru/soune/nocopy/dto/user/UserContentRequest.java

@@ -1,4 +1,4 @@
-package ru.soune.nocopy.dto;
+package ru.soune.nocopy.dto.user;
 
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;

src/main/java/ru/soune/nocopy/dto/user/UserContentUpdateRequest.java

@@ -1,4 +1,4 @@
-package ru.soune.nocopy.dto;
+package ru.soune.nocopy.dto.user;
 
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;

src/main/java/ru/soune/nocopy/dto/user/UserDTO.java

@@ -1,11 +1,11 @@
-package ru.soune.nocopy.dto;
+package ru.soune.nocopy.dto.user;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import ru.soune.nocopy.entity.GenderType;
+import ru.soune.nocopy.entity.user.GenderType;
-import ru.soune.nocopy.entity.SubscriptionType;
+import ru.soune.nocopy.entity.user.SubscriptionType;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;

src/main/java/ru/soune/nocopy/dto/user/UserRequest.java

@@ -1,15 +1,16 @@
-package ru.soune.nocopy.dto;
+package ru.soune.nocopy.dto.user;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.Past;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
-import ru.soune.nocopy.entity.GenderType;
+import ru.soune.nocopy.entity.user.GenderType;
 
 import java.time.LocalDate;
 
 @Data
+@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
 public class UserRequest {
     @Size(min = 2)
     private String fullName;

src/main/java/ru/soune/nocopy/entity/ImageProtection.java

@@ -1,49 +0,0 @@
-package ru.soune.nocopy.entity;
-
-import jakarta.persistence.*;
-import lombok.*;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-
-import java.time.LocalDateTime;
-
-@Entity
-@Table(name = "image_protection")
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@ToString
-@EntityListeners(AuditingEntityListener.class)
-public class ImageProtection {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long protectionId;
-
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "user_id", nullable = false)
-    @ToString.Exclude
-    private User user;
-
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "content_id", nullable = false)
-    @ToString.Exclude
-    private UserContent content;
-
-    @Column(name = "protection_method", nullable = false, length = 50)
-    private String protectionMethod;
-
-    @Column(name = "protection_level", nullable = false)
-    private Integer protectionLevel;
-
-    @Column(name = "is_active", nullable = false)
-    private Boolean isActive = true;
-
-    @CreatedDate
-    @Column(name = "applied_at", nullable = false, updatable = false)
-    private LocalDateTime appliedAt;
-
-    @Column(name = "metadata", columnDefinition = "JSON")
-    private String metadata;
-}

src/main/java/ru/soune/nocopy/entity/UserAction.java

@@ -1,44 +0,0 @@
-package ru.soune.nocopy.entity;
-
-import jakarta.persistence.*;
-import lombok.*;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-
-import java.time.LocalDateTime;
-
-@Entity
-@Table(name = "user_actions")
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@ToString
-@EntityListeners(AuditingEntityListener.class)
-public class UserAction {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long actionId;
-
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "user_id", nullable = false)
-    @ToString.Exclude
-    private User user;
-
-    @Column(name = "action", nullable = false, length = 100)
-    private String action;
-
-    @Column(name = "details", columnDefinition = "TEXT")
-    private String details;
-
-    @Column(name = "ip_address", length = 45)
-    private String ipAddress;
-
-    @Column(name = "user_agent", columnDefinition = "TEXT")
-    private String userAgent;
-
-    @CreatedDate
-    @Column(name = "created_at", nullable = false, updatable = false)
-    private LocalDateTime createdAt;
-}

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

@@ -1,4 +1,4 @@
-package ru.soune.nocopy.entity;
+package ru.soune.nocopy.entity.file;
 
 import lombok.Getter;
 

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

@@ -1,11 +1,15 @@
 package ru.soune.nocopy.entity.file;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.*;
 import lombok.*;
+import org.hibernate.annotations.GenerationTime;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
+import java.sql.DriverManager;
+import java.sql.SQLException;
 import java.time.LocalDateTime;
 
 @Data
@@ -16,11 +20,13 @@ import java.time.LocalDateTime;
 @Table(name = "file_entities")
 @EntityListeners(AuditingEntityListener.class)
 public class FileEntity {
-
     @Id
     @GeneratedValue(strategy = GenerationType.UUID)
     private String id;
 
+    @Column(name = "support_id", unique = true, updatable = false)
+    private Integer supportId;
+
     @Column(name = "user_id", nullable = false)
     private Long userId;
 
@@ -60,11 +66,34 @@ public class FileEntity {
     @Column(name = "updated_at")
     private LocalDateTime updatedAt;
 
+    @Column(name = "protected_file_path")
+    private String protectedFilePath;
+
+    @Column(name = "protection_status")
+    @Enumerated(EnumType.STRING)
+    private ProtectionStatus protectionStatus;
+
+    @Column(name = "protected_at")
+    private LocalDateTime protectedAt;
+
+    @Column(name = "signature")
+    @JsonIgnore
+    private String signature;
+
+    @OneToOne(mappedBy = "file", cascade = CascadeType.ALL, orphanRemoval = true)
+    @JsonIgnore
+    private ImageHashEntity imageHash;
+
     @PrePersist
     public void prePersist() {
         if (this.status == null) {
             this.status = FileStatus.ACTIVE;
         }
+
+        if (this.protectionStatus == null) {
+            this.protectionStatus = ProtectionStatus.NOT_PROTECTED;
+        }
+
         if (this.createdAt == null) {
             this.createdAt = LocalDateTime.now();
         }

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

@@ -7,10 +7,11 @@ 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", Arrays.asList("mp3", "wav", "flac"));
+    AUDIO("audio", List.of("wav"));
 
     private final String displayName;
     private final List<String> allowedExtensions;

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

@@ -69,6 +69,7 @@ public class FileUploadSession {
     private String extension;
 
     @Column(name = "retry_count")
+    @Builder.Default
     private Integer retryCount = 0;
 
     @Column(name = "completed_at")
@@ -81,6 +82,7 @@ public class FileUploadSession {
     )
     @MapKeyColumn(name = "chunk_number")
     @Column(name = "chunk_path")
+    @Builder.Default
     private Map<Integer, String> chunkPaths = new HashMap<>();
 
     @PrePersist

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

@@ -0,0 +1,43 @@
+package ru.soune.nocopy.entity.file;
+
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Entity
+@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
+@Builder
+public class ImageHashEntity {
+
+    @Id
+    @Column(name = "file_id")
+    private String fileId;
+
+    @OneToOne(fetch = FetchType.LAZY)
+    @MapsId
+    @JoinColumn(name = "file_id")
+    private FileEntity file;
+
+    @Column(name = "hash64_hi")
+    private Long hash64Hi;
+
+    @Column(name = "hash64_lo")
+    private Long hash64Lo;
+
+    @Column(name = "hash_algorithm", nullable = false)
+    private String hashAlgorithm;
+
+    @Column(name = "created_at")
+    private LocalDateTime createdAt;
+}

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

@@ -0,0 +1,9 @@
+package ru.soune.nocopy.entity.file;
+
+public enum ProtectionStatus {
+    NOT_PROTECTED,
+    PROCESSING,
+    PROTECTED,
+    FAILED,
+    FAILED_SAVE
+}

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

@@ -1,9 +1,10 @@
-package ru.soune.nocopy.entity;
+package ru.soune.nocopy.entity.file;
 
 import jakarta.persistence.*;
 import lombok.*;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+import ru.soune.nocopy.entity.user.User;
 
 import java.time.LocalDateTime;
 

src/main/java/ru/soune/nocopy/entity/user/AuthToken.java

@@ -1,4 +1,4 @@
-package ru.soune.nocopy.entity;
+package ru.soune.nocopy.entity.user;
 
 import jakarta.persistence.*;
 import lombok.*;
@@ -30,7 +30,7 @@ public class AuthToken {
     private String token;
 
     @Column(name = "expires_at", nullable = false)
-    private LocalDateTime expiresAt = LocalDateTime.now().plusDays(30);
+    private LocalDateTime expiresAt = LocalDateTime.now().plusHours(1);
 
     @CreatedDate
     @Column(name = "created_at", updatable = false, nullable = false)
@@ -41,8 +41,4 @@ public class AuthToken {
 
     @Column(name = "is_active")
     private Boolean isActive = true;
-
-    public boolean isValid() {
-        return Boolean.TRUE.equals(isActive) && expiresAt.isAfter(LocalDateTime.now());
-    }
 }

src/main/java/ru/soune/nocopy/entity/user/EmailVerificationToken.java

@@ -0,0 +1,35 @@
+package ru.soune.nocopy.entity.user;
+
+import jakarta.persistence.*;
+import lombok.*;
+import java.time.LocalDateTime;
+
+@Entity
+@Table(name = "email_verification_tokens")
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class EmailVerificationToken {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id", nullable = false)
+    private User user;
+
+    @Column(name = "token", nullable = false, length = 6)
+    private String token;
+
+    @Column(name = "expires_at", nullable = false)
+    private LocalDateTime expiresAt = LocalDateTime.now().plusMinutes(15);
+
+    @Column(name = "created_at", nullable = false)
+    private LocalDateTime createdAt;
+
+    public boolean isExpired() {
+        return LocalDateTime.now().isAfter(expiresAt);
+    }
+}

src/main/java/ru/soune/nocopy/entity/user/GenderType.java

@@ -1,4 +1,4 @@
-package ru.soune.nocopy.entity;
+package ru.soune.nocopy.entity.user;
 
 public enum GenderType {
     MALE, FEMALE

src/main/java/ru/soune/nocopy/entity/user/SubscriptionType.java

@@ -1,4 +1,4 @@
-package ru.soune.nocopy.entity;
+package ru.soune.nocopy.entity.user;
 
 import lombok.Getter;
 

src/main/java/ru/soune/nocopy/entity/user/User.java

@@ -1,4 +1,4 @@
-package ru.soune.nocopy.entity;
+package ru.soune.nocopy.entity.user;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.*;
@@ -6,6 +6,7 @@ import jakarta.validation.constraints.Size;
 import lombok.*;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+import ru.soune.nocopy.entity.file.Violation;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -33,6 +34,9 @@ public class User {
     @Column(name = "email", nullable = false, length = 1024, unique = true)
     private String email;
 
+    @Column(name = "email_verified")
+    private boolean emailVerified = false;
+
     @Column(name = "company")
     private String company;
 
@@ -64,7 +68,7 @@ public class User {
     private LocalDateTime lastLoginAt;
 
     @Column(name = "is_active")
-    private Boolean isActive = true;
+    private boolean isActive = false;
 
     @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
     @JsonIgnore
@@ -79,15 +83,4 @@ public class User {
     @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
     @JsonIgnore
     @ToString.Exclude
-    private List<UserAction> userActions = new ArrayList<>();
+    private List<Violation> violations = new ArrayList<>();}
-
-    @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
-    @JsonIgnore
-    @ToString.Exclude
-    private List<Violation> violations = new ArrayList<>();
-
-    @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
-    @JsonIgnore
-    @ToString.Exclude
-    private List<ImageProtection> imageProtections = new ArrayList<>();
-}

src/main/java/ru/soune/nocopy/entity/user/UserContent.java

@@ -1,9 +1,10 @@
-package ru.soune.nocopy.entity;
+package ru.soune.nocopy.entity.user;
 
 import jakarta.persistence.*;
 import lombok.*;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+import ru.soune.nocopy.entity.file.ContentStatus;
 import ru.soune.nocopy.entity.file.FileType;
 
 import java.time.LocalDateTime;

src/main/java/ru/soune/nocopy/exception/DuplicateImageException.java

@@ -0,0 +1,20 @@
+package ru.soune.nocopy.exception;
+
+public class DuplicateImageException extends RuntimeException {
+    private final String duplicateFileId;
+    private final Long userId;
+
+    public DuplicateImageException(String message, String duplicateFileId, Long userId) {
+        super(message);
+        this.duplicateFileId = duplicateFileId;
+        this.userId = userId;
+    }
+
+    public String duplicateFileId() {
+        return duplicateFileId;
+    }
+
+    public Long userId() {
+        return userId;
+    }
+}

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

@@ -0,0 +1,37 @@
+package ru.soune.nocopy.handler;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+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.TokenProcessRequest;
+import ru.soune.nocopy.exception.NotFoundAuthToken;
+import ru.soune.nocopy.service.register.AuthService;
+
+import java.util.Map;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class AuthRequestHandler implements RequestHandler {
+
+    private final ObjectMapper objectMapper;
+
+    private final AuthService authService;
+
+    @Override
+    public BaseResponse handle(BaseRequest request) throws NotFoundAuthToken {
+        TokenProcessRequest tokenProcessRequest = objectMapper.convertValue(request.getMessageBody(),
+                TokenProcessRequest.class);
+
+        authService.useUserAuthToken(tokenProcessRequest.getToken());
+
+        return new BaseResponse(request.getMsgId(),
+                MessageCode.SUCCESS.getCode(),
+                "Token processed successfully",
+                Map.of("token", tokenProcessRequest.getToken()));
+    }
+}

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

@@ -6,13 +6,13 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import ru.soune.nocopy.dto.*;
 import ru.soune.nocopy.dto.file.*;
-import ru.soune.nocopy.entity.AuthToken;
 import ru.soune.nocopy.entity.file.FileEntity;
 import ru.soune.nocopy.entity.file.FileStatus;
 import ru.soune.nocopy.exception.FileEntityNotFoundException;
 import ru.soune.nocopy.exception.NotFoundAuthToken;
-import ru.soune.nocopy.repository.AuthTokenRepository;
 import ru.soune.nocopy.repository.FileEntityRepository;
+import ru.soune.nocopy.repository.ImageHashRepository;
+import ru.soune.nocopy.service.register.AuthService;
 import ru.soune.nocopy.service.file.FileEntityService;
 import ru.soune.nocopy.service.file.FileStatsService;
 
@@ -26,14 +26,16 @@ public class FileEntityHandler implements RequestHandler {
 
     private final FileEntityService fileEntityService;
 
-    private final FileStatsService fileStatsService;
+    private final AuthService authService;
 
-    private final AuthTokenRepository authTokenRepository;
+    private final FileStatsService fileStatsService;
 
     private final ObjectMapper objectMapper;
 
     private final FileEntityRepository fileEntityRepository;
 
+    private final ImageHashRepository imageHashRepository;
+
     @Override
     public BaseResponse handle(BaseRequest request) {
         try {
@@ -62,7 +64,8 @@ public class FileEntityHandler implements RequestHandler {
                             .action(action)
                             .availableActions(Arrays.asList(
                                     "file_info", "file_by_session", "user_files",
-                                    "search_files", "storage_usage", "delete_file"))
+                                    "search_files", "storage_usage", "delete_file",
+                                    "user_files_info"))
                             .build();
 
                     return new BaseResponse(request.getMsgId(),
@@ -80,7 +83,7 @@ public class FileEntityHandler implements RequestHandler {
     }
 
     private BaseResponse handleGetFilesUserInfo(BaseRequest request, FileEntityRequest fileRequest) {
-        Long userId = getUserIdFromToken(fileRequest.getToken());
+        Long userId = authService.useUserAuthToken(fileRequest.getToken());
         FileInfoUserResponse userFileStats = fileStatsService.getUserFileStats(userId);
 
         return new BaseResponse(request.getMsgId(),
@@ -91,7 +94,7 @@ public class FileEntityHandler implements RequestHandler {
 
     private BaseResponse handleGetFileInfo(BaseRequest request, FileEntityRequest fileRequest) {
         try {
-            Long userId = getUserIdFromToken(fileRequest.getToken());
+            Long userId =  authService.useUserAuthToken(fileRequest.getToken());
             FileEntityResponse fileInfo = fileEntityService.getById(fileRequest.getFileId(), request.getVersion());
 
             if (!fileInfo.getUserId().equals(userId)) {
@@ -122,7 +125,7 @@ public class FileEntityHandler implements RequestHandler {
 
     private BaseResponse handleGetFileBySession(BaseRequest request, FileEntityRequest fileRequest) {
         try {
-            Long userId = getUserIdFromToken(fileRequest.getToken());
+            Long userId = authService.useUserAuthToken(fileRequest.getToken());
             FileEntityResponse fileInfo = fileEntityService.getByUploadSessionId(fileRequest.getUploadSessionId(),
                     request.getVersion());
 
@@ -154,7 +157,7 @@ public class FileEntityHandler implements RequestHandler {
 
     private BaseResponse handleGetUserFiles(BaseRequest request, FileEntityRequest fileRequest) {
         try {
-            Long userId = getUserIdFromToken(fileRequest.getToken());
+            Long userId = authService.useUserAuthToken(fileRequest.getToken());
             int page = fileRequest.getPage() != null ? fileRequest.getPage() : 1;
             int pageSize = fileRequest.getPageSize() != null ? fileRequest.getPageSize() : 20;
 
@@ -181,7 +184,7 @@ public class FileEntityHandler implements RequestHandler {
 
     private BaseResponse handleSearchFiles(BaseRequest request, FileEntityRequest fileRequest) {
         try {
-            Long userId = getUserIdFromToken(fileRequest.getToken());
+            Long userId = authService.useUserAuthToken(fileRequest.getToken());
             int page = fileRequest.getPage() != null ? fileRequest.getPage() : 1;
             int pageSize = fileRequest.getPageSize() != null ? fileRequest.getPageSize() : 20;
 
@@ -228,7 +231,7 @@ public class FileEntityHandler implements RequestHandler {
 
     private BaseResponse handleGetStorageUsage(BaseRequest request, FileEntityRequest fileRequest) {
         try {
-            Long userId = getUserIdFromToken(fileRequest.getToken());
+            Long userId = authService.useUserAuthToken(fileRequest.getToken());
             long usage = fileEntityService.getUserStorageUsed(userId);
 
             StorageUsageResponse response = StorageUsageResponse.builder()
@@ -258,7 +261,7 @@ public class FileEntityHandler implements RequestHandler {
 
     private BaseResponse handleDeleteFile(BaseRequest request, FileEntityRequest fileRequest) {
         try {
-            Long userId = getUserIdFromToken(fileRequest.getToken());
+            Long userId = authService.useUserAuthToken(fileRequest.getToken());
             String fileId = fileRequest.getFileId();
             FileEntityResponse fileInfo = fileEntityService.getById(fileId, request.getVersion());
             DeleteFileResponse response;
@@ -272,15 +275,21 @@ public class FileEntityHandler implements RequestHandler {
 
             FileEntity fileEntity = fileEntityRepository.findById(fileId)
                     .orElseThrow(() -> new FileEntityNotFoundException(fileId));
+            int fullDelete = fileRequest.getFullDelete() == null ? 0 : fileRequest.getFullDelete();
 
-            if (fileEntity.getStatus().equals(FileStatus.DELETED)) {
+            if (fileEntity.getStatus().equals(FileStatus.DELETED) || fullDelete == 1) {
                 fileEntityService.deleteFromDisk(fileEntity);
                 response = DeleteFileResponse.builder()
                         .fileId(fileRequest.getFileId())
                         .message("File deleted from disk")
                         .build();
             } else {
-                fileEntityService.markAsDeleted(fileEntity);
+                fileEntityService.softDeleteFileWithHash(fileEntity);
+//
+//                imageHashRepository.deleteByFileId(fileEntity.getId());
+//
+//                fileEntityService.markAsDeleted(fileEntity);
+
                 response = DeleteFileResponse.builder()
                         .fileId(fileRequest.getFileId())
                         .message("File marked as deleted")
@@ -305,20 +314,6 @@ public class FileEntityHandler implements RequestHandler {
         }
     }
 
-    private Long getUserIdFromToken(String token) {
-        if (token == null || token.isBlank()) {
-            throw new NotFoundAuthToken("Token is required");
-        }
-
-        if (token.startsWith("Bearer ")) {
-            token = token.replace("Bearer ", "");
-        }
-
-        AuthToken authToken = authTokenRepository.findByToken(token)
-                .orElseThrow(() -> new NotFoundAuthToken("Token not found"));
-        return authToken.getUser().getId();
-    }
-
     private String formatFileSize(long size) {
         if (size < 1024) return size + " B";
         int exp = (int) (Math.log(size) / Math.log(1024));

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

@@ -10,13 +10,14 @@ import org.springframework.validation.BindingResult;
 import org.springframework.validation.FieldError;
 import ru.soune.nocopy.dto.*;
 import ru.soune.nocopy.dto.file.*;
-import ru.soune.nocopy.entity.AuthToken;
+import ru.soune.nocopy.entity.user.AuthToken;
 import ru.soune.nocopy.entity.file.FileType;
 import ru.soune.nocopy.entity.file.FileUploadSession;
 import ru.soune.nocopy.exception.*;
 import ru.soune.nocopy.handler.validator.FileUploadRequestValidator;
 import ru.soune.nocopy.repository.AuthTokenRepository;
 import ru.soune.nocopy.repository.FileUploadSessionRepository;
+import ru.soune.nocopy.service.register.AuthService;
 import ru.soune.nocopy.service.file.FileUploadService;
 
 import java.util.*;
@@ -28,6 +29,8 @@ import java.util.stream.Collectors;
 public class FileUploadHandler implements RequestHandler {
     private final FileUploadService fileUploadService;
 
+    private final AuthService authService;
+
     private final AuthTokenRepository authTokenRepository;
 
     private final FileUploadSessionRepository fileUploadSessionRepository;
@@ -86,10 +89,9 @@ public class FileUploadHandler implements RequestHandler {
                         MessageCode.INVALID_TOKEN.getDescription(), Map.of("token", token));
             }
 
-            AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token not found"));
+            Long userId = authService.useUserAuthToken(token);
-
             BindingResult bindingResult = new BeanPropertyBindingResult(fileRequest, "fileRequest");
-            fileUploadRequestValidator.validate(fileRequest, bindingResult);
+                    fileUploadRequestValidator.validate(fileRequest, bindingResult);
 
             if (bindingResult.hasErrors()) {
                 Map<String, String> fieldErrors = bindingResult.getFieldErrors()
@@ -105,7 +107,7 @@ public class FileUploadHandler implements RequestHandler {
             }
 
             FileUploadSession session = fileUploadService.initUpload(
-                    authToken.getUser().getId(),
+                    userId,
                     fileRequest.getFileName(),
                     fileRequest.getFileType(),
                     fileRequest.getExtension(),
@@ -175,40 +177,13 @@ public class FileUploadHandler implements RequestHandler {
         }
     }
 
-    private BaseResponse handleRetryUpload(BaseRequest request, FileUploadRequest fileRequest) {
-        try {
-            fileUploadService.retryFailedUpload(fileRequest.getUploadId());
-            ru.soune.nocopy.dto.file.UploadProgressResponse progress =
-                    fileUploadService.getUploadProgress(fileRequest.getUploadId());
-
-            RetryUploadResponse response = RetryUploadResponse.builder()
-                    .uploadId(progress.getUploadId())
-                    .message("Upload retry initiated")
-                    .status(progress.getStatus().toString())
-                    .build();
-
-            return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(), "Upload retry initiated",
-                    response);
-
-        } catch (UploadSessionNotFoundException e) {
-            return new BaseResponse(request.getMsgId(), MessageCode.FILE_NOT_FOUND.getCode(),
-                    "Upload session not found", null);
-        } catch (FileUploadException e) {
-            return new BaseResponse(request.getMsgId(), MessageCode.FILE_UPLOAD_ERROR.getCode(), e.getMessage(),
-                    null);
-        } catch (Exception e) {
-            log.error("Error retrying upload", e);
-            return new BaseResponse(request.getMsgId(), MessageCode.FILE_UPLOAD_ERROR.getCode(),
-                    "Failed to retry upload", null);
-        }
-    }
-
     private BaseResponse handleGetChunkStatus(BaseRequest request, FileUploadRequest fileRequest) {
         try {
             FileUploadSession session = fileUploadSessionRepository.findById(fileRequest.getUploadId())
                     .orElseThrow(() -> new UploadSessionNotFoundException(fileRequest.getUploadId()));
 
             Map<String, Boolean> chunkStatus = new HashMap<>();
+
             for (int i = 0; i < session.getTotalChunks(); i++) {
                 chunkStatus.put("chunk_" + i, session.getChunkPaths().containsKey(i));
             }
@@ -223,7 +198,6 @@ public class FileUploadHandler implements RequestHandler {
 
             return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
                     MessageCode.SUCCESS.getDescription(), response);
-
         } catch (UploadSessionNotFoundException e) {
             return new BaseResponse(request.getMsgId(), MessageCode.FILE_NOT_FOUND.getCode(),
                     "Upload session not found", null);

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

@@ -5,15 +5,16 @@ import org.springframework.context.support.DefaultMessageSourceResolvable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.MethodArgumentNotValidException;
-import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.ResponseStatus;
+import ru.soune.nocopy.dto.BaseResponse;
-import org.springframework.web.bind.annotation.RestControllerAdvice;
+import ru.soune.nocopy.dto.MessageCode;
 import ru.soune.nocopy.exception.*;
 
 import java.util.Map;
 
 @RestControllerAdvice
 @AllArgsConstructor
+@ControllerAdvice
 public class GlobalExceptionHandler {
 
     @ExceptionHandler(MethodArgumentNotValidException.class)
@@ -81,4 +82,12 @@ public class GlobalExceptionHandler {
                         "message" ,ex.getMessage()
                 ));
     }
+
+    @ExceptionHandler(DuplicateImageException.class)
+    @ResponseBody
+    public ResponseEntity<BaseResponse> handleDuplicateImage(DuplicateImageException e) {
+        return ResponseEntity.ok().body(new BaseResponse(
+                20004, MessageCode.DUPLICATE_FILE_UPLOAD.getCode(),
+                "Duplicate image detected", e.getMessage()));
+    }
 }

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

@@ -3,14 +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.ImageSearchRequest;
 import ru.soune.nocopy.dto.file.YandexSearchResponse;
-import ru.soune.nocopy.service.YandexSearchService;
+import ru.soune.nocopy.service.search.YandexSearchService;
+import ru.soune.nocopy.service.search.GoogleVisionSearchService;
 
 @Slf4j
 @Component
@@ -19,9 +19,10 @@ public class ImageFoundRequestHandler implements RequestHandler {
 
     private final ObjectMapper objectMapper;
 
-    @Autowired
     private final YandexSearchService yandexSearchService;
 
+    private final GoogleVisionSearchService googleVisionSearchService;
+
     @Override
     public BaseResponse handle(BaseRequest request) throws Exception {
         ImageSearchRequest imageSearchRequest = objectMapper.convertValue(request.getMessageBody(),
@@ -31,6 +32,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/handler/LoginRequestHandler.java

@@ -4,10 +4,13 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 import ru.soune.nocopy.dto.*;
-import ru.soune.nocopy.entity.AuthToken;
+import ru.soune.nocopy.dto.register.LoginAnswer;
+import ru.soune.nocopy.dto.register.LoginRequest;
+import ru.soune.nocopy.entity.user.AuthToken;
+import ru.soune.nocopy.entity.user.User;
 import ru.soune.nocopy.exception.NotValidFieldException;
 import ru.soune.nocopy.repository.UserRepository;
-import ru.soune.nocopy.service.AuthService;
+import ru.soune.nocopy.service.register.AuthService;
 
 import java.util.Arrays;
 import java.util.Map;
@@ -17,14 +20,17 @@ import java.util.Map;
 public class LoginRequestHandler implements RequestHandler {
 
     private final UserRepository userRepository;
+
     private final AuthService authService;
+
     private final ObjectMapper objectMapper;
 
     @Override
     public BaseResponse handle(BaseRequest request) {
         LoginRequest loginRequest = objectMapper.convertValue(request.getMessageBody(), LoginRequest.class);
+        User user = userRepository.findByEmail(loginRequest.getEmail());
 
-        if (!userRepository.existsByEmail(loginRequest.getEmail())) {
+        if (user == null) {
             LoginAnswer loginAnswer = new LoginAnswer();
             loginAnswer.setFieldErrors(Arrays.asList(Map.of("email", loginRequest.getEmail())));
 
@@ -33,10 +39,24 @@ public class LoginRequestHandler implements RequestHandler {
                             MessageCode.AUTH_EMAIL_NOT_FOUND.getDescription(), loginAnswer));
         }
 
+        if (!user.isActive() && !user.isEmailVerified()) {
+            LoginAnswer loginAnswer = new LoginAnswer();
+
+            loginAnswer.setFieldErrors(Arrays.asList(Map.of(
+                    "verified", String.valueOf(user.isEmailVerified()),
+                    "isActive", String.valueOf(user.isActive()))));
+
+            return new BaseResponse(request.getMsgId(), MessageCode.USER_NOT_VERIFIED.getCode(),
+                    MessageCode.USER_NOT_VERIFIED.getDescription(), loginAnswer);
+        }
+
         AuthToken authToken = authService.login(loginRequest);
+        String token = authToken.getToken();
 
         LoginAnswer loginAnswer = new LoginAnswer();
-        loginAnswer.setToken(authToken.getToken());
+        loginAnswer.setToken(token);
+
+        authService.useUserAuthToken(token);
 
         return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
                 MessageCode.SUCCESS.getDescription(), loginAnswer);

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

@@ -4,12 +4,14 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 import ru.soune.nocopy.dto.*;
-import ru.soune.nocopy.entity.AuthToken;
+import ru.soune.nocopy.dto.register.LogOutAnswer;
-import ru.soune.nocopy.entity.User;
+import ru.soune.nocopy.dto.register.LogoutRequest;
+import ru.soune.nocopy.entity.user.AuthToken;
+import ru.soune.nocopy.entity.user.User;
 import ru.soune.nocopy.exception.NotValidFieldException;
 import ru.soune.nocopy.repository.AuthTokenRepository;
 import ru.soune.nocopy.repository.UserRepository;
-import ru.soune.nocopy.service.AuthService;
+import ru.soune.nocopy.service.register.AuthService;
 
 import java.util.Objects;
 import java.util.Optional;
@@ -31,16 +33,16 @@ public class LogoutRequestHandler implements RequestHandler {
         LogoutRequest logoutRequest = objectMapper.convertValue(request.getMessageBody(), LogoutRequest.class);
 
         Optional<AuthToken> opToken = authTokenRepository.findByToken(logoutRequest.getToken());
-        Optional<User> user = userRepository.findByEmail(logoutRequest.getEmail());
+        User user = userRepository.findByEmail(logoutRequest.getEmail());
 
-        if (opToken.isEmpty() || user.isEmpty()) {
+        if (opToken.isEmpty() || user == null) {
             throw new NotValidFieldException("User with email or token not found",
                     new BaseResponse(request.getMsgId(), MessageCode.AUTH_EMAIL_OR_TOKEN_NOT_FOUND.getCode(),
                             MessageCode.AUTH_EMAIL_OR_TOKEN_NOT_FOUND.getDescription(),
                             new LogoutRequest(logoutRequest.getEmail(), logoutRequest.getToken())));
         }
 
-        if (!Objects.equals(opToken.get().getUser().getId(), user.get().getId())) {
+        if (!Objects.equals(opToken.get().getUser().getId(), user.getId())) {
             throw new NotValidFieldException("User token mismatch with user",
                     new BaseResponse(request.getMsgId(), MessageCode.AUTH_TOKEN_MISMATCH.getCode(),
                             MessageCode.AUTH_TOKEN_MISMATCH.getDescription(),

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

@@ -7,12 +7,16 @@ import org.springframework.stereotype.Component;
 import org.springframework.validation.BeanPropertyBindingResult;
 import org.springframework.validation.BindingResult;
 import ru.soune.nocopy.dto.*;
-import ru.soune.nocopy.entity.AuthToken;
+import ru.soune.nocopy.dto.register.RegAnswer;
+import ru.soune.nocopy.dto.register.RegRequest;
+import ru.soune.nocopy.entity.user.AuthToken;
+import ru.soune.nocopy.entity.user.EmailVerificationToken;
 import ru.soune.nocopy.exception.NotValidFieldException;
 import ru.soune.nocopy.exception.ValidationException;
 import ru.soune.nocopy.handler.validator.RegRequestValidator;
 import ru.soune.nocopy.repository.UserRepository;
-import ru.soune.nocopy.service.AuthService;
+import ru.soune.nocopy.service.register.AuthService;
+import ru.soune.nocopy.service.mail.EmailService;
 
 import java.util.Arrays;
 import java.util.Map;
@@ -29,6 +33,8 @@ public class RegRequestHandler implements RequestHandler {
 
     private final ObjectMapper objectMapper;
 
+    private final EmailService emailService;
+
     @Override
     public BaseResponse handle(BaseRequest request) throws ValidationException {
         RegRequest regRequest = objectMapper.convertValue(request.getMessageBody(), RegRequest.class);
@@ -45,6 +51,7 @@ public class RegRequestHandler implements RequestHandler {
         }
 
         BindingResult bindingResult = new BeanPropertyBindingResult(regRequest, "regRequest");
+
         regRequestValidator.validate(regRequest, bindingResult);
 
         if (bindingResult.hasErrors()) {
@@ -52,9 +59,26 @@ public class RegRequestHandler implements RequestHandler {
         }
 
         AuthToken authToken = authService.register(regRequest);
+        EmailVerificationToken emailToken = emailService.createEmailVerificationToken(authToken);
+
+        try {
+            emailService.sendVerificationEmail(authToken.getUser(), emailToken.getToken());
+        } catch (Exception e) {
+            return new BaseResponse(request.getMsgId(), MessageCode.SEND_EMAIL_EXCEPTION.getCode(),
+                    MessageCode.SEND_EMAIL_EXCEPTION.getDescription(), Map.of(
+                        "message", "not send",
+                            "email",  regRequest.getEmail()
+            ));
+        }
+
+
+        String token = authToken.getToken();
+        authService.useUserAuthToken(token);
 
         RegAnswer regAnswer = new RegAnswer();
-        regAnswer.setToken(authToken.getToken());
+        regAnswer.setVerified(false);
+        regAnswer.setActive(false);
+        regAnswer.setUserId(authToken.getUser().getId());
 
         return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
                 MessageCode.SUCCESS.getDescription(), regAnswer);

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

@@ -0,0 +1,122 @@
+package ru.soune.nocopy.handler;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.mail.MessagingException;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+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.register.RegAnswer;
+import ru.soune.nocopy.dto.register.VerifyUserRequest;
+import ru.soune.nocopy.entity.user.AuthToken;
+import ru.soune.nocopy.entity.user.EmailVerificationToken;
+import ru.soune.nocopy.entity.user.User;
+import ru.soune.nocopy.exception.NotValidFieldException;
+import ru.soune.nocopy.exception.UserNotFoundException;
+import ru.soune.nocopy.repository.AuthTokenRepository;
+import ru.soune.nocopy.repository.EmailVerificationTokenRepository;
+import ru.soune.nocopy.repository.UserRepository;
+import ru.soune.nocopy.service.mail.EmailService;
+import ru.soune.nocopy.service.register.AuthService;
+import ru.soune.nocopy.service.user.UserService;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.Optional;
+
+@Component
+@Slf4j
+@RequiredArgsConstructor
+public class VerifyRegisterUserHandler implements RequestHandler {
+    private final ObjectMapper objectMapper;
+
+    private final EmailVerificationTokenRepository emailVerificationTokenRepository;
+
+    private final EmailService emailService;
+
+    private final UserRepository userRepository;
+
+    private final UserService userService;
+
+    private final AuthTokenRepository authTokenRepository;
+
+    private final AuthService authService;
+
+    @Override
+    public BaseResponse handle(BaseRequest request) throws MessagingException, IOException {
+        VerifyUserRequest verifyUserRequest = objectMapper.convertValue(request.getMessageBody(), VerifyUserRequest.class);
+
+        Long userId = verifyUserRequest.getUserId();
+
+        User user = userRepository.findById(userId)
+                .orElseThrow(() -> new UserNotFoundException("User not found with id: " + userId));
+
+        Optional<AuthToken> userAuthTokens = authTokenRepository.findByUserId(userId);
+
+        AuthToken authToken = userAuthTokens.isEmpty() ? authService.generateAuthToken(user): userAuthTokens.get();
+
+        if (verifyUserRequest.getResend() != null && verifyUserRequest.getResend() == 1) {
+            return handleResend(request, user, authToken);
+        }
+
+        return handleVerify(request, user, authToken, verifyUserRequest.getVerifyToken());
+    }
+
+    private BaseResponse handleResend(BaseRequest request, User user, AuthToken authToken) throws MessagingException, IOException {
+
+        EmailVerificationToken token = emailVerificationTokenRepository.findByUserId(user.getId());
+
+        if (token != null && !token.isExpired()) {
+            emailService.sendVerificationEmail(user, token.getToken());
+
+            log.info("Verification token resent for user {}", user.getEmail());
+            return successResponse(request, authToken, "Verification code has been resent", false,
+                    false, user.getEmail());
+        }
+
+        if (token != null) {
+            emailVerificationTokenRepository.delete(token);
+        }
+
+        EmailVerificationToken newToken = emailService.createEmailVerificationToken(authToken);
+
+        emailService.sendVerificationEmail(user, newToken.getToken());
+
+        log.info("New verification token generated for user {}", user.getEmail());
+
+        return successResponse(request, authToken, "New verification code has been sent",
+                false, false, user.getEmail());
+    }
+
+
+    private BaseResponse handleVerify(BaseRequest request, User user, AuthToken authToken, String providedToken) {
+
+        EmailVerificationToken token = emailVerificationTokenRepository.findByUserIdAndToken(user.getId(), providedToken);
+
+        if (token == null || token.isExpired()) {
+            throw new NotValidFieldException("Invalid or expired token",
+                    new BaseResponse(request.getMsgId(), MessageCode.INVALID_TOKEN.getCode(),
+                            MessageCode.INVALID_TOKEN.getDescription(), Map.of("userId", user.getId())));
+        }
+
+        User updateUser = userService.activateAndVerifyUser(user.getId());
+
+        emailVerificationTokenRepository.delete(token);
+
+        return successResponse(request, authToken, MessageCode.SUCCESS.getDescription(), updateUser.isActive(),
+                updateUser.isEmailVerified(), updateUser.getEmail());
+    }
+
+    private BaseResponse successResponse(BaseRequest request, AuthToken authToken, String message, boolean isActive,
+                                         boolean isVerified, String email) {
+        RegAnswer regAnswer = new RegAnswer();
+        regAnswer.setToken(authToken.getToken());
+        regAnswer.setVerified(isVerified);
+        regAnswer.setActive(isActive);
+        regAnswer.setEmail(email);
+
+        return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(), message, regAnswer);
+    }
+}

src/main/java/ru/soune/nocopy/handler/validator/RegRequestValidator.java

@@ -1,19 +1,16 @@
 package ru.soune.nocopy.handler.validator;
 
-import org.apache.commons.validator.routines.DomainValidator;
 import org.apache.commons.validator.routines.EmailValidator;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.Errors;
 import org.springframework.validation.Validator;
-import ru.soune.nocopy.dto.RegRequest;
+import ru.soune.nocopy.dto.register.RegRequest;
 
-import java.net.InetAddress;
-import java.net.UnknownHostException;
 import java.util.*;
 
 @Component
 public class RegRequestValidator implements Validator {
-    private static final String COMPANY_REGEX = "^[a-zA-Zа-яА-ЯёЁ0-9\\s\\-&.,'()]{0,200}$";
+    private static final String COMPANY_REGEX = "^[a-zA-Zа-яА-ЯёЁ0-9\\s\\-&.,'()\"\"«»„‟”“”‘'’‹›❛❜❝❞〝〞〟]{1,200}$";
 
     private static final String NAME_REGEX = "^[a-zA-Zа-яА-ЯёЁ\\s\\-'.]{2,100}$";
 
@@ -74,21 +71,6 @@ public class RegRequestValidator implements Validator {
             errors.rejectValue("companyName", "companyName.invalid.chars",
                     "Company name contains invalid characters");
         }
-
-        validateForbiddenWords(trimmedCompany, "companyName", errors,
-                Arrays.asList("admin", "root", "system", "test"));
-    }
-
-    private void validateForbiddenWords(String text, String fieldName,
-                                        Errors errors, List<String> forbiddenWords) {
-        String lowerText = text.toLowerCase();
-        for (String word : forbiddenWords) {
-            if (lowerText.contains(word)) {
-                errors.rejectValue(fieldName, fieldName + ".forbidden.word",
-                        "Contains forbidden word: " + word);
-                break;
-            }
-        }
     }
 
     private void validateEmail(String email, Errors errors) {
@@ -156,15 +138,6 @@ public class RegRequestValidator implements Validator {
             errors.rejectValue("password", "password.contains.spaces",
                     "Password cannot contain spaces");
         }
-
-//        recomment if need complexity
-//        checkPasswordComplexity(password, errors);
-
-//        reccoment if need check simply standart password
-//        checkCommonPasswords(password, errors);
-
-//        reccoment if need check simply standart password
-//        checkForSequences(password, errors);
     }
 
     private void checkPasswordComplexity(String password, Errors errors) {

src/main/java/ru/soune/nocopy/mapper/UserContentMapper.java

@@ -4,8 +4,8 @@ import org.mapstruct.Mapper;
 import org.mapstruct.MappingTarget;
 import org.mapstruct.NullValuePropertyMappingStrategy;
 import org.mapstruct.factory.Mappers;
-import ru.soune.nocopy.dto.UserContentUpdateRequest;
+import ru.soune.nocopy.dto.user.UserContentUpdateRequest;
-import ru.soune.nocopy.entity.UserContent;
+import ru.soune.nocopy.entity.user.UserContent;
 
 @Mapper(componentModel = "spring",
         nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)

src/main/java/ru/soune/nocopy/mapper/UserMapper.java

@@ -3,8 +3,8 @@ package ru.soune.nocopy.mapper;
 import org.mapstruct.Mapper;
 import org.mapstruct.NullValuePropertyMappingStrategy;
 import org.mapstruct.factory.Mappers;
-import ru.soune.nocopy.dto.UserDTO;
+import ru.soune.nocopy.dto.user.UserDTO;
-import ru.soune.nocopy.entity.User;
+import ru.soune.nocopy.entity.user.User;
 
 @Mapper(componentModel = "spring",
         nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)

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

@@ -1,14 +1,24 @@
 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;
+import ru.soune.nocopy.entity.user.AuthToken;
 
-import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Optional;
 
 @Repository
 public interface AuthTokenRepository extends JpaRepository<AuthToken, Long> {
-    Optional<AuthToken> findByTokenAndExpiresAtAfter(String token, LocalDate expiresAtAfter);
+    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);
+    Optional<AuthToken> findByUserIdAndIsActive(Long userId, boolean isActive);
+    Optional<AuthToken> findByUserId(Long userId);
 }

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

@@ -0,0 +1,15 @@
+package ru.soune.nocopy.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import ru.soune.nocopy.entity.user.EmailVerificationToken;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Optional;
+
+public interface EmailVerificationTokenRepository extends JpaRepository<EmailVerificationToken, Long> {
+    Optional<EmailVerificationToken> findByToken(String token);
+    EmailVerificationToken findByUserIdAndToken(Long userId, String token);
+    List<EmailVerificationToken> findByExpiresAtBefore(LocalDateTime expiresAtBefore);
+    EmailVerificationToken findByUserId(Long userId);
+}

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

@@ -6,14 +6,15 @@ import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 import ru.soune.nocopy.entity.file.FileEntity;
 import ru.soune.nocopy.entity.file.FileStatus;
+import ru.soune.nocopy.entity.file.ProtectionStatus;
 
 import java.util.List;
 import java.util.Optional;
 
 @Repository
 public interface FileEntityRepository extends JpaRepository<FileEntity, String> {
-
     List<FileEntity> findByUserId(Long userId);
+
     Optional<FileEntity> findByUserIdAndChecksum(Long userId,  String imageHash);
 
     List<FileEntity> findByUserIdAndStatus(Long userId, FileStatus status);
@@ -22,13 +23,31 @@ public interface FileEntityRepository extends JpaRepository<FileEntity, String>
 
     Optional<FileEntity> findByUploadSessionId(String uploadSessionId);
 
+    List<FileEntity> findByProtectionStatus(ProtectionStatus protectionStatus);
+
     boolean existsByFilePath(String filePath);
 
     @Query("SELECT SUM(f.fileSize) FROM FileEntity f WHERE f.userId = :userId AND f.status = 'ACTIVE'")
     Long getTotalSizeByUserId(@Param("userId") Long userId);
 
+    @Query("SELECT f FROM FileEntity f WHERE f.protectionStatus = null AND f.status = 'ACTIVE' OR " +
+            "f.protectionStatus = 'NOT_PROTECTED' AND f.status = 'ACTIVE'")
+    List<FileEntity> findAllActiveFilesAndNotProtected();
+
     @Query("SELECT f FROM FileEntity f WHERE f.userId = :userId AND f.originalFileName LIKE %:keyword%")
     List<FileEntity> searchByFileName(@Param("userId") Long userId, @Param("keyword") String keyword);
 
+    @Query("SELECT f FROM FileEntity f WHERE f.status = :status")
+    List<FileEntity> searchFileEntityByStatus(@Param("status") FileStatus status);
+
+    @Query("SELECT f FROM FileEntity f WHERE f.id = :fileId")
+    FileEntity findByFileId(@Param("fileId") String fileId);
+
+    @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/ImageHashRepository.java

@@ -0,0 +1,14 @@
+package ru.soune.nocopy.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+import ru.soune.nocopy.entity.file.ImageHashEntity;
+
+import java.util.List;
+
+@Repository
+public interface ImageHashRepository extends JpaRepository<ImageHashEntity, String> {
+    void deleteByFileId(String fileId);
+    List<ImageHashEntity> findByFileId(String fileId);
+    ImageHashEntity findByHash64HiAndHash64Lo(Long hash64Hi, Long hash64Lo);
+}

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

@@ -0,0 +1,75 @@
+package ru.soune.nocopy.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+import ru.soune.nocopy.entity.file.FileEntity;
+
+import java.util.List;
+
+@Repository
+public interface ImageSimilarityRepository
+        extends JpaRepository<FileEntity, String> {
+    @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
+        """,
+            nativeQuery = true)
+    List<SimilarImageProjection> findCandidates(
+            @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,
+        h.hash64_lo AS hash64Lo,
+        h.file_id AS fileId,
+        f.user_id AS userId,
+        f.original_file_name AS originalFileName,
+        f.file_size AS fileSize,
+        f.stored_file_name AS similarFileId
+    FROM image_hashes h
+    JOIN file_entities f ON f.id = h.file_id
+    WHERE h.hash64_hi = :hash64Hi 
+      AND h.hash64_lo = :hash64Lo
+    """,
+            nativeQuery = true)
+    List<SimilarImageProjection> findExactDuplicates(
+            @Param("hash64Hi") Long hash64_hi,
+            @Param("hash64Lo") Long hash64_lo);
+}
+

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

@@ -0,0 +1,10 @@
+package ru.soune.nocopy.repository;
+
+public interface SimilarImageProjection {
+    Long getHash64Hi();
+    Long getHash64Lo();
+    String getId();
+    Long getUserId();
+    String getOriginalFileName();
+    Long getFileSize();
+}

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

@@ -3,7 +3,7 @@ package ru.soune.nocopy.repository;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import ru.soune.nocopy.entity.file.FileType;
-import ru.soune.nocopy.entity.UserContent;
+import ru.soune.nocopy.entity.user.UserContent;
 
 import java.util.List;
 

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

@@ -2,12 +2,12 @@ package ru.soune.nocopy.repository;
 
 import jakarta.validation.constraints.Size;
 import org.springframework.data.jpa.repository.JpaRepository;
-import ru.soune.nocopy.entity.User;
+import ru.soune.nocopy.entity.user.User;
 
 import java.util.Optional;
 
 public interface UserRepository extends JpaRepository<User, Long> {
-    Optional<User> findByEmail(String email);
+    User findByEmail(String email);
     boolean existsByEmail(String email);
     boolean existsByPhone(@Size(min = 11, max = 14) String phone);
 }

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

@@ -0,0 +1,191 @@
+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.*;
+import java.util.stream.Collectors;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class FileSimilarityService {
+
+    private final ImageSimilarityRepository repository;
+
+    private final ImageHashRepository hashRepository;
+
+    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"));
+
+        Long hash64Hi = imageHashEntity.getHash64Hi();
+        Long hash64Lo = imageHashEntity.getHash64Lo();
+
+        List<SimilarImageProjection> candidates = repository.findCandidates(fileId);
+
+        return candidates.stream()
+                .map(c -> {
+                    Long cHi = c.getHash64Hi();
+                    Long cLo = c.getHash64Lo();
+
+                    int hamming = fileUtil.hamming64(hash64Hi, hash64Lo, cHi, cLo);
+
+                    String level;
+                    if (hamming <= 5) {
+                        level = "DUPLICATE";
+                    } else if (hamming <= 12) {
+                        level = "SIMILAR";
+                    } else {
+                        level = "DIFFERENT";
+                    }
+
+                    return SimilarFileDTO.builder()
+                            .fileId(c.getId())
+                            .ownerId(c.getUserId())
+                            .originalFileName(c.getOriginalFileName())
+                            .fileSize(c.getFileSize())
+                            .hammingDistance(hamming)
+                            .similarityLevel(level)
+                            .build();
+                })
+                .sorted((a, b) ->
+                        Integer.compare(a.getHammingDistance(), b.getHammingDistance()))
+                .toList();
+    }
+
+    public List<SimilarFileDTO> findDuplicateByHammingDistance(String fileId, int hammingDistance,
+                                                               int duplicate, int similar) {
+        List<SimilarImageProjection> candidates = repository.findCandidates(fileId);
+
+        Optional<ImageHashEntity> hashOptional = hashRepository.findById(fileId);
+
+        if (hashOptional.isEmpty()) {
+            return Collections.emptyList();
+        }
+
+        var imageHashEntity = hashOptional.get();
+
+        Long hash64Hi = imageHashEntity.getHash64Hi();
+        Long hash64Lo = imageHashEntity.getHash64Lo();
+
+        return candidates.stream()
+                .map(c -> {
+                    Long cHi = c.getHash64Hi();
+                    Long cLo = c.getHash64Lo();
+
+                    int hamming = fileUtil.hamming64(hash64Hi, hash64Lo, cHi, cLo);
+
+                    return new AbstractMap.SimpleEntry<>(c, hamming);
+                })
+                .filter(entry -> entry.getValue() <= hammingDistance)
+                .sorted((a, b) -> Integer.compare(a.getValue(), b.getValue()))
+                .map(entry -> {
+                    SimilarImageProjection similarImageProjection = entry.getKey();
+                    int hamming = entry.getValue();
+
+                    String level;
+                    if (hamming <= duplicate) {
+                        level = "DUPLICATE";
+                    } else if (hamming <= similar) {
+                        level = "SIMILAR";
+                    } else {
+                        level = "DIFFERENT";
+                    }
+
+                    return SimilarFileDTO.builder()
+                            .fileId(similarImageProjection.getId())
+                            .originalFileName(similarImageProjection.getOriginalFileName())
+                            .fileSize(similarImageProjection.getFileSize())
+                            .hammingDistance(hamming)
+                            .similarityLevel(level)
+                            .ownerId(similarImageProjection.getUserId())
+                            .build();
+                })
+                .toList();
+    }
+
+    public List<SimilarImageProjection> findDuplicatedByHash(Long hash64Hi, Long hash64Lo) {
+        List<SimilarImageProjection> duplicates = repository.findExactDuplicates(hash64Hi,hash64Lo);
+
+        if (duplicates.isEmpty()) {
+            return new ArrayList<>();
+        }
+
+        return duplicates;
+    }
+
+    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 = authToken.equals("all") ? repository.findCandidates(fileId):
+                repository.findCandidatesFromUserFiles(fileId, authTokenRepository.findUserIdByToken(authToken));
+
+        List<String> similarityLevels = (filter != null && filter.getSimilarityLevels() != null)
+                ? filter.getSimilarityLevels()
+                : List.of("DUPLICATE", "SIMILAR", "DIFFERENT");
+
+        List<SimilarFileDTO> allResults = candidates.stream()
+                .map(c -> createSimilarFileResponse(c, hash64Hi, hash64Lo))
+                .filter(response -> similarityLevels.contains(response.getSimilarityLevel()))
+                .sorted(Comparator.comparingInt(SimilarFileDTO::getHammingDistance))
+                .collect(Collectors.toList());
+
+        int total = allResults.size();
+        int page = (pageable != null) ? pageable.getPageNumber() : 0;
+        int size = (pageable != null) ? pageable.getPageSize() : 20;
+
+        int fromIndex = Math.min(page * size, total);
+        int toIndex = Math.min(fromIndex + size, total);
+
+        List<SimilarFileDTO> pageContent = allResults.subList(fromIndex, toIndex);
+
+        return new PageImpl<>(pageContent, pageable, total);
+    }
+
+    private SimilarFileDTO createSimilarFileResponse(SimilarImageProjection similarImageProjection,
+                                                     Long hash64Hi, Long hash64Lo) {
+        Long imageProjectionHash64Hi = similarImageProjection.getHash64Hi();
+        Long similarImageProjectionHash64Lo = similarImageProjection.getHash64Lo();
+
+        int hamming = fileUtil.hamming64(hash64Hi, hash64Lo, imageProjectionHash64Hi, similarImageProjectionHash64Lo);
+
+        String level;
+        if (hamming <= 5) {
+            level = "DUPLICATE";
+        } else if (hamming <= 12) {
+            level = "SIMILAR";
+        } else {
+            level = "DIFFERENT";
+        }
+
+        return SimilarFileDTO.builder()
+                .fileId(similarImageProjection.getId())
+                .ownerId(similarImageProjection.getUserId())
+                .originalFileName(similarImageProjection.getOriginalFileName())
+                .fileSize(similarImageProjection.getFileSize())
+                .hammingDistance(hamming)
+                .similarityLevel(level)
+                .build();
+    }
+}

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

@@ -0,0 +1,48 @@
+package ru.soune.nocopy.service;
+
+import com.vrt.fileprotection.image.phash.PHash;
+import com.vrt.fileprotection.image.phash.PerceptualHashHelper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import ru.soune.nocopy.entity.file.FileEntity;
+import ru.soune.nocopy.entity.file.ImageHashEntity;
+import ru.soune.nocopy.repository.ImageHashRepository;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.time.LocalDateTime;
+import java.util.Map;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class ImageHashService {
+
+    private final ImageHashRepository repository;
+
+    public Map<String, Long> calculateHash(Path imagePath) throws IOException {
+        File file = imagePath.toFile();
+        PHash pHash = PerceptualHashHelper.INSTANCE.generateDCTPerceptualHash(file);
+        Long firstPart = pHash.getFirstPart();
+        Long secondPart = pHash.getSecondPart();
+        Map<String, Long> hash = Map.of(
+                "hi", firstPart,
+                "low", secondPart);
+
+        return hash;
+    }
+
+    public void create(FileEntity file,  Map<String, Long> stringIntegerMap) {
+        ImageHashEntity entity = ImageHashEntity.builder()
+                .file(file)
+                .hash64Hi(stringIntegerMap.get("hi"))
+                .hash64Lo(stringIntegerMap.get("low"))
+                .hashAlgorithm("PHASH64")
+                .createdAt(LocalDateTime.now())
+                .build();
+
+        repository.save(entity);
+    }
+}

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

@@ -1,72 +0,0 @@
-package ru.soune.nocopy.service;
-
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import ru.soune.nocopy.dto.UserContentRequest;
-import ru.soune.nocopy.dto.UserContentUpdateRequest;
-import ru.soune.nocopy.entity.file.FileType;
-import ru.soune.nocopy.entity.User;
-import ru.soune.nocopy.entity.UserContent;
-import ru.soune.nocopy.exception.ContentNotFoundException;
-import ru.soune.nocopy.exception.UserNotFoundException;
-import ru.soune.nocopy.mapper.UserContentMapper;
-import ru.soune.nocopy.repository.UserContentRepository;
-import ru.soune.nocopy.repository.UserRepository;
-
-import java.util.List;
-import java.util.Optional;
-
-@Service
-@AllArgsConstructor
-public class UserContentService {
-
-    private final UserContentRepository userContentRepository;
-
-    private final UserRepository userRepository;
-
-    private final UserContentMapper userContentMapper;
-
-    public List<UserContent> findByUser(long userId) {
-        return userContentRepository.findByUserId(userId);
-    }
-
-    @Transactional
-    public UserContent addUserContent(UserContentRequest userContentRequest) {
-        UserContent userContent = new UserContent();
-
-        Optional<User> byEmail = userRepository.findByEmail(userContentRequest.userEmail());
-        User user = byEmail.orElseThrow(() -> new UserNotFoundException(userContentRequest.userEmail()));
-
-        userContent.setUser(user);
-        userContent.setFilename(userContentRequest.fileName());
-        userContent.setFileExtension(userContentRequest.fileExtension());
-        userContent.setFilePath(userContentRequest.filePath());
-        userContent.setFileType(FileType.valueOf(userContentRequest.fileType()));
-        userContent.setOriginalFilename(userContentRequest.originalFilename());
-        userContent.setProtectionLevel(userContentRequest.protectionLevel());
-        userContent.setFileSize(userContentRequest.fileSize());
-
-        //TODO add
-        //    @Column(name = "protection_hash", length = 64)
-        //    private String protectionHash;
-        //    @Column(name = "watermark_id", length = 50)
-        //    private String watermarkId;
-
-        return userContentRepository.save(userContent);
-    }
-
-    @Transactional
-    public UserContent updateUserContent(UserContentUpdateRequest userContentRequest) {
-        UserContent entity = userContentRepository.findById(userContentRequest.id())
-                .orElseThrow(() -> new ContentNotFoundException("Content not found with: " + userContentRequest.id()));
-
-        userContentMapper.updateEntityFromDto(userContentRequest, entity);
-
-        return userContentRepository.save(entity);
-    }
-
-    public void deleteUserContent(long userContentId) {
-        userContentRepository.deleteById(userContentId);
-    }
-}

src/main/java/ru/soune/nocopy/service/auth/CleanupTokenSessionsService.java

@@ -0,0 +1,37 @@
+package ru.soune.nocopy.service.auth;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import ru.soune.nocopy.entity.user.AuthToken;
+import ru.soune.nocopy.repository.AuthTokenRepository;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class CleanupTokenSessionsService {
+    @Autowired
+    private AuthTokenRepository authTokenRepository;
+
+    @Value("${file.storage.auth-token-life-hours}")
+    private int authTokenLife;
+
+    @Transactional
+    @Scheduled(fixedDelay = 30000)
+    public void cleanupExpiredTokens() {
+        LocalDateTime now = LocalDateTime.now();
+
+        List<AuthToken> expiredTokens = authTokenRepository.findByExpiresAtBefore(now);
+
+        if (!expiredTokens.isEmpty()) {
+            authTokenRepository.deleteAll(expiredTokens);
+        }
+    }
+}

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

@@ -9,16 +9,23 @@ import ru.soune.nocopy.dto.file.FileResponse;
 import ru.soune.nocopy.entity.file.FileEntity;
 import ru.soune.nocopy.entity.file.FileStatus;
 import ru.soune.nocopy.entity.file.FileUploadSession;
+import ru.soune.nocopy.entity.file.ProtectionStatus;
+import ru.soune.nocopy.exception.DuplicateImageException;
 import ru.soune.nocopy.exception.FileEntityNotFoundException;
 import ru.soune.nocopy.repository.FileEntityRepository;
+import ru.soune.nocopy.repository.ImageHashRepository;
+import ru.soune.nocopy.repository.SimilarImageProjection;
+import ru.soune.nocopy.service.FileSimilarityService;
+import ru.soune.nocopy.service.ImageHashService;
 
+import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.time.LocalDateTime;
-import java.time.ZoneOffset;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -28,7 +35,13 @@ public class FileEntityService {
 
     private final FileEntityRepository fileEntityRepository;
 
-    @Transactional
+    private final ImageHashService imageHashService;
+
+    private final FileSimilarityService fileSimilarityService;
+
+    private final ImageHashRepository imageHashRepository;
+
+    @Transactional(noRollbackFor = DuplicateImageException.class)
     public FileEntity createFromUploadSession(FileUploadSession session, String checksum) {
         log.info("Creating FileEntity for upload session: {}", session.getUploadId());
 
@@ -39,6 +52,21 @@ public class FileEntityService {
                 throw new IOException("File not found on disk: " + filePath);
             }
 
+            Map<String, Long> imageHash = Map.of();
+
+            if (session.getFileType().startsWith("image")) {
+                imageHash = imageHashService.calculateHash(filePath);
+                List<SimilarImageProjection> duplicatedByHash = fileSimilarityService.findDuplicatedByHash(
+                        imageHash.get("hi"), imageHash.get("low"));
+
+                if (!duplicatedByHash.isEmpty()) {
+                    SimilarImageProjection similarImageProjection = duplicatedByHash.get(0);
+
+                    throw new DuplicateImageException("Duplicate", similarImageProjection.getId(),
+                            similarImageProjection.getUserId());
+                }
+            }
+
             long fileSize = Files.size(filePath);
             String originalName = session.getFileName();
             String storedName = filePath.getFileName().toString();
@@ -57,11 +85,12 @@ public class FileEntityService {
                     .build();
 
             FileEntity saved = fileEntityRepository.save(fileEntity);
-            log.info("FileEntity created successfully: {} (size: {} bytes)",
+
-                    saved.getId(), fileSize);
+            if (!imageHash.isEmpty()) {
+                imageHashService.create(saved, imageHash);
+            }
 
             return saved;
-
         } catch (IOException e) {
             log.error("Failed to create FileEntity for session {}: {}",
                     session.getUploadId(), e.getMessage(), e);
@@ -69,15 +98,6 @@ public class FileEntityService {
         }
     }
 
-
-    private String extractFileExtension(String fileName) {
-        int dotIndex = fileName.lastIndexOf('.');
-        if (dotIndex > 0 && dotIndex < fileName.length() - 1) {
-            return fileName.substring(dotIndex + 1).toLowerCase();
-        }
-        return "";
-    }
-
     @Transactional(readOnly = true)
     public FileEntityResponse getById(String fileId, int version) {
         FileEntity fileEntity = fileEntityRepository.findById(fileId)
@@ -168,24 +188,45 @@ public class FileEntityService {
     }
 
     @Transactional
-    public void markAsDeleted(FileEntity fileEntity) {
+    public FileEntity markAsDeleted(FileEntity fileEntity) throws IOException {
         fileEntity.setStatus(FileStatus.DELETED);
         fileEntity.setUpdatedAt(LocalDateTime.now());
+        fileEntity.setProtectionStatus(ProtectionStatus.NOT_PROTECTED);
+
+        Path path = Paths.get(fileEntity.getProtectedFilePath());
+        Files.deleteIfExists(path);
+        fileEntity.setProtectedFilePath("");
+
+        return fileEntityRepository.save(fileEntity);
+    }
+
+    public void softDeleteFileWithHash(FileEntity fileEntity) throws IOException {
+        if (fileEntity.getImageHash() != null) {
+            fileEntity.setImageHash(null);
+        }
+
+        fileEntity.setStatus(FileStatus.DELETED);
+        fileEntity.setUpdatedAt(LocalDateTime.now());
+        fileEntity.setProtectionStatus(ProtectionStatus.NOT_PROTECTED);
+
+        Path path = Paths.get(fileEntity.getProtectedFilePath());
+        Files.deleteIfExists(path);
+        fileEntity.setProtectedFilePath("");
 
         fileEntityRepository.save(fileEntity);
     }
 
     @Transactional
-    public boolean deleteFromDisk(FileEntity fileEntity) throws IOException {
+    public void deleteFromDisk(FileEntity fileEntity) throws IOException {
         Path path = Paths.get(fileEntity.getFilePath());
 
         if (!Files.exists(path)) {
-            return true;
+            return;
         }
 
         Files.delete(path);
 
-        return true;
+        fileEntityRepository.delete(fileEntity);
     }
 
     @Transactional(readOnly = true)
@@ -194,6 +235,99 @@ public class FileEntityService {
         return totalSize != null ? totalSize : 0L;
     }
 
+    public void changeStatus(ProtectionStatus newStatus, String fileId) {
+        FileEntity fileEntity = fileEntityRepository.findById(fileId)
+                .orElseThrow(() -> new FileEntityNotFoundException(fileId));
+        fileEntity.setProtectionStatus(newStatus);
+
+        fileEntityRepository.save(fileEntity);
+    }
+
+    @Transactional
+    public void writeProtectedFile(String id, byte[] data, String fileExt) throws IOException {
+        FileEntity fileEntity = fileEntityRepository.findById(id)
+                .orElseThrow(() -> new RuntimeException("File not found: " + id));
+
+        String extension = determineFileExtension(fileExt, fileEntity);
+        Path protectedFilePath = prepareProtectedPath(fileEntity, extension);
+
+        if (Files.exists(protectedFilePath)) {
+            Files.delete(protectedFilePath);
+        }
+
+        Files.write(protectedFilePath, data);
+
+        fileEntity.setProtectedFilePath(protectedFilePath.toString());
+        fileEntity.setProtectedAt(LocalDateTime.now());
+        fileEntity.setUpdatedAt(LocalDateTime.now());
+        fileEntity.setFileExtension(extension);
+        fileEntity.setProtectionStatus(ProtectionStatus.PROTECTED);
+
+        fileEntityRepository.save(fileEntity);
+    }
+
+    public FileEntity findBySignature(String signature) {
+        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(() ->
+                    new RuntimeException("File not found: " + id));
+
+            File file = new File(fileEntity.getFilePath());
+
+            if (!file.exists()) {
+                throw new RuntimeException("File not found on disk: " + fileEntity.getFilePath());
+            }
+
+            return file;
+        } catch (Exception e) {
+            log.error("Error getting file: {}", id, e);
+            return null;
+        }
+    }
+
+    public Path prepareProtectedPath(FileEntity fileEntity, String extension) throws IOException {
+        Path originalPath = Paths.get(fileEntity.getFilePath());
+
+        String pathStr = originalPath.toString();
+        pathStr = pathStr.replaceFirst("/uploads/uploads/", "/uploads/protected/");
+
+        Path protectedPath = Paths.get(pathStr);
+        String fileName = protectedPath.getFileName().toString();
+
+        if (extension != null) {
+            String nameWithoutExt = fileName;
+            int lastDotIndex = fileName.lastIndexOf('.');
+            if (lastDotIndex > 0) {
+                nameWithoutExt = fileName.substring(0, lastDotIndex);
+            }
+            fileName = nameWithoutExt + "." + extension;
+
+            protectedPath = protectedPath.getParent().resolve(fileName);
+        }
+
+        Files.createDirectories(protectedPath.getParent());
+
+        return protectedPath;
+    }
+
+    public void updateSignature(String signature, String fileId) throws IOException {
+        FileEntity fileEntity = fileEntityRepository.findByFileId(fileId);
+        fileEntity.setSignature(signature);
+        fileEntity.setProtectionStatus(ProtectionStatus.PROTECTED);
+        fileEntity.setUpdatedAt(LocalDateTime.now());
+        fileEntity.setProtectedAt(LocalDateTime.now());
+        fileEntity.setProtectedFilePath(prepareProtectedPath(fileEntity, fileEntity.getFileExtension()).toString());
+
+        fileEntityRepository.save(fileEntity);
+    }
+
     private boolean checkFileExistsOnDisk(String filePath) {
         try {
             return Files.exists(Paths.get(filePath));
@@ -203,6 +337,14 @@ public class FileEntityService {
         }
     }
 
+    private String determineFileExtension(String fileExt, FileEntity fileEntity) {
+        if (fileExt != null && !fileExt.trim().isEmpty()) {
+            return fileExt;
+        } else {
+            return fileEntity.getFileExtension();
+        }
+    }
+
     private FileEntityResponse convertToResponse(FileEntity fileEntity, int version) {
         boolean existsOnDisk = checkFileExistsOnDisk(fileEntity.getFilePath());
 
@@ -223,6 +365,8 @@ public class FileEntityService {
                 .formattedSize(formatFileSize(fileEntity.getFileSize()))
                 .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/FileProcessingOrchestrator.java

@@ -0,0 +1,53 @@
+package ru.soune.nocopy.service.file;
+
+import com.vrt.NoCopyFileService;
+import com.vrt.fileprotection.FileProtector;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+import ru.soune.nocopy.entity.file.FileEntity;
+import ru.soune.nocopy.entity.file.ProtectionStatus;
+import ru.soune.nocopy.repository.FileEntityRepository;
+import ru.soune.nocopy.util.FileUtil;
+
+import java.util.List;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class FileProcessingOrchestrator {
+
+    private final NoCopyFileService noCopyFileService;
+
+    private final FileEntityRepository fileRepository;
+
+    private final FileUtil fileUtil;
+
+    public void initializeProcessingQueue() {
+        List<FileEntity> filesToProtect = fileRepository.findByProtectionStatus(ProtectionStatus.NOT_PROTECTED);
+
+        for (FileEntity fileEntity : filesToProtect) {
+            try {
+                FileProtector.FileInfo fileInfo = fileUtil.createFileInfo(fileEntity);
+
+                noCopyFileService.addFile(fileInfo);
+
+                log.info("Add to query: {}", fileEntity.getOriginalFileName());
+            } catch (Exception e) {
+                log.error("Fail add to query: {}", fileEntity.getId(), e);
+            }
+        }
+    }
+
+    @Scheduled(fixedDelay = 120000)
+    public void checkNewFilesForProtection() {
+        List<FileEntity> newFiles = fileRepository.findAllActiveFilesAndNotProtected();
+
+        for (FileEntity fileEntity : newFiles) {
+            FileProtector.FileInfo fileInfo = fileUtil.createFileInfo(fileEntity);
+
+            noCopyFileService.addFile(fileInfo);
+        }
+    }
+}

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

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

@@ -0,0 +1,35 @@
+package ru.soune.nocopy.service.file;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import ru.soune.nocopy.entity.file.FileEntity;
+import ru.soune.nocopy.entity.file.FileStatus;
+import ru.soune.nocopy.repository.FileEntityRepository;
+
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class NotExistFilesCleanupService {
+
+    @Autowired
+    private FileEntityRepository fileEntityRepository;
+
+    @Transactional
+    @Scheduled(fixedDelay = 30000)
+    public void cleanUpNotExistFiles() {
+        List<FileEntity> fileEntities = fileEntityRepository.searchFileEntityByStatus(FileStatus.DELETED);
+
+        for (FileEntity fileEntity : fileEntities) {
+            boolean exists = Files.exists(Paths.get(fileEntity.getFilePath()));
+            if (!exists) {
+                fileEntityRepository.delete(fileEntity);
+            }
+        }
+    }
+}

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

@@ -0,0 +1,44 @@
+package ru.soune.nocopy.service.file.impl;
+
+import com.vrt.AudioFilePathProvider;
+import com.vrt.fileprotection.FileProtector;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.stereotype.Service;
+import ru.soune.nocopy.entity.file.FileEntity;
+import ru.soune.nocopy.repository.FileEntityRepository;
+import ru.soune.nocopy.service.file.FileEntityService;
+
+import java.io.IOException;
+import java.util.Optional;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class AudioFilePathProviderImpl implements AudioFilePathProvider {
+
+    private final FileEntityService fileEntityService;
+
+    private final FileEntityRepository fileEntityRepository;
+
+    @Override
+    public @NotNull String providePath(@NotNull FileProtector.FileInfo fileInfo) {
+        String filePath;
+        Optional<FileEntity> optionalFileEntity = fileEntityRepository.findById(fileInfo.getId());
+
+        if (optionalFileEntity.isEmpty()) {
+            throw new NullPointerException();
+        }
+
+        FileEntity fileEntity = optionalFileEntity.get();
+
+        try {
+            filePath = fileEntityService.prepareProtectedPath(fileEntity, fileEntity.getFileExtension()).toString();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        return filePath;
+    }
+}

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

@@ -0,0 +1,42 @@
+package ru.soune.nocopy.service.file.impl;
+
+import com.vrt.fileprotection.FileProtector;
+import com.vrt.fileprotection.audio.AudioLocalSearch;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.springframework.stereotype.Service;
+import ru.soune.nocopy.entity.file.FileEntity;
+import ru.soune.nocopy.service.file.FileEntityService;
+import ru.soune.nocopy.util.FileUtil;
+
+import java.io.IOException;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class AudioLocalSearchImpl implements AudioLocalSearch {
+
+    private final FileEntityService fileEntityService;
+
+    private final FileUtil fileUtil;
+
+    @Override
+    public @Nullable FileProtector.FileInfo findBySignature(@NotNull String signature) {
+        FileEntity fileEntity = fileEntityService.findBySignature(signature);
+
+        return fileUtil.createFileInfo(fileEntity);
+    }
+
+    @Override
+    public void updateSignature(@NotNull String signature, @NotNull FileProtector.FileInfo fileInfo) {
+        try {
+            fileEntityService.updateSignature(signature, fileInfo.getId());
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+
+}

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

@@ -1,5 +1,7 @@
-package ru.soune.nocopy.service.file;
+package ru.soune.nocopy.service.file.impl;
 
+import com.vrt.NoCopyFileService;
+import com.vrt.fileprotection.FileProtector;
 import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -10,12 +12,22 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 import ru.soune.nocopy.dto.file.UploadProgressResponse;
+import ru.soune.nocopy.entity.file.FileEntity;
+import ru.soune.nocopy.entity.file.FileStatus;
 import ru.soune.nocopy.entity.file.FileUploadSession;
 import ru.soune.nocopy.entity.file.UploadStatus;
 import ru.soune.nocopy.exception.ChunkSizeExceededException;
+import ru.soune.nocopy.exception.DuplicateImageException;
 import ru.soune.nocopy.exception.FileUploadException;
 import ru.soune.nocopy.exception.UploadSessionNotFoundException;
+import ru.soune.nocopy.repository.FileEntityRepository;
 import ru.soune.nocopy.repository.FileUploadSessionRepository;
+import ru.soune.nocopy.repository.SimilarImageProjection;
+import ru.soune.nocopy.service.FileSimilarityService;
+import ru.soune.nocopy.service.ImageHashService;
+import ru.soune.nocopy.service.file.FileEntityService;
+import ru.soune.nocopy.service.file.FileUploadService;
+import ru.soune.nocopy.util.FileUtil;
 
 import java.io.*;
 import java.nio.file.*;
@@ -23,10 +35,7 @@ import java.nio.file.attribute.PosixFilePermission;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.time.LocalDateTime;
-import java.util.Comparator;
+import java.util.*;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Stream;
 
@@ -57,9 +66,22 @@ public class FileUploadServiceImpl implements FileUploadService {
 
     private Path storageRoot;
 
+    @Autowired
+    private ImageHashService imageHashService;
+
+    @Autowired
+    private FileSimilarityService fileSimilarityService;
+
+    @Autowired
+    private FileEntityRepository fileEntityRepository;
+
     @Autowired
     private FileEntityService fileEntityService;
 
+    private final NoCopyFileService noCopyFileService;
+
+    private final FileUtil fileUtil;
+
     @PostConstruct
     public void init() {
         try {
@@ -125,14 +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) {
-
-        log.info("Processing chunk {} for session {}, size: {} bytes",
-                chunkNumber, uploadId, chunkFile.getSize());
-
         FileUploadSession session = sessionRepository.findById(uploadId)
                 .orElseThrow(() -> new UploadSessionNotFoundException(uploadId));
 
@@ -158,80 +204,7 @@ public class FileUploadServiceImpl implements FileUploadService {
             throw new ChunkSizeExceededException(chunkFile.getSize(), chunkSize);
         }
 
-        return processChunk(session, chunkNumber, chunkFile);
+        return processChunk(session, chunkNumber, chunkFile, findSimilar);
-    }
-
-    @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) {
-        try {
-            assembleFile(session);
-            log.info("File assembly completed successfully for session: {}",
-                    session.getUploadId());
-
-        } 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);
-    }
-
-    @Override
-    @Transactional
-    public void retryFailedUpload(String uploadId) {
-        FileUploadSession session = sessionRepository.findById(uploadId)
-                .orElseThrow(() -> new UploadSessionNotFoundException(uploadId));
-
-        if (session.getStatus() != UploadStatus.FAILED) {
-            throw new FileUploadException("Only failed uploads can be retried");
-        }
-
-        if (session.getRetryCount() >= maxRetryAttempts) {
-            throw new FileUploadException("Max retry attempts exceeded");
-        }
-
-        session.setStatus(UploadStatus.UPLOADING);
-        session.setRetryCount(session.getRetryCount() + 1);
-        session.setLastError(null);
-
-        sessionRepository.save(session);
-
-        if (session.getChunksUploaded().equals(session.getTotalChunks())) {
-            log.info("Retrying file assembly for session: {}", uploadId);
-            assembleFileAsync(session);
-        }
-
-        log.info("Upload retry initiated for session: {} (attempt {})",
-                uploadId, session.getRetryCount());
     }
 
     @Override
@@ -242,6 +215,47 @@ public class FileUploadServiceImpl implements FileUploadService {
         return UploadProgressResponse.fromSession(session);
     }
 
+    @Async("fileUploadTaskExecutor")
+    @Transactional
+    @Override
+    public void completeFileProcessingAsync(FileUploadSession session) {
+        try {
+            Path filePath = Paths.get(session.getFilePath());
+            String checksum = calculateChecksum(filePath);
+
+            FileEntity fileEntity = FileEntity.builder()
+                    .userId(session.getUserId())
+                    .originalFileName(session.getFileName())
+                    .storedFileName(filePath.getFileName().toString())
+                    .filePath(session.getFilePath())
+                    .fileSize(session.getFileSize())
+                    .mimeType(session.getFileType())
+                    .fileExtension(session.getExtension())
+                    .checksum(checksum)
+                    .uploadSessionId(session.getUploadId())
+                    .status(FileStatus.ACTIVE)
+                    .build();
+
+            FileEntity saved = fileEntityRepository.save(fileEntity);
+
+            if (session.getFileType().equals("image")) {
+                Map<String, Long> hash = imageHashService.calculateHash(filePath);
+
+                imageHashService.create(saved, hash);
+            }
+
+            cleanupSessionFiles(session);
+
+            noCopyFileService.addFile(fileUtil.createFileInfo(fileEntity));
+
+            log.info("File processing completed for session: {}", session.getUploadId());
+
+        } catch (Exception e) {
+            log.error("Failed to complete file processing for session {}: {}",
+                    session.getUploadId(), e.getMessage(), e);
+        }
+    }
+
     private void validateSession(FileUploadSession session) {
         UploadStatus status = session.getStatus();
 
@@ -271,14 +285,13 @@ public class FileUploadServiceImpl implements FileUploadService {
         }
     }
 
-    private UploadProgressResponse processChunk(FileUploadSession session,
+    private UploadProgressResponse processChunk(FileUploadSession session, Integer chunkNumber, MultipartFile chunkFile,
-                                                Integer chunkNumber,
+                                                Integer findSimilar) {
-                                                MultipartFile chunkFile) {
         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);
@@ -291,17 +304,42 @@ public class FileUploadServiceImpl implements FileUploadService {
             log.debug("Chunk {} saved successfully. Uploaded: {}/{}",
                     chunkNumber, session.getChunksUploaded(), session.getTotalChunks());
 
-            if (session.getChunksUploaded().equals(session.getTotalChunks())) {
+            boolean isLastChunk = session.getChunksUploaded().equals(session.getTotalChunks());
+
+            if (isLastChunk) {
                 log.info("All chunks uploaded for session {}. Starting assembly...",
                         session.getUploadId());
-                sessionRepository.save(session);
+
-                assembleFileAsync(session);
+                String finalFilePath = assembleFileSynchronously(session);
+
+                if (session.getFileType().startsWith("image") && findSimilar == 0) {
+                    checkForDuplicatesSynchronously(finalFilePath);
+                }
+
+                session.setStatus(UploadStatus.COMPLETED);
+                session.setFilePath(finalFilePath);
+
+                completeFileProcessingAsync(session);
+
             } else {
                 sessionRepository.save(session);
             }
 
             return UploadProgressResponse.fromSession(session);
 
+        } catch (DuplicateImageException e) {
+            if (chunkPath != null) {
+                cleanupFailedChunk(chunkPath);
+            }
+
+            log.warn("Duplicate image found for session {}: {}",
+                    session.getUploadId(), e.getMessage());
+
+            session.setStatus(UploadStatus.FAILED);
+            session.setLastError(e.getMessage());
+            sessionRepository.save(session);
+
+            throw e;
         } catch (Exception e) {
             if (chunkPath != null) {
                 cleanupFailedChunk(chunkPath);
@@ -318,32 +356,56 @@ public class FileUploadServiceImpl implements FileUploadService {
         }
     }
 
+    private String assembleFileSynchronously(FileUploadSession session) throws IOException {
+        Path finalFilePath = prepareFinalFile(session);
+
+        validateAllChunksExist(session);
+        mergeChunksToFile(session, finalFilePath);
+        validateFinalFile(session, finalFilePath);
+
+        return finalFilePath.toString();
+    }
+
+    private void checkForDuplicatesSynchronously(String filePath)
+            throws IOException , DuplicateImageException {
+        Path path = Paths.get(filePath);
+        Map<String, Long> hash = imageHashService.calculateHash(path);
+
+        List<SimilarImageProjection> duplicates = fileSimilarityService.findDuplicatedByHash(
+                hash.get("hi"), hash.get("low"));
+
+        if (!duplicates.isEmpty()) {
+            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);
 
         if (!Files.exists(chunkPath)) {
-            log.warn("Chunk file missing, re-uploading: {}", chunkPath);
             session.getChunkPaths().remove(chunkNumber);
             session.setChunksUploaded(session.getChunksUploaded() - 1);
             sessionRepository.save(session);
-            return processChunk(session, chunkNumber, chunkFile);
+
+            return processChunk(session, chunkNumber, chunkFile, findSimilar);
         }
 
         long existingSize = Files.size(chunkPath);
+
         if (existingSize != chunkFile.getSize()) {
-            log.warn("Chunk size mismatch, re-uploading: {} != {}",
-                    existingSize, chunkFile.getSize());
             Files.deleteIfExists(chunkPath);
             session.getChunkPaths().remove(chunkNumber);
             session.setChunksUploaded(session.getChunksUploaded() - 1);
             sessionRepository.save(session);
-            return processChunk(session, chunkNumber, chunkFile);
+
+            return processChunk(session, chunkNumber, chunkFile, findSimilar);
         }
 
-        log.debug("Chunk {} already uploaded and valid", chunkNumber);
         return UploadProgressResponse.fromSession(session);
     }
 
@@ -402,7 +464,7 @@ public class FileUploadServiceImpl implements FileUploadService {
                 session.getUploadId(), session.getFileName());
 
         Path finalFilePath = null;
-        String checksum = null;
+        String checksum;
 
         try {
             finalFilePath = prepareFinalFile(session);
@@ -421,13 +483,21 @@ public class FileUploadServiceImpl implements FileUploadService {
             session.setChecksum(checksum);
             session.setStatus(UploadStatus.COMPLETED);
             session.setCompletedAt(LocalDateTime.now());
+
             sessionRepository.save(session);
             log.info("Upload session updated to COMPLETED: {}", session.getUploadId());
 
             try {
-                fileEntityService.createFromUploadSession(session, checksum);
+                FileEntity fileEntity = fileEntityService.createFromUploadSession(session, checksum);
+
+                FileProtector.FileInfo fileInfo = fileUtil.createFileInfo(fileEntity);
+
+                noCopyFileService.addFile(fileInfo);
+
                 log.info("FileEntity successfully created for session: {}",
                         session.getUploadId());
+            } catch (DuplicateImageException e) {
+                throw new DuplicateImageException("Duplicate", e.duplicateFileId(), e.userId());
             } catch (Exception e) {
                 log.error("Failed to create FileEntity for session {} (file uploaded, but metadata not saved): {}",
                         session.getUploadId(), e.getMessage());
@@ -591,44 +661,10 @@ public class FileUploadServiceImpl implements FileUploadService {
     private void handleAssemblyFailure(FileUploadSession session, Exception e) {
         session.setStatus(UploadStatus.FAILED);
         session.setLastError(e.getMessage());
+
         sessionRepository.save(session);
-
-        log.error("File assembly failed for session {}: {}",
-                session.getUploadId(), e.getMessage());
     }
 
-
-
-//    @Override
-//    @Transactional
-//    public void cleanupExpiredSessions() {
-//        log.info("Starting cleanup of expired upload sessions");
-//
-//        LocalDateTime expiryThreshold = LocalDateTime.now().minusHours(sessionExpiryHours);
-//
-//        try {
-//            var expiredSessions = sessionRepository.findByStatusInAndCreatedAtBefore(
-//                    Set.of(UploadStatus.INITIATED, UploadStatus.UPLOADING, UploadStatus.FAILED),
-//                    expiryThreshold
-//            );
-//
-//            int cleanedCount = 0;
-//            for (FileUploadSession session : expiredSessions) {
-//                session.setStatus(UploadStatus.FAILED);
-//                session.setLastError("Session expired during cleanup");
-//                sessionRepository.save(session);
-//
-//                CompletableFuture.runAsync(() -> cleanupSessionFiles(session));
-//                cleanedCount++;
-//            }
-//
-//            log.info("Cleaned up {} expired upload sessions", cleanedCount);
-//
-//        } catch (Exception e) {
-//            log.error("Error during session cleanup", e);
-//        }
-//    }
-
     private Path getChunkDirectory(Long userId, String uploadId) {
         return storageRoot.resolve("temp")
                 .resolve("user")

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

@@ -0,0 +1,54 @@
+package ru.soune.nocopy.service.file.impl;
+
+import com.vrt.fileprotection.FileProtector;
+import com.vrt.fileprotection.image.ImageLocalSearch;
+import com.vrt.fileprotection.image.phash.PHash;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.springframework.stereotype.Service;
+import ru.soune.nocopy.dto.file.SimilarFileDTO;
+import ru.soune.nocopy.entity.file.FileEntity;
+import ru.soune.nocopy.entity.file.ImageHashEntity;
+import ru.soune.nocopy.repository.FileEntityRepository;
+import ru.soune.nocopy.repository.ImageHashRepository;
+import ru.soune.nocopy.service.FileSimilarityService;
+import ru.soune.nocopy.util.FileUtil;
+
+import java.util.List;
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class ImageLocalSearchImpl implements ImageLocalSearch {
+
+    private final FileSimilarityService fileSimilarityService;
+
+    private final ImageHashRepository imageHashRepository;
+
+    private final FileUtil fileUtil;
+
+    private final FileEntityRepository fileEntityRepository;
+
+    @Override
+    public @NotNull List<Result> find(@NotNull FileProtector.FileInfo fileInfo) {
+        List<SimilarFileDTO> duplicateByHammingDistance =
+                fileSimilarityService.findDuplicateByHammingDistance(fileInfo.getId(), 10,
+                        5, 10);
+
+        return duplicateByHammingDistance.stream()
+                .map(fileUtil::convertToResult)
+                .toList();
+    }
+
+    @Override
+    public @Nullable FileProtector.FileInfo findByPHash(@NotNull PHash pHash) {
+        ImageHashEntity imageHashEntity =
+                imageHashRepository.findByHash64HiAndHash64Lo(pHash.getFirstPart(),
+                        pHash.getSecondPart());
+        FileEntity file = fileEntityRepository.findByFileId(imageHashEntity.getFileId());
+
+        return new FileProtector.FileInfo(FileProtector.Type.IMAGE, imageHashEntity.getFileId(),
+                String.valueOf(file.getUserId()));
+    }
+}

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

@@ -0,0 +1,34 @@
+package ru.soune.nocopy.service.file.impl;
+
+import com.vrt.fileprotection.FileProtector;
+import com.vrt.fileprotection.OperationResult;
+import com.vrt.fileprotection.image.ImageUniqueCheck;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.stereotype.Service;
+import ru.soune.nocopy.dto.file.SimilarFileDTO;
+import ru.soune.nocopy.service.FileSimilarityService;
+
+import java.util.List;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class ImageUniqueCheckImpl implements ImageUniqueCheck {
+
+    private final FileSimilarityService fileSimilarityService;
+
+    @Override
+    public @NotNull OperationResult check(@NotNull FileProtector.FileInfo fileInfo) {
+        String fileId = fileInfo.getId();
+        List<SimilarFileDTO> duplicateByHammingDistance =
+                fileSimilarityService.findDuplicateByHammingDistance(fileId, 3, 3, 4);
+
+        if (duplicateByHammingDistance == null || duplicateByHammingDistance.isEmpty()) {
+            return OperationResult.Companion.success();
+        } else {
+            return OperationResult.Companion.failure("Duplicate file");
+        }
+    }
+}

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

@@ -0,0 +1,36 @@
+package ru.soune.nocopy.service.file.impl;
+
+import com.vrt.fileprotection.FileProtector;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import ru.soune.nocopy.entity.file.ProtectionStatus;
+import ru.soune.nocopy.service.file.FileEntityService;
+
+@Slf4j
+@Component
+@AllArgsConstructor
+public class NoCopyProcessingListenerImpl implements FileProtector.ProcessingListener {
+
+    private final FileEntityService fileEntityService;
+
+    @Override
+    public void onStartProcessing(FileProtector.FileInfo fileInfo) {
+        fileEntityService.changeStatus(ProtectionStatus.PROCESSING, fileInfo.getId());
+    }
+
+    @Override
+    public void onProcessingFailed(FileProtector.FileInfo fileInfo) {
+        fileEntityService.changeStatus(ProtectionStatus.FAILED, fileInfo.getId());
+    }
+
+    @Override
+    public void onSavingFailed(FileProtector.FileInfo fileInfo) {
+        fileEntityService.changeStatus(ProtectionStatus.FAILED_SAVE, fileInfo.getId());
+    }
+
+    @Override
+    public void onFinish(FileProtector.FileInfo fileInfo) {
+        fileEntityService.changeStatus(ProtectionStatus.PROTECTED, fileInfo.getId());;
+    }
+}

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

@@ -0,0 +1,108 @@
+package ru.soune.nocopy.service.file.impl;
+
+import com.vrt.fileprotection.FileProtector;
+import com.vrt.fileprotection.OperationResult;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.springframework.stereotype.Component;
+import ru.soune.nocopy.service.file.FileEntityService;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class ProtectionFileProviderImpl implements FileProtector.FileProvider {
+
+    private static final Path SIGNATURE_FILE_PATH = Paths.get("/data/uploads/signature");
+
+    private final FileEntityService fileEntityService;
+
+    @Nullable
+    @Override
+    public File getImageFile(@NotNull String id) {
+        return fileEntityService.getFileById(id);
+    }
+
+    @Nullable
+    @Override
+    public File getVideoFile(@NotNull String id) {
+        return fileEntityService.getFileById(id);
+    }
+
+    @Nullable
+    @Override
+    public File getAudioFile(@NotNull String id) {
+        return fileEntityService.getFileById(id);
+    }
+
+    @Override
+    public @Nullable File getSignature() {
+        File signatureFile = SIGNATURE_FILE_PATH.toFile();
+
+        if (signatureFile.exists() && signatureFile.isFile() && signatureFile.length() > 0) {
+            return signatureFile;
+        }
+
+        return null;
+    }
+
+    @Override
+    public @NotNull OperationResult writeSignature(@NotNull byte[] bytes) {
+        try {
+            Path directory = SIGNATURE_FILE_PATH.getParent();
+
+            if (directory != null && !Files.exists(directory)) {
+                Files.createDirectories(directory);
+            }
+
+            Files.write(SIGNATURE_FILE_PATH, bytes);
+
+            return OperationResult.Companion.success();
+        } catch (IOException e) {
+            return OperationResult.Companion.failure("Not saved signature file");
+        }
+    }
+
+    @NotNull
+    @Override
+    public com.vrt.fileprotection.OperationResult writeAudioFile(@NotNull String id, @NotNull byte[] data, @Nullable String fileExt) {
+        try {
+            fileEntityService.writeProtectedFile(id, data, fileExt);
+            return OperationResult.Companion.success();
+        } catch (Exception e) {
+            log.error("Failed to create protected file: {}", id, e);
+            return OperationResult.Companion.failure("Failed to create protected file");
+        }
+    }
+
+    @NotNull
+    @Override
+    public com.vrt.fileprotection.OperationResult writeVideoFile(@NotNull String id, @NotNull byte[] data, @Nullable String fileExt) {
+        try {
+            fileEntityService.writeProtectedFile(id, data, fileExt);
+            return OperationResult.Companion.success();
+        } catch (Exception e) {
+            log.error("Failed to create protected file: {}", id, e);
+            return OperationResult.Companion.failure("Failed to create protected file");
+        }
+    }
+
+    @NotNull
+    @Override
+    public com.vrt.fileprotection.OperationResult writeImageFile(@NotNull String id, @NotNull byte[] data, @Nullable String fileExt) {
+        try {
+            fileEntityService.writeProtectedFile(id, data, fileExt);
+            return OperationResult.Companion.success();
+        } catch (Exception e) {
+            log.error("Failed to create protected file: {}", id, e);
+            return OperationResult.Companion.failure("Failed to create protected file");
+        }
+    }
+}

src/main/java/ru/soune/nocopy/service/mail/EmailService.java

@@ -0,0 +1,94 @@
+package ru.soune.nocopy.service.mail;
+
+import jakarta.mail.MessagingException;
+import jakarta.mail.internet.MimeMessage;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.mail.javamail.MimeMessageHelper;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import ru.soune.nocopy.entity.user.AuthToken;
+import ru.soune.nocopy.entity.user.EmailVerificationToken;
+import ru.soune.nocopy.entity.user.User;
+import ru.soune.nocopy.repository.EmailVerificationTokenRepository;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.security.SecureRandom;
+import java.time.LocalDateTime;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class EmailService {
+
+    private final JavaMailSender mailSender;
+
+    private final EmailVerificationTokenRepository emailVerificationTokenRepository;
+
+    @Value("${app.email.verification.standart-subject}")
+    private String standartSubject;
+
+    @Value("${app.email.verification.standart-address-from}")
+    private String standartAdressFrom;
+
+    @Value("${app.email.verification.user}")
+    private String user;
+
+    public void sendVerificationEmail(User user, String code) throws MessagingException, IOException {
+        MimeMessage message = mailSender.createMimeMessage();
+        MimeMessageHelper helper = new MimeMessageHelper(message, true, "UTF-8");
+
+        helper.setFrom(standartAdressFrom);
+        helper.setTo(user.getEmail());
+        helper.setSubject(standartSubject);
+
+        String htmlContent = loadAndProcessTemplate(user.getFullName(), code);
+        helper.setText(htmlContent, true);
+
+        mailSender.send(message);
+
+        log.info("Email sent to: {}", user.getEmail());
+    }
+
+    @Transactional
+    public EmailVerificationToken createEmailVerificationToken(AuthToken authToken) {
+        EmailVerificationToken emailToken = new EmailVerificationToken();
+        emailToken.setUser(authToken.getUser());
+        emailToken.setToken(generateVerificationCode());
+        emailToken.setCreatedAt(LocalDateTime.now());
+
+        return emailVerificationTokenRepository.save(emailToken);
+    }
+
+    private String generateVerificationCode() {
+        SecureRandom random = new SecureRandom();
+        int code = 100000 + random.nextInt(900000);
+
+        return String.valueOf(code);
+    }
+
+    private String loadAndProcessTemplate(String username, String code) throws IOException {
+        ClassPathResource resource = new ClassPathResource("templates/email-verification.html");
+        String template = new String(resource.getInputStream().readAllBytes(), StandardCharsets.UTF_8);
+        String safeUsername = escapeHtml(username != null ? username : user);
+        String safeCode = escapeHtml(code);
+
+        return template
+                .replace("{{username}}", safeUsername)
+                .replace("{{code}}", safeCode);
+    }
+
+    private String escapeHtml(String text) {
+        if (text == null) return "";
+        return text
+                .replace("&", "&")
+                .replace("<", "&lt;")
+                .replace(">", "&gt;")
+                .replace("\"", "&quot;")
+                .replace("'", "&#39;");
+    }
+}

src/main/java/ru/soune/nocopy/service/register/AuthService.java

@@ -1,4 +1,4 @@
-package ru.soune.nocopy.service;
+package ru.soune.nocopy.service.register;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.MessageSource;
@@ -6,18 +6,19 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import ru.soune.nocopy.dto.*;
-import ru.soune.nocopy.entity.AuthToken;
+import ru.soune.nocopy.dto.register.LoginAnswer;
-import ru.soune.nocopy.entity.User;
+import ru.soune.nocopy.dto.register.LoginRequest;
+import ru.soune.nocopy.dto.register.RegRequest;
+import ru.soune.nocopy.entity.user.AuthToken;
+import ru.soune.nocopy.entity.user.User;
+import ru.soune.nocopy.exception.NotFoundAuthToken;
 import ru.soune.nocopy.exception.NotValidFieldException;
 import ru.soune.nocopy.repository.AuthTokenRepository;
 import ru.soune.nocopy.repository.UserRepository;
 
 import java.security.SecureRandom;
 import java.time.LocalDateTime;
-import java.util.Arrays;
+import java.util.*;
-import java.util.Base64;
-import java.util.Map;
-import java.util.Optional;
 
 @Service
 @RequiredArgsConstructor
@@ -50,17 +51,35 @@ public class AuthService {
 
         User savedUser = userRepository.save(user);
 
-        AuthToken authToken = new AuthToken();
+        AuthToken authToken = genereateAuthToken(savedUser);
-        authToken.setToken(generateAuthToken());
-        authToken.setUser(savedUser);
 
         return authTokenRepository.save(authToken);
     }
 
+    @Transactional
+    public Long useUserAuthToken(String token) {
+        if (token == null || token.isBlank()) {
+            throw new NotFoundAuthToken("Token is required");
+        }
+
+        if (token.startsWith("Bearer ")) {
+            token = token.replace("Bearer ", "");
+        }
+
+        AuthToken authToken = authTokenRepository.findByToken(token)
+                .orElseThrow(() -> new NotFoundAuthToken("Token not found"));
+        authToken.setLastUsedAt(LocalDateTime.now());
+        authToken.setExpiresAt(LocalDateTime.now().plusHours(1));
+
+        authTokenRepository.save(authToken);
+
+        return authToken.getUser().getId();
+    }
+
+
     @Transactional
     public AuthToken login(LoginRequest request) {
-        Optional<User> userOpt = userRepository.findByEmail(request.getEmail());
+        User user = userRepository.findByEmail(request.getEmail());
-        User user = userOpt.get();
 
         if (!passwordEncoder.matches(request.getPassword(), user.getPassword())) {
             LoginAnswer loginAnswer = new LoginAnswer();
@@ -87,6 +106,18 @@ public class AuthService {
                 .ifPresent(authTokenRepository::delete);
     }
 
+    public AuthToken generateAuthToken(User user) {
+        return authTokenRepository.save(genereateAuthToken(user));
+    }
+
+    private AuthToken genereateAuthToken(User user) {
+        AuthToken authToken = new AuthToken();
+        authToken.setToken(generateAuthToken());
+        authToken.setUser(user);
+
+        return authToken;
+    }
+
     private String generateAuthToken() {
         byte[] bytes = new byte[32];
         secureRandom.nextBytes(bytes);

src/main/java/ru/soune/nocopy/service/register/CleanUpVerifyTokens.java

@@ -0,0 +1,31 @@
+package ru.soune.nocopy.service.register;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import ru.soune.nocopy.entity.user.EmailVerificationToken;
+import ru.soune.nocopy.repository.EmailVerificationTokenRepository;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class CleanUpVerifyTokens {
+
+    private final EmailVerificationTokenRepository emailVerificationTokenRepository;
+
+    @Transactional
+    @Scheduled(fixedDelay = 30000)
+    public void cleanupExpiredTokens() {
+        LocalDateTime now = LocalDateTime.now();
+
+
+        List<EmailVerificationToken> expiredTokens = emailVerificationTokenRepository.findByExpiresAtBefore(now);
+
+        if (!expiredTokens.isEmpty()) {
+            emailVerificationTokenRepository.deleteAll(expiredTokens);
+        }
+    }
+}