NCBACK-23 add full logic to reset

.env

@@ -1,10 +1,19 @@
+# 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

@@ -30,8 +30,7 @@ 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'
 
 	implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.17.0'
 	implementation 'tools.jackson.core:jackson-core:3.0.3'

docker-compose.yaml

@@ -17,6 +17,29 @@ 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
@@ -30,6 +53,8 @@ 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
@@ -59,8 +84,11 @@ 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
@@ -70,6 +98,13 @@ 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:
@@ -238,7 +273,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/HandlerConfig.java

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

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

@@ -4,9 +4,6 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.UrlResource;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.web.PageableDefault;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -17,9 +14,7 @@ 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.register.RegAnswer;
-import ru.soune.nocopy.dto.file.*;
-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;
@@ -28,9 +23,7 @@ import ru.soune.nocopy.entity.file.FileStatus;
 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.register.AuthService;
-import ru.soune.nocopy.service.FileSimilarityService;
-import ru.soune.nocopy.service.auth.AuthService;
 import ru.soune.nocopy.service.file.FileEntityService;
 import ru.soune.nocopy.service.file.FileUploadService;
 
@@ -41,7 +34,6 @@ import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -57,10 +49,6 @@ public class ApiController {
 
     private final AuthService authService;
 
-    private final FileSimilarityService fileSimilarityService;
-
-    private final FileEntityRepository fileEntityRepository;
-
     @PostMapping("/v{version}/data")
     public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request,
                                                @PathVariable("version") int version) {
@@ -82,6 +70,9 @@ 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<>()));
@@ -107,61 +98,52 @@ public class ApiController {
             @RequestParam(value = "chunk", required = false) MultipartFile chunk) {
         try {
             if (chunk == null || chunk.isEmpty()) {
-                return buildErrorResponse(uploadId, chunkNumber, "Chunk file null or empty");
+                return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
+                        "Chunk file null or empty", ChunkUploadResponse.builder()
+                        .uploadId(uploadId)
+                        .chunkNumber(chunkNumber)
+                        .build()));
             }
+
             if (uploadId == null || uploadId.isBlank()) {
-                return buildErrorResponse(uploadId, chunkNumber, "Upload ID is required");
+                return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
+                        "Upload ID is required", ChunkUploadResponse.builder()
+                        .uploadId(uploadId)
+                        .chunkNumber(chunkNumber)
+                        .build()));
             }
+
             if (chunkNumber == null || chunkNumber < 0) {
-                return buildErrorResponse(uploadId, chunkNumber, "Valid chunk number is required");
+                return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
+                        "Valid chunk number is required", ChunkUploadResponse.builder()
+                        .uploadId(uploadId)
+                        .chunkNumber(chunkNumber)
+                        .build()));
             }
 
             fileUploadService.uploadChunk(uploadId, chunkNumber, chunk);
 
-            return buildSuccessResponse(uploadId, chunkNumber, chunk);
+            ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
-        } catch (DuplicateImageException e) {
+                    .uploadId(uploadId)
-            return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.DUPLICATE_FILE_UPLOAD.getCode(),
+                    .chunkNumber(chunkNumber)
-                    MessageCode.DUPLICATE_FILE_UPLOAD.getDescription(),
+                    .chunkSize(chunk.getSize())
-                    Map.of("duplicateOwnerId", e.userId(), "duplicateFileId", e.duplicateFileId())));
+                    .message("Chunk uploaded successfully")
+                    .build();
+
+            return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.SUCCESS.getCode(),
+                    "Chunk uploaded successfully", responseBody));
         } catch (Exception e) {
             log.error("Error uploading chunk", e);
-            return buildErrorResponse(uploadId, chunkNumber, "Failed to upload chunk: " + e.getMessage());
-        }
-    }
 
-    @GetMapping("/v{version}/files/{fileId}/similar")
+            ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
-    public ResponseEntity<BaseResponse> findSimilarFiles(
+                    .uploadId(uploadId)
-            @PathVariable("version") int version,
+                    .chunkNumber(chunkNumber)
-            @PathVariable String fileId,
-            @RequestParam(required = false) List<String> similarityLevels,
-            @PageableDefault(size = 20, sort = "hammingDistance") Pageable pageable) {
-        SimilarityFilter filter = SimilarityFilter.builder()
-                .similarityLevels(similarityLevels)
                     .build();
-        Page<SimilarFileResponse> similarFiles = fileSimilarityService.findSimilarFiles(fileId, filter, pageable);
 
-        String messageDesc;
+            return ResponseEntity.ok().body(new BaseResponse(
-        MessageCode success;
+                    20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
-
+                    "Failed to upload chunk: " + e.getMessage(), responseBody));
-        if (similarFiles.isEmpty()) {
-            messageDesc = MessageCode.FILE_NOT_FOUND.getDescription();
-            success = MessageCode.FILE_NOT_FOUND;
-        } else {
-            messageDesc = MessageCode.SIMILAR_FILES_FOUND.getDescription();
-            success = MessageCode.SIMILAR_FILES_FOUND;
         }
-
-        Map<String, Object> responseData = new HashMap<>();
-        responseData.put("content", similarFiles.getContent());
-        responseData.put("page", similarFiles.getNumber());
-        responseData.put("size", similarFiles.getSize());
-        responseData.put("totalElements", similarFiles.getTotalElements());
-        responseData.put("totalPages", similarFiles.getTotalPages());
-        responseData.put("hasNext", similarFiles.hasNext());
-        responseData.put("hasPrevious", similarFiles.hasPrevious());
-
-        return ResponseEntity.ok()
-                .body(new BaseResponse(20004, success.getCode(), messageDesc, responseData));
     }
 
     @GetMapping("/v{version}/files/progress/{uploadId}")
@@ -187,6 +169,7 @@ public class ApiController {
 
             return ResponseEntity.ok().body(new BaseResponse(
                     20004, MessageCode.SUCCESS.getCode(), MessageCode.SUCCESS.getDescription(), responseBody));
+
         } catch (Exception e) {
             log.error("Error getting progress for upload: {}", uploadId, e);
 
@@ -194,7 +177,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));
         }
     }
@@ -353,78 +337,6 @@ public class ApiController {
         }
     }
 
