NCBACK-25 change path to file

# Conflicts:
#	src/main/java/ru/soune/nocopy/controller/ApiController.java
#	src/main/java/ru/soune/nocopy/entity/file/FileEntity.java

.env

@@ -1,19 +1,10 @@
-# Postgres
 POSTGRES_DB=no_copy_
 POSTGRES_USER=ncp_db
 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!

build.gradle

@@ -21,6 +21,9 @@ configurations {
 
 repositories {
 	mavenCentral()
+	flatDir {
+		dirs 'libs'
+	}
 }
 
 dependencies {
@@ -30,7 +33,6 @@ 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 'org.flywaydb:flyway-core:9.22.0'
 
@@ -52,6 +54,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,29 +17,6 @@ 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.7
     restart: always
@@ -53,8 +30,6 @@ services:
           memory: 1G
     environment:
       POSTGRES_DB: no_copy_
-      #      POSTGRES_USER: postgres
-      #      POSTGRES_PASSWORD: postgres
       POSTGRES_USER: ${POSTGRES_USER}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       POSTGRES_SHARED_BUFFERS: 512MB
@@ -84,11 +59,8 @@ services:
     environment:
       FILE_STORAGE_PATH: /data/uploads
       MAX_FILE_SIZE: 10737418240
-      #      FILE_CHUNK_SIZE: 1048576
       FILE_CHUNK_SIZE: 1000000
       POSTGRES_DB: no_copy_
-      #      POSTGRES_USER: postgres
-      #      POSTGRES_PASSWORD: postgres
       POSTGRES_USER: ${POSTGRES_USER}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       POSTGRES_PORT: 5432
@@ -98,13 +70,6 @@ services:
       YANDEX_API_KEY: AQVNyaVaUmgUb1GMCtf5zSEqFxy0woXrcMOOB43q
       YANDEX_FOLDER_ID: b1gokpdbm6qfpsou8pcd
       YANDEX_SEARCH_URL: "https://searchapi.api.cloud.yandex.net/v2/image/search_by_image"
-#      MAIL_HOST: postfix
-#      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:
@@ -273,7 +238,7 @@ volumes:
   loki_rules:
   uploads_data:
   prometheus_data:
-#  postfix-data:
+
 networks:
   app-network:
     external: true

referral/build.gradle.kts

@@ -1,28 +0,0 @@
-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")
-
-    testImplementation(kotlin("test"))
-}
-
-tasks.test {
-    useJUnitPlatform()
-}
-kotlin {
-    jvmToolchain(21)
-}

referral/src/main/kotlin/Main.kt

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

settings.gradle

@@ -1,6 +1 @@
-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

@@ -18,7 +18,6 @@ public class HandlerConfig {
             FileEntityHandler file,
             LogoutRequestHandler logoutHandler,
             ImageFoundRequestHandler imageFoundRequestHandler,
-            VerifyRegisterUserHandler verifyRegisterUser,
             AuthRequestHandler authRequestHandler
     ) {
         Map<Integer, RequestHandler> map = new HashMap<>();
@@ -29,7 +28,6 @@ public class HandlerConfig {
         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/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,5 +1,8 @@
 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;
@@ -17,19 +20,26 @@ 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.register.RegAnswer;
 import ru.soune.nocopy.entity.file.FileEntity;
+import ru.soune.nocopy.dto.file.ChunkUploadResponse;
+import ru.soune.nocopy.dto.file.CompleteUploadResponse;
+import ru.soune.nocopy.dto.file.FileEntityResponse;
+import ru.soune.nocopy.dto.file.UploadProgress;
 import ru.soune.nocopy.entity.file.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.FileEntityRepository;
 import ru.soune.nocopy.service.FileSimilarityService;
-import ru.soune.nocopy.service.register.AuthService;
+import ru.soune.nocopy.service.auth.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;
@@ -57,6 +67,10 @@ public class ApiController {
 
     private final FileEntityRepository fileEntityRepository;
 
+    private final NoCopyFileService noCopyFileService;
+
+    private final FileUtil fileUtil;
+
     @PostMapping("/v{version}/data")
     public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request,
                                                @PathVariable("version") int version) {
@@ -78,9 +92,6 @@ 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<>()));
@@ -137,7 +148,7 @@ public class ApiController {
         SimilarityFilter filter = SimilarityFilter.builder()
                 .similarityLevels(similarityLevels)
                 .build();
-        Page<SimilarFileResponse> similarFiles = fileSimilarityService.findSimilarFiles(fileId, filter, pageable);
+        Page<SimilarFileDTO> similarFiles = fileSimilarityService.findSimilarFiles(fileId, filter, pageable);
 
         String messageDesc;
         MessageCode success;
@@ -193,7 +204,8 @@ public class ApiController {
                     .uploadId(uploadId)
                     .build();
 
-            return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
+            return ResponseEntity.ok().body(new BaseResponse(
+                    20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
                     "Failed to get upload progress: " + e.getMessage(), responseBody));
         }
     }
@@ -352,6 +364,43 @@ 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 = 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);
 
@@ -360,7 +409,7 @@ public class ApiController {
         }
 
         FileEntity fileEntity = uploadedFile.get();
-        List<SimilarFileResponse> similarFiles = fileSimilarityService.findSimilarFiles(fileEntity.getId());
+        List<SimilarFileDTO> similarFiles = fileSimilarityService.findSimilarFiles(fileEntity.getId());
 
         if (hasDuplicate(similarFiles)) {
             return handleDuplicate(fileEntity, similarFiles);
@@ -369,11 +418,11 @@ public class ApiController {
         return null;
     }
 
-    private boolean hasDuplicate(List<SimilarFileResponse> similarFiles) {
+    private boolean hasDuplicate(List<SimilarFileDTO> similarFiles) {
         return similarFiles.stream().anyMatch(f -> f.getHammingDistance() <= 5);
     }
 
-    private ResponseEntity<BaseResponse> handleDuplicate(FileEntity fileEntity, List<SimilarFileResponse> similarFiles)
+    private ResponseEntity<BaseResponse> handleDuplicate(FileEntity fileEntity, List<SimilarFileDTO> similarFiles)
             throws IOException {
         fileEntityService.deleteFromDisk(fileEntity);
 
@@ -459,16 +508,4 @@ public class ApiController {
         }
         return contentType;
     }
-
-    private boolean isPreviewSupported(String mimeType) {
-        if (mimeType == null) {
-            return false;
-        }
-
-        return mimeType.startsWith("image") ||
-                mimeType.startsWith("text") ||
-                mimeType.equals("pdf") ||
-                mimeType.startsWith("video") ||
-                mimeType.startsWith("audio");
-    }
 }

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

@@ -3,17 +3,17 @@ package ru.soune.nocopy.controller;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
-import ru.soune.nocopy.dto.register.ChangePasswordRequest;
-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.dto.ChangePasswordRequest;
+import ru.soune.nocopy.dto.UserDTO;
+import ru.soune.nocopy.dto.UserRequest;
+import ru.soune.nocopy.entity.AuthToken;
+import ru.soune.nocopy.entity.User;
 import ru.soune.nocopy.exception.InvalidUserEmail;
 import ru.soune.nocopy.exception.NotFoundAuthToken;
 import ru.soune.nocopy.mapper.UserMapper;
 import ru.soune.nocopy.repository.AuthTokenRepository;
 import ru.soune.nocopy.repository.UserRepository;
-import ru.soune.nocopy.service.user.UserService;
+import ru.soune.nocopy.service.UserService;
 
 import java.util.List;
 import java.util.Optional;
@@ -34,7 +34,7 @@ public class UserController {
     @GetMapping("/all")
     public ResponseEntity<List<UserDTO>> getAllUsers() {
         List<UserDTO> allUsers = userRepository.findAll().stream()
-                .map(u -> new UserDTO(u.getFullName(), u.getCompany(), u.getEmail(), u.isActive(),
+                .map(u -> new UserDTO(u.getFullName(), u.getCompany(), u.getEmail(), u.getIsActive(),
                         u.getPhone(), u.getGenderType(),
                         u.getBirthday(), u.getCreatedAt(), u.getSubscriptionType()))
                 .toList();
@@ -52,19 +52,19 @@ public class UserController {
         AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
 
         if (authToken != null) {
-            User user = userRepository.findByEmail(email);
+            Optional<User> user = userRepository.findByEmail(email);
             //TODO add mapper
-            if (user != null) {
-                UserDTO userDTO = userMapper.toDTO(user);
+            if (user.isPresent()) {
+                UserDTO userDTO = userMapper.toDTO(user.get());
                 userDTO.setEmail(email);
-                userDTO.setFullName(user.getFullName());
-                userDTO.setCompany(user.getCompany());
-                userDTO.setPhone(user.getPhone());
-                userDTO.setGenderType(user.getGenderType());
-                userDTO.setBirthday(user.getBirthday());
-                userDTO.setCreatedAt(user.getCreatedAt());
-                userDTO.setSubscriptionType(user.getSubscriptionType());
-                userDTO.setActive(user.isActive());
+                userDTO.setFullName(user.get().getFullName());
+                userDTO.setCompany(user.get().getCompany());
+                userDTO.setPhone(user.get().getPhone());
+                userDTO.setGenderType(user.get().getGenderType());
+                userDTO.setBirthday(user.get().getBirthday());
+                userDTO.setCreatedAt(user.get().getCreatedAt());
+                userDTO.setSubscriptionType(user.get().getSubscriptionType());
+                userDTO.setActive(user.get().getIsActive());
 
                 return ResponseEntity.ok(userDTO);
             }

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

@@ -0,0 +1,10 @@
+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/ChangePasswordRequest.java

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

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

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

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

@@ -1,4 +1,4 @@
-package ru.soune.nocopy.dto.register;
+package ru.soune.nocopy.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -13,9 +13,5 @@ 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/LoginRequest.java

@@ -1,4 +1,4 @@
-package ru.soune.nocopy.dto.register;
+package ru.soune.nocopy.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.validation.constraints.Email;

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

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

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

@@ -6,13 +6,10 @@ 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"),
@@ -26,7 +23,6 @@ public enum MessageCode {
     AUTH_TOKEN_NOT_FOUND(4, "Token not found"),
     FILE_NOT_FOUND(4, "File not found"),
     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/RegAnswer.java

@@ -1,4 +1,4 @@
-package ru.soune.nocopy.dto.register;
+package ru.soune.nocopy.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -13,13 +13,5 @@ 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/RegRequest.java

@@ -1,4 +1,4 @@
-package ru.soune.nocopy.dto.register;
+package ru.soune.nocopy.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.validation.constraints.*;

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

@@ -0,0 +1,14 @@
+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/UserContentRequest.java

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

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

@@ -0,0 +1,17 @@
+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/UserContentUpdateRequest.java

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

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

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

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

@@ -1,11 +1,11 @@
-package ru.soune.nocopy.dto.user;
+package ru.soune.nocopy.dto;
 
 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.user.GenderType;
+import ru.soune.nocopy.entity.GenderType;
 
 import java.time.LocalDate;
 

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

@@ -5,10 +5,11 @@ import lombok.Value;
 
 @Value
 @Builder
-public class SimilarFileResponse {
+public class SimilarFileDTO {
     String fileId;
     String originalFileName;
     Long fileSize;
     Integer hammingDistance;
     String similarityLevel;
+    Long ownerId;
 }

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

@@ -1,20 +0,0 @@
-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/entity/AuthToken.java

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package ru.soune.nocopy.entity.user;
+package ru.soune.nocopy.entity;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.*;
@@ -6,8 +6,6 @@ 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.ImageProtection;
-import ru.soune.nocopy.entity.file.Violation;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -35,9 +33,6 @@ 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;
 
@@ -69,7 +64,7 @@ public class User {
     private LocalDateTime lastLoginAt;
 
     @Column(name = "is_active")
-    private boolean isActive = false;
+    private Boolean isActive = true;
 
     @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
     @JsonIgnore
@@ -84,10 +79,9 @@ public class User {
     @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
     @JsonIgnore
     @ToString.Exclude
-    private List<Violation> violations = new ArrayList<>();
+    private List<UserAction> userActions = new ArrayList<>();
 
     @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
     @JsonIgnore
     @ToString.Exclude
-    private List<ImageProtection> imageProtections = new ArrayList<>();
-}
+    private List<Violation> violations = new ArrayList<>();}

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

@@ -0,0 +1,44 @@
+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/UserContent.java

@@ -1,10 +1,9 @@
-package ru.soune.nocopy.entity.user;
+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 ru.soune.nocopy.entity.file.ContentStatus;
 import ru.soune.nocopy.entity.file.FileType;
 
 import java.time.LocalDateTime;

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

@@ -1,10 +1,9 @@
-package ru.soune.nocopy.entity.file;
+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 ru.soune.nocopy.entity.user.User;
 
 import java.time.LocalDateTime;
 

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

@@ -66,6 +66,20 @@ 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;
@@ -75,9 +89,19 @@ public class FileEntity {
         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();
         }
         this.updatedAt = LocalDateTime.now();
     }
+
+    @PreUpdate
+    public void preUpdate() {
+        this.updatedAt = LocalDateTime.now();
+    }
 }

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

@@ -10,7 +10,7 @@ public enum FileType {
     IMAGE("image", Arrays.asList("jpg", "jpeg", "png", "gif", "bmp", "webp", "jfif")),
     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/ImageHashEntity.java

@@ -26,10 +26,10 @@ public class ImageHashEntity {
     private FileEntity file;
 
     @Column(name = "hash64_hi")
-    private Integer hash64Hi;
+    private Long hash64Hi;
 
     @Column(name = "hash64_lo")
-    private Integer hash64Lo;
+    private Long hash64Lo;
 
     @Column(name = "hash_algorithm", nullable = false)
     private String hashAlgorithm;

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

@@ -1,51 +0,0 @@
-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 ru.soune.nocopy.entity.user.UserContent;
-
-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/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/user/EmailVerificationToken.java

@@ -1,35 +0,0 @@
-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/handler/AuthRequestHandler.java

@@ -9,7 +9,7 @@ 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 ru.soune.nocopy.service.auth.AuthService;
 
 import java.util.Map;
 

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

@@ -6,13 +6,12 @@ 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.user.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.FileEntityRepository;
-import ru.soune.nocopy.service.register.AuthService;
+import ru.soune.nocopy.service.auth.AuthService;
 import ru.soune.nocopy.service.file.FileEntityService;
 import ru.soune.nocopy.service.file.FileStatsService;
 

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

@@ -10,14 +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.user.AuthToken;
+import ru.soune.nocopy.entity.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.auth.AuthService;
 import ru.soune.nocopy.service.file.FileUploadService;
 
 import java.util.*;

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

@@ -3,13 +3,14 @@ package ru.soune.nocopy.handler;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import ru.soune.nocopy.dto.BaseRequest;
 import ru.soune.nocopy.dto.BaseResponse;
 import ru.soune.nocopy.dto.MessageCode;
 import ru.soune.nocopy.dto.file.ImageSearchRequest;
 import ru.soune.nocopy.dto.file.YandexSearchResponse;
-import ru.soune.nocopy.service.search.YandexSearchService;
+import ru.soune.nocopy.service.YandexSearchService;
 
 @Slf4j
 @Component

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

@@ -4,13 +4,10 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 import ru.soune.nocopy.dto.*;
-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.entity.AuthToken;
 import ru.soune.nocopy.exception.NotValidFieldException;
 import ru.soune.nocopy.repository.UserRepository;
-import ru.soune.nocopy.service.register.AuthService;
+import ru.soune.nocopy.service.auth.AuthService;
 
 import java.util.Arrays;
 import java.util.Map;
@@ -28,9 +25,8 @@ public class LoginRequestHandler implements RequestHandler {
     @Override
     public BaseResponse handle(BaseRequest request) {
         LoginRequest loginRequest = objectMapper.convertValue(request.getMessageBody(), LoginRequest.class);
-        User user = userRepository.findByEmail(loginRequest.getEmail());
 
-        if (user == null) {
+        if (!userRepository.existsByEmail(loginRequest.getEmail())) {
             LoginAnswer loginAnswer = new LoginAnswer();
             loginAnswer.setFieldErrors(Arrays.asList(Map.of("email", loginRequest.getEmail())));
 
@@ -39,17 +35,6 @@ 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();
 

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

@@ -4,14 +4,12 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 import ru.soune.nocopy.dto.*;
-import ru.soune.nocopy.dto.register.LogOutAnswer;
-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.entity.AuthToken;
+import ru.soune.nocopy.entity.User;
 import ru.soune.nocopy.exception.NotValidFieldException;
 import ru.soune.nocopy.repository.AuthTokenRepository;
 import ru.soune.nocopy.repository.UserRepository;
-import ru.soune.nocopy.service.register.AuthService;
+import ru.soune.nocopy.service.auth.AuthService;
 
 import java.util.Objects;
 import java.util.Optional;
@@ -33,16 +31,16 @@ public class LogoutRequestHandler implements RequestHandler {
         LogoutRequest logoutRequest = objectMapper.convertValue(request.getMessageBody(), LogoutRequest.class);
 
         Optional<AuthToken> opToken = authTokenRepository.findByToken(logoutRequest.getToken());
-        User user = userRepository.findByEmail(logoutRequest.getEmail());
+        Optional<User> user = userRepository.findByEmail(logoutRequest.getEmail());
 
-        if (opToken.isEmpty() || user == null) {
+        if (opToken.isEmpty() || user.isEmpty()) {
             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.getId())) {
+        if (!Objects.equals(opToken.get().getUser().getId(), user.get().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,16 +7,12 @@ import org.springframework.stereotype.Component;
 import org.springframework.validation.BeanPropertyBindingResult;
 import org.springframework.validation.BindingResult;
 import ru.soune.nocopy.dto.*;
-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.entity.AuthToken;
 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.register.AuthService;
-import ru.soune.nocopy.service.mail.EmailService;
+import ru.soune.nocopy.service.auth.AuthService;
 
 import java.util.Arrays;
 import java.util.Map;
@@ -33,8 +29,6 @@ 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);
@@ -51,7 +45,6 @@ public class RegRequestHandler implements RequestHandler {
         }
 
         BindingResult bindingResult = new BeanPropertyBindingResult(regRequest, "regRequest");
-
         regRequestValidator.validate(regRequest, bindingResult);
 
         if (bindingResult.hasErrors()) {
@@ -59,26 +52,11 @@ 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.setVerified(false);
-        regAnswer.setActive(false);
-        regAnswer.setUserId(authToken.getUser().getId());
+        regAnswer.setToken(token);
 
         return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
                 MessageCode.SUCCESS.getDescription(), regAnswer);

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

@@ -1,122 +0,0 @@
-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

@@ -4,7 +4,7 @@ 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.register.RegRequest;
+import ru.soune.nocopy.dto.RegRequest;
 
 import java.util.*;
 
@@ -138,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.user.UserContentUpdateRequest;
-import ru.soune.nocopy.entity.user.UserContent;
+import ru.soune.nocopy.dto.UserContentUpdateRequest;
+import ru.soune.nocopy.entity.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.user.UserDTO;
-import ru.soune.nocopy.entity.user.User;
+import ru.soune.nocopy.dto.UserDTO;
+import ru.soune.nocopy.entity.User;
 
 @Mapper(componentModel = "spring",
         nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)

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

@@ -2,7 +2,7 @@ package ru.soune.nocopy.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
-import ru.soune.nocopy.entity.user.AuthToken;
+import ru.soune.nocopy.entity.AuthToken;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -13,6 +13,4 @@ public interface AuthTokenRepository extends JpaRepository<AuthToken, Long> {
     List<AuthToken> findByExpiresAtBefore(LocalDateTime expiresAtBefore);
     Optional<AuthToken> findByLastUsedAtBefore(LocalDateTime lastUsedAt);
     Optional<AuthToken> findByToken(String token);
-    Optional<AuthToken> findByUserIdAndIsActive(Long userId, boolean isActive);
-    Optional<AuthToken> findByUserId(Long userId);
 }

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

@@ -1,15 +0,0 @@
-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,16 +23,28 @@ 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);
+
     long countByUserId(Long userId);
 }

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

@@ -4,7 +4,11 @@ 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

@@ -48,7 +48,7 @@ public interface ImageSimilarityRepository
     """,
             nativeQuery = true)
     List<SimilarImageProjection> findExactDuplicates(
-            @Param("hash64Hi") Integer hash64_hi,
-            @Param("hash64Lo") Integer hash64_lo);
+            @Param("hash64Hi") Long hash64_hi,
+            @Param("hash64Lo") Long hash64_lo);
 }
 

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

@@ -1,9 +1,9 @@
 package ru.soune.nocopy.repository;
 
 public interface SimilarImageProjection {
-    Integer getHash64Hi();
-    Integer getHash64Lo();
-    String getId();
+    Long getHash64Hi();
+    Long getHash64Lo();
+    String getFileId();
     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.user.UserContent;
+import ru.soune.nocopy.entity.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.User;
+import ru.soune.nocopy.entity.User;
 
 import java.util.Optional;
 
 public interface UserRepository extends JpaRepository<User, Long> {
-    User findByEmail(String email);
+    Optional<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

@@ -5,12 +5,14 @@ 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.SimilarFileResponse;
+import ru.soune.nocopy.dto.file.SimilarFileDTO;
 import ru.soune.nocopy.dto.file.SimilarityFilter;
 import ru.soune.nocopy.repository.ImageHashRepository;
 import ru.soune.nocopy.repository.ImageSimilarityRepository;
 import ru.soune.nocopy.repository.SimilarImageProjection;
+import ru.soune.nocopy.util.FileUtil;
 
+import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
@@ -19,26 +21,28 @@ import java.util.stream.Collectors;
 @Service
 @RequiredArgsConstructor
 public class FileSimilarityService {
+
     private final ImageSimilarityRepository repository;
 
     private final ImageHashRepository hashRepository;
 
-    public List<SimilarFileResponse> findSimilarFiles(String fileId) {
+    private final FileUtil fileUtil;
+
+    public List<SimilarFileDTO> findSimilarFiles(String fileId) {
         var imageHashEntity = hashRepository.findById(fileId)
                 .orElseThrow(() -> new RuntimeException("Hash not found"));
 
-        Integer hash64Hi = imageHashEntity.getHash64Hi();
-        Integer hash64Lo = imageHashEntity.getHash64Lo();
+        Long hash64Hi = imageHashEntity.getHash64Hi();
+        Long hash64Lo = imageHashEntity.getHash64Lo();
 
-        List<SimilarImageProjection> candidates =
-                repository.findCandidates(fileId);
+        List<SimilarImageProjection> candidates = repository.findCandidates(fileId);
 
         return candidates.stream()
                 .map(c -> {
-                    Integer cHi = c.getHash64Hi();
-                    Integer cLo = c.getHash64Lo();
+                    Long cHi = c.getHash64Hi();
+                    Long cLo = c.getHash64Lo();
 
-                    int hamming = hamming64(hash64Hi, hash64Lo, cHi, cLo);
+                    int hamming = fileUtil.hamming64(hash64Hi, hash64Lo, cHi, cLo);
 
                     String level;
                     if (hamming <= 5) {
@@ -49,8 +53,8 @@ public class FileSimilarityService {
                         level = "DIFFERENT";
                     }
 
-                    return SimilarFileResponse.builder()
-                            .fileId(c.getId())
+                    return SimilarFileDTO.builder()
+                            .fileId(c.getFileId())
                             .originalFileName(c.getOriginalFileName())
                             .fileSize(c.getFileSize())
                             .hammingDistance(hamming)
@@ -62,7 +66,53 @@ public class FileSimilarityService {
                 .toList();
     }
 
-    public List<SimilarImageProjection> findDuplicatedByHash(Integer hash64Hi, Integer hash64Lo) {
+    public List<SimilarFileDTO> findDuplicateByHammingDistance(String fileId, int hammingDistance,
+                                                               int duplicate, int similar) {
+        List<SimilarImageProjection> candidates = repository.findCandidates(fileId);
+
+        var imageHashEntity = hashRepository.findById(fileId)
+                .orElseThrow(() -> new RuntimeException("Hash not found"));
+
+        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.getFileId())
+                            .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()) {
@@ -72,12 +122,12 @@ public class FileSimilarityService {
         return duplicates;
     }
 
-    public Page<SimilarFileResponse> findSimilarFiles(String fileId, SimilarityFilter filter, Pageable pageable) {
+    public Page<SimilarFileDTO> findSimilarFiles(String fileId, SimilarityFilter filter, Pageable pageable) {
         var imageHashEntity = hashRepository.findById(fileId)
                 .orElseThrow(() -> new RuntimeException("Hash not found"));
 
-        Integer hash64Hi = imageHashEntity.getHash64Hi();
-        Integer hash64Lo = imageHashEntity.getHash64Lo();
+        Long hash64Hi = imageHashEntity.getHash64Hi();
+        Long hash64Lo = imageHashEntity.getHash64Lo();
 
         List<SimilarImageProjection> candidates = repository.findCandidates(fileId);
 
@@ -85,10 +135,10 @@ public class FileSimilarityService {
                 ? filter.getSimilarityLevels()
                 : List.of("DUPLICATE", "SIMILAR", "DIFFERENT");
 
-        List<SimilarFileResponse> allResults = candidates.stream()
+        List<SimilarFileDTO> allResults = candidates.stream()
                 .map(c -> createSimilarFileResponse(c, hash64Hi, hash64Lo))
                 .filter(response -> similarityLevels.contains(response.getSimilarityLevel()))
-                .sorted(Comparator.comparingInt(SimilarFileResponse::getHammingDistance))
+                .sorted(Comparator.comparingInt(SimilarFileDTO::getHammingDistance))
                 .collect(Collectors.toList());
 
         int total = allResults.size();
@@ -98,17 +148,17 @@ public class FileSimilarityService {
         int fromIndex = Math.min(page * size, total);
         int toIndex = Math.min(fromIndex + size, total);
 
-        List<SimilarFileResponse> pageContent = allResults.subList(fromIndex, toIndex);
+        List<SimilarFileDTO> pageContent = allResults.subList(fromIndex, toIndex);
 
         return new PageImpl<>(pageContent, pageable, total);
     }
 
-    private SimilarFileResponse createSimilarFileResponse(SimilarImageProjection similarImageProjection,
-                                                          Integer hash64Hi, Integer hash64Lo) {
-        Integer imageProjectionHash64Hi = similarImageProjection.getHash64Hi();
-        Integer similarImageProjectionHash64Lo = similarImageProjection.getHash64Lo();
+    private SimilarFileDTO createSimilarFileResponse(SimilarImageProjection similarImageProjection,
+                                                     Long hash64Hi, Long hash64Lo) {
+        Long imageProjectionHash64Hi = similarImageProjection.getHash64Hi();
+        Long similarImageProjectionHash64Lo = similarImageProjection.getHash64Lo();
 
-        int hamming = hamming64(hash64Hi, hash64Lo, imageProjectionHash64Hi, similarImageProjectionHash64Lo);
+        int hamming = fileUtil.hamming64(hash64Hi, hash64Lo, imageProjectionHash64Hi, similarImageProjectionHash64Lo);
 
         String level;
         if (hamming <= 5) {
@@ -119,17 +169,12 @@ public class FileSimilarityService {
             level = "DIFFERENT";
         }
 
-        return SimilarFileResponse.builder()
-                .fileId(similarImageProjection.getId())
+        return SimilarFileDTO.builder()
+                .fileId(similarImageProjection.getFileId())
                 .originalFileName(similarImageProjection.getOriginalFileName())
                 .fileSize(similarImageProjection.getFileSize())
                 .hammingDistance(hamming)
                 .similarityLevel(level)
                 .build();
     }
-
-    private int hamming64(int aHi, int aLo, int bHi, int bLo) {
-        return Integer.bitCount(aHi ^ bHi)
-                + Integer.bitCount(aLo ^ bLo);
-    }
 }

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

@@ -1,5 +1,7 @@
 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;
@@ -7,15 +9,10 @@ import ru.soune.nocopy.entity.file.FileEntity;
 import ru.soune.nocopy.entity.file.ImageHashEntity;
 import ru.soune.nocopy.repository.ImageHashRepository;
 
-import javax.imageio.ImageIO;
-import java.awt.*;
-import java.awt.image.BufferedImage;
+import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.LocalDateTime;
-import java.util.Arrays;
 import java.util.Map;
 
 @Service
@@ -25,15 +22,19 @@ public class ImageHashService {
 
     private final ImageHashRepository repository;
 
-    public Map<String, Integer> calculateHash(Path imagePath) throws IOException {
-        long hash64 = computePhash64(imagePath);
+    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 Map.of(
-                "hi", high32(hash64),
-                "low", low32(hash64));
+        return hash;
     }
 
-    public void create(FileEntity file,  Map<String, Integer> stringIntegerMap) {
+    public void create(FileEntity file,  Map<String, Long> stringIntegerMap) {
         ImageHashEntity entity = ImageHashEntity.builder()
                 .file(file)
                 .hash64Hi(stringIntegerMap.get("hi"))
@@ -44,111 +45,4 @@ public class ImageHashService {
 
         repository.save(entity);
     }
-
-    private long computePhash64(Path path) throws IOException {
-        try (InputStream is = Files.newInputStream(path)) {
-            BufferedImage image = ImageIO.read(is);
-            if (image == null) throw new IOException("Cannot read image file: " + path);
-
-            BufferedImage gray = toGrayScale(image);
-            BufferedImage resized = resizeImage(gray, 32, 32);
-
-            double[][] dct = applyDCT(resized);
-            double[][] topLeft = extractTopLeft8x8(dct);
-            double median = calculateMedian(topLeft, true);
-
-            return create64BitHashLong(topLeft, median);
-        }
-    }
-
-    private BufferedImage toGrayScale(BufferedImage image) {
-        BufferedImage gray = new BufferedImage(image.getWidth(), image.getHeight(), BufferedImage.TYPE_BYTE_GRAY);
-        Graphics2D g = gray.createGraphics();
-        g.drawImage(image, 0, 0, null);
-        g.dispose();
-        return gray;
-    }
-
-    private BufferedImage resizeImage(BufferedImage image, int width, int height) {
-        BufferedImage resized = new BufferedImage(width, height, BufferedImage.TYPE_BYTE_GRAY);
-        Graphics2D g = resized.createGraphics();
-        g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
-        g.drawImage(image, 0, 0, width, height, null);
-        g.dispose();
-        return resized;
-    }
-
-    private double[][] applyDCT(BufferedImage image) {
-        int w = image.getWidth();
-        int h = image.getHeight();
-        double[][] pixels = new double[h][w];
-
-        for (int y = 0; y < h; y++) {
-            for (int x = 0; x < w; x++) {
-                int gray = image.getRGB(x, y) & 0xFF;
-                pixels[y][x] = gray;
-            }
-        }
-
-        double[][] dct = new double[h][w];
-        for (int u = 0; u < h; u++) {
-            double au = u == 0 ? 1.0 / Math.sqrt(h) : Math.sqrt(2.0 / h);
-            for (int v = 0; v < w; v++) {
-                double av = v == 0 ? 1.0 / Math.sqrt(w) : Math.sqrt(2.0 / w);
-                double sum = 0.0;
-                for (int x = 0; x < h; x++) {
-                    for (int y = 0; y < w; y++) {
-                        sum += pixels[x][y] *
-                                Math.cos((2 * x + 1) * u * Math.PI / (2.0 * h)) *
-                                Math.cos((2 * y + 1) * v * Math.PI / (2.0 * w));
-                    }
-                }
-                dct[u][v] = au * av * sum;
-            }
-        }
-        return dct;
-    }
-
-    private double[][] extractTopLeft8x8(double[][] dct) {
-        double[][] block = new double[8][8];
-        for (int i = 0; i < 8; i++) System.arraycopy(dct[i], 0, block[i], 0, 8);
-        return block;
-    }
-
-    private double calculateMedian(double[][] block, boolean excludeDC) {
-        double[] vals = new double[63];
-        int idx = 0;
-        for (int i = 0; i < 8; i++) {
-            for (int j = 0; j < 8; j++) {
-                if (i == 0 && j == 0 && excludeDC) continue;
-                vals[idx++] = block[i][j];
-            }
-        }
-        Arrays.sort(vals);
-        return (vals.length % 2 == 0) ?
-                (vals[vals.length / 2 - 1] + vals[vals.length / 2]) / 2.0 :
-                vals[vals.length / 2];
-    }
-
-    private long create64BitHashLong(double[][] block, double median) {
-        long hash = 0L;
-
-        for (int i = 0; i < 8; i++) {
-            for (int j = 0; j < 8; j++) {
-                if (i == 0 && j == 0) continue;
-                hash <<= 1;
-                if (block[i][j] > median) hash |= 1;
-            }
-        }
-
-        return hash;
-    }
-
-    private int high32(long hash64) {
-        return (int) (hash64 >>> 32);
-    }
-
-    private int low32(long hash64) {
-        return (int) hash64;
-    }
 }

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

@@ -0,0 +1,72 @@
+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/UserService.java

@@ -1,20 +1,18 @@
-package ru.soune.nocopy.service.user;
+package ru.soune.nocopy.service;
 
 import lombok.AllArgsConstructor;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import ru.soune.nocopy.dto.register.ChangePasswordRequest;
-import ru.soune.nocopy.dto.user.UserDTO;
-import ru.soune.nocopy.dto.user.UserRequest;
-import ru.soune.nocopy.entity.user.User;
+import ru.soune.nocopy.dto.ChangePasswordRequest;
+import ru.soune.nocopy.dto.UserDTO;
+import ru.soune.nocopy.dto.UserRequest;
+import ru.soune.nocopy.entity.User;
 import ru.soune.nocopy.exception.InvalidUserEmail;
 import ru.soune.nocopy.exception.NotValidationPasswordException;
 import ru.soune.nocopy.exception.UserNotFoundException;
 import ru.soune.nocopy.repository.UserRepository;
 
-import java.util.Optional;
-
 @Service
 @AllArgsConstructor
 public class UserService {
@@ -46,16 +44,6 @@ public class UserService {
         return mapToDTO(updatedUser);
     }
 
-    @Transactional
-    public User activateAndVerifyUser(long userId) {
-        Optional<User> users = userRepository.findById(userId);
-        User user = users.orElseThrow(() -> new UserNotFoundException("User not found with id: " + userId));
-        user.setActive(true);
-        user.setEmailVerified(true);
-
-        return userRepository.save(user);
-    }
-
     private void updateUserFromRequest(User user, UserRequest request) {
         if (request.getFullName() != null) {
             user.setFullName(request.getFullName());

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

@@ -1,4 +1,4 @@
-package ru.soune.nocopy.service.search;
+package ru.soune.nocopy.service;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;

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

@@ -1,16 +1,12 @@
-package ru.soune.nocopy.service.register;
+package ru.soune.nocopy.service.auth;
 
 import lombok.RequiredArgsConstructor;
-import org.springframework.context.MessageSource;
 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.dto.register.LoginAnswer;
-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.entity.AuthToken;
+import ru.soune.nocopy.entity.User;
 import ru.soune.nocopy.exception.NotFoundAuthToken;
 import ru.soune.nocopy.exception.NotValidFieldException;
 import ru.soune.nocopy.repository.AuthTokenRepository;
@@ -18,7 +14,10 @@ import ru.soune.nocopy.repository.UserRepository;
 
 import java.security.SecureRandom;
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.Map;
+import java.util.Optional;
 
 @Service
 @RequiredArgsConstructor
@@ -30,8 +29,6 @@ public class AuthService {
 
     private final PasswordEncoder passwordEncoder;
 
-    private final MessageSource messageSource;
-
     private final SecureRandom secureRandom = new SecureRandom();
 
     @Transactional
@@ -51,7 +48,33 @@ public class AuthService {
 
         User savedUser = userRepository.save(user);
 
-        AuthToken authToken = genereateAuthToken(savedUser);
+        AuthToken authToken = new AuthToken();
+        authToken.setToken(generateAuthToken());
+        authToken.setUser(savedUser);
+
+        return authTokenRepository.save(authToken);
+    }
+
+    @Transactional
+    public AuthToken login(LoginRequest request) {
+        Optional<User> userOpt = userRepository.findByEmail(request.getEmail());
+        User user = userOpt.get();
+
+        if (!passwordEncoder.matches(request.getPassword(), user.getPassword())) {
+            LoginAnswer loginAnswer = new LoginAnswer();
+            loginAnswer.setFieldErrors(Arrays.asList(Map.of("password", request.getPassword())));
+
+            throw new NotValidFieldException("Invalid password", new BaseResponse(20003,
+                    MessageCode.AUTH_PASSWORD_NOT_MATCHES.getCode(),
+                    MessageCode.AUTH_PASSWORD_NOT_MATCHES.getDescription(), loginAnswer));
+        }
+
+        user.setLastLoginAt(LocalDateTime.now());
+        User savedUser = userRepository.save(user);
+
+        AuthToken authToken = new AuthToken();
+        authToken.setToken(generateAuthToken());
+        authToken.setUser(savedUser);
 
         return authTokenRepository.save(authToken);
     }
@@ -76,48 +99,12 @@ public class AuthService {
         return authToken.getUser().getId();
     }
 
-
-    @Transactional
-    public AuthToken login(LoginRequest request) {
-        User user = userRepository.findByEmail(request.getEmail());
-
-        if (!passwordEncoder.matches(request.getPassword(), user.getPassword())) {
-            LoginAnswer loginAnswer = new LoginAnswer();
-            loginAnswer.setFieldErrors(Arrays.asList(Map.of("password", request.getPassword())));
-
-            throw new NotValidFieldException("Invalid password", new BaseResponse(20003,
-                    MessageCode.AUTH_PASSWORD_NOT_MATCHES.getCode(),
-                    MessageCode.AUTH_PASSWORD_NOT_MATCHES.getDescription(), loginAnswer));
-        }
-
-        user.setLastLoginAt(LocalDateTime.now());
-        User savedUser = userRepository.save(user);
-
-        AuthToken authToken = new AuthToken();
-        authToken.setToken(generateAuthToken());
-        authToken.setUser(savedUser);
-
-        return authTokenRepository.save(authToken);
-    }
-
     @Transactional
     public void logout(String token) {
         authTokenRepository.findByToken(token)
                 .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/auth/CleanupTokenSessionsService.java

@@ -7,7 +7,7 @@ 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.entity.AuthToken;
 import ru.soune.nocopy.repository.AuthTokenRepository;
 
 import java.time.LocalDateTime;

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

@@ -9,6 +9,7 @@ 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;
@@ -16,6 +17,7 @@ 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;
@@ -47,7 +49,7 @@ public class FileEntityService {
                 throw new IOException("File not found on disk: " + filePath);
             }
 
-            Map<String, Integer> imageHash = Map.of();
+            Map<String, Long> imageHash = Map.of();
 
             if (session.getFileType().startsWith("image")) {
                 imageHash = imageHashService.calculateHash(filePath);
@@ -57,7 +59,7 @@ public class FileEntityService {
                 if (!duplicatedByHash.isEmpty()) {
                     SimilarImageProjection similarImageProjection = duplicatedByHash.get(0);
 
-                    throw new DuplicateImageException("Duplicate", similarImageProjection.getId(),
+                    throw new DuplicateImageException("Duplicate", similarImageProjection.getFileId(),
                             similarImageProjection.getUserId());
                 }
             }
@@ -110,6 +112,39 @@ public class FileEntityService {
         return convertToResponse(fileEntity, version);
     }
 
+    @Transactional(readOnly = true)
+    public FileEntityResponse getByFilePath(String filePath, int version) {
+        FileEntity fileEntity = fileEntityRepository.findByFilePath(filePath)
+                .orElseThrow(() -> new FileEntityNotFoundException("Path: " + filePath));
+
+        return convertToResponse(fileEntity, version);
+    }
+
+
+    @Transactional(readOnly = true)
+    public FileResponse getAllUserFiles(Long userId, int version) {
+        List<FileEntity> fileEntities = fileEntityRepository.findByUserIdAndStatus(
+                userId, FileStatus.ACTIVE);
+
+        List<FileEntityResponse> files = fileEntities.stream()
+                .map(file -> convertToResponse(file, version))
+                .collect(Collectors.toList());
+
+        long totalSize = fileEntities.stream()
+                .mapToLong(FileEntity::getFileSize)
+                .sum();
+
+        return FileResponse.builder()
+                .files(files)
+                .totalCount(files.size())
+                .totalSize(totalSize)
+                .formattedTotalSize(formatFileSize(totalSize))
+                .page(1)
+                .pageSize(files.size())
+                .build();
+    }
+
+
     @Transactional(readOnly = true)
     public FileResponse getUserFiles(Long userId, int page, int pageSize, int version) {
         List<FileEntity> allFiles = fileEntityRepository.findByUserIdAndStatus(
@@ -178,6 +213,95 @@ 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 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));
@@ -187,6 +311,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());
 

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/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;
@@ -23,6 +25,9 @@ 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.*;
@@ -73,6 +78,10 @@ public class FileUploadServiceImpl implements FileUploadService {
     @Autowired
     private FileEntityService fileEntityService;
 
+    private final NoCopyFileService noCopyFileService;
+
+    private final FileUtil fileUtil;
+
     @PostConstruct
     public void init() {
         try {
@@ -274,11 +283,16 @@ public class FileUploadServiceImpl implements FileUploadService {
 
             FileEntity saved = fileEntityRepository.save(fileEntity);
 
-            Map<String, Integer> hash = imageHashService.calculateHash(filePath);
+            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) {
@@ -370,12 +384,13 @@ public class FileUploadServiceImpl implements FileUploadService {
     private void checkForDuplicatesSynchronously(String filePath)
             throws IOException {
         Path path = Paths.get(filePath);
-        Map<String, Integer> hash = imageHashService.calculateHash(path);
+        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.get(0).getId(),
+            throw new DuplicateImageException("Duplicate", duplicates.get(0).getFileId(),
                     duplicates.get(0).getUserId());
         }
     }
@@ -482,11 +497,17 @@ 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) {

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

@@ -1,94 +0,0 @@
-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/CleanUpVerifyTokens.java

@@ -1,31 +0,0 @@
-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);
-        }
-    }
-}

src/main/java/ru/soune/nocopy/util/FileUtil.java

@@ -0,0 +1,48 @@
+package ru.soune.nocopy.util;
+
+import com.vrt.fileprotection.FileProtector;
+import com.vrt.fileprotection.image.ImageLocalSearch;
+import com.vrt.fileprotection.image.ImageScore;
+import org.springframework.stereotype.Service;
+import ru.soune.nocopy.dto.file.SimilarFileDTO;
+import ru.soune.nocopy.entity.file.FileEntity;
+
+@Service
+public class FileUtil {
+    public ImageLocalSearch.Result convertToResult(SimilarFileDTO response) {
+        FileProtector.FileInfo fileInfo =
+                new FileProtector.FileInfo(FileProtector.Type.IMAGE, response.getFileId(),
+                        String.valueOf(response.getOwnerId()));
+        ImageScore imageScore = new ImageScore(ImageScore.Rate.valueOf(response.getSimilarityLevel()),
+                response.getHammingDistance());
+
+        return new ImageLocalSearch.Result(fileInfo, imageScore);
+    }
+
+    public FileProtector.FileInfo createFileInfo(FileEntity fileEntity) {
+        FileProtector.Type type = determineFileType(fileEntity.getMimeType());
+
+        return new FileProtector.FileInfo(type, fileEntity.getId(), String.valueOf(fileEntity.getUserId()));
+    }
+
+    public int hamming64(long aHi, long aLo, long bHi, long bLo) {
+        return Long.bitCount(aHi ^ bHi)
+                + Long.bitCount(aLo ^ bLo);
+    }
+
+    private FileProtector.Type determineFileType(String mimeType) {
+        if (mimeType == null) {
+            return FileProtector.Type.IMAGE;
+        }
+
+        if (mimeType.startsWith("image")) {
+            return FileProtector.Type.IMAGE;
+        } else if (mimeType.startsWith("video")) {
+            return FileProtector.Type.VIDEO;
+        } else if (mimeType.startsWith("audio")) {
+            return FileProtector.Type.AUDIO;
+        } else {
+            return FileProtector.Type.IMAGE;
+        }
+    }
+}

src/main/resources/application.yaml

@@ -1,26 +1,4 @@
 spring:
-  mail:
-    host: smtp.gmail.com
-    port: 587
-    username: vlad.popovtsev@gmail.com
-    password: gocjwvrqrzlaatsr
-    properties:
-      mail:
-        smtp:
-          auth: true
-          starttls:
-            enable: true
-
-#    mail:
-#      host: postfix
-  #      port: 25
-  #      username: noreply@nocopy.com
-  #      password: nocopy!nocopy!
-  #      properties:
-  #        mail.smtp.auth: false
-  #        mail.smtp.starttls.enable: false
-  #        mail.debug: true
-
   flyway:
     enabled: true
     baseline-on-migrate: true
@@ -82,10 +60,3 @@ yandex:
   api-key: ${YANDEX_API_KEY:AQVNyaVaUmgUb1GMCtf5zSEqFxy0woXrcMOOB43q}
   folder-id: ${YANDEX_FOLDER_ID:b1gokpdbm6qfpsou8pcd}
   search-url: ${YANDEX_SEARCH_URL:https://searchapi.api.cloud.yandex.net/v2/image/search_by_image}
-
-app:
-  email:
-    verification:
-      standart-subject: NO COPY - Подтверждение email адреса
-      standart-address-from: NO COPY <noreply@nocopy.com>
-      user: Пользователь

src/main/resources/templates/email-verification.html

@@ -1,127 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Подтверждение email</title>
-    <style>
-        body {
-            font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
-            line-height: 1.6;
-            color: #333;
-            margin: 0;
-            padding: 0;
-            background-color: #f5f5f5;
-        }
-        .container {
-            max-width: 600px;
-            margin: 0 auto;
-            background: white;
-            border-radius: 12px;
-            overflow: hidden;
-            box-shadow: 0 6px 20px rgba(0,0,0,0.1);
-        }
-        .header {
-            background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-            color: white;
-            padding: 40px 20px;
-            text-align: center;
-        }
-        .logo {
-            font-size: 32px;
-            font-weight: 800;
-            margin-bottom: 10px;
-            letter-spacing: 1px;
-        }
-        .content {
-            padding: 40px 30px;
-        }
-        .greeting {
-            font-size: 18px;
-            margin-bottom: 20px;
-        }
-        .username {
-            color: #667eea;
-            font-weight: bold;
-        }
-        .code-container {
-            background: #f8f9fa;
-            border: 2px dashed #667eea;
-            border-radius: 10px;
-            padding: 25px;
-            text-align: center;
-            margin: 30px 0;
-        }
-        .verification-code {
-            font-size: 42px;
-            font-weight: 800;
-            letter-spacing: 8px;
-            color: #333;
-            margin: 0;
-        }
-        .info-text {
-            color: #666;
-            font-size: 14px;
-            margin: 10px 0;
-        }
-        .warning {
-            background: #fff3cd;
-            border: 1px solid #ffeaa7;
-            color: #856404;
-            padding: 15px;
-            border-radius: 8px;
-            margin: 25px 0;
-            font-size: 14px;
-        }
-        .footer {
-            text-align: center;
-            padding: 25px;
-            color: #666;
-            font-size: 12px;
-            border-top: 1px solid #eee;
-            background: #f9f9f9;
-        }
-        .highlight {
-            color: #764ba2;
-            font-weight: 600;
-        }
-    </style>
-</head>
-<body>
-<div class="container">
-    <div class="header">
-        <div class="logo">NO COPY</div>
-        <h1>Подтверждение email адреса</h1>
-    </div>
-
-    <div class="content">
-        <p class="greeting">
-            Здравствуйте, <span class="username">{{username}}</span>!
-        </p>
-
-        <p>Спасибо за регистрацию на платформе NO COPY.
-            Для завершения регистрации, пожалуйста, введите код подтверждения:</p>
-
-        <div class="code-container">
-            <p class="verification-code">{{code}}</p>
-            <p class="info-text">Код подтверждения</p>
-        </div>
-
-        <p class="info-text">
-            Код действителен в течение <span class="highlight">15 минут</span>
-        </p>
-
-        <div class="warning">
-             <strong>Важно:</strong> Если вы не регистрировались на NO COPY,
-            просто проигнорируйте это письмо.
-        </div>
-    </div>
-
-    <div class="footer">
-        <p>© 2024 NO COPY. Все права защищены.</p>
-        <p>Это письмо отправлено автоматически, пожалуйста, не отвечайте на него.</p>
-        <p>Если у вас возникли вопросы, обратитесь в службу поддержки.</p>
-    </div>
-</div>
-</body>
-</html>