-    private ResponseEntity<BaseResponse> checkForDuplicates(String uploadId) throws IOException {
-        Optional<FileEntity> uploadedFile = fileEntityRepository.findByUploadSessionId(uploadId);
-
-        if (uploadedFile.isEmpty() || !uploadedFile.get().getMimeType().equals("image")) {
-            return null;
-        }
-
-        FileEntity fileEntity = uploadedFile.get();
-        List<SimilarFileResponse> similarFiles = fileSimilarityService.findSimilarFiles(fileEntity.getId());
-
-        if (hasDuplicate(similarFiles)) {
-            return handleDuplicate(fileEntity, similarFiles);
-        }
-
-        return null;
-    }
-
-    private boolean hasDuplicate(List<SimilarFileResponse> similarFiles) {
-        return similarFiles.stream().anyMatch(f -> f.getHammingDistance() <= 5);
-    }
-
-    private ResponseEntity<BaseResponse> handleDuplicate(FileEntity fileEntity, List<SimilarFileResponse> similarFiles)
-            throws IOException {
-        fileEntityService.deleteFromDisk(fileEntity);
-
-        fileEntityService.markAsDeleted(fileEntity);
-
-        Optional<FileEntity> originalFile = fileEntityRepository.findById(similarFiles.get(0).getFileId());
-
-        if (originalFile.isPresent()) {
-            Map<String, String> duplicateInfo = Map.of(
-                    "duplicate_file_id", originalFile.get().getId(),
-                    "owner_user_id", String.valueOf(originalFile.get().getUserId()));
-
-            return ResponseEntity.ok().body(new BaseResponse(
-                    20004,
-                    MessageCode.DUPLICATE_FILE_UPLOAD.getCode(),
-                    "Failed to upload chunk, duplicate",
-                    duplicateInfo));
-        }
-
-        return null;
-    }
-
-    private ResponseEntity<BaseResponse> buildSuccessResponse(String uploadId, Integer chunkNumber, MultipartFile chunk) {
-        ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
-                .uploadId(uploadId)
-                .chunkNumber(chunkNumber)
-                .chunkSize(chunk.getSize())
-                .message("Chunk uploaded successfully")
-                .build();
-
-        return ResponseEntity.ok().body(new BaseResponse(
-                20000,
-                MessageCode.SUCCESS.getCode(),
-                "Chunk uploaded successfully",
-                responseBody));
-    }
-
-    private ResponseEntity<BaseResponse> buildErrorResponse(String uploadId, Integer chunkNumber, String errorMessage) {
-        ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
-                .uploadId(uploadId)
-                .chunkNumber(chunkNumber)
-                .build();
-
-        return ResponseEntity.ok().body(new BaseResponse(
-                20004,
-                MessageCode.FILE_UPLOAD_ERROR.getCode(),
-                errorMessage,
-                responseBody));
-    }
-
     private ResponseEntity<BaseResponse> createValidationErrorResponse(BindingResult bindingResult, Integer msgId) {
         List<Map<String, String>> fieldErrors = bindingResult.getFieldErrors()
                 .stream()

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.ChangePasswordRequest;
+import ru.soune.nocopy.dto.register.ChangePasswordRequest;
-import ru.soune.nocopy.dto.UserDTO;
+import ru.soune.nocopy.dto.user.UserDTO;
-import ru.soune.nocopy.dto.UserRequest;
+import ru.soune.nocopy.dto.user.UserRequest;
-import ru.soune.nocopy.entity.AuthToken;
+import ru.soune.nocopy.entity.user.AuthToken;
-import ru.soune.nocopy.entity.User;
+import ru.soune.nocopy.entity.user.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.UserService;
+import ru.soune.nocopy.service.user.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.getIsActive(),
+                .map(u -> new UserDTO(u.getFullName(), u.getCompany(), u.getEmail(), u.isActive(),
                         u.getPhone(), u.getGenderType(),
                         u.getBirthday(), u.getCreatedAt(), u.getSubscriptionType()))
                 .toList();
@@ -52,19 +52,19 @@ public class UserController {
         AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
 
         if (authToken != null) {
-            Optional<User> user = userRepository.findByEmail(email);
+            User user = userRepository.findByEmail(email);
             //TODO add mapper
-            if (user.isPresent()) {
+            if (user != null) {
-                UserDTO userDTO = userMapper.toDTO(user.get());
+                UserDTO userDTO = userMapper.toDTO(user);
                 userDTO.setEmail(email);
-                userDTO.setFullName(user.get().getFullName());
+                userDTO.setFullName(user.getFullName());
-                userDTO.setCompany(user.get().getCompany());
+                userDTO.setCompany(user.getCompany());
-                userDTO.setPhone(user.get().getPhone());
+                userDTO.setPhone(user.getPhone());
-                userDTO.setGenderType(user.get().getGenderType());
+                userDTO.setGenderType(user.getGenderType());
-                userDTO.setBirthday(user.get().getBirthday());
+                userDTO.setBirthday(user.getBirthday());
-                userDTO.setCreatedAt(user.get().getCreatedAt());
+                userDTO.setCreatedAt(user.getCreatedAt());
-                userDTO.setSubscriptionType(user.get().getSubscriptionType());
+                userDTO.setSubscriptionType(user.getSubscriptionType());
-                userDTO.setActive(user.get().getIsActive());
+                userDTO.setActive(user.isActive());
 
                 return ResponseEntity.ok(userDTO);
             }

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

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

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

@@ -6,10 +6,12 @@ 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"),
@@ -23,7 +25,7 @@ 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"),
-    SIMILAR_FILES_FOUND(0, "Similar files found");
+    USER_NOT_ACTIVE(2, "User not active");
 
     private final Integer code;
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,24 @@
+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 ResetPasswordRequest {
+
+    @JsonProperty("email")
+    private String email;
+
+    @JsonProperty("verifyToken")
+    private String verifyToken;
+
+    @JsonProperty("action")
+    private String action;
+
+    @JsonProperty("password")
+    private String password;
+}

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

@@ -0,0 +1,13 @@
+package ru.soune.nocopy.dto.register;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
+public class ResetPasswordResponse {
+    @JsonProperty("user_id")
+    private Long userId;
+
+    @JsonProperty("authToken")
+    private String authToken;
+}

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

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

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

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

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

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

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

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

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

@@ -1,11 +1,11 @@
-package ru.soune.nocopy.dto;
+package ru.soune.nocopy.dto.user;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.Past;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
-import ru.soune.nocopy.entity.GenderType;
+import ru.soune.nocopy.entity.user.GenderType;
 
 import java.time.LocalDate;
 

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

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

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

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

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

@@ -1,6 +1,5 @@
 package ru.soune.nocopy.entity.file;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.*;
 import lombok.*;
 import org.hibernate.annotations.GenerationTime;
@@ -66,10 +65,6 @@ public class FileEntity {
     @Column(name = "updated_at")
     private LocalDateTime updatedAt;
 
-    @OneToOne(mappedBy = "file", cascade = CascadeType.ALL, orphanRemoval = true)
-    @JsonIgnore
-    private ImageHashEntity imageHash;
-
     @PrePersist
     public void prePersist() {
         if (this.status == null) {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,11 +1,14 @@
-package ru.soune.nocopy.entity;
+package ru.soune.nocopy.entity.user;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.*;
 import jakarta.validation.constraints.Size;
 import lombok.*;
+import org.hibernate.annotations.ColumnDefault;
 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;
@@ -33,6 +36,9 @@ public class User {
     @Column(name = "email", nullable = false, length = 1024, unique = true)
     private String email;
 
+    @Column(name = "email_verified")
+    private boolean emailVerified = false;
+
     @Column(name = "company")
     private String company;
 
@@ -64,22 +70,22 @@ public class User {
     private LocalDateTime lastLoginAt;
 
     @Column(name = "is_active")
-    private Boolean isActive = true;
+    private boolean isActive = false;
 
     @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
     @JsonIgnore
     @ToString.Exclude
     private List<AuthToken> tokens = new ArrayList<>();
 
-    @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
+    @OneToOne(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
     @JsonIgnore
     @ToString.Exclude
-    private List<UserContent> userContents = new ArrayList<>();
+    private UserNotActive userNotActive;
 
     @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
     @JsonIgnore
     @ToString.Exclude
-    private List<UserAction> userActions = new ArrayList<>();
+    private List<UserContent> userContents = new ArrayList<>();
 
     @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
     @JsonIgnore
@@ -90,4 +96,8 @@ public class User {
     @JsonIgnore
     @ToString.Exclude
     private List<ImageProtection> imageProtections = new ArrayList<>();
+
+    @Column(name = "failed_login_attempts")
+    @ColumnDefault("0")
+    private Integer failedLoginAttempts = 0;
 }

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

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

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

@@ -0,0 +1,32 @@
+package ru.soune.nocopy.entity.user;
+
+import jakarta.persistence.*;
+import lombok.*;
+import org.springframework.data.annotation.CreatedDate;
+
+import java.time.LocalDateTime;
+
+@Entity
+@Table(name = "user_not_active")
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@ToString
+@Builder
+public class UserNotActive {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @OneToOne(fetch = FetchType.LAZY)
+    private User user;
+
+    @CreatedDate
+    @Column(name = "created_at", updatable = false)
+    private LocalDateTime createdAt;
+
+    @Column(name = "blocked_until")
+    private LocalDateTime blockedUntil;
+}

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

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

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

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

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

@@ -6,12 +6,13 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import ru.soune.nocopy.dto.*;
 import ru.soune.nocopy.dto.file.*;
+import ru.soune.nocopy.entity.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.auth.AuthService;
+import ru.soune.nocopy.service.register.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.AuthToken;
+import ru.soune.nocopy.entity.user.AuthToken;
 import ru.soune.nocopy.entity.file.FileType;
 import ru.soune.nocopy.entity.file.FileUploadSession;
 import ru.soune.nocopy.exception.*;
 import ru.soune.nocopy.handler.validator.FileUploadRequestValidator;
 import ru.soune.nocopy.repository.AuthTokenRepository;
 import ru.soune.nocopy.repository.FileUploadSessionRepository;
-import ru.soune.nocopy.service.auth.AuthService;
+import ru.soune.nocopy.service.register.AuthService;
 import ru.soune.nocopy.service.file.FileUploadService;
 
 import java.util.*;
@@ -177,13 +177,40 @@ public class FileUploadHandler implements RequestHandler {
         }
     }
 
+    private BaseResponse handleRetryUpload(BaseRequest request, FileUploadRequest fileRequest) {
+        try {
+            fileUploadService.retryFailedUpload(fileRequest.getUploadId());
+            ru.soune.nocopy.dto.file.UploadProgressResponse progress =
+                    fileUploadService.getUploadProgress(fileRequest.getUploadId());
+
+            RetryUploadResponse response = RetryUploadResponse.builder()
+                    .uploadId(progress.getUploadId())
+                    .message("Upload retry initiated")
+                    .status(progress.getStatus().toString())
+                    .build();
+
+            return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(), "Upload retry initiated",
+                    response);
+
+        } catch (UploadSessionNotFoundException e) {
+            return new BaseResponse(request.getMsgId(), MessageCode.FILE_NOT_FOUND.getCode(),
+                    "Upload session not found", null);
+        } catch (FileUploadException e) {
+            return new BaseResponse(request.getMsgId(), MessageCode.FILE_UPLOAD_ERROR.getCode(), e.getMessage(),
+                    null);
+        } catch (Exception e) {
+            log.error("Error retrying upload", e);
+            return new BaseResponse(request.getMsgId(), MessageCode.FILE_UPLOAD_ERROR.getCode(),
+                    "Failed to retry upload", null);
+        }
+    }
+
     private BaseResponse handleGetChunkStatus(BaseRequest request, FileUploadRequest fileRequest) {
         try {
             FileUploadSession session = fileUploadSessionRepository.findById(fileRequest.getUploadId())
                     .orElseThrow(() -> new UploadSessionNotFoundException(fileRequest.getUploadId()));
 
             Map<String, Boolean> chunkStatus = new HashMap<>();
-
             for (int i = 0; i < session.getTotalChunks(); i++) {
                 chunkStatus.put("chunk_" + i, session.getChunkPaths().containsKey(i));
             }
@@ -198,6 +225,7 @@ public class FileUploadHandler implements RequestHandler {
 
             return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
                     MessageCode.SUCCESS.getDescription(), response);
+
         } catch (UploadSessionNotFoundException e) {
             return new BaseResponse(request.getMsgId(), MessageCode.FILE_NOT_FOUND.getCode(),
                     "Upload session not found", null);

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

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

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

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

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

@@ -4,10 +4,13 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 import ru.soune.nocopy.dto.*;
-import ru.soune.nocopy.entity.AuthToken;
+import ru.soune.nocopy.dto.register.LoginAnswer;
+import ru.soune.nocopy.dto.register.LoginRequest;
+import ru.soune.nocopy.entity.user.AuthToken;
+import ru.soune.nocopy.entity.user.User;
 import ru.soune.nocopy.exception.NotValidFieldException;
 import ru.soune.nocopy.repository.UserRepository;
-import ru.soune.nocopy.service.auth.AuthService;
+import ru.soune.nocopy.service.register.AuthService;
 
 import java.util.Arrays;
 import java.util.Map;
@@ -25,8 +28,9 @@ 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 (!userRepository.existsByEmail(loginRequest.getEmail())) {
+        if (user == null) {
             LoginAnswer loginAnswer = new LoginAnswer();
             loginAnswer.setFieldErrors(Arrays.asList(Map.of("email", loginRequest.getEmail())));
 
@@ -35,6 +39,17 @@ 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,12 +4,14 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 import ru.soune.nocopy.dto.*;
-import ru.soune.nocopy.entity.AuthToken;
+import ru.soune.nocopy.dto.register.LogOutAnswer;
-import ru.soune.nocopy.entity.User;
+import ru.soune.nocopy.dto.register.LogoutRequest;
+import ru.soune.nocopy.entity.user.AuthToken;
+import ru.soune.nocopy.entity.user.User;
 import ru.soune.nocopy.exception.NotValidFieldException;
 import ru.soune.nocopy.repository.AuthTokenRepository;
 import ru.soune.nocopy.repository.UserRepository;
-import ru.soune.nocopy.service.auth.AuthService;
+import ru.soune.nocopy.service.register.AuthService;
 
 import java.util.Objects;
 import java.util.Optional;
@@ -31,16 +33,16 @@ public class LogoutRequestHandler implements RequestHandler {
         LogoutRequest logoutRequest = objectMapper.convertValue(request.getMessageBody(), LogoutRequest.class);
 
         Optional<AuthToken> opToken = authTokenRepository.findByToken(logoutRequest.getToken());
-        Optional<User> user = userRepository.findByEmail(logoutRequest.getEmail());
+        User user = userRepository.findByEmail(logoutRequest.getEmail());
 
-        if (opToken.isEmpty() || user.isEmpty()) {
+        if (opToken.isEmpty() || user == null) {
             throw new NotValidFieldException("User with email or token not found",
                     new BaseResponse(request.getMsgId(), MessageCode.AUTH_EMAIL_OR_TOKEN_NOT_FOUND.getCode(),
                             MessageCode.AUTH_EMAIL_OR_TOKEN_NOT_FOUND.getDescription(),
                             new LogoutRequest(logoutRequest.getEmail(), logoutRequest.getToken())));
         }
 
-        if (!Objects.equals(opToken.get().getUser().getId(), user.get().getId())) {
+        if (!Objects.equals(opToken.get().getUser().getId(), user.getId())) {
             throw new NotValidFieldException("User token mismatch with user",
                     new BaseResponse(request.getMsgId(), MessageCode.AUTH_TOKEN_MISMATCH.getCode(),
                             MessageCode.AUTH_TOKEN_MISMATCH.getDescription(),

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

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

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

@@ -0,0 +1,112 @@
+package ru.soune.nocopy.handler;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.crypto.password.PasswordEncoder;
+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.ActionResponse;
+import ru.soune.nocopy.dto.register.ResetPasswordRequest;
+import ru.soune.nocopy.dto.register.ResetPasswordResponse;
+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 java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+@Component
+@Slf4j
+@RequiredArgsConstructor
+public class ResetPasswordHandler implements RequestHandler{
+
+    private final ObjectMapper objectMapper;
+
+    private final EmailService emailService;
+
+    private final AuthService authService;
+
+    private final UserRepository userRepository;
+
+    private final EmailVerificationTokenRepository emailVerificationTokenRepository;
+
+    private final AuthTokenRepository authTokenRepository;
+
+    private final PasswordEncoder passwordEncoder;
+
+    @Override
+    public BaseResponse handle(BaseRequest request) throws Exception {
+        ResetPasswordRequest resetPasswordRequest = objectMapper.convertValue(request.getMessageBody(),
+                ResetPasswordRequest.class);
+        String action = resetPasswordRequest.getAction();
+        User user = userRepository.findByEmail(resetPasswordRequest.getEmail());
+        AuthToken authToken;
+
+        if (user == null) {
+            throw new UserNotFoundException("User not found with email: " + resetPasswordRequest.getEmail());
+        }
+
+        switch (action) {
+            case "resetPassword":
+                authToken = authService.generateAuthToken(user);
+
+                EmailVerificationToken emailToken = emailService.createEmailVerificationToken(authToken);
+
+                emailService.sendResetPasswordEmail(authToken.getUser(), emailToken.getToken());
+
+                return successResponse(request, authToken, user, MessageCode.SUCCESS.getDescription());
+            case "confirmVerification":
+                String verifyToken = resetPasswordRequest.getVerifyToken();
+
+                EmailVerificationToken verificationToken =
+                        emailVerificationTokenRepository.findByUserIdAndToken(user.getId(), verifyToken);
+
+                if (verificationToken == null) {
+                    throw new NotValidFieldException("Verification token not found",
+                            new BaseResponse(request.getMsgId(), MessageCode.INVALID_TOKEN.getCode(),
+                                    MessageCode.INVALID_TOKEN.getDescription(), Map.of("verifyToken", verifyToken)));
+                }
+                List<AuthToken> authTokens = authTokenRepository.findByUserId(user.getId());
+
+                authToken = authTokens.isEmpty() ? authService.generateAuthToken(user): authTokens.getFirst();
+
+                user.setPassword(passwordEncoder.encode(resetPasswordRequest.getPassword()));
+                user.setActive(true);
+
+                emailVerificationTokenRepository.delete(verificationToken);
+
+                User saveUser = userRepository.save(user);
+
+                return successResponse(request, authToken, saveUser, MessageCode.SUCCESS.getDescription());
+            default:
+                ActionResponse response = ActionResponse.builder()
+                        .action(action)
+                        .availableActions(Arrays.asList("confirmVerification", "resetPassword"))
+                        .build();
+
+                return new BaseResponse(request.getMsgId(), MessageCode.INVALID_ACTION.getCode(),
+                        "Invalid action: " + action, response);
+
+        }
+    }
+
+    private BaseResponse successResponse(BaseRequest request, AuthToken authToken, User user, String message) {
+        ResetPasswordResponse resetPasswordResponse = new ResetPasswordResponse();
+        resetPasswordResponse.setAuthToken(authToken.getToken());
+        resetPasswordResponse.setUserId(user.getId());
+
+        return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(), message, resetPasswordResponse);
+    }
+}

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

@@ -0,0 +1,119 @@
+package ru.soune.nocopy.handler;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import ru.soune.nocopy.dto.BaseRequest;
+import ru.soune.nocopy.dto.BaseResponse;
+import ru.soune.nocopy.dto.MessageCode;
+import ru.soune.nocopy.dto.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.util.List;
+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) {
+        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));
+
+        List<AuthToken> authTokens = authTokenRepository.findByUserId(user.getId());
+
+        AuthToken authToken = authTokens.isEmpty() ? authService.generateAuthToken(user): authTokens.getFirst();
+
+        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) {
+
+        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);
+        }
+
+        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);
+    }
+
+
+    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());
+    }
+
+    private BaseResponse successResponse(BaseRequest request, AuthToken authToken, String message, boolean isActive,
+                                         boolean isVerified) {
+
+        RegAnswer regAnswer = new RegAnswer();
+        regAnswer.setToken(authToken.getToken());
+        regAnswer.setVerified(isVerified);
+        regAnswer.setActive(isActive);
+
+        return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(), message, regAnswer);
+    }
+}

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

@@ -1,14 +1,11 @@
 package ru.soune.nocopy.handler.validator;
 
-import org.apache.commons.validator.routines.DomainValidator;
 import org.apache.commons.validator.routines.EmailValidator;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.Errors;
 import org.springframework.validation.Validator;
-import ru.soune.nocopy.dto.RegRequest;
+import ru.soune.nocopy.dto.register.RegRequest;
 
-import java.net.InetAddress;
-import java.net.UnknownHostException;
 import java.util.*;
 
 @Component

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

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

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

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

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

@@ -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.AuthToken;
+import ru.soune.nocopy.entity.user.AuthToken;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -13,4 +13,6 @@ 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);
+    List<AuthToken> findByUserId(Long userId);
 }

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

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

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

@@ -30,8 +30,5 @@ public interface FileEntityRepository extends JpaRepository<FileEntity, String>
     @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);
-
     long countByUserId(Long userId);
 }

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

@@ -1,10 +0,0 @@
-package ru.soune.nocopy.repository;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-import ru.soune.nocopy.entity.file.ImageHashEntity;
-
-@Repository
-public interface ImageHashRepository extends JpaRepository<ImageHashEntity, String> {
-    void deleteByFileId(String fileId);
-}

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

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

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

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

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

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

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

@@ -0,0 +1,16 @@
+package ru.soune.nocopy.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+import ru.soune.nocopy.entity.user.UserNotActive;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Optional;
+
+@Repository
+public interface UserNotActiveRepository extends JpaRepository<UserNotActive, Long> {
+    Optional<UserNotActive> findByUserId(Long userId);
+    List<UserNotActive> findByBlockedUntilBefore(LocalDateTime now);
+
+}

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

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

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

@@ -1,135 +0,0 @@
-package ru.soune.nocopy.service;
-
-import lombok.RequiredArgsConstructor;
-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.SimilarityFilter;
-import ru.soune.nocopy.repository.ImageHashRepository;
-import ru.soune.nocopy.repository.ImageSimilarityRepository;
-import ru.soune.nocopy.repository.SimilarImageProjection;
-
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.stream.Collectors;
-
-@Service
-@RequiredArgsConstructor
-public class FileSimilarityService {
-    private final ImageSimilarityRepository repository;
-
-    private final ImageHashRepository hashRepository;
-
-    public List<SimilarFileResponse> findSimilarFiles(String fileId) {
-        var imageHashEntity = hashRepository.findById(fileId)
-                .orElseThrow(() -> new RuntimeException("Hash not found"));
-
-        Integer hash64Hi = imageHashEntity.getHash64Hi();
-        Integer hash64Lo = imageHashEntity.getHash64Lo();
-
-        List<SimilarImageProjection> candidates =
-                repository.findCandidates(fileId);
-
-        return candidates.stream()
-                .map(c -> {
-                    Integer cHi = c.getHash64Hi();
-                    Integer cLo = c.getHash64Lo();
-
-                    int hamming = hamming64(hash64Hi, hash64Lo, cHi, cLo);
-
-                    String level;
-                    if (hamming <= 5) {
-                        level = "DUPLICATE";
-                    } else if (hamming <= 12) {
-                        level = "SIMILAR";
-                    } else {
-                        level = "DIFFERENT";
-                    }
-
-                    return SimilarFileResponse.builder()
-                            .fileId(c.getId())
-                            .originalFileName(c.getOriginalFileName())
-                            .fileSize(c.getFileSize())
-                            .hammingDistance(hamming)
-                            .similarityLevel(level)
-                            .build();
-                })
-                .sorted((a, b) ->
-                        Integer.compare(a.getHammingDistance(), b.getHammingDistance()))
-                .toList();
-    }
-
-    public List<SimilarImageProjection> findDuplicatedByHash(Integer hash64Hi, Integer hash64Lo) {
-        List<SimilarImageProjection> duplicates = repository.findExactDuplicates(hash64Hi,hash64Lo);
-
-        if (duplicates.isEmpty()) {
-            return new ArrayList<>();
-        }
-
-        return duplicates;
-    }
-
-    public Page<SimilarFileResponse> 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();
-
-        List<SimilarImageProjection> candidates = repository.findCandidates(fileId);
-
-        List<String> similarityLevels = (filter != null && filter.getSimilarityLevels() != null)
-                ? filter.getSimilarityLevels()
-                : List.of("DUPLICATE", "SIMILAR", "DIFFERENT");
-
-        List<SimilarFileResponse> allResults = candidates.stream()
-                .map(c -> createSimilarFileResponse(c, hash64Hi, hash64Lo))
-                .filter(response -> similarityLevels.contains(response.getSimilarityLevel()))
-                .sorted(Comparator.comparingInt(SimilarFileResponse::getHammingDistance))
-                .collect(Collectors.toList());
-
-        int total = allResults.size();
-        int page = (pageable != null) ? pageable.getPageNumber() : 0;
-        int size = (pageable != null) ? pageable.getPageSize() : 20;
-
-        int fromIndex = Math.min(page * size, total);
-        int toIndex = Math.min(fromIndex + size, total);
-
-        List<SimilarFileResponse> 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();
-
-        int hamming = hamming64(hash64Hi, hash64Lo, imageProjectionHash64Hi, similarImageProjectionHash64Lo);
-
-        String level;
-        if (hamming <= 5) {
-            level = "DUPLICATE";
-        } else if (hamming <= 12) {
-            level = "SIMILAR";
-        } else {
-            level = "DIFFERENT";
-        }
-
-        return SimilarFileResponse.builder()
-                .fileId(similarImageProjection.getId())
-                .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,154 +0,0 @@
-package ru.soune.nocopy.service;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import ru.soune.nocopy.entity.file.FileEntity;
-import ru.soune.nocopy.entity.file.ImageHashEntity;
-import ru.soune.nocopy.repository.ImageHashRepository;
-
-import javax.imageio.ImageIO;
-import java.awt.*;
-import java.awt.image.BufferedImage;
-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
-@RequiredArgsConstructor
-@Slf4j
-public class ImageHashService {
-
-    private final ImageHashRepository repository;
-
-    public Map<String, Integer> calculateHash(Path imagePath) throws IOException {
-        long hash64 = computePhash64(imagePath);
-
-        return Map.of(
-                "hi", high32(hash64),
-                "low", low32(hash64));
-    }
-
-    public void create(FileEntity file,  Map<String, Integer> stringIntegerMap) {
-        ImageHashEntity entity = ImageHashEntity.builder()
-                .file(file)
-                .hash64Hi(stringIntegerMap.get("hi"))
-                .hash64Lo(stringIntegerMap.get("low"))
-                .hashAlgorithm("PHASH64")
-                .createdAt(LocalDateTime.now())
-                .build();
-
-        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

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

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

@@ -0,0 +1,48 @@
+package ru.soune.nocopy.service.auth;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import ru.soune.nocopy.entity.user.User;
+import ru.soune.nocopy.entity.user.UserNotActive;
+import ru.soune.nocopy.repository.UserNotActiveRepository;
+import ru.soune.nocopy.repository.UserRepository;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class CleanUpNotActiveUser {
+
+    @Autowired
+    private UserNotActiveRepository userNotActiveRepository;
+
+    @Autowired
+    private UserRepository userRepository;
+
+    @Transactional
+    @Scheduled(fixedDelay = 600000)
+    public void cleanupNotActiveUsers() {
+        LocalDateTime now = LocalDateTime.now();
+
+        List<UserNotActive> expiredTokens = userNotActiveRepository.findByBlockedUntilBefore(now);
+
+        for (UserNotActive userNotActive : expiredTokens) {
+            User user = userNotActive.getUser();
+            user.setActive(true);
+            user.setFailedLoginAttempts(0);
+
+            userRepository.save(user);
+        }
+
+        if (!expiredTokens.isEmpty()) {
+            userNotActiveRepository.deleteAll(expiredTokens);
+
+        }
+    }
+}

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

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

@@ -9,12 +9,8 @@ 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.exception.DuplicateImageException;
 import ru.soune.nocopy.exception.FileEntityNotFoundException;
 import ru.soune.nocopy.repository.FileEntityRepository;
-import ru.soune.nocopy.repository.SimilarImageProjection;
-import ru.soune.nocopy.service.FileSimilarityService;
-import ru.soune.nocopy.service.ImageHashService;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -22,7 +18,6 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.time.LocalDateTime;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -32,11 +27,7 @@ public class FileEntityService {
 
     private final FileEntityRepository fileEntityRepository;
 
-    private final ImageHashService imageHashService;
+    @Transactional
-
-    private final FileSimilarityService fileSimilarityService;
-
-    @Transactional(noRollbackFor = DuplicateImageException.class)
     public FileEntity createFromUploadSession(FileUploadSession session, String checksum) {
         log.info("Creating FileEntity for upload session: {}", session.getUploadId());
 
@@ -47,21 +38,6 @@ public class FileEntityService {
                 throw new IOException("File not found on disk: " + filePath);
             }
 
-            Map<String, Integer> imageHash = Map.of();
-
-            if (session.getFileType().startsWith("image")) {
-                imageHash = imageHashService.calculateHash(filePath);
-                List<SimilarImageProjection> duplicatedByHash = fileSimilarityService.findDuplicatedByHash(
-                        imageHash.get("hi"), imageHash.get("low"));
-
-                if (!duplicatedByHash.isEmpty()) {
-                    SimilarImageProjection similarImageProjection = duplicatedByHash.get(0);
-
-                    throw new DuplicateImageException("Duplicate", similarImageProjection.getFileId(),
-                            similarImageProjection.getUserId());
-                }
-            }
-
             long fileSize = Files.size(filePath);
             String originalName = session.getFileName();
             String storedName = filePath.getFileName().toString();
@@ -80,12 +56,11 @@ public class FileEntityService {
                     .build();
 
             FileEntity saved = fileEntityRepository.save(fileEntity);
-
+            log.info("FileEntity created successfully: {} (size: {} bytes)",
-            if (!imageHash.isEmpty()) {
+                    saved.getId(), fileSize);
-                imageHashService.create(saved, imageHash);
-            }
 
             return saved;
+
         } catch (IOException e) {
             log.error("Failed to create FileEntity for session {}: {}",
                     session.getUploadId(), e.getMessage(), e);
@@ -93,6 +68,15 @@ public class FileEntityService {
         }
     }
 
+
+    private String extractFileExtension(String fileName) {
+        int dotIndex = fileName.lastIndexOf('.');
+        if (dotIndex > 0 && dotIndex < fileName.length() - 1) {
+            return fileName.substring(dotIndex + 1).toLowerCase();
+        }
+        return "";
+    }
+
     @Transactional(readOnly = true)
     public FileEntityResponse getById(String fileId, int version) {
         FileEntity fileEntity = fileEntityRepository.findById(fileId)
@@ -110,6 +94,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(
@@ -167,8 +184,6 @@ public class FileEntityService {
 
         Files.delete(path);
 
-        markAsDeleted(fileEntity);
-
         return true;
     }
 

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

@@ -17,5 +17,7 @@ public interface FileUploadService {
 
     void handleExpiredSession(FileUploadSession session);
 
+    public void retryFailedUpload(String uploadId);
+
     public void cancelUpload(String uploadId);
 }

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

@@ -10,19 +10,12 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 import ru.soune.nocopy.dto.file.UploadProgressResponse;
-import ru.soune.nocopy.entity.file.FileEntity;
-import ru.soune.nocopy.entity.file.FileStatus;
 import ru.soune.nocopy.entity.file.FileUploadSession;
 import ru.soune.nocopy.entity.file.UploadStatus;
 import ru.soune.nocopy.exception.ChunkSizeExceededException;
-import ru.soune.nocopy.exception.DuplicateImageException;
 import ru.soune.nocopy.exception.FileUploadException;
 import ru.soune.nocopy.exception.UploadSessionNotFoundException;
-import ru.soune.nocopy.repository.FileEntityRepository;
 import ru.soune.nocopy.repository.FileUploadSessionRepository;
-import ru.soune.nocopy.repository.SimilarImageProjection;
-import ru.soune.nocopy.service.FileSimilarityService;
-import ru.soune.nocopy.service.ImageHashService;
 
 import java.io.*;
 import java.nio.file.*;
@@ -30,7 +23,10 @@ import java.nio.file.attribute.PosixFilePermission;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Stream;
 
@@ -61,15 +57,6 @@ public class FileUploadServiceImpl implements FileUploadService {
 
     private Path storageRoot;
 
-    @Autowired
-    private ImageHashService imageHashService;
-
-    @Autowired
-    private FileSimilarityService fileSimilarityService;
-
-    @Autowired
-    private FileEntityRepository fileEntityRepository;
-
     @Autowired
     private FileEntityService fileEntityService;
 
@@ -142,6 +129,10 @@ public class FileUploadServiceImpl implements FileUploadService {
     @Transactional
     public UploadProgressResponse uploadChunk(String uploadId, Integer chunkNumber,
                                               MultipartFile chunkFile) {
+
+        log.info("Processing chunk {} for session {}, size: {} bytes",
+                chunkNumber, uploadId, chunkFile.getSize());
+
         FileUploadSession session = sessionRepository.findById(uploadId)
                 .orElseThrow(() -> new UploadSessionNotFoundException(uploadId));
 
@@ -182,13 +173,12 @@ public class FileUploadServiceImpl implements FileUploadService {
 
     @Async("fileUploadTaskExecutor")
     @Transactional
-    public void assembleFileAsync(FileUploadSession session) throws DuplicateImageException {
+    public void assembleFileAsync(FileUploadSession session) {
         try {
             assembleFile(session);
             log.info("File assembly completed successfully for session: {}",
                     session.getUploadId());
-        } catch (DuplicateImageException e) {
+
-            throw new DuplicateImageException("DUBL", e.duplicateFileId(), e.userId());
         } catch (Exception e) {
             log.error("Failed to assemble file for session {}: {}",
                     session.getUploadId(), e.getMessage(), e);
@@ -215,6 +205,35 @@ public class FileUploadServiceImpl implements FileUploadService {
         log.info("Upload cancelled: {}", uploadId);
     }
 
+    @Override
+    @Transactional
+    public void retryFailedUpload(String uploadId) {
+        FileUploadSession session = sessionRepository.findById(uploadId)
+                .orElseThrow(() -> new UploadSessionNotFoundException(uploadId));
+
+        if (session.getStatus() != UploadStatus.FAILED) {
+            throw new FileUploadException("Only failed uploads can be retried");
+        }
+
+        if (session.getRetryCount() >= maxRetryAttempts) {
+            throw new FileUploadException("Max retry attempts exceeded");
+        }
+
+        session.setStatus(UploadStatus.UPLOADING);
+        session.setRetryCount(session.getRetryCount() + 1);
+        session.setLastError(null);
+
+        sessionRepository.save(session);
+
+        if (session.getChunksUploaded().equals(session.getTotalChunks())) {
+            log.info("Retrying file assembly for session: {}", uploadId);
+            assembleFileAsync(session);
+        }
+
+        log.info("Upload retry initiated for session: {} (attempt {})",
+                uploadId, session.getRetryCount());
+    }
+
     @Override
     public UploadProgressResponse getUploadProgress(String uploadId) {
         FileUploadSession session = sessionRepository.findById(uploadId)
@@ -252,42 +271,9 @@ public class FileUploadServiceImpl implements FileUploadService {
         }
     }
 
-    @Async("fileUploadTaskExecutor")
+    private UploadProgressResponse processChunk(FileUploadSession session,
-    @Transactional
+                                                Integer chunkNumber,
-    public void completeFileProcessingAsync(FileUploadSession session) {
+                                                MultipartFile chunkFile) {
-        try {
-            Path filePath = Paths.get(session.getFilePath());
-            String checksum = calculateChecksum(filePath);
-
-            FileEntity fileEntity = FileEntity.builder()
-                    .userId(session.getUserId())
-                    .originalFileName(session.getFileName())
-                    .storedFileName(filePath.getFileName().toString())
-                    .filePath(session.getFilePath())
-                    .fileSize(session.getFileSize())
-                    .mimeType(session.getFileType())
-                    .fileExtension(session.getExtension())
-                    .checksum(checksum)
-                    .uploadSessionId(session.getUploadId())
-                    .status(FileStatus.ACTIVE)
-                    .build();
-
-            FileEntity saved = fileEntityRepository.save(fileEntity);
-
-            Map<String, Integer> hash = imageHashService.calculateHash(filePath);
-            imageHashService.create(saved, hash);
-
-            cleanupSessionFiles(session);
-
-            log.info("File processing completed for session: {}", session.getUploadId());
-
-        } catch (Exception e) {
-            log.error("Failed to complete file processing for session {}: {}",
-                    session.getUploadId(), e.getMessage(), e);
-        }
-    }
-
-    private UploadProgressResponse processChunk(FileUploadSession session, Integer chunkNumber, MultipartFile chunkFile) {
         String chunkPath = null;
 
         try {
@@ -305,42 +291,17 @@ public class FileUploadServiceImpl implements FileUploadService {
             log.debug("Chunk {} saved successfully. Uploaded: {}/{}",
                     chunkNumber, session.getChunksUploaded(), session.getTotalChunks());
 
-            boolean isLastChunk = session.getChunksUploaded().equals(session.getTotalChunks());
+            if (session.getChunksUploaded().equals(session.getTotalChunks())) {
-
-            if (isLastChunk) {
                 log.info("All chunks uploaded for session {}. Starting assembly...",
                         session.getUploadId());
-
+                sessionRepository.save(session);
-                String finalFilePath = assembleFileSynchronously(session);
+                assembleFileAsync(session);
-
-                if (session.getFileType().startsWith("image")) {
-                    checkForDuplicatesSynchronously(finalFilePath);
-                }
-
-                session.setStatus(UploadStatus.COMPLETED);
-                session.setFilePath(finalFilePath);
-
-                completeFileProcessingAsync(session);
-
             } else {
                 sessionRepository.save(session);
             }
 
             return UploadProgressResponse.fromSession(session);
 
-        } catch (DuplicateImageException e) {
-            if (chunkPath != null) {
-                cleanupFailedChunk(chunkPath);
-            }
-
-            log.warn("Duplicate image found for session {}: {}",
-                    session.getUploadId(), e.getMessage());
-
-            session.setStatus(UploadStatus.FAILED);
-            session.setLastError(e.getMessage());
-            sessionRepository.save(session);
-
-            throw e;
         } catch (Exception e) {
             if (chunkPath != null) {
                 cleanupFailedChunk(chunkPath);
@@ -357,29 +318,6 @@ public class FileUploadServiceImpl implements FileUploadService {
         }
     }
 
-    private String assembleFileSynchronously(FileUploadSession session) throws IOException {
-        Path finalFilePath = prepareFinalFile(session);
-
-        validateAllChunksExist(session);
-        mergeChunksToFile(session, finalFilePath);
-        validateFinalFile(session, finalFilePath);
-
-        return finalFilePath.toString();
-    }
-
-    private void checkForDuplicatesSynchronously(String filePath)
-            throws IOException {
-        Path path = Paths.get(filePath);
-        Map<String, Integer> 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).getFileId(),
-                    duplicates.get(0).getUserId());
-        }
-    }
-
     private UploadProgressResponse handleExistingChunk(FileUploadSession session,
                                                        Integer chunkNumber,
                                                        MultipartFile chunkFile) throws IOException {
@@ -387,24 +325,25 @@ public class FileUploadServiceImpl implements FileUploadService {
         Path chunkPath = Paths.get(existingPath);
 
         if (!Files.exists(chunkPath)) {
+            log.warn("Chunk file missing, re-uploading: {}", chunkPath);
             session.getChunkPaths().remove(chunkNumber);
             session.setChunksUploaded(session.getChunksUploaded() - 1);
             sessionRepository.save(session);
-
             return processChunk(session, chunkNumber, chunkFile);
         }
 
         long existingSize = Files.size(chunkPath);
-
         if (existingSize != chunkFile.getSize()) {
+            log.warn("Chunk size mismatch, re-uploading: {} != {}",
+                    existingSize, chunkFile.getSize());
             Files.deleteIfExists(chunkPath);
             session.getChunkPaths().remove(chunkNumber);
             session.setChunksUploaded(session.getChunksUploaded() - 1);
             sessionRepository.save(session);
-
             return processChunk(session, chunkNumber, chunkFile);
         }
 
+        log.debug("Chunk {} already uploaded and valid", chunkNumber);
         return UploadProgressResponse.fromSession(session);
     }
 
@@ -463,7 +402,7 @@ public class FileUploadServiceImpl implements FileUploadService {
                 session.getUploadId(), session.getFileName());
 
         Path finalFilePath = null;
-        String checksum;
+        String checksum = null;
 
         try {
             finalFilePath = prepareFinalFile(session);
@@ -489,8 +428,6 @@ public class FileUploadServiceImpl implements FileUploadService {
                 fileEntityService.createFromUploadSession(session, checksum);
                 log.info("FileEntity successfully created for session: {}",
                         session.getUploadId());
-            } catch (DuplicateImageException e) {
-                throw new DuplicateImageException("Duplicate", e.duplicateFileId(), e.userId());
             } catch (Exception e) {
                 log.error("Failed to create FileEntity for session {} (file uploaded, but metadata not saved): {}",
                         session.getUploadId(), e.getMessage());
@@ -654,10 +591,44 @@ public class FileUploadServiceImpl implements FileUploadService {
     private void handleAssemblyFailure(FileUploadSession session, Exception e) {
         session.setStatus(UploadStatus.FAILED);
         session.setLastError(e.getMessage());
-
         sessionRepository.save(session);
+
+        log.error("File assembly failed for session {}: {}",
+                session.getUploadId(), e.getMessage());
     }
 
+
+
+//    @Override
+//    @Transactional
+//    public void cleanupExpiredSessions() {
+//        log.info("Starting cleanup of expired upload sessions");
+//
+//        LocalDateTime expiryThreshold = LocalDateTime.now().minusHours(sessionExpiryHours);
+//
+//        try {
+//            var expiredSessions = sessionRepository.findByStatusInAndCreatedAtBefore(
+//                    Set.of(UploadStatus.INITIATED, UploadStatus.UPLOADING, UploadStatus.FAILED),
+//                    expiryThreshold
+//            );
+//
+//            int cleanedCount = 0;
+//            for (FileUploadSession session : expiredSessions) {
+//                session.setStatus(UploadStatus.FAILED);
+//                session.setLastError("Session expired during cleanup");
+//                sessionRepository.save(session);
+//
+//                CompletableFuture.runAsync(() -> cleanupSessionFiles(session));
+//                cleanedCount++;
+//            }
+//
+//            log.info("Cleaned up {} expired upload sessions", cleanedCount);
+//
+//        } catch (Exception e) {
+//            log.error("Error during session cleanup", e);
+//        }
+//    }
+
     private Path getChunkDirectory(Long userId, String uploadId) {
         return storageRoot.resolve("temp")
                 .resolve("user")

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

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

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

@@ -0,0 +1,123 @@
+package ru.soune.nocopy.service.mail;
+
+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.drop-password-subject}")
+    private String dropPasswordSubject;
+
+    @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) {
+        try {
+            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,
+                    "templates/email-verification.html");
+            helper.setText(htmlContent, true);
+
+            mailSender.send(message);
+
+            log.info("Email sent to: {}", user.getEmail());
+
+        } catch (Exception e) {
+            log.error("Failed to send email: {}", e.getMessage());
+        }
+    }
+
+    public void sendResetPasswordEmail(User user, String code) {
+        try {
+            MimeMessage message = mailSender.createMimeMessage();
+            MimeMessageHelper helper = new MimeMessageHelper(message, true, "UTF-8");
+
+            helper.setFrom(standartAdressFrom);
+            helper.setTo(user.getEmail());
+            helper.setSubject(dropPasswordSubject);
+
+            String htmlContent = loadAndProcessTemplate(user.getFullName(), code,
+                    "templates/reset-password.html");
+            helper.setText(htmlContent, true);
+
+            mailSender.send(message);
+
+            log.info("Email sent to: {}", user.getEmail());
+        } catch (Exception e) {
+            log.error("Failed to send email: {}", e.getMessage());
+        }
+    }
+
+    @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, String templatePath) throws IOException {
+        ClassPathResource resource = new ClassPathResource(templatePath);
+        String template = new String(resource.getInputStream().readAllBytes(), StandardCharsets.UTF_8);
+        String safeUsername = escapeHtml(username != null ? username : user);
+        String safeCode = escapeHtml(code);
+
+        return template
+                .replace("{{username}}", safeUsername)
+                .replace("{{code}}", safeCode);
+    }
+
+    private String escapeHtml(String text) {
+        if (text == null) return "";
+        return text
+                .replace("&", "&")
+                .replace("<", "&lt;")
+                .replace(">", "&gt;")
+                .replace("\"", "&quot;")
+                .replace("'", "&#39;");
+    }
+}

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

@@ -1,23 +1,26 @@
-package ru.soune.nocopy.service.auth;
+package ru.soune.nocopy.service.register;
 
 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.entity.AuthToken;
+import ru.soune.nocopy.dto.register.LoginAnswer;
-import ru.soune.nocopy.entity.User;
+import ru.soune.nocopy.dto.register.LoginRequest;
+import ru.soune.nocopy.dto.register.RegRequest;
+import ru.soune.nocopy.entity.user.AuthToken;
+import ru.soune.nocopy.entity.user.User;
+import ru.soune.nocopy.entity.user.UserNotActive;
 import ru.soune.nocopy.exception.NotFoundAuthToken;
 import ru.soune.nocopy.exception.NotValidFieldException;
 import ru.soune.nocopy.repository.AuthTokenRepository;
+import ru.soune.nocopy.repository.UserNotActiveRepository;
 import ru.soune.nocopy.repository.UserRepository;
 
 import java.security.SecureRandom;
 import java.time.LocalDateTime;
-import java.util.Arrays;
+import java.util.*;
-import java.util.Base64;
-import java.util.Map;
-import java.util.Optional;
 
 @Service
 @RequiredArgsConstructor
@@ -29,6 +32,8 @@ public class AuthService {
 
     private final PasswordEncoder passwordEncoder;
 
+    private final UserNotActiveRepository userNotActiveRepository;
+
     private final SecureRandom secureRandom = new SecureRandom();
 
     @Transactional
@@ -48,33 +53,7 @@ public class AuthService {
 
         User savedUser = userRepository.save(user);
 
-        AuthToken authToken = new AuthToken();
+        AuthToken authToken = genereateAuthToken(savedUser);
-        authToken.setToken(generateAuthToken());
-        authToken.setUser(savedUser);
-
-        return authTokenRepository.save(authToken);
-    }
-
-    @Transactional
-    public 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);
     }
@@ -99,15 +78,86 @@ public class AuthService {
         return authToken.getUser().getId();
     }
 
+    public AuthToken login(LoginRequest request) {
+        User user = userRepository.findByEmail(request.getEmail());
+
+        if (!user.isActive()) {
+            throw new NotValidFieldException("User not active", new BaseResponse(20003,
+                    MessageCode.USER_NOT_ACTIVE.getCode(),
+                    MessageCode.USER_NOT_ACTIVE.getDescription(), Map.of("userId", user.getId())));
+        }
+
+        if (!passwordEncoder.matches(request.getPassword(), user.getPassword())) {
+            LoginAnswer loginAnswer = new LoginAnswer();
+            loginAnswer.setFieldErrors(Arrays.asList(Map.of("password", request.getPassword())));
+            loginAnswer.setVerified(user.isEmailVerified());
+            loginAnswer.setActive(user.isActive());
+
+            int attempts = user.getFailedLoginAttempts() + 1;
+            user.setFailedLoginAttempts(attempts);
+
+            if (attempts >= 5) {
+                user.setActive(false);
+                blockUser(user);
+            }
+
+            userRepository.save(user);
+
+            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.setFailedLoginAttempts(0);
+        user.setActive(true);
+
+        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);
     }
 
+    @Transactional
+    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);
         return Base64.getUrlEncoder().withoutPadding().encodeToString(bytes);
     }
+
+    public void blockUser(User user) {
+        Optional<UserNotActive> existing = userNotActiveRepository.findByUserId(user.getId());
+        if (existing.isEmpty()) {
+            LocalDateTime now = LocalDateTime.now();
+
+            UserNotActive notActive = UserNotActive.builder()
+                    .user(user)
+                    .createdAt(now)
+                    .blockedUntil(now.plusMinutes(15))
+                    .build();
+
+            userNotActiveRepository.save(notActive);
+        }
+    }
 }

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

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

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

@@ -1,4 +1,4 @@
-package ru.soune.nocopy.service;
+package ru.soune.nocopy.service.search;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -12,7 +12,6 @@ import ru.soune.nocopy.dto.BaseResponse;
 import ru.soune.nocopy.dto.MessageCode;
 import ru.soune.nocopy.dto.file.YandexSearchResponse;
 import ru.soune.nocopy.entity.file.FileEntity;
-import ru.soune.nocopy.exception.FileEntityNotFoundException;
 import ru.soune.nocopy.exception.NotValidFieldException;
 import ru.soune.nocopy.repository.FileEntityRepository;
 

src/main/java/ru/soune/nocopy/service/user/UserService.java

@@ -1,18 +1,20 @@
-package ru.soune.nocopy.service;
+package ru.soune.nocopy.service.user;
 
 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.ChangePasswordRequest;
+import ru.soune.nocopy.dto.register.ChangePasswordRequest;
-import ru.soune.nocopy.dto.UserDTO;
+import ru.soune.nocopy.dto.user.UserDTO;
-import ru.soune.nocopy.dto.UserRequest;
+import ru.soune.nocopy.dto.user.UserRequest;
-import ru.soune.nocopy.entity.User;
+import ru.soune.nocopy.entity.user.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 {
@@ -44,6 +46,16 @@ 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/resources/application.yaml

@@ -1,7 +1,25 @@
 spring:
-  flyway:
+  mail:
-    enabled: true
+    host: smtp.gmail.com
-    baseline-on-migrate: true
+    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
 
   datasource:
     url: jdbc:postgresql://${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}
@@ -60,3 +78,11 @@ 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 адреса
+      drop-password-subject: NO COPY - сброс пароля
+      standart-address-from: NO COPY <noreply@nocopy.com>
+      user: Пользователь

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

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

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

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

src/main/resources/templates/reset-password.html

@@ -0,0 +1,201 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Восстановление пароля</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, #ff6b6b 0%, #ee5a52 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: #ee5a52;
+            font-weight: bold;
+        }
+        .code-container {
+            background: #f8f9fa;
+            border: 2px dashed #ff6b6b;
+            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;
+        }
+        .action-button {
+            display: inline-block;
+            background: linear-gradient(135deg, #ff6b6b 0%, #ee5a52 100%);
+            color: white;
+            padding: 14px 32px;
+            text-decoration: none;
+            border-radius: 8px;
+            font-weight: 600;
+            margin: 20px 0;
+            text-align: center;
+            transition: all 0.3s ease;
+        }
+        .action-button:hover {
+            background: linear-gradient(135deg, #ee5a52 0%, #d64541 100%);
+            transform: translateY(-2px);
+            box-shadow: 0 4px 12px rgba(238, 90, 82, 0.3);
+        }
+        .steps {
+            margin: 30px 0;
+            padding-left: 20px;
+        }
+        .steps li {
+            margin-bottom: 10px;
+            padding-left: 5px;
+        }
+        .footer {
+            text-align: center;
+            padding: 25px;
+            color: #666;
+            font-size: 12px;
+            border-top: 1px solid #eee;
+            background: #f9f9f9;
+        }
+        .highlight {
+            color: #ee5a52;
+            font-weight: 600;
+        }
+        .urgent {
+            color: #d63031;
+            font-weight: 700;
+        }
+        .link-fallback {
+            margin-top: 15px;
+            font-size: 13px;
+            color: #666;
+        }
+        .timer {
+            background: #ffebee;
+            border-left: 4px solid #ff6b6b;
+            padding: 12px 15px;
+            margin: 20px 0;
+            border-radius: 0 8px 8px 0;
+        }
+        .timer-text {
+            color: #d32f2f;
+            font-weight: 600;
+        }
+    </style>
+</head>
+<body>
+<div class="container">
+    <div class="header">
+        <div class="logo">NO COPY</div>
+        <h1>Восстановление пароля</h1>
+        <p>Безопасный доступ к вашему аккаунту</p>
+    </div>
+
+    <div class="content">
+        <p class="greeting">
+            Здравствуйте, <span class="username">{{username}}</span>!
+        </p>
+
+        <p>Мы получили запрос на восстановление пароля для вашего аккаунта NO COPY.</p>
+        <p>Для продолжения восстановления доступа, пожалуйста, используйте следующий код подтверждения:</p>
+
+        <div class="code-container">
+            <p class="verification-code">{{code}}</p>
+            <p class="info-text">Код для восстановления пароля</p>
+        </div>
+
+        <div class="timer">
+            <p class="timer-text">Код действителен в течение 15 минут</p>
+        </div>
+
+        <h3>Как использовать этот код:</h3>
+        <ol class="steps">
+            <li>Вернитесь на страницу восстановления пароля</li>
+            <li>Введите полученный код в поле подтверждения</li>
+            <li>Создайте новый надежный пароль</li>
+            <li>Войдите в аккаунт с новым паролем</li>
+        </ol>
+
+        <div style="text-align: center;">
+            <a href="{{resetLink}}" class="action-button">Перейти к восстановлению пароля</a>
+        </div>
+
+        <p class="link-fallback">
+            Если кнопка не работает, скопируйте и вставьте эту ссылку в браузер:<br>
+            <span style="color: #3498db; word-break: break-all;">{{resetLink}}</span>
+        </p>
+
+        <div class="warning">
+            <strong>Важная информация:</strong><br>
+            1. Если вы не запрашивали восстановление пароля, проигнорируйте это письмо.<br>
+            2. Никому не сообщайте этот код, включая сотрудников поддержки.<br>
+            3. После успешного восстановления старый пароль будет недействителен.
+        </div>
+
+        <p style="font-size: 13px; color: #7f8c8d;">
+            <strong>Совет по безопасности:</strong> Используйте пароль длиной не менее 8 символов,
+            содержащий буквы (заглавные и строчные), цифры и специальные символы.
+        </p>
+    </div>
+
+    <div class="footer">
+        <p>© 2024 NO COPY. Все права защищены.</p>
+        <p>Это письмо отправлено автоматически, пожалуйста, не отвечайте на него.</p>
+        <p>Если у вас возникли вопросы или вы не запрашивали восстановление пароля,
+            <a href="mailto:support@nocopy.com" style="color: #ee5a52;">свяжитесь со службой поддержки</a>.</p>
+        <p style="font-size: 11px; margin-top: 10px;">
+            IP запроса: {{ipAddress}} • Время: {{timestamp}} • Устройство: {{deviceInfo}}
+        </p>
+    </div>
+</div>
+</body>
+</html>