Add file info public

# Conflicts:
#	src/main/java/ru/soune/nocopy/controller/ApiController.java
#	src/main/java/ru/soune/nocopy/repository/FileEntityRepository.java
#	src/main/java/ru/soune/nocopy/service/file/impl/FileUploadServiceImpl.java

README.md

@@ -290,7 +290,7 @@ server_name dev-admin.not-copy.com;
     ssl_certificate_key /etc/letsencrypt/live/dev-admin.not-copy.com/privkey.pem;
 
     location /api/ {
-        proxy_pass http://localhost:3001;
+        proxy_pass http://localhost:8082;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -323,6 +323,7 @@ server_name dev-workspace.not-copy.com;
     ssl_certificate_key /etc/letsencrypt/live/dev-workspace.not-copy.com/privkey.pem;
 
     location /api/ {
+
         proxy_pass http://localhost:3001;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
@@ -489,4 +490,14 @@ killall 3proxy                         # Остановка прокси
 На основном сервере:
 bash
 curl -x http://193.46.217.94:3128 https://api.ipify.org  # Проверка прокси
-telnet 193.46.217.94 3128                                 # Проверка порта
+telnet 193.46.217.94 3128                                 # Проверка порта
+
+------
+
+Настройка Яндекс Клауд
+
+1. YCAJEpWAtaVkVGX0sH6_EupEg - индетификатор ключа
+2. YCMmVykfXrZ_nfU13Vo4yoCVGa70DnTlBgF1pUzO - секретный ключ
+
+   private static final String KEY_ID = "YCAJEmHZcWxzf4oGWvETG3mms";
+   private static final String SECRET_KEY = "YCPAPZ32XC-LWb8xE0b_xTcBD8NZUCHpSOfu8LUG";

build.gradle

@@ -62,9 +62,30 @@ dependencies {
 	implementation name: 'testlib-fat-0.3.1-all'
 
 	implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.12.0'
+	implementation 'com.maxmind.geoip2:geoip2:4.2.0'
+	implementation 'org.sejda.imageio:webp-imageio:0.1.6'
 
 	implementation project(':referral')
 
+	//cloud
+	implementation("software.amazon.awssdk:aws-sdk-java:2.29.33")
+	implementation("software.amazon.awssdk:apache-client:2.29.33")
+
+	implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0")
+	implementation("org.springframework.boot:spring-boot-starter-web")
+
+
+	implementation 'org.springframework.cloud:spring-cloud-starter-openfeign:4.1.0'
+	implementation 'io.github.resilience4j:resilience4j-spring-boot3:2.2.0'
+
+	//cache
+	implementation("org.springframework.boot:spring-boot-starter-cache:4.0.6")
+	implementation 'com.github.ben-manes.caffeine:caffeine'
+
+	//security
+	implementation 'org.springframework.boot:spring-boot-starter-security'
+	implementation("io.jsonwebtoken:jjwt:0.13.0")
+
 }
 
 tasks.named('test') {

docker-compose.yaml

@@ -216,6 +216,33 @@ services:
     networks:
       - app-network
 
+  nexus:
+    image: sonatype/nexus3:latest
+    container_name: nexus
+    restart: unless-stopped
+    ports:
+      - "9000:8081"
+    volumes:
+      - nexus-data:/nexus-data
+    environment:
+      - INSTALL4J_ADD_VM_PARAMS=-Xms512m -Xmx1024m -XX:MaxDirectMemorySize=512m
+    networks:
+      - app-network
+
+  mongodb:
+    image: mongo:latest
+    container_name: mongo_ncp
+    restart: unless-stopped
+    ports:
+      - "27017:27017"
+    environment:
+      MONGO_INITDB_ROOT_USERNAME: mongo_db
+      MONGO_INITDB_ROOT_PASSWORD: mongo_ncp
+    volumes:
+      - mongodb_data:/data/db
+    networks:
+      - app-network
+
   tempo:
     image: grafana/tempo:2.4.1
     container_name: tempo
@@ -267,6 +294,8 @@ services:
 
 volumes:
   pgdata:
+  mongodb_data:
+    name: mongodb_data
   artifacts:
   tempo_data:
   loki_data:
@@ -275,6 +304,8 @@ volumes:
   loki_rules:
   uploads_data:
   prometheus_data:
+  nexus-data:
+    driver: local
 #  postfix-data:
 networks:
   app-network:

infrastructure/jenkins/deploy-backend.groovy

@@ -86,10 +86,11 @@ pipeline {
                                     passwordVariable: 'SSH_PASS'
                             ),
                             string(credentialsId: 'DB_USER', variable: 'DB_USER'),
-                            string(credentialsId: 'DB_PASSWORD', variable: 'DB_PASSWORD')
+                            string(credentialsId: 'DB_PASSWORD', variable: 'DB_PASSWORD'),
+                            string(credentialsId: 'MONGO_USER', variable: 'MONGO_USER'),
+                            string(credentialsId: 'MONGO_PASSWORD', variable: 'MONGO_PASSWORD')
                     ]) {
                         sh """
-                # Тестируем подключение сначала
                 echo "Testing SSH connection..."
                 if sshpass -p '${SSH_PASS}' ssh -o StrictHostKeyChecking=no ${SSH_USER}@${params.SERVER} 'echo "SSH connection successful"'; then
                     echo "SSH connection OK"
@@ -98,7 +99,6 @@ pipeline {
                     exit 1
                 fi
 
-                # Основная команда
                 sshpass -p '${SSH_PASS}' ssh -o StrictHostKeyChecking=no ${SSH_USER}@${params.SERVER} "
                     mkdir -p /opt/deployments/${params.BRANCH}-${params.PORT}
                     cd /opt/deployments/${params.BRANCH}-${params.PORT}
@@ -118,6 +118,8 @@ pipeline {
                     docker rm postgres-${params.PORT} 2>/dev/null || echo 'Контейнер БД не найден'
                     docker stop file-storage-${params.PORT} 2>/dev/null || echo 'Контейнер storage не найден'
                     docker rm file-storage-${params.PORT} 2>/dev/null || echo 'Контейнер storage не найден'
+                    docker stop mongodb-${params.PORT} 2>/dev/null || echo 'Контейнер MongoDB не найден'
+                    docker rm mongodb-${params.PORT} 2>/dev/null || echo 'Контейнер MongoDB не найден'
 
                     echo '3. Запускаем БД...'
                     docker run -d \\
@@ -134,20 +136,31 @@ pipeline {
                       -e BUILD_TIME_BACK='${buildTime}' \\
                       postgres:17.7
 
-                    echo '4. Запускаем storage...'
+                    echo '4. Запускаем MongoDB...'
+                    docker run -d \\
+                      --name mongodb-${params.PORT} \\
+                      --network ${params.NETWORK} \\
+                      --network-alias mongodb-${params.PORT} \\
+                      -p ${params.PORT}1:27017 \\
+                      -e MONGO_INITDB_ROOT_USERNAME=${MONGO_USER} \\
+                      -e MONGO_INITDB_ROOT_PASSWORD=${MONGO_PASSWORD} \\
+                      -v mongodb_data_${params.PORT}:/data/db \\
+                      mongo:7.0
+
+                    echo '5. Запускаем storage...'
                     docker run -d \\
                       --name file-storage-${params.PORT} \\
                       --network ${params.NETWORK} \\
                       -v uploads_data_${params.PORT}:/storage:rw \\
                       alpine:latest tail -f /dev/null
 
-                    echo '5. Ждем БД...'
+                    echo '6. Ждем БД...'
                     sleep 15
-
+                    
-                    echo '6. Собираем приложение...'
+                    echo '7. Собираем приложение...'
                     docker build --no-cache -t app-backend-${params.PORT}:latest .
 
-                    echo '7. Запускаем приложение...'
+                    echo '8. Запускаем приложение...'
                     docker run -d \\
                       --name app-backend-${params.PORT} \\
                       --network ${params.NETWORK} \\
@@ -162,9 +175,11 @@ pipeline {
                       -e POSTGRES_HOST=no_copy_${params.PORT} \\
                       -e FILE_STORAGE_PATH=/data/uploads \\
                       -e SPRING_PROFILES_ACTIVE=${springProfile} \\
+                      -e MONGO_URI=mongodb://${MONGO_USER}:${MONGO_PASSWORD}@mongodb-${params.PORT}:27017 \\
+                      -e MONGO_DATABASE=no_copy \\
                       app-backend-${params.PORT}:latest
 
-                    echo '8. Проверка...'
+                    echo '9. Проверка...'
                     sleep 10
                     
                     if curl -s -f http://localhost:${params.PORT}/health > /dev/null 2>&1; then

referral/src/main/kotlin/Referral.kt

@@ -9,5 +9,6 @@ interface Referral {
     val totalIncome: Int
     val availableIncome: Int
     val holdBalance: Int
+    val spentBalance: Int
     val active: Boolean
 }

referral/src/main/kotlin/ReferralService.kt

@@ -18,6 +18,7 @@ class ReferralService(
             override val totalIncome = 0
             override val availableIncome = 0
             override val holdBalance: Int = 0
+            override val spentBalance: Int = 0
             override val active: Boolean = false
         }
 
@@ -59,7 +60,8 @@ class ReferralService(
             totalIncome = referral.totalIncome,
             availableIncome = referral.availableIncome,
             holdBalance = referral.holdBalance,
-            referralLink = referral.referralLink
+            referralLink = referral.referralLink,
+            spentBalance = referral.spentBalance,
         )
     }
 

referral/src/main/kotlin/ReferralStat.kt

@@ -7,4 +7,5 @@ data class ReferralStat(
     val availableIncome: Int,
     val holdBalance: Int,
     val referralLink: String,
+    val spentBalance: Int,
 )

src/main/java/ru/soune/nocopy/NoCopyApplication.java

@@ -2,10 +2,12 @@ package ru.soune.nocopy;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
 @EnableScheduling
+@EnableCaching
 public class NoCopyApplication {
 
 	public static void main(String[] args) {

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

@@ -1,5 +1,6 @@
 package ru.soune.nocopy.configuration;
 
+import com.github.benmanes.caffeine.cache.Caffeine;
 import com.vrt.AudioFilePathProvider;
 import com.vrt.fileprotection.FileProtector;
 import com.vrt.fileprotection.audio.AudioLocalSearch;
@@ -8,16 +9,21 @@ import com.vrt.fileprotection.image.ImageLocalSearch;
 import com.vrt.fileprotection.image.ImageUniqueCheck;
 import lombok.AllArgsConstructor;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.cache.caffeine.CaffeineCacheManager;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 
 import java.util.Collections;
+import java.util.concurrent.TimeUnit;
 
 @Configuration
 @EnableAutoConfiguration
 @AllArgsConstructor
+@EnableCaching
 public class ApplicationConfig {
 
     @Bean
@@ -47,5 +53,21 @@ public class ApplicationConfig {
                 documentLocalSearch
         );
     }
+
+    @Bean
+    public CacheManager cacheManager() {
+        CaffeineCacheManager cacheManager = new CaffeineCacheManager(
+                "reverseImageSearch", "parsedImages");
+
+        cacheManager.setCaffeine(Caffeine.newBuilder()
+                .maximumSize(2_000)
+                .expireAfterWrite(1, TimeUnit.HOURS)
+                .expireAfterAccess(30, TimeUnit.MINUTES)
+                .softValues()
+                .recordStats()
+        );
+
+        return cacheManager;
+    }
 }
 

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

@@ -9,14 +9,33 @@ import java.util.Map;
 
 @Configuration
 public class HandlerConfig {
+/*
+RegRequestHandler
+LoginRequestHandler
+FileUploadHandler
+FileEntityHandler
+ImageFoundRequestHandler
+VerifyRegisterUserHandler
+TariffHandler
+ReferralHandler
+ResetPasswordHandler
+MonitoringHandler
+GlobalSearchHandler
+ComplaintEntityHandler
+ViolationNotionHandler
+NotificationHandler
+TokenOperationHandler
+DockViewFileHandler
+ */
 
+/*
+Убрать
+LogoutRequestHandler logoutHandler
+ */
     @Bean
     public Map<Integer, RequestHandler> handlers(
-            RegRequestHandler reg,
-            LoginRequestHandler login,
             FileUploadHandler upload,
             FileEntityHandler file,
-            LogoutRequestHandler logoutHandler,
             ImageFoundRequestHandler imageFoundRequestHandler,
             VerifyRegisterUserHandler verifyRegisterUser,
             AuthRequestHandler authRequestHandler,
@@ -24,31 +43,32 @@ public class HandlerConfig {
             TariffHandler tariffHandler,
             TariffInfoHandler tariffInfoHandler,
             ReferralHandler referralHandler,
-            ResetPasswordHandler resetPasswordHandler,
-            DaDataHandler daDataHandler,
             PaymentHandler paymentHandler,
             CostHandler costHandler,
             MonitoringHandler monitoringHandler,
             ViolationHandler violationHandler,
             ViolationStatisticsHandler violationStatisticsHandler,
             GlobalSearchHandler globalSearchHandler,
-            ViolationNotionHandler violationNotionHandler
+            ViolationNotionHandler violationNotionHandler,
+            ComplaintEntityHandler complaintEntityHandler,
+            UserInfoHandler userInfoHandler,
+            NotificationHandler notificationHandler,
+            UserVerificationHandler userVerificationHandler,
+            LawCaseHandler lawCaseHandler,
+            TokenOperationHandler tokenOperationHandler,
+            MonitoringStatisticHandler monitoringStatisticHandler,
+            DockViewFileHandler dockViewFileHandler
     ) {
         Map<Integer, RequestHandler> map = new HashMap<>();
-        map.put(20001, login);
-        map.put(20002, reg);
         map.put(20004, upload);
         map.put(20005, file);
-        map.put(20006, logoutHandler);
         map.put(20007, imageFoundRequestHandler);
         map.put(20008, authRequestHandler);
         map.put(20009, verifyRegisterUser);
-        map.put(20010, resetPasswordHandler);
         map.put(30000, companyHandler);
         map.put(30001, tariffHandler);
         map.put(30002, tariffInfoHandler);
         map.put(30003, referralHandler);
-        map.put(30004, daDataHandler);
         map.put(30005, paymentHandler);
         map.put(30007, monitoringHandler);
         map.put(30008, costHandler);
@@ -56,6 +76,81 @@ public class HandlerConfig {
         map.put(30010, violationStatisticsHandler);
         map.put(30011, globalSearchHandler);
         map.put(30012, violationNotionHandler);
+        map.put(30013, complaintEntityHandler);
+        map.put(30014, userInfoHandler);
+        map.put(30015, notificationHandler);
+        map.put(30016, userVerificationHandler);
+        map.put(30017, lawCaseHandler);
+        map.put(30018, tokenOperationHandler);
+        map.put(30027, monitoringStatisticHandler);
+        map.put(30028, dockViewFileHandler);
+
+        return map;
+    }
+
+    @Bean
+    public Map<Integer, RequestHandler> internalInfoHandler(
+         StatisticComplaintHandler statisticComplaintHandler,
+         StatisticUserFilesHandler statisticUserHandler,
+         StatisticTariffInfoFileHandler statisticTariffInfoFileHandler,
+         StatisticUserDynamicHandler statisticUserDynamicHandler,
+         StatisticProtectedFilesHandler statisticProtectedFilesHandler,
+         StatisticViolationHandler statisticViolationHandler,
+         StatisticSubscriberHandler statisticSubscriberHandler,
+         StatisticTokenHandler statisticTokenHandler,
+         StatisticIncomeHandler statisticIncomeHandler,
+         FileInteranlInfoHandler fileInfo,
+         TariffInformationHandler tariffInformationHandler,
+         UserInfoHandler userInfoHandler
+    )
+    {
+        Map<Integer, RequestHandler> map = new HashMap<>();
+        map.put(30014, userInfoHandler);
+        map.put(30019, statisticUserHandler);
+        map.put(30020, statisticTariffInfoFileHandler);
+        map.put(30021, statisticUserDynamicHandler);
+        map.put(30022, statisticProtectedFilesHandler);
+        map.put(30023, statisticViolationHandler);
+        map.put(30024, statisticSubscriberHandler);
+        map.put(30025, statisticTokenHandler);
+        map.put(30026, statisticIncomeHandler);
+        map.put(30029, statisticComplaintHandler);
+        map.put(40001, fileInfo);
+        map.put(40004, tariffInformationHandler);
+
+        return map;
+    }
+
+    @Bean
+    public Map<Integer, RequestHandler> internalControlHandler(
+            ControlComplaintHandler controlComplaintHandler,
+            FileInternalControlHandler fileInternalControlHandler,
+            TariffControlHandler tariffControlHandler,
+            UserInfoHandler userInfoHandler
+    )
+    {
+        Map<Integer, RequestHandler> map = new HashMap<>();
+        map.put(30014, userInfoHandler);
+        map.put(30030, controlComplaintHandler);
+        map.put(40002, fileInternalControlHandler);
+        map.put(40003, tariffControlHandler);
+
+        return map;
+    }
+
+    @Bean
+    public Map<Integer, RequestHandler> authHandler(
+            RegRequestHandler reg,
+            LoginRequestHandler login,
+            DaDataHandler daDataHandler,
+            ResetPasswordHandler resetPasswordHandler
+            )
+    {
+        Map<Integer, RequestHandler> map = new HashMap<>();
+        map.put(20001, login);
+        map.put(20002, reg);
+        map.put(30004, daDataHandler);
+        map.put(20010, resetPasswordHandler);
 
         return map;
     }

src/main/java/ru/soune/nocopy/configuration/security/SecurityConfig.java

@@ -0,0 +1,40 @@
+package ru.soune.nocopy.configuration.security;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
+import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+import ru.soune.nocopy.util.JwtAuthFilter;
+
+@Configuration
+@EnableWebSecurity
+@RequiredArgsConstructor
+public class SecurityConfig {
+
+    private final JwtAuthFilter jwtAuthFilter;
+
+    @Bean
+    public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
+        http
+                .csrf(AbstractHttpConfigurer::disable)
+                .sessionManagement(session ->
+                        session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
+                .authorizeHttpRequests(auth -> auth
+                        .requestMatchers("api/v{version}/files/public-download/**").permitAll()
+                        .requestMatchers("/api/files/public/**").permitAll()
+                        .requestMatchers("/api/auth/**").permitAll()
+                        .requestMatchers("/api/file/link/**").permitAll()
+                        .requestMatchers("/check/api/**").permitAll()
+                        .requestMatchers("/internal/**").permitAll()
+                        .anyRequest().authenticated()
+                )
+                .addFilterBefore(jwtAuthFilter, UsernamePasswordAuthenticationFilter.class);
+
+        return http.build();
+    }
+}

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

@@ -5,15 +5,14 @@ import com.vrt.fileprotection.FileProtector;
 import com.vrt.fileprotection.NoCopyCheckResult;
 import com.vrt.fileprotection.audio.AudioCheckResult;
 import com.vrt.fileprotection.documents.DocumentCheckResult;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.core.io.FileSystemResource;
+import org.apache.commons.io.IOUtils;
 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.*;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.FieldError;
 import org.springframework.web.bind.annotation.*;
@@ -21,12 +20,14 @@ 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.docviewer.DocViewerRequest;
 import ru.soune.nocopy.dto.file.*;
 import ru.soune.nocopy.dto.register.RegAnswer;
 import ru.soune.nocopy.entity.company.Company;
 import ru.soune.nocopy.entity.file.FileEntity;
 import ru.soune.nocopy.entity.file.FileStatus;
 import ru.soune.nocopy.entity.file.UploadStatus;
+import ru.soune.nocopy.entity.file.permission.PermissionType;
 import ru.soune.nocopy.entity.user.AuthToken;
 import ru.soune.nocopy.entity.user.User;
 import ru.soune.nocopy.exception.*;
@@ -35,18 +36,18 @@ import ru.soune.nocopy.repository.AuthTokenRepository;
 import ru.soune.nocopy.repository.FileEntityRepository;
 import ru.soune.nocopy.repository.UserRepository;
 import ru.soune.nocopy.service.FileSimilarityService;
+import ru.soune.nocopy.service.dockview.DockViewService;
+import ru.soune.nocopy.service.file.*;
 import ru.soune.nocopy.service.file.CheckCounterService;
 import ru.soune.nocopy.service.file.ProtectionsLimitService;
-import ru.soune.nocopy.service.register.AuthService;
+import ru.soune.nocopy.service.file.cloud.CloudStorageService;
-import ru.soune.nocopy.service.file.FileEntityService;
+import software.amazon.awssdk.services.s3.model.NoSuchKeyException;
-import ru.soune.nocopy.service.file.FileUploadService;
-import ru.soune.nocopy.util.FileUtil;
 
 import java.io.File;
-import java.io.IOException;
+import java.io.FileNotFoundException;
-import java.nio.file.Files;
+import java.io.InputStream;
-import java.nio.file.Path;
+import java.net.URLEncoder;
-import java.nio.file.Paths;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -59,15 +60,21 @@ public class ApiController {
 
     private final Map<Integer, RequestHandler> handlers;
 
-    private final FileEntityService fileEntityService;
+    private final Map<Integer, RequestHandler> internalInfoHandler;
 
-    private final AuthService authService;
+    private final Map<Integer, RequestHandler> internalControlHandler;
+
+    private final Map<Integer, RequestHandler> authHandler;
+
+    private final FileEntityService fileEntityService;
 
     private final FileSimilarityService fileSimilarityService;
 
     private final FileEntityRepository fileEntityRepository;
 
-    private final FileUtil fileUtil;
+    private final NoCopyFileService noCopyFileService;
+
+    private final HttpServletRequest httpServletRequest;
 
     private final ProtectionsLimitService protectionsLimitService;
 
@@ -77,6 +84,12 @@ public class ApiController {
 
     private final CheckCounterService checkCounterService;
 
+    private final CloudStorageService cloudStorageService;
+
+    private final ZipService zipService;
+
+    private final DockViewService dockViewService;
+
     @PostMapping("/v{version}/data")
     public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request,
                                                @PathVariable("version") int version) {
@@ -118,6 +131,136 @@ public class ApiController {
         }
     }
 
+    @PostMapping("/auth")
+    public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request) {
+        Integer msgId = request.getMsgId();
+        BaseResponse response;
+
+        try {
+            RequestHandler handler = authHandler.get(msgId);
+
+            if (handler == null) {
+                response = new BaseResponse(msgId,
+                        MessageCode.MSG_ID_NOT_FOUND.getCode(),
+                        MessageCode.MSG_ID_NOT_FOUND.getDescription(),
+                        new HashMap<>());
+            } else {
+                response = handler.handle(request);
+            }
+
+            return ResponseEntity.ok().body(response);
+        } catch (ValidationException e) {
+            return createValidationErrorResponse(e.getBindingResult(), e.getMsgId());
+        } catch (UserNotFoundException e) {
+            return ResponseEntity.ok().body(new BaseResponse(msgId, MessageCode.USER_NOT_FOUND.getCode(),
+                    MessageCode.USER_NOT_FOUND.getDescription(), new HashMap<>()));
+        } catch (NotFoundAuthToken e) {
+            return ResponseEntity.ok().body(new BaseResponse(msgId, MessageCode.AUTH_TOKEN_NOT_FOUND.getCode(),
+                    MessageCode.AUTH_TOKEN_NOT_FOUND.getDescription(), new HashMap<>()));
+        } catch (NotValidFieldException e) {
+            throw e;
+        } catch (Exception e) {
+            log.error("Handler execution failed for msgId: {}", msgId, e);
+
+            BaseResponse errorResponse = new BaseResponse(msgId,
+                    MessageCode.INVALID_JSON_BODY.getCode(),
+                    MessageCode.INVALID_JSON_BODY.getDescription(),
+                    new HashMap<>());
+
+            return ResponseEntity.ok().body(errorResponse);
+        }
+    }
+
+    @PostMapping("/internal/data-info")
+    public ResponseEntity<?> handleInternalInfoPostRequest(@RequestBody BaseRequest request) {
+        Integer msgId = request.getMsgId();
+        BaseResponse response;
+        RequestHandler internalHandler = internalInfoHandler.get(msgId);
+
+        try {
+            if (internalHandler == null) {
+                response = new BaseResponse(msgId,
+                        MessageCode.MSG_ID_NOT_FOUND.getCode(),
+                        MessageCode.MSG_ID_NOT_FOUND.getDescription(),
+                        new HashMap<>());
+            } else {
+                response = internalHandler.handle(request);
+            }
+
+            return ResponseEntity.ok().body(response);
+        } catch (Exception e) {
+            log.error("Handler execution failed for msgId: {}", msgId, e);
+
+            BaseResponse errorResponse = new BaseResponse(msgId,
+                    MessageCode.INVALID_JSON_BODY.getCode(),
+                    MessageCode.INVALID_JSON_BODY.getDescription(),
+                    new HashMap<>());
+
+            return ResponseEntity.ok().body(errorResponse);
+        }
+    }
+
+    @GetMapping("/internal/data-download/{fileId}")
+    public ResponseEntity<byte[]> getPublicFile(@PathVariable String fileId) {
+        try {
+            FileEntity fileEntity = fileEntityRepository.findById(fileId)
+                    .orElseThrow(() -> new FileNotFoundException("Not found in DB: " + fileId));
+
+            MediaType mediaType = getMediaType(fileEntity);
+
+            ContentDisposition contentDisposition = ContentDisposition.inline()
+                    .filename(fileEntity.getOriginalFileName(), StandardCharsets.UTF_8)
+                    .build();
+
+            byte[] fileBytes;
+            try (InputStream inputStream = cloudStorageService.readFileFromStorage(fileEntity.getFilePath())) {
+                fileBytes = IOUtils.toByteArray(inputStream);
+            }
+
+            return ResponseEntity.ok()
+                    .contentType(mediaType)
+                    .header(HttpHeaders.CONTENT_DISPOSITION, contentDisposition.toString())
+                    .header(HttpHeaders.CACHE_CONTROL, "public, max-age=3600")
+                    .body(fileBytes);
+
+        } catch (FileNotFoundException e) {
+            return ResponseEntity.notFound().build();
+        } catch (NoSuchKeyException e) {
+            return ResponseEntity.status(HttpStatus.NOT_FOUND).build();
+        } catch (Exception e) {
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
+        }
+    }
+
+    @PostMapping("/internal/data-control")
+    public ResponseEntity<?> handleInternalControlPostRequest(@RequestBody BaseRequest request) {
+        Integer msgId = request.getMsgId();
+        BaseResponse response;
+        RequestHandler internalHandler = internalControlHandler.get(msgId);
+
+        try {
+            if (internalHandler == null) {
+                response = new BaseResponse(msgId,
+                        MessageCode.MSG_ID_NOT_FOUND.getCode(),
+                        MessageCode.MSG_ID_NOT_FOUND.getDescription(),
+                        new HashMap<>());
+            } else {
+                response = internalHandler.handle(request);
+            }
+
+            return ResponseEntity.ok().body(response);
+        } catch (Exception e) {
+            log.error("Handler execution failed for msgId: {}", msgId, e);
+
+            BaseResponse errorResponse = new BaseResponse(msgId,
+                    MessageCode.INVALID_JSON_BODY.getCode(),
+                    MessageCode.INVALID_JSON_BODY.getDescription(),
+                    new HashMap<>());
+
+            return ResponseEntity.ok().body(errorResponse);
+        }
+    }
+
     @PostMapping("/v{version}/files/chunk")
     public ResponseEntity<BaseResponse> uploadChunk(
             @PathVariable("version") int version,
@@ -157,6 +300,43 @@ public class ApiController {
                     MessageCode.DUPLICATE_FILE_UPLOAD.getDescription(),
                     duplicateData
             ));
+        } catch (FileFormatException e){
+            return buildErrorResponse(uploadId, chunkNumber, e.getMessage());
+        } catch (Exception e) {
+            log.error("Error uploading chunk", e);
+            return buildErrorResponse(uploadId, chunkNumber, "Failed to upload chunk: " + e.getMessage());
+        }
+    }
+
+    @PostMapping("/v{version}/private/files/chunk")
+    public ResponseEntity<BaseResponse> uploadChunk(
+            @RequestParam(value = "upload_id", required = false) String uploadId,
+            @RequestParam(value = "chunk_number", required = false) Integer chunkNumber,
+            @RequestParam(value = "chunk", required = false) MultipartFile chunk,
+            @RequestParam(value = "last_file", required = false) Boolean last_file) {
+        try {
+            if (chunk == null || chunk.isEmpty()) {
+                return buildErrorResponse(uploadId, chunkNumber, "Chunk file null or empty");
+            }
+            if (uploadId == null || uploadId.isBlank()) {
+                return buildErrorResponse(uploadId, chunkNumber, "Upload Id is required");
+            }
+            if (chunkNumber == null || chunkNumber < 0) {
+                return buildErrorResponse(uploadId, chunkNumber, "Valid chunk number is required");
+            }
+
+            Long userId = (Long) httpServletRequest.getAttribute("userId");
+
+            UploadProgressResponse uploadProgressResponse = fileUploadService.uploadPassportChunk(uploadId, chunkNumber,
+                    chunk, userId);
+
+            if (last_file) {
+                zipService.createAndSplitZip(userId,
+                        fileEntityService.getAllUserFiles(userId, List.of(FileStatus.PRIVATE)));
+            }
+
+            return buildSuccessResponse(uploadId, chunkNumber, chunk,
+                    fileEntityService.findFileIdByPath(uploadProgressResponse.getFilePath()));
         }catch (FileFormatException e){
             return buildErrorResponse(uploadId, chunkNumber, e.getMessage());
         } catch (Exception e) {
@@ -165,13 +345,22 @@ public class ApiController {
         }
     }
 
-    private final NoCopyFileService noCopyFileService;
+    @GetMapping("/check/{fileId}")
+    public ResponseEntity<BaseResponse> check(@PathVariable String fileId) {
+        FileEntity fileEntity = fileEntityRepository.findByFileId(fileId);
+
+        File file = new File(fileEntity.getFilePath());
+        NoCopyCheckResult checkResult = noCopyFileService.checkFile(file,  FileProtector.Type.IMAGE);
+        log.info("checkResult: {}", checkResult);
+
+
+        return ResponseEntity.ok(new BaseResponse(1, 1, "1", checkResult));
+    }
 
     @GetMapping("/v{version}/files/{fileId}/similar")
     public ResponseEntity<BaseResponse> findSimilarFiles(
             @PathVariable("version") int version,
             @PathVariable String fileId,
-            @RequestParam(value = "auth_token", required = false) String authToken,
             @RequestParam(required = false) List<String> similarityLevels,
             @PageableDefault(size = 20, sort = "hammingDistance") Pageable pageable) {
 
@@ -183,20 +372,21 @@ public class ApiController {
                         MessageCode.INVALID_FIELD.getDescription(), null));
             }
 
+            Long userId = (Long) httpServletRequest.getAttribute("userId");
+
             BaseResponse response;
             if ("image".equals(fileEntity.getMimeType())) {
                 Page<SimilarFileDTO> similarFilesPage = fileSimilarityService.findSimilarFiles(
-                        fileId, similarityLevels, pageable, authToken);
+                        fileId, similarityLevels, pageable, userId);
                 response = buildSuccessResponse(similarFilesPage, MessageCode.SIMILAR_FILES_FOUND);
             } else {
-                List<SimilarFileDTO> results = processNonImageFile(fileEntity, authToken);
+                List<SimilarFileDTO> results = processNonImageFile(fileEntity, true);
                 log.info("results: {}", results);
                 response = buildSuccessResponse(results, MessageCode.SIMILAR_FILES_FOUND);
                 checkCounterService.incrementCheckCount(fileEntity.getUserId(), fileEntity.getMimeType());
             }
 
             return ResponseEntity.ok(response);
-
         } catch(IllegalArgumentException e) {
             log.error("Error with file extensions : {}", e.getMessage(), e);
             return ResponseEntity.ok().body(new BaseResponse(MessageCode.FILE_FOR_SEARCH_NOT_VALID.getCode(),
@@ -210,45 +400,55 @@ public class ApiController {
         }
     }
 
-    private List<SimilarFileDTO> processNonImageFile(FileEntity fileEntity, String authToken) throws Exception {
+    private List<SimilarFileDTO> processNonImageFile(FileEntity fileEntity, boolean cloud) throws Exception {
         List<SimilarFileDTO> results = new ArrayList<>();
-
+        File file = null;
         FileEntity duplicateByHash = fileSimilarityService.findDuplicateByHash(fileEntity.getFilePath(),
-                fileEntity.getMimeType(), fileEntity.getUserId());
+                fileEntity.getMimeType(), fileEntity.getUserId(), cloud);
+
         log.info("duplicateByHash: {}", duplicateByHash);
+
         if (duplicateByHash != null) {
             results.add(fileSimilarityService.buildDTO(duplicateByHash));
 
             return results;
         }
 
-        File file = new File(fileEntity.getFilePath());
+        try {
-        FileProtector.Type type = "document".equals(fileEntity.getMimeType()) ?
+            file = cloudStorageService.readFileFromStorageByPath(fileEntity.getFilePath());
-                FileProtector.Type.DOC : FileProtector.Type.AUDIO;
+            FileProtector.Type type = "document".equals(fileEntity.getMimeType()) ?
+                    FileProtector.Type.DOC : FileProtector.Type.AUDIO;
 
-        NoCopyCheckResult checkResult = noCopyFileService.checkFile(file, type);
+            NoCopyCheckResult checkResult = noCopyFileService.checkFile(file, type);
-        log.info("checkResult: {}", checkResult);
+            log.info("checkResult: {}", checkResult);
 
-        switch (checkResult) {
+            switch (checkResult) {
-            case DocumentCheckResult.Success success -> {
+                case DocumentCheckResult.Success success -> {
-                FileProtector.FileInfo info = success.getInfo();
+                    FileProtector.FileInfo info = success.getInfo();
-                FileEntity entity = fileEntityRepository.findByFileId(info.getId());
+                    FileEntity entity = fileEntityRepository.findByFileId(info.getId());
-                if (entity != null) {
+                    if (entity != null) {
-                    results.add(fileSimilarityService.buildDTO(entity));
+                        results.add(fileSimilarityService.buildDTO(entity));
+                    }
                 }
-            }
+                case AudioCheckResult.Success success -> {
-            case AudioCheckResult.Success success -> {
+                    FileProtector.FileInfo info = success.getInfo();
-                FileProtector.FileInfo info = success.getInfo();
+                    FileEntity entity = fileEntityRepository.findByFileId(info.getId());
-                FileEntity entity = fileEntityRepository.findByFileId(info.getId());
+                    if (entity != null) {
-                if (entity != null) {
+                        results.add(fileSimilarityService.buildDTO(entity));
-                    results.add(fileSimilarityService.buildDTO(entity));
+                    }
                 }
+                case DocumentCheckResult.Failed failed ->
+                        log.warn("Document check failed: {}", failed.getMessage());
+                case AudioCheckResult.Failed failed ->
+                        log.warn("Audio check failed: {}", failed.getMessage());
+                default -> log.warn("Unexpected result type: {}", checkResult.getClass().getSimpleName());
+            }
+        } catch (Exception e) {
+            throw new Exception("Files for search not valid");
+        } finally {
+            if (file != null && file.exists()) {
+                file.delete();
             }
-            case DocumentCheckResult.Failed failed ->
-                    log.warn("Document check failed: {}", failed.getMessage());
-            case AudioCheckResult.Failed failed ->
-                    log.warn("Audio check failed: {}", failed.getMessage());
-            default -> log.warn("Unexpected result type: {}", checkResult.getClass().getSimpleName());
         }
 
         return results;
@@ -373,6 +573,42 @@ public class ApiController {
         }
     }
 
+    @GetMapping("/v{version}/files/public-download/{fileId}")
+    public ResponseEntity<?> downloadFile(
+            @PathVariable(required = false) String fileId, @PathVariable(required = false) Integer version) {
+        FileEntityResponse entityResponse = fileEntityService.getById(fileId, version);
+        FileStatus status = entityResponse.getStatus();
+
+        if (status.equals(FileStatus.BLOCKED) || status.equals(FileStatus.DELETED) ||
+                status.equals(FileStatus.REMOVED)) {
+            Map<String, Object> errorData = new HashMap<>();
+            errorData.put("fileId", entityResponse.getId());
+
+            return ResponseEntity.ok().body(new BaseResponse(20004,
+                    MessageCode.FILE_IS_BLOCKED.getCode(),
+                    MessageCode.FILE_IS_BLOCKED.getDescription(),
+                    errorData));
+        }
+
+        if (!entityResponse.getPermissions().get(PermissionType.DOWNLOAD)) {
+            Map<String, Object> errorData = new HashMap<>();
+            errorData.put("fileId", entityResponse.getId());
+
+            return ResponseEntity.ok().body(new BaseResponse(20004,
+                    MessageCode.NOT_HAVE_DOWNLOAD_PERMISSION.getCode(),
+                    MessageCode.NOT_HAVE_DOWNLOAD_PERMISSION.getDescription(),
+                    errorData));
+        }
+
+        byte[] bytes = cloudStorageService.readFileFromStorageBytes(entityResponse.getProtectedFilePath());
+
+        return ResponseEntity.ok()
+                .contentType(MediaType.APPLICATION_OCTET_STREAM)
+                .header(HttpHeaders.CONTENT_DISPOSITION,
+                        "attachment; filename=\"" + entityResponse.getFileName() + "\"")
+                .body(bytes);
+    }
+
     @GetMapping("/v{version}/files/download/{fileId}")
     public ResponseEntity<?> downloadFile(
             @PathVariable(required = false) String fileId,
@@ -389,8 +625,30 @@ public class ApiController {
                         errorData));
             }
 
-            Long userId = authService.useUserAuthToken(tokenHeader);
+            Long userId = (Long) httpServletRequest.getAttribute("userId");
             FileEntityResponse entityResponse = fileEntityService.getById(fileId, version);
+            FileStatus status = entityResponse.getStatus();
+
+            if (status.equals(FileStatus.BLOCKED) || status.equals(FileStatus.DELETED) ||
+                    status.equals(FileStatus.REMOVED)) {
+                Map<String, Object> errorData = new HashMap<>();
+                errorData.put("fileId", entityResponse.getId());
+
+                return ResponseEntity.ok().body(new BaseResponse(20004,
+                        MessageCode.FILE_IS_BLOCKED.getCode(),
+                        MessageCode.FILE_IS_BLOCKED.getDescription(),
+                        errorData));
+            }
+
+            if (!entityResponse.getPermissions().get(PermissionType.DOWNLOAD)) {
+                Map<String, Object> errorData = new HashMap<>();
+                errorData.put("fileId", entityResponse.getId());
+
+                return ResponseEntity.ok().body(new BaseResponse(20004,
+                        MessageCode.NOT_HAVE_DOWNLOAD_PERMISSION.getCode(),
+                        MessageCode.NOT_HAVE_DOWNLOAD_PERMISSION.getDescription(),
+                        errorData));
+            }
 
             User fileUser = userRepository.findById(entityResponse.getUserId()).orElseThrow();
             User user = userRepository.findById(userId).orElseThrow();
@@ -426,38 +684,13 @@ public class ApiController {
                         errorData));
             }
 
-            if (!entityResponse.isExistsOnDisk()) {
+            byte[] bytes = cloudStorageService.readFileFromStorageBytes(entityResponse.getProtectedFilePath());
-                Map<String, Object> errorData = new HashMap<>();
-                errorData.put("onDisk", entityResponse.isExistsOnDisk());
-
-                return ResponseEntity.ok().body(new BaseResponse(20004,
-                        MessageCode.FILE_NOT_EXIST.getCode(),
-                        MessageCode.FILE_NOT_EXIST.getDescription(),
-                        errorData));
-            }
-
-
-            Path filePath = Paths.get(entityResponse.getProtectedFilePath());
-            FileSystemResource resource = new FileSystemResource(filePath);
-            long fileSize = Files.size(filePath);
-
-            if (!resource.exists()) {
-                Map<String, Object> errorData = new HashMap<>();
-                errorData.put("resource", resource.exists());
-
-                return ResponseEntity.ok().body(new BaseResponse(20004,
-                        MessageCode.FILE_DOWNLOAD_ERROR.getCode(),
-                        MessageCode.FILE_DOWNLOAD_ERROR.getDescription(),
-                        errorData));
-            }
-            String contentType = determineContentType(filePath);
 
             return ResponseEntity.ok()
-                    .contentLength(fileSize)
+                    .contentType(MediaType.APPLICATION_OCTET_STREAM)
-                    .contentType(MediaType.parseMediaType(contentType))
                     .header(HttpHeaders.CONTENT_DISPOSITION,
                             "attachment; filename=\"" + entityResponse.getFileName() + "\"")
-                    .body(resource);
+                    .body(bytes);
         } catch (FileEntityNotFoundException e) {
             Map<String, Object> errorData = new HashMap<>();
             errorData.put("fileId", fileId);
@@ -474,59 +707,79 @@ public class ApiController {
                     MessageCode.AUTH_TOKEN_NOT_FOUND.getCode(),
                     MessageCode.AUTH_TOKEN_NOT_FOUND.getDescription(),
                     errorData));
-        } catch (IOException e) {
+        }
-            Map<String, Object> errorData = new HashMap<>();
+    }
-            errorData.put("token", tokenHeader);
-            errorData.put("fileId", fileId);
-            errorData.put("version", version);
 
-            return ResponseEntity.ok().body(new BaseResponse(20004,
+    @PostMapping("/file/link")
-                    MessageCode.FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD.getCode(),
+    public ResponseEntity<?> downloadFile(@RequestBody DocViewerRequest viewerRequest) {
-                    MessageCode.FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD.getDescription(),
+        try {
+            Long userId = httpServletRequest.getAttribute("userId") == null ? 0L:
+                    (Long) httpServletRequest.getAttribute("userId");
+
+            if (viewerRequest.getFileId() == null) {
+                return ResponseEntity.ok().body(new BaseResponse(0,
+                        MessageCode.NOT_VALID_FIELD.getCode(),
+                        MessageCode.NOT_VALID_FIELD.getDescription(),
+                        "file_id is required"));
+            }
+
+            FileEntityResponse entityResponse = fileEntityService.getById(viewerRequest.getFileId(), 0);
+            FileStatus status = entityResponse.getStatus();
+
+            if (status.equals(FileStatus.BLOCKED) || status.equals(FileStatus.DELETED) ||
+                    status.equals(FileStatus.REMOVED)) {
+                Map<String, Object> errorData = new HashMap<>();
+                errorData.put("fileId", entityResponse.getId());
+
+                return ResponseEntity.ok().body(new BaseResponse(0,
+                        MessageCode.FILE_IS_BLOCKED.getCode(),
+                        MessageCode.FILE_IS_BLOCKED.getDescription(),
+                        errorData));
+            }
+
+            byte[] bytes = cloudStorageService.readFileFromStorageBytes(entityResponse.getProtectedFilePath());
+
+            dockViewService.createDockView(viewerRequest, userId);
+
+            String filename = entityResponse.getFileName();
+            String encodedFilename = URLEncoder.encode(filename, StandardCharsets.UTF_8)
+                    .replace("+", "%20");
+
+            String safeFilename = filename.replaceAll("[^\\x00-\\x7F]", "_");
+
+            return ResponseEntity.ok()
+                    .contentType(MediaType.APPLICATION_OCTET_STREAM)
+                    .header(HttpHeaders.CONTENT_DISPOSITION,
+                            "attachment; filename=\"" + safeFilename + "\"; filename*=UTF-8''" + encodedFilename)
+                    .body(bytes);
+        } catch (FileEntityNotFoundException e) {
+            Map<String, Object> errorData = new HashMap<>();
+            errorData.put("fileId", viewerRequest.getFileId());
+
+            return ResponseEntity.ok().body(new BaseResponse(0,
+                    MessageCode.FILE_NOT_FOUND.getCode(),
+                    MessageCode.FILE_NOT_FOUND.getDescription(),
+                    errorData));
+        } catch (NotFoundAuthToken e) {
+            Map<String, Object> errorData = new HashMap<>();
+            errorData.put("token", viewerRequest.getFileId());
+
+            return ResponseEntity.ok().body(new BaseResponse(0,
+                    MessageCode.AUTH_TOKEN_NOT_FOUND.getCode(),
+                    MessageCode.AUTH_TOKEN_NOT_FOUND.getDescription(),
                     errorData));
         }
     }
 
     @GetMapping("/check/file_stats")
-    public ResponseEntity<?> checkFileProtectStats(@RequestHeader("Authorization") String tokenHeader) {
+    public ResponseEntity<?> checkFileProtectStats() {
-        String token = tokenHeader.replace("Bearer ", "");
+        Long userId = (Long) httpServletRequest.getAttribute("userId");
 
-        Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
+        Map<String, Object> fileTypeStats = protectionsLimitService.getFileTypeStats(userId);
-
-        AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
-
-        Map<String, Object> fileTypeStats = protectionsLimitService.getFileTypeStats(authToken.getUser().getId());
 
         return ResponseEntity.ok().body(fileTypeStats);
     }
 
-    private boolean hasDuplicate(List<SimilarFileDTO> similarFiles) {
-        return similarFiles.stream().anyMatch(f -> f.getHammingDistance() <= 5);
-    }
-
-    private ResponseEntity<BaseResponse> handleDuplicate(FileEntity fileEntity, List<SimilarFileDTO> similarFiles)
-            throws IOException {
-        fileEntityService.deleteFromDisk(fileEntity);
-
-        fileEntityService.softDeleteFileWithHash(fileEntity);
-
-        Optional<FileEntity> originalFile = fileEntityRepository.findById(similarFiles.get(0).getFileId());
-
-        if (originalFile.isPresent()) {
-            Map<String, String> duplicateInfo = Map.of(
-                    "duplicate_file_id", originalFile.get().getId(),
-                    "owner_user_id", String.valueOf(originalFile.get().getUserId()));
-
-            return ResponseEntity.ok().body(new BaseResponse(
-                    20004,
-                    MessageCode.DUPLICATE_FILE_UPLOAD.getCode(),
-                    "Failed to upload chunk, duplicate",
-                    duplicateInfo));
-        }
-
-        return null;
-    }
-
     private ResponseEntity<BaseResponse> buildSuccessResponse(String uploadId, Integer chunkNumber, MultipartFile chunk,
                                                               String fileId) {
         ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
@@ -584,12 +837,22 @@ public class ApiController {
         return errorDetail;
     }
 
-
+    private MediaType getMediaType(FileEntity fileEntity) {
-    private String determineContentType(Path filePath) throws IOException {
+        try {
-        String contentType = Files.probeContentType(filePath);
+            return MediaType.parseMediaType(fileEntity.getMimeType());
-        if (contentType == null) {
+        } catch (InvalidMediaTypeException e) {
-            contentType = "application/octet-stream";
+            String extension = fileEntity.getFileExtension().toLowerCase();
+            switch (extension) {
+                case "jpg":
+                case "jpeg":
+                    return MediaType.IMAGE_JPEG;
+                case "png":
+                    return MediaType.IMAGE_PNG;
+                case "pdf":
+                    return MediaType.APPLICATION_PDF;
+                default:
+                    return MediaType.APPLICATION_OCTET_STREAM;
+            }
         }
-        return contentType;
     }
 }

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

@@ -1,10 +1,15 @@
 package ru.soune.nocopy.controller;
 
+import com.google.common.io.ByteStreams;
+import com.vrt.NoCopyFileService;
+import com.vrt.fileprotection.FileProtector;
+import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.InputStreamResource;
 import org.springframework.core.io.Resource;
 import org.springframework.http.*;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;
 import ru.soune.nocopy.dto.file.CheckStatus;
 import ru.soune.nocopy.entity.file.FileEntity;
 import ru.soune.nocopy.entity.file.ProtectionStatus;
@@ -13,51 +18,40 @@ import ru.soune.nocopy.entity.user.User;
 import ru.soune.nocopy.repository.FileEntityRepository;
 import ru.soune.nocopy.repository.UserRepository;
 import ru.soune.nocopy.service.file.CheckCounterService;
-import ru.soune.nocopy.service.file.FileStorageService;
+import ru.soune.nocopy.service.file.ZipService;
-import ru.soune.nocopy.service.file.ImageResizeService;
+import ru.soune.nocopy.service.file.cloud.CloudStorageService;
+import ru.soune.nocopy.util.FileUtil;
+import software.amazon.awssdk.services.s3.model.NoSuchKeyException;
 
-import java.io.FileNotFoundException;
+import java.io.*;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
 @RestController
 @RequestMapping("/api/files")
 @Slf4j
+@AllArgsConstructor
 public class FileController {
 
-    @Autowired
-    private FileStorageService fileStorageService;
-
-    @Autowired
     private FileEntityRepository fileRepository;
 
-    @Autowired
     private CheckCounterService checkCounterService;
 
-    @Autowired
     private UserRepository userRepository;
 
-    @Autowired
+    private NoCopyFileService noCopyFileService;
-    private ImageResizeService imageResizeService;
+
+    private FileUtil fileUtil;
+
+    private ZipService zipService;
+
+    private CloudStorageService cloudStorageService;
 
     @GetMapping("/public/{fileId}")
-    public ResponseEntity<Resource> getPublicFile(@PathVariable String fileId) {
+    public ResponseEntity<StreamingResponseBody> getPublicFile(@PathVariable String fileId) {
         try {
             FileEntity fileEntity = fileRepository.findById(fileId)
-                    .orElseThrow(() -> new FileNotFoundException("Not found: " + fileId));
+                    .orElseThrow(() -> new FileNotFoundException("Not found in DB: " + fileId));
-
-            Path filePath = Paths.get(fileEntity.getFilePath());
-            if (!Files.exists(filePath)) {
-                log.error("Not on disk: {}", fileEntity.getFilePath());
-                return ResponseEntity.notFound().build();
-            }
-
-            Resource resource = fileStorageService.loadFileAsResource(fileEntity.getFilePath());
 
             MediaType mediaType = getMediaType(fileEntity);
 
@@ -65,18 +59,28 @@ public class FileController {
                     .filename(fileEntity.getOriginalFileName(), StandardCharsets.UTF_8)
                     .build();
 
+            StreamingResponseBody responseBody = outputStream -> {
+                try (InputStream inputStream = cloudStorageService.readFileFromStorage(fileEntity.getFilePath())) {
+                    ByteStreams.copy(inputStream, outputStream);
+                } catch (NoSuchKeyException e) {
+                    log.error("File disappeared from S3 during streaming: {}", fileId, e);
+                    throw new IOException("File not found in storage", e);
+                }
+            };
+
             return ResponseEntity.ok()
                     .contentType(mediaType)
-                    .contentLength(Files.size(filePath))
                     .header(HttpHeaders.CONTENT_DISPOSITION, contentDisposition.toString())
                     .header(HttpHeaders.CACHE_CONTROL, "public, max-age=3600")
-                    .body(resource);
+                    .body(responseBody);
-
         } catch (FileNotFoundException e) {
-            log.warn("Not on disk: {}", fileId);
+            log.warn("File not found in DB: {}", fileId);
             return ResponseEntity.notFound().build();
-        } catch (IOException e) {
+        } catch (NoSuchKeyException e) {
-            log.error("Read file exception: {}", fileId, e);
+            log.warn("File not found in S3: {}", fileId);
+            return ResponseEntity.status(HttpStatus.NOT_FOUND).build();
+        } catch (Exception e) {
+            log.error("Error reading file: {}", fileId, e);
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
         }
     }
@@ -107,9 +111,14 @@ public class FileController {
         FileEntity fileEntity = fileRepository.findById(fileId)
                 .orElseThrow(() -> new RuntimeException("File not found"));
 
-        String path = imageResizeService.getPath(fileEntity, type);
+        String filePath = type.equals("thumbnail") ? fileEntity.getThumbnailPath(): fileEntity.getFilePath();
 
-        Resource resource = fileStorageService.loadFileAsResource(path);
+//        InputStream file = cloudStorageService.readFileFromStorage(filePath);
+
+//        if (file == null || !file.exists()) {
+//            log.error("File not found in storage: {}", fileEntity.getFilePath());
+//            return ResponseEntity.notFound().build();
+//        }
 
         if (fileEntity.getProtectionStatus() == ProtectionStatus.NOT_PROTECTED ||
                 fileEntity.getProtectionStatus() == ProtectionStatus.PROCESSING) {
@@ -122,6 +131,8 @@ public class FileController {
         String encodedFileName = URLEncoder.encode(fileName, StandardCharsets.UTF_8)
                 .replace("+", "%20");
 
+        InputStreamResource resource = new InputStreamResource(cloudStorageService.readFileFromStorage(filePath));
+
         return ResponseEntity.ok()
                 .contentType(new MediaType(fileEntity.getMimeType(), fileEntity.getFileExtension()))
                 .header(HttpHeaders.CONTENT_DISPOSITION,
@@ -145,4 +156,33 @@ public class FileController {
                 .ok()
                 .body(protectedFileCheck);
     }
+
+    @PostMapping("protect/{fileId}/{convertTo}")
+    public ResponseEntity<FileProtector.FileInfo> convert(@PathVariable String fileId, @PathVariable String convertTo) {
+        FileEntity file = fileRepository.findByFileId(fileId);
+        FileProtector.FileInfo fileInfo = fileUtil.createFileInfo(file, convertTo);
+
+        noCopyFileService.addFile(fileInfo);
+
+        return ResponseEntity
+                .ok()
+                .body(fileInfo);
+    }
+
+    @GetMapping("/download/user-passport/archive/{userId}")
+    public ResponseEntity<byte[]> downloadPassportZip(@PathVariable Long userId) {
+        try {
+            byte[] zipBytes = zipService.assembleZipFromSplitFiles(userId);
+
+            return ResponseEntity.ok()
+                    .header(HttpHeaders.CONTENT_DISPOSITION,
+                            "attachment; filename=passport_" + userId + ".zip")
+                    .contentType(MediaType.APPLICATION_OCTET_STREAM)
+                    .contentLength(zipBytes.length)
+                    .body(zipBytes);
+        } catch (IOException e) {
+            log.error("Failed to assemble passport for user {}", userId, e);
+            return ResponseEntity.internalServerError().build();
+        }
+    }
 }

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

@@ -1,19 +1,20 @@
 package ru.soune.nocopy.controller;
 
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Page;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import ru.soune.nocopy.dto.search.GlobalSearchStartRequest;
 import ru.soune.nocopy.dto.search.GlobalSearchStartResponse;
 import ru.soune.nocopy.dto.search.GlobalSearchStatusResponse;
 import ru.soune.nocopy.dto.violation.FileViolationSummaryDTO;
+import ru.soune.nocopy.dto.violation.ViolationRequest;
 import ru.soune.nocopy.entity.file.FileEntity;
 import ru.soune.nocopy.entity.search.GlobalSearchTask;
 import ru.soune.nocopy.entity.search.SearchStatus;
-import ru.soune.nocopy.exception.NotFoundAuthToken;
 import ru.soune.nocopy.repository.GlobalSearchTaskRepository;
-import ru.soune.nocopy.service.register.AuthService;
 import ru.soune.nocopy.service.search.GlobalSearchService;
 import ru.soune.nocopy.service.violation.ViolationService;
 
@@ -25,148 +26,90 @@ import java.util.*;
 @RequiredArgsConstructor
 public class GlobalSearchController {
 
-    private final AuthService authService;
-
     private final GlobalSearchService globalSearchService;
 
-    private final GlobalSearchTaskRepository globalSearchTaskRepository;
-
     private final GlobalSearchTaskRepository searchTaskRepository;
 
     private final ViolationService violationService;
 
+    private final HttpServletRequest httpServletRequest;
+
     @PostMapping("/start")
     public ResponseEntity<?> startSearch(
-            @RequestBody GlobalSearchStartRequest request,
+            @RequestBody GlobalSearchStartRequest request) {
-            @RequestHeader(value = "Authorization", required = false) String tokenHeader) {
-        if (tokenHeader == null || tokenHeader.isBlank()) {
-            Map<String, Object> errorData = new HashMap<>();
-            errorData.put("token", tokenHeader);
-
-            return ResponseEntity.ok().body(Map.of("error", errorData));
-        }
-
         GlobalSearchStartResponse response = new GlobalSearchStartResponse();
 
-        try {
+        Long userId = (Long) httpServletRequest.getAttribute("userId");
-            Long userId = authService.useUserAuthToken(tokenHeader);
 
-            List<FileEntity> filesToProcess = globalSearchService.getFilesToProcess(request, userId);
+        List<FileEntity> filesToProcess = globalSearchService.getFilesToProcess(request, userId);
 
-            if (filesToProcess.isEmpty()) return ResponseEntity.ok().body("Files for search not found");
+        if (filesToProcess.isEmpty()) return ResponseEntity.ok().body("Files for search not found");
 
-            String taskId = globalSearchService.startSearch(request, userId, filesToProcess);
+        String taskId = globalSearchService.startSearch(request, userId, filesToProcess);
 
-            Optional<GlobalSearchTask> taskOptional = globalSearchTaskRepository.findById(taskId);
+        response.setTaskId(taskId);
-
+        response.setStatus(SearchStatus.ACCEPTED.name());
-            if (taskOptional.isEmpty()) return ResponseEntity.ok().body("Task not found");
+        response.setTotalFiles(filesToProcess.size());
-
-            GlobalSearchTask task = taskOptional.orElseThrow();
-
-            response.setTaskId(taskId);
-            response.setStatus(SearchStatus.ACCEPTED.name());
-            response.setTotalFiles(task.getTotalFiles());
-        } catch (NotFoundAuthToken e) {
-            Map<String, Object> errorData = new HashMap<>();
-            errorData.put("token", tokenHeader);
-
-            return ResponseEntity.ok().body(Map.of("error", errorData));
-        }
 
         return ResponseEntity.ok(response);
     }
 
     @GetMapping("/actual-task")
-    public ResponseEntity<?> getStatus(@RequestHeader(value = "Authorization", required = false) String tokenHeader) {
+    public ResponseEntity<?> getStatus() {
-
-        if (tokenHeader == null || tokenHeader.isBlank()) {
-            Map<String, Object> errorData = new HashMap<>();
-            errorData.put("token", tokenHeader);
-
-            return ResponseEntity.ok().body(Map.of("error", errorData));
-        }
-
         Optional<GlobalSearchTask> taskOptional;
 
-        try {
+        Long userId = (Long) httpServletRequest.getAttribute("userId");
-            Long userId = authService.useUserAuthToken(tokenHeader);
 
-            taskOptional = searchTaskRepository.findByUserIdAndStatus(userId,
+        taskOptional = searchTaskRepository.findByUserIdAndStatus(userId,
-                    "PROCESSING");
+                "PROCESSING");
 
-            if (taskOptional.isEmpty()) return ResponseEntity.ok().body("Task not found");
+        if (taskOptional.isEmpty()) return ResponseEntity.ok().body("Task not found");
-        } catch (NotFoundAuthToken e) {
-            Map<String, Object> errorData = new HashMap<>();
-            errorData.put("token", tokenHeader);
-
-            return ResponseEntity.ok().body(Map.of("error", errorData));
-        }
 
         return ResponseEntity.ok(taskOptional.get());
     }
 
     @GetMapping("/violation-summary")
-    public ResponseEntity<?> getSummary(@RequestHeader(value = "Authorization", required = false) String tokenHeader) {
+    public ResponseEntity<?> getSummary() {
-
-        if (tokenHeader == null || tokenHeader.isBlank()) {
-            Map<String, Object> errorData = new HashMap<>();
-            errorData.put("token", tokenHeader);
-
-            return ResponseEntity.ok().body(Map.of("error", errorData));
-        }
-
         List<FileViolationSummaryDTO> fileViolationsSummary;
 
-        try {
+        Long userId = (Long) httpServletRequest.getAttribute("userId");
-            Long userId = authService.useUserAuthToken(tokenHeader);
 
-            fileViolationsSummary =
+        fileViolationsSummary = violationService.getFileViolationsSummary(userId);
-                    violationService.getFileViolationsSummary(userId);
 
-            if (fileViolationsSummary.isEmpty()) return ResponseEntity.ok().body("Violations summary not found");
+        if (fileViolationsSummary.isEmpty()) return ResponseEntity.ok().body("Violations summary not found");
-        } catch (NotFoundAuthToken e) {
-            Map<String, Object> errorData = new HashMap<>();
-            errorData.put("token", tokenHeader);
-
-            return ResponseEntity.ok().body(Map.of("error", errorData));
-        }
 
         return ResponseEntity.ok(fileViolationsSummary);
     }
 
+
+    @PostMapping("/violation-summary-with-files")
+    public ResponseEntity<?> getViolations(@RequestBody ViolationRequest request) {
+        Long userId = (Long) httpServletRequest.getAttribute("userId");
+        Page<FileViolationSummaryDTO> result = violationService.getFileViolationsSummary(
+                userId, request.getFileName(), request.getSortDirection(),
+                request.getPage(), request.getSize(), request.getStartDate(), request.getEndDate());
+
+        return ResponseEntity.ok(result);
+    }
+
     @GetMapping("/status/{taskId}")
-    public ResponseEntity<?> getStatus(@PathVariable String taskId,
+    public ResponseEntity<?> getStatus(@PathVariable String taskId) {
-            @RequestHeader(value = "Authorization", required = false) String tokenHeader) {
-
-        if (tokenHeader == null || tokenHeader.isBlank()) {
-            Map<String, Object> errorData = new HashMap<>();
-            errorData.put("token", tokenHeader);
-
-            return ResponseEntity.ok().body(Map.of("error", errorData));
-        }
         GlobalSearchStatusResponse response;
+        Long userId = (Long) httpServletRequest.getAttribute("userId");
 
-        try {
+        Optional<GlobalSearchTask> taskOptional = searchTaskRepository.findByTaskIdAndUserId(taskId, userId);
-            Long userId = authService.useUserAuthToken(tokenHeader);
 
-            Optional<GlobalSearchTask> taskOptional = searchTaskRepository.findByTaskIdAndUserId(taskId, userId);
+        if (taskOptional.isEmpty()) return ResponseEntity.ok().body("Task not found");
 
-            if (taskOptional.isEmpty()) return ResponseEntity.ok().body("Task not found");
+        GlobalSearchTask task = taskOptional.orElseThrow();
 
-            GlobalSearchTask task = taskOptional.orElseThrow();
+        int progress = task.getTotalFiles() > 0 ? task.getProcessedFiles() * 100 / task.getTotalFiles() : 0;
 
-            int progress = task.getTotalFiles() > 0 ? task.getProcessedFiles() * 100 / task.getTotalFiles() : 0;
+        response = new GlobalSearchStatusResponse();
+        response.setTaskId(taskId);
+        response.setStatus(task.getStatus());
+        response.setProgress(progress);
 
-            response = new GlobalSearchStatusResponse();
-            response.setTaskId(taskId);
-            response.setStatus(task.getStatus());
-            response.setProgress(progress);
-        } catch (NotFoundAuthToken e) {
-            Map<String, Object> errorData = new HashMap<>();
-            errorData.put("token", tokenHeader);
-
-            return ResponseEntity.ok().body(Map.of("error", errorData));
-        }
 
         return ResponseEntity.ok(response);
     }

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

@@ -0,0 +1,83 @@
+package ru.soune.nocopy.controller;
+
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import ru.soune.nocopy.dto.docviewer.DockViewResponse;
+import ru.soune.nocopy.entity.docviewer.DockView;
+import ru.soune.nocopy.entity.file.FileEntity;
+import ru.soune.nocopy.entity.user.User;
+import ru.soune.nocopy.migration.S3MigrationTool;
+import ru.soune.nocopy.repository.DockViewRepository;
+import ru.soune.nocopy.repository.FileEntityRepository;
+import ru.soune.nocopy.repository.UserRepository;
+import ru.soune.nocopy.service.geo.GeoCountryService;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+@RestController
+@RequestMapping("/api/admin/migration")
+@RequiredArgsConstructor
+@Slf4j
+public class MigrationController {
+
+    private final S3MigrationTool migrationTool;
+
+    private final DockViewRepository dockViewRepository;
+
+    private final GeoCountryService geoCountryService;
+
+    private final UserRepository userRepository;
+
+    private final FileEntityRepository fileEntityRepository;
+
+    @PostMapping("/start")
+    public ResponseEntity<String> startMigration() {
+        log.info("Migration triggered via API");
+
+        CompletableFuture.runAsync(() -> {
+            try {
+                migrationTool.migrationFilesToS3();
+            } catch (Exception e) {
+                log.error("Migration failed", e);
+            }
+        });
+
+        return ResponseEntity.ok("Migration started. Check logs for progress.");
+    }
+
+    @PostMapping("/status")
+    public ResponseEntity<String> getStatus() {
+        return ResponseEntity.ok("Check application logs and migration_failed.txt for details");
+    }
+
+    @PostMapping("/fill-dock-view")
+    public ResponseEntity<String> fillDockView() {
+        List<DockView> dockViews = dockViewRepository.findAll();
+
+        for (DockView dockView: dockViews) {
+            String viewerIp = dockView.getViewerIp();
+            Long viewerId = dockView.getViewerId();
+            String geoEnName = geoCountryService.getCityByIp(viewerIp, "en") + "/" +
+                    geoCountryService.getCountryByIp(viewerIp, "en");
+            String geoRuName = geoCountryService.getCityByIp(viewerIp, "ru") + "/" +
+                    geoCountryService.getCountryByIp(viewerIp, "ru");
+            User user = userRepository.findById(viewerId).orElse(null);
+            FileEntity file = fileEntityRepository.findByFileId(dockView.getFileId());
+
+            dockView.setGeoNameRu(geoRuName);
+            dockView.setGeoNameEn(geoEnName);
+            dockView.setViewerName(user == null ? "guest" : user.getFullName());
+            dockView.setDocName(file.getOriginalFileName());
+
+            dockViewRepository.save(dockView);
+        }
+
+        return ResponseEntity.ok("fill old dock view");
+    }
+}

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

@@ -1,17 +1,16 @@
 package ru.soune.nocopy.controller;
 
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
-import ru.soune.nocopy.dto.search.GlobalSearchStartResponse;
 import ru.soune.nocopy.entity.payment.Payment;
 import ru.soune.nocopy.exception.PaymentNotFoundException;
 import ru.soune.nocopy.exception.TariffNotFoundException;
 import ru.soune.nocopy.exception.UserNotFoundException;
 import ru.soune.nocopy.service.payment.PaymentService;
-import ru.soune.nocopy.service.register.AuthService;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -24,7 +23,7 @@ public class PaymentController {
 
     private final PaymentService paymentService;
 
-    private final AuthService authService;
+    private final HttpServletRequest httpServletRequest;
 
     @PostMapping("/create")
     public ResponseEntity<?> createPayment(@RequestParam String email, @RequestParam Long tariffId,
@@ -69,8 +68,10 @@ public class PaymentController {
                 return ResponseEntity.ok().body(Map.of("error", errorData));
             }
 
-            paymentService.changeAutoRenewal(authService.useUserAuthToken(tokenHeader), renewal);
+            Long userId = (Long) httpServletRequest.getAttribute("userId");
-            return ResponseEntity.ok(Map.of("message", "Auto-renewal disabled"));
+
+            paymentService.changeAutoRenewal(userId, renewal);
+            return ResponseEntity.ok(Map.of("message", "Auto-renewal changed:" + renewal));
         } catch (UserNotFoundException e) {
             return ResponseEntity.status(HttpStatus.NOT_FOUND)
                     .body(Map.of("error", e.getMessage()));
@@ -88,7 +89,9 @@ public class PaymentController {
                 return ResponseEntity.ok().body(Map.of("error", errorData));
             }
 
-            paymentService.deletePaymentMethod(authService.useUserAuthToken(tokenHeader), paymentMethodId);
+            Long userId = (Long) httpServletRequest.getAttribute("userId");
+
+            paymentService.deletePaymentMethod(userId, paymentMethodId);
             return ResponseEntity.ok(Map.of("message", "Payment method deleted"));
         } catch (UserNotFoundException e) {
             return ResponseEntity.status(HttpStatus.NOT_FOUND)
@@ -109,8 +112,9 @@ public class PaymentController {
                 return ResponseEntity.ok().body(Map.of("error", errorData));
             }
 
-            return ResponseEntity.ok(paymentService.getUserPaymentMethods(
+            Long userId = (Long) httpServletRequest.getAttribute("userId");
-                    authService.useUserAuthToken(tokenHeader)));
+
+            return ResponseEntity.ok(paymentService.getUserPaymentMethods(userId));
         } catch (UserNotFoundException e) {
             return ResponseEntity.status(HttpStatus.NOT_FOUND)
                     .body(Map.of("error", e.getMessage()));

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

@@ -1,6 +1,7 @@
 package ru.soune.nocopy.controller;
 
 
+import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -12,16 +13,16 @@ import ru.soune.nocopy.entity.payout.BankTransferPayoutMethod;
 import ru.soune.nocopy.entity.payout.CardPayoutMethod;
 import ru.soune.nocopy.entity.payout.PayoutRequest;
 import ru.soune.nocopy.entity.payout.PayoutType;
-import ru.soune.nocopy.entity.user.AuthToken;
 import ru.soune.nocopy.entity.user.User;
-import ru.soune.nocopy.exception.NotFoundAuthToken;
+import ru.soune.nocopy.exception.InsufficientFundsException;
-import ru.soune.nocopy.repository.AuthTokenRepository;
+import ru.soune.nocopy.exception.InvalidPayoutMethodException;
+import ru.soune.nocopy.exception.PendingPayoutExistsException;
 import ru.soune.nocopy.service.payout.PayoutMethodService;
 import ru.soune.nocopy.service.payout.PayoutRequestService;
+import ru.soune.nocopy.service.user.UserService;
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 @RestController
@@ -34,25 +35,28 @@ public class PayoutController {
 
     private final PayoutMethodService payoutMethodService;
 
-    private final AuthTokenRepository authTokenRepository;
+    private final HttpServletRequest httpServletRequest;
+
+    private final UserService userService;
 
     /*
        Create payout
      */
     @PostMapping("/create-request")
-    public ResponseEntity<PayoutRequest> createPayoutRequest(@RequestHeader("Authorization") String tokenHeader,
+    public ResponseEntity<?> createPayoutRequest(@Valid @RequestBody PayoutRequestDTO request) {
-                                                             @Valid @RequestBody PayoutRequestDTO request) {
+        Long userId = (Long) httpServletRequest.getAttribute("userId");
-        String token = tokenHeader.replace("Bearer ", "");
+        User user = userService.getUserById(userId).orElse(null);
 
-        Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
+        if (user == null) {
+            return ResponseEntity.status(HttpStatus.NOT_FOUND).body("User not found with id: " + userId);
+        }
 
-        AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
+        try {
-
+            PayoutRequest payoutRequest = payoutRequestService.createPayoutRequest(user.getId(), request);
-        User user = authToken.getUser();
+            return ResponseEntity.status(HttpStatus.CREATED).body(payoutRequest);
-
+        } catch (InsufficientFundsException | PendingPayoutExistsException | InvalidPayoutMethodException e) {
-        PayoutRequest payoutRequest = payoutRequestService.createPayoutRequest(user.getId(), request);
+            return ResponseEntity.status(HttpStatus.CONFLICT).body(e.getMessage());
-
+        }
-        return ResponseEntity.status(HttpStatus.CREATED).body(payoutRequest);
     }
 
     /*
@@ -69,15 +73,13 @@ public class PayoutController {
        Cancel payout
      */
     @PostMapping("/requests/{requestId}/cancel")
-    public ResponseEntity<PayoutRequest> cancelPayoutRequest(@PathVariable Long requestId,
+    public ResponseEntity<PayoutRequest> cancelPayoutRequest(@PathVariable Long requestId) {
-                                                             @RequestHeader("Authorization") String tokenHeader) {
+        Long userId = (Long) httpServletRequest.getAttribute("userId");
-        String token = tokenHeader.replace("Bearer ", "");
+        User user = userService.getUserById(userId).orElse(null);
 
-        Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
+        if (user == null) {
-
+            return ResponseEntity.notFound().build();
-        AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
+        }
-
-        User user = authToken.getUser();
 
         PayoutRequest cancelled = payoutRequestService.cancelPayoutRequest(user.getId(), requestId);
 
@@ -88,14 +90,13 @@ public class PayoutController {
        Get user payouts
      */
     @GetMapping("/requests")
-    public ResponseEntity<List<PayoutRequest>> getUserRequests(@RequestHeader("Authorization") String tokenHeader) {
+    public ResponseEntity<List<PayoutRequest>> getUserRequests() {
-        String token = tokenHeader.replace("Bearer ", "");
+        Long userId = (Long) httpServletRequest.getAttribute("userId");
+        User user = userService.getUserById(userId).orElse(null);
 
-        Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
+        if (user == null) {
-
+            return ResponseEntity.notFound().build();
-        AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
+        }
-
-        User user = authToken.getUser();
 
         return ResponseEntity.ok(payoutRequestService.getUserPayoutRequests(user.getId()));
     }
@@ -104,15 +105,13 @@ public class PayoutController {
          Get payout by id
     */
     @GetMapping("/requests/{requestId}")
-    public ResponseEntity<PayoutRequest> getPayoutRequest(@PathVariable Long requestId,
+    public ResponseEntity<PayoutRequest> getPayoutRequest(@PathVariable Long requestId) {
-                                                          @RequestHeader("Authorization") String tokenHeader) {
+        Long userId = (Long) httpServletRequest.getAttribute("userId");
-        String token = tokenHeader.replace("Bearer ", "");
+        User user = userService.getUserById(userId).orElse(null);
 
-        Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
+        if (user == null) {
-
+            return ResponseEntity.notFound().build();
-        AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
+        }
-
-        User user = authToken.getUser();
 
         return ResponseEntity.ok(payoutRequestService.getPayoutRequest(user.getId(), requestId));
     }
@@ -121,14 +120,13 @@ public class PayoutController {
              Get payout by id
      */
     @GetMapping("user/payout-methods")
-    public ResponseEntity<List<PayoutMethodDTO>> getUserMethods(@RequestHeader("Authorization") String tokenHeader) {
+    public ResponseEntity<List<PayoutMethodDTO>> getUserMethods() {
-        String token = tokenHeader.replace("Bearer ", "");
+        Long userId = (Long) httpServletRequest.getAttribute("userId");
+        User user = userService.getUserById(userId).orElse(null);
 
-        Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
+        if (user == null) {
-
+            return ResponseEntity.notFound().build();
-        AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
+        }
-
-        User user = authToken.getUser();
 
         return ResponseEntity.ok(payoutMethodService.getUserMethods(user.getId()));
     }
@@ -151,15 +149,13 @@ public class PayoutController {
          add card method by userId
        */
     @PostMapping("/payout-method/card")
-    public ResponseEntity<PayoutMethodDTO> addCardMethod(@Valid @RequestBody AddCardRequest request,
+    public ResponseEntity<PayoutMethodDTO> addCardMethod(@Valid @RequestBody AddCardRequest request) {
-                                                         @RequestHeader("Authorization") String tokenHeader) {
+        Long userId = (Long) httpServletRequest.getAttribute("userId");
-        String token = tokenHeader.replace("Bearer ", "");
+        User user = userService.getUserById(userId).orElse(null);
 
-        Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
+        if (user == null) {
-
+            return ResponseEntity.notFound().build();
-        AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
+        }
-
-        User user = authToken.getUser();
 
         CardPayoutMethod method = payoutMethodService.addCardMethod(user.getId(), request);
 
@@ -171,15 +167,13 @@ public class PayoutController {
          add bank payout-method
      */
     @PostMapping("/payout-method/bank-transfer")
-    public ResponseEntity<PayoutMethodDTO> addBankTransferMethod(@Valid @RequestBody AddBankTransferRequest request,
+    public ResponseEntity<PayoutMethodDTO> addBankTransferMethod(@Valid @RequestBody AddBankTransferRequest request) {
-                                                                 @RequestHeader("Authorization") String tokenHeader) {
+        Long userId = (Long) httpServletRequest.getAttribute("userId");
-        String token = tokenHeader.replace("Bearer ", "");
+        User user = userService.getUserById(userId).orElse(null);
 
-        Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
+        if (user == null) {
-
+            return ResponseEntity.notFound().build();
-        AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
+        }
-
-        User user = authToken.getUser();
 
         BankTransferPayoutMethod method = payoutMethodService.addBankTransferMethod(user.getId(), request);
 
@@ -192,15 +186,13 @@ public class PayoutController {
          set default bank payout-method
      */
     @PutMapping("/payout-method/{methodId}/default")
-    public ResponseEntity<Void> setDefaultMethod(@PathVariable Long methodId,
+    public ResponseEntity<Void> setDefaultMethod(@PathVariable Long methodId) {
-                                                 @RequestHeader("Authorization") String tokenHeader) {
+        Long userId = (Long) httpServletRequest.getAttribute("userId");
-        String token = tokenHeader.replace("Bearer ", "");
+        User user = userService.getUserById(userId).orElse(null);
 
-        Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
+        if (user == null) {
-
+            return ResponseEntity.notFound().build();
-        AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
+        }
-
-        User user = authToken.getUser();
 
         payoutMethodService.setDefaultMethod(user.getId(), methodId);
 

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

@@ -1,5 +1,6 @@
 package ru.soune.nocopy.controller;
 
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -14,23 +15,19 @@ import ru.soune.nocopy.dto.user.UserDTO;
 import ru.soune.nocopy.dto.user.UserRequest;
 import ru.soune.nocopy.entity.tarif.Tariff;
 import ru.soune.nocopy.entity.tarif.TariffInfo;
-import ru.soune.nocopy.entity.user.AuthToken;
 import ru.soune.nocopy.entity.user.User;
 import ru.soune.nocopy.exception.InvalidUserEmail;
-import ru.soune.nocopy.exception.NotFoundAuthToken;
 import ru.soune.nocopy.exception.NotValidFieldException;
+import ru.soune.nocopy.exception.UserNotFoundException;
 import ru.soune.nocopy.mapper.UserMapper;
-import ru.soune.nocopy.repository.AuthTokenRepository;
 import ru.soune.nocopy.repository.UserRepository;
 import ru.soune.nocopy.service.file.FileStatsService;
-import ru.soune.nocopy.service.register.AuthService;
 import ru.soune.nocopy.service.tariff.TariffService;
 import ru.soune.nocopy.service.user.UserService;
+import ru.soune.nocopy.util.JwtUtil;
 
 import java.util.Arrays;
-import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 
 @RestController
 @RequestMapping("v1/api/user")
@@ -41,100 +38,79 @@ public class UserController {
 
     private final UserService userService;
 
-    private final AuthTokenRepository authTokenRepository;
-
     private final UserMapper userMapper;
 
     private final PasswordEncoder passwordEncoder;
 
-    private final AuthService authService;
-
     private final TariffService tariffService;
 
     private final FileStatsService fileStatsService;
 
-    @GetMapping("/all")
+    private final JwtUtil jwtUtil;
-    public ResponseEntity<List<UserDTO>> getAllUsers() {
+
-        List<UserDTO> allUsers = userRepository.findAll().stream()
+    private final HttpServletRequest httpServletRequest;
-                .map(u -> new UserDTO(u.getFullName(), u.getCompanyName(), u.getEmail(), u.isActive(),
-                        u.getPhone(), u.getGenderType(),
-                        u.getBirthday(), u.getCreatedAt(), u.getSubscriptionType(), tariffService.getAllTariffs(),
-                        null, null))
-                .toList();
 
-        return ResponseEntity.ok(allUsers);
-    }
 
     @GetMapping
-    public ResponseEntity<UserDTO> getUser(@RequestParam("email") String email,
+    public ResponseEntity<UserDTO> getUser(@RequestParam("email") String email) {
-                                           @RequestHeader("Authorization") String tokenHeader) {
+        User user = userRepository.findByEmail(email);
-        String token = tokenHeader.replace("Bearer ", "");
 
-        Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
+        if (user != null) {
+            UserDTO userDTO = userMapper.toDTO(user);
+            userDTO.setEmail(email);
+            userDTO.setFullName(user.getFullName());
+            userDTO.setVerifiedStatus(user.getVerificationStatus());
 
-        if (tokenOptional.isPresent()) {
+            if (user.getCompany() != null) {
-            User user = userRepository.findByEmail(email);
+                userDTO.setCompany(user.getCompany().getCompanyName());
-
-            if (user != null) {
-                UserDTO userDTO = userMapper.toDTO(user);
-                userDTO.setEmail(email);
-                userDTO.setFullName(user.getFullName());
-
-                if (user.getCompany() != null) {
-                    userDTO.setCompany(user.getCompany().getCompanyName());
-                }
-
-                if (user.canManageCompanySettings() || user.canLogin() && user.getCompany() == null) {
-                    userDTO.setTariffs(tariffService.getTariffByAccountType(user));
-
-                    Long fileOnDisk = user.canManageCompanySettings() ?
-                            fileStatsService.calculateCompanyFileSize(user.getId()):
-                            fileStatsService.calculateUserFileSize(user.getId());
-
-                    Integer filesCount =  user.canManageCompanySettings() ?
-                            fileStatsService.filesCompanyCount(user.getId()):
-                            fileStatsService.filesUserCount(user.getId());
-
-                    TariffInfo personalTariffInfo;
-
-                    if (user.getCompany() == null) {
-                        personalTariffInfo = user.getPersonalTariffInfo();
-                    } else {
-                        personalTariffInfo = user.getCompany().getTariffInfo();
-                    }
-
-                    Tariff tariff = personalTariffInfo.getTariff();
-
-                    TariffInfoDTO infoDTO = TariffInfoDTO.builder().tokens(personalTariffInfo.getTokens())
-                            .id(personalTariffInfo.getId())
-                            .tariffName(tariff.getName())
-                            .status(personalTariffInfo.getStatus().name())
-                            .tariffId(tariff.getId())
-                            .currentFileCounts(filesCount)
-                            .maxFileCounts(tariff.getMaxFilesCount())
-                            .currentFileOnDisk(fileOnDisk)
-                            .maxFileOnDisk(tariff.getDiskSize())
-                            .startTariff(personalTariffInfo.getStartTariff())
-                            .endTariff(personalTariffInfo.getEndTariff())
-                            .tokens(personalTariffInfo.getTokens() + personalTariffInfo.getBoughtTokens())
-                            .build();
-
-                    userDTO.setTariffInfo(infoDTO);
-
-                }
-
-                userDTO.setPhone(user.getPhone());
-                userDTO.setGenderType(user.getGenderType());
-                userDTO.setBirthday(user.getBirthday());
-                userDTO.setCreatedAt(user.getCreatedAt());
-                userDTO.setSubscriptionType(user.getSubscriptionType());
-                userDTO.setActive(user.isActive());
-                userDTO.setPermission(user.getUserPermissions());
-
-                return ResponseEntity.ok(userDTO);
             }
-        } else {
+
-            return ResponseEntity.notFound().build();
+            if (user.canManageCompanySettings() || user.canLogin() && user.getCompany() == null) {
+                userDTO.setTariffs(tariffService.getTariffByAccountType(user));
+
+                Long fileOnDisk = user.canManageCompanySettings() ?
+                        fileStatsService.calculateCompanyFileSize(user.getId()):
+                        fileStatsService.calculateUserFileSize(user.getId());
+
+                Integer filesCount =  user.canManageCompanySettings() ?
+                        fileStatsService.filesCompanyCount(user.getId()):
+                        fileStatsService.filesUserCount(user.getId());
+
+                TariffInfo personalTariffInfo;
+
+                if (user.getCompany() == null) {
+                    personalTariffInfo = user.getPersonalTariffInfo();
+                } else {
+                    personalTariffInfo = user.getCompany().getTariffInfo();
+                }
+
+                Tariff tariff = personalTariffInfo.getTariff();
+
+                TariffInfoDTO infoDTO = TariffInfoDTO.builder().tokens(personalTariffInfo.getTokens())
+                        .id(personalTariffInfo.getId())
+                        .tariffName(tariff.getName())
+                        .status(personalTariffInfo.getStatus().name())
+                        .tariffId(tariff.getId())
+                        .currentFileCounts(filesCount)
+                        .maxFileCounts(tariff.getMaxFilesCount())
+                        .currentFileOnDisk(fileOnDisk)
+                        .maxFileOnDisk(tariff.getDiskSize())
+                        .startTariff(personalTariffInfo.getStartTariff())
+                        .endTariff(personalTariffInfo.getEndTariff())
+                        .tokens(personalTariffInfo.getTokens() + personalTariffInfo.getBoughtTokens())
+                        .build();
+
+                userDTO.setTariffInfo(infoDTO);
+            }
+
+            userDTO.setPhone(user.getPhone());
+            userDTO.setGenderType(user.getGenderType());
+            userDTO.setBirthday(user.getBirthday());
+            userDTO.setCreatedAt(user.getCreatedAt());
+            userDTO.setActive(user.isActive());
+            userDTO.setPermission(user.getUserPermissions());
+
+            return ResponseEntity.ok(userDTO);
         }
 
         return ResponseEntity.notFound().build();
@@ -142,15 +118,13 @@ public class UserController {
 
     //TODO fix mapper,doesnot exist all fields
     @PostMapping("/change-password")
-    public ResponseEntity<UserDTO> updateUser(@RequestBody ChangePasswordRequest changePasswordRequest,
+    public ResponseEntity<UserDTO> updateUser(@RequestBody ChangePasswordRequest changePasswordRequest) {
-                                              @RequestHeader("Authorization") String tokenHeader) {
+        Long userId = (Long) httpServletRequest.getAttribute("userId");
-        String token = tokenHeader.replace("Bearer ", "");
+        User user = userService.getUserById(userId).orElse(null);
 
-        Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
+        if (user == null) {
-
+            throw  new UserNotFoundException("User not found by id: " + userId);
-        AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
+        }
-
-        User user = authToken.getUser();
 
         if (!changePasswordRequest.getEmail().equals(user.getEmail())) {
             throw new InvalidUserEmail("Email is not valid: " + changePasswordRequest.getEmail() + "not found");
@@ -162,21 +136,19 @@ public class UserController {
     }
 
     @PatchMapping("/user-update")
-    public ResponseEntity<UserDTO> updateUser(@RequestBody UserRequest userRequest,
+    public ResponseEntity<UserDTO> updateUser(@RequestBody UserRequest userRequest) {
-                                              @RequestHeader("Authorization") String tokenHeader) {
+        Long userId = (Long) httpServletRequest.getAttribute("userId");
-        String token = tokenHeader.replace("Bearer ", "");
+        User user = userService.getUserById(userId).orElse(null);
 
-        Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
+        if (user == null) {
-
+            throw  new UserNotFoundException("User not found by id: " + userId);
-        AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
+        }
-
-        User user = authToken.getUser();
 
         return ResponseEntity.ok(userService.updateUser(userRequest, user));
     }
 
     @PostMapping("/create-user")
-    public ResponseEntity<User> addUser(@RequestBody RegRequest registerRequest) {
+    public ResponseEntity<?> addUser(@RequestBody RegRequest registerRequest) {
 
         if (userRepository.existsByEmail(registerRequest.getEmail()) ||
                 userRepository.existsByPhone(registerRequest.getPhone())) {
@@ -203,11 +175,11 @@ public class UserController {
 
         User savedUser = userRepository.save(user);
 
-        AuthToken authToken = authService.generateAuthToken(savedUser);
+        String authToken = jwtUtil.generateToken(savedUser.getId(), savedUser.getEmail());
 
-        authTokenRepository.save(authToken);
+        return ResponseEntity.ok().body(Map.of(
-
+                "user", savedUser,
-        return ResponseEntity.ok().body(savedUser);
+                "token", authToken));
     }
 
     @DeleteMapping("/delete-user/{userId}")

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

@@ -15,4 +15,7 @@ public class BaseRequest {
 
     @JsonProperty("message_body")
     Object messageBody;
+
+    @JsonProperty(value = "admin_id", required = false)
+    Long adminId;
 }

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

@@ -2,9 +2,11 @@ package ru.soune.nocopy.dto;
 
 public enum MessageCode {
     SUCCESS(0, "Operation successful"),
+    SUCCESS_MODERATION(0, "File moderated successfully"),
     REG_EMAIL_EXISTS(1, "Email already registered"),
     REG_EMAIL_OR_PHONE_EXISTS(1, "Email or phone already registered"),
     REFERRAL_LINK_IS_NOT_EXIST(1, "Refferal link is not exist"),
+    FILE_IS_BLOCKED(1, "File is blocked,deleted or removed"),
     INVALID_FIELD(2, "Invalid field"),
     MAIL_VERIFIED_NULL(2, "Mail verified null"),
     INVALID_TOKEN(2, "Token not found or time expired"),
@@ -16,18 +18,26 @@ public enum MessageCode {
     FILE_NOT_EXIST(2, "File not exist on disk"),
     FILE_DELETE(2, "File was deleted"),
     USER_NOT_HAD_PERMISSION(2, "User not have permission for file"),
+    NOT_OWNER_FILE_STATUS_VIOLATION(2, "Violation in not owner file status"),
     USER_NOT_VERIFIED(2, "User not verified"),
+    LAW_CASE_NOT_FOUND(4, "Law case not found"),
     PERMISSION_NOT_FOUND(2, "Permission not found"),
+    INVALID_CREDENTIALS(2, "Invalid credentials"),
     USER_NOT_FOUND(2, "User not found"),
+    LAW_CASE_ALREADY_EXIST(2, "Law case already exists"),
+    COMPLAINT_ALREADY_EXIST(2, "Complaint already exists"),
+    COMPLAINT_NOT_FOUND(4, "Complaint not found"),
     FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD(2, "Not correct field"),
     TOKEN_IS_NULL(2, "Token field is null"),
     IMAGE_FOUND_ERROR(2, "Image found error"),
     INVALID_JSON_BODY(2, "Invalid fields in JSON object"),
     INCOMPLETE_UPLOAD(2, "Not load all chunks"),
+    USER_NOT_HAVE_TOKEN(2, "Not have tokens"),
     MSG_ID_NOT_FOUND(4, "Message id not found"),
     FILE_ENTITY_ERROR(2, "File entity error"),
+    NOT_VALID_FIELD(2, "Not valid field"),
     ACCESS_DENIED(2, "Access denied"),
-    AUTH_EMAIL_NOT_FOUND(4, "Email not found"),
+    AUTH_EMAIL_NOT_FOUND(4, "Email not COMPLAINT_OR_LAW_CASE_IN_WORK"),
     AUTH_EMAIL_OR_TOKEN_NOT_FOUND(4, "Email or Token not found "),
     AUTH_TOKEN_MISMATCH(4, "Token mismatch"),
     AUTH_TOKEN_NOT_FOUND(4, "Token not found"),
@@ -39,10 +49,12 @@ public enum MessageCode {
     FILE_IS_NOT_PROTECTED(0, "File is not protected"),
     TARIFF_IS_ADD(0, "Tariff is added"),
     TARIFF_IS_DELETED(0, "Tariff is deleted"),
+    TARIFF_IS_NOT_DELETED(0, "Tariff is not deleted,use some users"),
     TARIFF_IS_UPDATED(0, "Tariff is updated"),
     TARIFF_IS_NOT_FOUND(0, "Tariff is not found"),
     VALIDATION_ERROR(2, "Validation error"),
     RESOURCE_NOT_FOUND(4, "Resource not found"),
+    OPERATION_NOT_FOUND(4, "Operation not found"),
     INTERNAL_ERROR(4, "Internal server error"),
     COMPANY_NOT_FOUND(4, "Company not found"),
     PAYMENT_NOT_FOUND(4, "Payment not found"),
@@ -51,11 +63,20 @@ public enum MessageCode {
     MONITORING_TYPE_NOT_FOUND(4, "Monitoring type not found"),
     ERROR_TARIFF_INFO(2, "Erorr with tariff info"),
     FILE_FOR_SEARCH_NOT_VALID(2, "File for search unsupported"),
+    ILLEGAL_STATE(2, "File is not in moderation state"),
     NOT_VALID_FILE_TYPE_OR_COUNT_FILE(2, "Cost for file type not found, count is negative or files count" +
             "more than max valid"),
     USER_NOT_ACTIVE(2, "User not active"),
     NOTION_NOT_FOUND(4, "Notion not found"),
-    MESSAGE_IS_REQUIRED_FOR_NOTION(4, "Message is required for notion");
+    NOT_FOUND(4, "Notion not found"),
+    MESSAGE_IS_REQUIRED_FOR_NOTION(4, "Message is required for notion"),
+    USER_VERIFICATIONS_NOT_FOUND(4, "Verifications not found"),
+    COMPLAINT_OR_LAW_CASE_IN_WORK(2, "Complaint or lawcase in work"),
+    NOT_VALID_STATUS(2, "Not valid status"),
+    PERMISSION_NOT_VALID(2, "Not valid permission"),
+    NOT_HAVE_DOWNLOAD_PERMISSION(2, "Not haver permission for download"),
+    ADMIN_USER_NOT_FOUND(4, "Verifications ,user or admin not found");
+
 
     private final Integer code;
 

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

@@ -6,6 +6,4 @@ import lombok.Data;
 @Data
 public class TokenProcessRequest {
 
-    @JsonProperty("token")
-    private String token;
 }

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

@@ -0,0 +1,35 @@
+package ru.soune.nocopy.dto.complaint;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class BaseResponse {
+    @JsonProperty("status")
+    private String status;
+
+    @JsonProperty("message")
+    private String message;
+
+    @JsonProperty("data")
+    private Object data;
+
+    @JsonProperty("error_code")
+    private String errorCode;
+
+    public static BaseResponse success(Object data) {
+        return BaseResponse.builder()
+                .status("SUCCESS")
+                .data(data)
+                .build();
+    }
+
+    public static BaseResponse error(String message, String errorCode) {
+        return BaseResponse.builder()
+                .status("ERROR")
+                .message(message)
+                .errorCode(errorCode)
+                .build();
+    }
+}

src/main/java/ru/soune/nocopy/dto/complaint/ComplaintRequest.java

@@ -0,0 +1,38 @@
+package ru.soune.nocopy.dto.complaint;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import java.util.List;
+
+@Data
+public class ComplaintRequest {
+    @JsonProperty("action")
+    private String action;
+
+    @JsonProperty("id")
+    private Long id;
+
+    @JsonProperty("violation_id")
+    private Long violationId;
+
+    @JsonProperty("text")
+    private String complaintText;
+
+    @JsonProperty("email")
+    private String email;
+
+    @JsonProperty("status")
+    private String status;
+
+    @JsonProperty("page")
+    private Integer page;
+
+    @JsonProperty("size")
+    private Integer size;
+
+    @JsonProperty("sort_by")
+    private String sortBy;
+
+    @JsonProperty("sort_direction")
+    private String sortDirection;
+}

src/main/java/ru/soune/nocopy/dto/complaint/ComplaintResponse.java

@@ -0,0 +1,42 @@
+package ru.soune.nocopy.dto.complaint;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ComplaintResponse {
+    @JsonProperty("id")
+    private Long id;
+
+    @JsonProperty("status")
+    private String status;
+
+    @JsonProperty("complaint_text")
+    private String complaintText;
+
+    @JsonProperty("violation_id")
+    private Long violationId;
+
+    @JsonProperty("email")
+    private String email;
+
+    @JsonProperty("created_at")
+    private String createdAt;
+
+    @JsonProperty("updated_at")
+    private String updatedAt;
+
+    @JsonProperty("not_moderated")
+    private Boolean notModerated;
+
+    @JsonProperty("file_id")
+    private String fileId;
+}

src/main/java/ru/soune/nocopy/dto/complaint/LawCasePageResponse.java

@@ -0,0 +1,17 @@
+package ru.soune.nocopy.dto.complaint;
+
+import lombok.Builder;
+import lombok.Data;
+import java.util.List;
+
+@Data
+@Builder
+public class LawCasePageResponse {
+    private List<LawCaseResponse> content;
+    private int pageNumber;
+    private int pageSize;
+    private long totalElements;
+    private int totalPages;
+    private boolean last;
+    private boolean first;
+}

src/main/java/ru/soune/nocopy/dto/complaint/LawCaseRequest.java

@@ -0,0 +1,32 @@
+package ru.soune.nocopy.dto.complaint;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import ru.soune.nocopy.entity.complaint.LawCasePriority;
+import ru.soune.nocopy.entity.complaint.LawCaseType;
+
+import java.math.BigDecimal;
+
+@Data
+public class LawCaseRequest {
+    private Long id;
+    //required
+    private String name;
+    //required
+    private String description;
+    private BigDecimal amount;
+    private String priority = LawCasePriority.HIGH.toString();
+    private String type;
+    private String lawyer;
+    private Integer pageSize = 5;
+    private Integer pageNumber = 0;
+    private String sortBy = "updatedAt";
+    private String sortDir = "desc";
+    private String action;
+    private String filterType;
+    private String filterLawyer;
+    private String filterPriority;
+    @JsonProperty("violation_id")
+    private Long violationId;
+
+}

src/main/java/ru/soune/nocopy/dto/complaint/LawCaseResponse.java

@@ -0,0 +1,71 @@
+package ru.soune.nocopy.dto.complaint;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Builder;
+import lombok.Data;
+import ru.soune.nocopy.entity.complaint.LawCase;
+import ru.soune.nocopy.entity.complaint.LawCasePriority;
+import ru.soune.nocopy.entity.complaint.LawCaseType;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+@Builder
+public class LawCaseResponse {
+    private Long id;
+
+    private String name;
+
+    private String description;
+
+    private BigDecimal amount;
+
+    private LawCasePriority priority;
+
+    private LawCaseType type;
+
+    private String lawyer;
+
+    @JsonProperty("created_at")
+    private LocalDateTime createdAt;
+
+    @JsonProperty("updated_at")
+    private LocalDateTime updatedAt;
+
+    @JsonProperty("page_number")
+    private int pageNumber;
+
+    @JsonProperty("page_size")
+    private int pageSize;
+
+    @JsonProperty("total_elements")
+    private long totalElements;
+
+    @JsonProperty("total_pages")
+    private int totalPages;
+
+    @JsonProperty("violation_id")
+    private long violationId;
+
+    @JsonProperty("file_id")
+    private String fileId;
+
+    private List<LawCaseResponse> content;
+
+    public static LawCaseResponse fromEntity(LawCase lawCase) {
+        return LawCaseResponse.builder()
+                .id(lawCase.getId())
+                .name(lawCase.getName())
+                .description(lawCase.getDescription())
+                .amount(lawCase.getAmount())
+                .priority(lawCase.getPriority())
+                .type(lawCase.getType())
+                .lawyer(lawCase.getLawyer())
+                .createdAt(lawCase.getCreatedAt())
+                .updatedAt(lawCase.getUpdatedAt())
+                .violationId(lawCase.getViolationId())
+                .build();
+    }
+}

src/main/java/ru/soune/nocopy/dto/complaint/PaginatedResponse.java

@@ -0,0 +1,17 @@
+package ru.soune.nocopy.dto.complaint;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+public class PaginatedResponse<T> {
+    private List<T> content;
+    private long totalElements;
+    private int totalPages;
+    private int pageNumber;
+    private int pageSize;
+    private boolean first;
+    private boolean last;
+}

src/main/java/ru/soune/nocopy/dto/cost/CostRequest.java

@@ -12,7 +12,4 @@ public class CostRequest {
 
     @JsonProperty("count_files")
     Integer countFilesForProtect;
-
-    @JsonProperty("auth_token")
-    String authToken;
 }

src/main/java/ru/soune/nocopy/dto/docviewer/DocViewerRequest.java

@@ -0,0 +1,36 @@
+package ru.soune.nocopy.dto.docviewer;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class DocViewerRequest {
+    @JsonProperty("file_id")
+    private String fileId;
+
+    @JsonProperty("ip")
+    private String ip;
+
+    @JsonProperty("user_agent")
+    private String userAgent;
+
+    @JsonProperty("page")
+    private int page = 0;
+
+    @JsonProperty("size")
+    private int size = 10;
+
+    @JsonProperty("sort_by")
+    private String sortBy = "createdAt";
+
+    @JsonProperty("sort_direction")
+    private String sortDirection = "desc";
+
+    @JsonProperty("action")
+    private String action;
+
+    @JsonProperty("locale")
+    private String locale;
+}

src/main/java/ru/soune/nocopy/dto/docviewer/DockViewResponse.java

@@ -0,0 +1,31 @@
+package ru.soune.nocopy.dto.docviewer;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class DockViewResponse {
+
+    @JsonProperty("city")
+    private String city;
+
+    @JsonProperty("country")
+    private String country;
+
+    @JsonProperty("viewer")
+    private String viewer;
+
+    @JsonProperty("document")
+    private String document;
+
+    @JsonProperty("view_date")
+    private LocalDateTime viewDate;
+}

src/main/java/ru/soune/nocopy/dto/docviewer/DockViewStatsResponse.java

@@ -0,0 +1,55 @@
+package ru.soune.nocopy.dto.docviewer;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class DockViewStatsResponse {
+    private String fileId;
+
+    private Long totalViews;
+
+    private Long uniqueIps;
+
+    private Long uniqueUsers;
+
+    private int documentsCount;
+
+    private int uniqueCountryCount;
+
+    private int uniqueCityCount;
+
+    private LocalDateTime firstViewDate;
+
+    private LocalDateTime lastViewDate;
+
+    private List<DockViewStatsResponse> content;
+
+    private List<DockViewResponse> history;
+
+    private Integer pageNumber;
+
+    private Integer pageSize;
+
+    private Long totalElements;
+
+    private Integer totalPages;
+
+    private Boolean isLast;
+
+    private Boolean isFirst;
+
+    private Boolean hasNext;
+
+    private Boolean hasPrevious;
+}

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

@@ -0,0 +1,14 @@
+package ru.soune.nocopy.dto.file;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@Builder
+public class AppealInfo {
+    private String appealId;
+    private String status;
+    private LocalDateTime createdAt;
+}

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

@@ -0,0 +1,12 @@
+package ru.soune.nocopy.dto.file;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class AppealRequest {
+    private String fileId;
+    private String appealReason;
+    private String additionalInfo;
+}

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

@@ -0,0 +1,20 @@
+package ru.soune.nocopy.dto.file;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@Builder
+public class AppealResponse {
+    private String appealId;
+    private String fileId;
+    private String appealReason;
+    private String additionalInfo;
+    private String status;
+    private String adminComment;
+    private String fileName;
+    private LocalDateTime createdAt;
+    private LocalDateTime resolvedAt;
+}

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

@@ -5,6 +5,11 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import ru.soune.nocopy.entity.file.FileStatus;
+import ru.soune.nocopy.entity.file.permission.PermissionType;
+
+import java.util.List;
+import java.util.Map;
 
 @Data
 @Builder
@@ -17,6 +22,9 @@ public class FileEntityRequest {
     @JsonProperty("file_id")
     private String fileId;
 
+    @JsonProperty("file_ids")
+    private List<String> fileIds;
+
     @JsonProperty("full_delete")
     private Integer fullDelete;
 
@@ -32,9 +40,6 @@ public class FileEntityRequest {
     @JsonProperty("page_size")
     private Integer pageSize;
 
-    @JsonProperty("token")
-    private String token;
-
     @JsonProperty("sort_by")
     private String sortBy;
 
@@ -44,6 +49,33 @@ public class FileEntityRequest {
     @JsonProperty("type")
     private String type;
 
+    @JsonProperty("file_status")
+    private FileStatus fileStatus;
+
     @JsonProperty("date_filter")
     private String dateFilter;
+
+    @JsonProperty("comment")
+    private String comment;
+
+    @JsonProperty("appeal_reason")
+    private String appealReason;
+
+    @JsonProperty("additional_info")
+    private String additionalInfo;
+
+    @JsonProperty("appeal_id")
+    private String appealId;
+
+    @JsonProperty("approve")
+    private Boolean approve;
+
+    @JsonProperty("reason_text")
+    private String reasonText;
+
+    @JsonProperty("search_query")
+    private String searchQuery;
+
+    @JsonProperty("permissions")
+    private Map<String, Boolean> permissions;
 }

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

@@ -5,8 +5,10 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import ru.soune.nocopy.entity.file.FileStatus;
+import ru.soune.nocopy.entity.file.permission.PermissionType;
 
 import java.time.LocalDateTime;
+import java.util.Map;
 
 @Data
 @Builder
@@ -42,4 +44,5 @@ public class FileEntityResponse {
     private Integer checksCount;
     private LocalDateTime fileUploadDate;
     private String monitoring;
+    private Map<PermissionType, Boolean> permissions;
 }

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

@@ -16,12 +16,6 @@ public class FileListResponse {
     @JsonProperty("files")
     private List<FileEntityResponse> files;
 
-    @JsonProperty("total_count")
-    private Integer totalCount;
-
-    @JsonProperty("total_size")
-    private Long totalSize;
-
     @JsonProperty("formatted_total_size")
     private String formattedTotalSize;
 
@@ -36,4 +30,10 @@ public class FileListResponse {
 
     @JsonProperty("sort_order")
     private String sortOrder;
+
+    @JsonProperty("total_count")
+    private Integer totalCount;
+
+    @JsonProperty("total_size")
+    private Long totalSize;
 }

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

@@ -0,0 +1,20 @@
+package ru.soune.nocopy.dto.file;
+
+import lombok.Builder;
+import lombok.Data;
+import ru.soune.nocopy.entity.file.FileStatus;
+
+import java.time.LocalDateTime;
+
+@Data
+@Builder
+public class FileModerationInfo {
+    private String fileId;
+    private String fileName;
+    private String ownerName;
+    private String ownerEmail;
+    private FileStatus currentStatus;
+    private LocalDateTime uploadDate;
+    private Boolean hasActiveAppeal;
+    private AppealInfo activeAppeal;
+}

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

@@ -26,9 +26,6 @@ public class FileUploadRequest {
     @JsonProperty("action")
     private String action;
 
-    @JsonProperty("token")
-    private String token;
-
     @JsonProperty("convertTo")
     private String convertTo;
 }

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

@@ -8,6 +8,9 @@ public class ImageSearchRequest {
     @JsonProperty("file_id")
     private String fileId;
 
+    @JsonProperty("check_similar_first")
+    private Boolean checkSimilarFirst;
+
     @JsonProperty("page")
     private Integer page = 1;
 

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

@@ -0,0 +1,21 @@
+package ru.soune.nocopy.dto.file;
+
+import lombok.Builder;
+import lombok.Data;
+import ru.soune.nocopy.entity.file.FileStatus;
+
+@Data
+@Builder
+public class ModerationActionRequest {
+    private String fileId;
+    private FileStatus newStatus;
+    private String comment;
+    private Long adminId;
+}
+
+
+
+
+
+
+

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

@@ -20,4 +20,5 @@ public class SimilarFileDTO {
     LocalDateTime uploadDate;
     String url;
     Boolean owner;
+    String fileStatus;
 }

src/main/java/ru/soune/nocopy/dto/monitoring/GetViolationsRequest.java

@@ -17,7 +17,4 @@ public class GetViolationsRequest {
 
     @JsonProperty("mark_as_read")
     private boolean markAsRead;
-
-    @JsonProperty("auth_token")
-    private String authToken;
 }

src/main/java/ru/soune/nocopy/dto/monitoring/SetMonitoringRequest.java

@@ -14,7 +14,4 @@ public class SetMonitoringRequest {
 
     @JsonProperty("monitoring_type")
     private String monitoringType;
-
-    @JsonProperty("auth_token")
-    private String authToken;
 }

src/main/java/ru/soune/nocopy/dto/notification/ActivateNotificationRequest.java

@@ -0,0 +1,7 @@
+package ru.soune.nocopy.dto.notification;
+
+import lombok.Data;
+
+@Data
+public class ActivateNotificationRequest {
+}

src/main/java/ru/soune/nocopy/dto/notification/ActiveNotificationsResponse.java

@@ -0,0 +1,13 @@
+package ru.soune.nocopy.dto.notification;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@Builder
+public class ActiveNotificationsResponse {
+    private List<NotificationDto> notifications;
+    private long unreadCount;
+}

src/main/java/ru/soune/nocopy/dto/notification/MarkAsReadRequest.java

@@ -0,0 +1,10 @@
+package ru.soune.nocopy.dto.notification;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class MarkAsReadRequest {
+    private List<Long> notificationIds;
+}

src/main/java/ru/soune/nocopy/dto/notification/MarkAsReadResponse.java

@@ -0,0 +1,11 @@
+package ru.soune.nocopy.dto.notification;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class MarkAsReadResponse {
+    private boolean success;
+    private int updatedCount;
+}

src/main/java/ru/soune/nocopy/dto/notification/NotificationDto.java

@@ -0,0 +1,19 @@
+package ru.soune.nocopy.dto.notification;
+
+import lombok.Builder;
+import lombok.Data;
+import ru.soune.nocopy.entity.notification.NotificationStatus;
+import ru.soune.nocopy.entity.notification.NotificationType;
+
+import java.time.LocalDateTime;
+
+@Data
+@Builder
+public class NotificationDto {
+    private Long id;
+    private String message;
+    private NotificationType type;
+    private NotificationStatus status;
+    private LocalDateTime createdAt;
+    private Object context;
+}

src/main/java/ru/soune/nocopy/dto/notification/NotificationListRequest.java

@@ -0,0 +1,17 @@
+package ru.soune.nocopy.dto.notification;
+
+import lombok.Data;
+import ru.soune.nocopy.entity.notification.NotificationStatus;
+import ru.soune.nocopy.entity.notification.NotificationType;
+
+import java.util.List;
+
+@Data
+public class NotificationListRequest {
+    private int page = 0;
+    private int size = 10;
+    private String sortBy = "createdAt";
+    private String sortDirection = "DESC";
+    private List<NotificationType> types;
+    private List<NotificationStatus> statuses;
+}

src/main/java/ru/soune/nocopy/dto/notification/NotificationListResponse.java

@@ -0,0 +1,15 @@
+package ru.soune.nocopy.dto.notification;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@Builder
+public class NotificationListResponse {
+    private List<NotificationDto> notifications;
+    private int currentPage;
+    private int totalPages;
+    private long totalElements;
+}

src/main/java/ru/soune/nocopy/dto/referral/ReferralRequest.java

@@ -10,7 +10,6 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @Builder
 public class ReferralRequest {
-    private String token;
     private Integer amount;
     private Integer pageSize;
     private Integer pageNumber;

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

@@ -37,4 +37,10 @@ public class RegRequest {
 
     @JsonProperty("mail_verified")
     private String mailVerified;
+
+    @JsonProperty("ip")
+    private String ip;
+
+    @JsonProperty("user_agent")
+    private String userAgent;
 }

src/main/java/ru/soune/nocopy/dto/search/GlobalSearchStatisticsRequest.java

@@ -6,9 +6,6 @@ import lombok.Data;
 @Data
 public class GlobalSearchStatisticsRequest {
 
-    @JsonProperty("token")
-    private String token;
-
     @JsonProperty("limit")
     private Integer limit = 10;
 

src/main/java/ru/soune/nocopy/dto/statistic/ComplaintStatisticRequest.java

@@ -0,0 +1,7 @@
+package ru.soune.nocopy.dto.statistic;
+
+import lombok.Data;
+
+@Data
+public class ComplaintStatisticRequest {
+}

src/main/java/ru/soune/nocopy/dto/statistic/ComplaintStatisticResponse.java

@@ -0,0 +1,34 @@
+package ru.soune.nocopy.dto.statistic;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Map;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ComplaintStatisticResponse {
+
+    @JsonProperty("total_complaint")
+    private Long totalComplaints;
+
+    @JsonProperty("total_created")
+    private Long totalCreated;
+
+    @JsonProperty("total_in_work")
+    private Long totalInWork;
+
+    @JsonProperty("total_completed")
+    private Long totalCompleted;
+
+    @JsonProperty("total_cancelled")
+    private Long totalCancelled;
+
+    @JsonProperty("complaints")
+    private Map<String, Object> complaints;
+}

src/main/java/ru/soune/nocopy/dto/statistic/IncomeStatisticRequest.java

@@ -0,0 +1,6 @@
+package ru.soune.nocopy.dto.statistic;
+import lombok.Data;
+
+@Data
+public class IncomeStatisticRequest {
+}

src/main/java/ru/soune/nocopy/dto/statistic/IncomeStatisticResponse.java

@@ -0,0 +1,40 @@
+package ru.soune.nocopy.dto.statistic;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class IncomeStatisticResponse {
+
+    @JsonProperty("total_income")
+    private Long totalIncome;
+
+    @JsonProperty("total_available")
+    private Long totalAvailable;
+
+    @JsonProperty("total_hold")
+    private Long totalHold;
+
+    @JsonProperty("income_per_user")
+    private Percentiles incomePerUser;
+
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class Percentiles {
+        @JsonProperty("p5")
+        private Long p5;
+
+        @JsonProperty("p50")
+        private Long p50;
+
+        @JsonProperty("p95")
+        private Long p95;
+    }
+}

src/main/java/ru/soune/nocopy/dto/statistic/MonitoringStatisticRequest.java

@@ -0,0 +1,7 @@
+package ru.soune.nocopy.dto.statistic;
+
+import lombok.Data;
+
+@Data
+public class MonitoringStatisticRequest {
+}

src/main/java/ru/soune/nocopy/dto/statistic/MonitoringStatisticResponse.java

@@ -0,0 +1,20 @@
+package ru.soune.nocopy.dto.statistic;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class MonitoringStatisticResponse {
+
+    @JsonProperty("day")
+    private Long everyDay;
+
+    @JsonProperty("month")
+    private Long everyMonth;
+
+    @JsonProperty("weekly")
+    private Long everyWeekly;
+
+}

src/main/java/ru/soune/nocopy/dto/statistic/ProtectedFilesStatisticRequest.java

@@ -0,0 +1,7 @@
+package ru.soune.nocopy.dto.statistic;
+
+import lombok.Data;
+
+@Data
+public class ProtectedFilesStatisticRequest {
+}

src/main/java/ru/soune/nocopy/dto/statistic/ProtectedFilesStatisticResponse.java

@@ -0,0 +1,66 @@
+package ru.soune.nocopy.dto.statistic;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ProtectedFilesStatisticResponse {
+
+    @JsonProperty("total_files")
+    private Long totalFiles;
+
+    @JsonProperty("total_size_bytes")
+    private Long totalSizeBytes;
+
+    @JsonProperty("total_size_gb")
+    private Double totalSizeGb;
+
+    @JsonProperty("files_per_user_percentiles")
+    private Percentiles filesPerUser;
+
+    @JsonProperty("size_per_user_percentiles")
+    private SizePercentiles sizePerUser;
+
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class Percentiles {
+        @JsonProperty("p5")
+        private Long p5;
+
+        @JsonProperty("p50")
+        private Long p50;
+
+        @JsonProperty("p95")
+        private Long p95;
+    }
+
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class SizePercentiles {
+        @JsonProperty("p5_bytes")
+        private Long p5;
+
+        @JsonProperty("p50_bytes")
+        private Long p50;
+
+        @JsonProperty("p95_bytes")
+        private Long p95;
+
+        @JsonProperty("p5_mb")
+        private Double p5Mb;
+
+        @JsonProperty("p50_mb")
+        private Double p50Mb;
+
+        @JsonProperty("p95_mb")
+        private Double p95Mb;
+    }
+}

src/main/java/ru/soune/nocopy/dto/statistic/SubscriberStatisticRequest.java

@@ -0,0 +1,7 @@
+package ru.soune.nocopy.dto.statistic;
+
+import lombok.Data;
+
+@Data
+public class SubscriberStatisticRequest {
+}

src/main/java/ru/soune/nocopy/dto/statistic/SubscriberStatisticResponse.java

@@ -0,0 +1,42 @@
+package ru.soune.nocopy.dto.statistic;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class SubscriberStatisticResponse {
+
+    @JsonProperty("monthly")
+    private PeriodStatistics monthly;
+
+    @JsonProperty("yearly")
+    private PeriodStatistics yearly;
+
+    @Data
+    @Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class PeriodStatistics {
+
+        @JsonProperty("current_active_subscriptions")
+        private Long currentActiveSubscriptions;
+
+        @JsonProperty("first_time_subscriptions")
+        private Long firstTimeSubscriptions;
+
+        @JsonProperty("renewals")
+        private Long renewals;
+
+        @JsonProperty("upgrades")
+        private Long upgrades;
+
+        @JsonProperty("downgrades")
+        private Long downgrades;
+    }
+}

src/main/java/ru/soune/nocopy/dto/statistic/TariffStatisticFullResponse.java

@@ -0,0 +1,17 @@
+package ru.soune.nocopy.dto.statistic;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TariffStatisticFullResponse {
+
+    @JsonProperty("tariffs")
+    private List<TariffStatisticResponse> tariffs;
+}

src/main/java/ru/soune/nocopy/dto/statistic/TariffStatisticRequest.java

@@ -0,0 +1,14 @@
+package ru.soune.nocopy.dto.statistic;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
+public class TariffStatisticRequest {
+
+    @JsonProperty("company_only")
+    private Boolean companyOnly = false;
+
+    @JsonProperty("active_only")
+    private Boolean activeOnly = true;
+}

src/main/java/ru/soune/nocopy/dto/statistic/TariffStatisticResponse.java

@@ -0,0 +1,21 @@
+package ru.soune.nocopy.dto.statistic;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TariffStatisticResponse {
+
+    @JsonProperty("tariff_name")
+    private String tariffName;
+
+    @JsonProperty("user_count")
+    private Long userCount;
+
+    @JsonProperty("usage_percent")
+    private Double usagePercent;
+}

src/main/java/ru/soune/nocopy/dto/statistic/TokenStatisticRequest.java

@@ -0,0 +1,7 @@
+package ru.soune.nocopy.dto.statistic;
+
+import lombok.Data;
+
+@Data
+public class TokenStatisticRequest {
+}

src/main/java/ru/soune/nocopy/dto/statistic/TokenStatisticResponse.java

@@ -0,0 +1,40 @@
+package ru.soune.nocopy.dto.statistic;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class TokenStatisticResponse {
+
+    @JsonProperty("total_bought")
+    private Long totalBought;
+
+    @JsonProperty("total_spent")
+    private Long totalSpent;
+
+    @JsonProperty("bought_per_user")
+    private Percentiles boughtPerUser;
+
+    @JsonProperty("spent_per_user")
+    private Percentiles spentPerUser;
+
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class Percentiles {
+        @JsonProperty("p5")
+        private Long p5;
+
+        @JsonProperty("p50")
+        private Long p50;
+
+        @JsonProperty("p95")
+        private Long p95;
+    }
+}

src/main/java/ru/soune/nocopy/dto/statistic/UserDynamicStatisticRequest.java

@@ -0,0 +1,7 @@
+package ru.soune.nocopy.dto.statistic;
+
+import lombok.Data;
+
+@Data
+public class UserDynamicStatisticRequest {
+}

src/main/java/ru/soune/nocopy/dto/statistic/UserDynamicStatisticResponse.java

@@ -0,0 +1,33 @@
+package ru.soune.nocopy.dto.statistic;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.NoArgsConstructor;
+
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class UserDynamicStatisticResponse {
+
+    @JsonProperty("total_users")
+    private Long totalUsers;
+
+    @JsonProperty("new_last_30_days")
+    private Long newLast30Days;
+
+    @JsonProperty("new_previous_30_days")
+    private Long newPrevious30Days;
+
+    @JsonProperty("growth_percent")
+    private Double growthPercent;
+
+    @JsonProperty("new_current_month")
+    private Long newCurrentMonth;
+
+    @JsonProperty("new_previous_month")
+    private Long newPreviousMonth;
+
+    @JsonProperty("month_growth_percent")
+    private Double monthGrowthPercent;
+}

src/main/java/ru/soune/nocopy/dto/statistic/UserFilesStatisticRequest.java

@@ -0,0 +1,13 @@
+package ru.soune.nocopy.dto.statistic;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
+public class UserFilesStatisticRequest {
+    @JsonProperty("top")
+    int topUsers;
+
+    @JsonProperty("type")
+    String fileMimeType;
+}

src/main/java/ru/soune/nocopy/dto/statistic/UserFilesStatisticResponse.java

@@ -0,0 +1,19 @@
+package ru.soune.nocopy.dto.statistic;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
+public class UserFilesStatisticResponse {
+    @JsonProperty("full_name")
+    private final String userName;
+
+    @JsonProperty("user_id")
+    private final long userId;
+
+    @JsonProperty("count")
+    private final int countFiles;
+
+    @JsonProperty("files_size")
+    private final long fileSize;
+}

src/main/java/ru/soune/nocopy/dto/statistic/ViolationStatisticRequest.java

@@ -0,0 +1,7 @@
+package ru.soune.nocopy.dto.statistic;
+
+import lombok.Data;
+
+@Data
+public class ViolationStatisticRequest {
+}

src/main/java/ru/soune/nocopy/dto/statistic/ViolationStatisticResponse.java

@@ -0,0 +1,32 @@
+package ru.soune.nocopy.dto.statistic;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ViolationStatisticResponse {
+
+    @JsonProperty("total_violations")
+    private Long totalViolations;
+
+    @JsonProperty("total_complaints")
+    private Long totalComplaints;
+
+    @JsonProperty("total_law_cases")
+    private Long totalLawCases;
+
+    @JsonProperty("complaints_without_case")
+    private Long complaintsWithoutCase;
+
+    @JsonProperty("violations_with_complaint")
+    private Long violationsWithComplaint;
+
+    @JsonProperty("violations_without_complaint")
+    private Long violationsWithoutComplaint;
+}

src/main/java/ru/soune/nocopy/dto/tarriff/TariffDTO.java

@@ -16,4 +16,6 @@ public class TariffDTO {
     private int maxFilesCount;
     private Long diskSize;
     private Long maxUsers;
+    private String tariffTerm;
+    private String description;
 }

src/main/java/ru/soune/nocopy/dto/tarriff/TariffRequest.java

@@ -24,29 +24,45 @@ public class TariffRequest {
     @JsonProperty("tariff_name")
     private String name;
 
-    @Min(value = 0, message = "Price cannot be negative")
     @JsonProperty("tariff_price")
-    private double price;
+    private Double price;
 
-    @Min(value = 0, message = "Tokens must be at least 0")
     @JsonProperty("tariff_tokens")
-    private int tokens;
+    private Integer tokens;
 
-    @Min(value = 0, message = "Max files count must be at least 0")
     @JsonProperty("max_files")
-    private int maxFilesCount;
+    private Integer maxFilesCount;
 
-    @Min(value = 0, message = "Disk size must be at least 0")
     @JsonProperty("disk_size")
-    private int diskSize;
+    private Long diskSize;
 
-    @Min(value = 0, message = "Max users must be at least 0")
     @JsonProperty("max_users")
-    private int maxUsers;
+    private Long maxUsers;
 
     @JsonProperty("action")
     private String action;
 
     @JsonProperty("user_token")
     private String userToken;
+
+    @JsonProperty("tariff_term")
+    private String tariffTerm;
+
+    @JsonProperty("description")
+    private String description;
+
+    @JsonProperty("account_type")
+    private String accountType;
+
+    @JsonProperty("page")
+    private Integer page;
+
+    @JsonProperty("page_size")
+    private Integer size;
+
+    @JsonProperty("sort_by")
+    private String sortBy;
+
+    @JsonProperty("sort_direction")
+    private String sortDirection = "desc";
 }

src/main/java/ru/soune/nocopy/dto/tarriff/TariffResponse.java

@@ -1,12 +1,41 @@
 package ru.soune.nocopy.dto.tarriff;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Builder;
 import lombok.Data;
-import ru.soune.nocopy.entity.tarif.Tariff;
+
+import java.util.List;
 
 @Data
 @Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class TariffResponse {
+    @JsonProperty("tariff_name")
     private String tariffName;
+
+    @JsonProperty("type")
     private String tariffType;
+
+    @JsonProperty("page")
+    private Integer page;
+
+    @JsonProperty("page_size")
+    private Integer pageSize;
+
+    @JsonProperty("sort_by")
+    private String sortBy;
+
+    @JsonProperty("sort_direction")
+    private String sortDirection;
+
+    @JsonProperty("total_pages")
+    private Integer totalPages;
+
+    @JsonProperty("total_elements")
+    private Long totalElements;
+
+    @JsonProperty("tariffs")
+    private List<TariffDTO> tariffs;
 }

src/main/java/ru/soune/nocopy/dto/tokenoperation/TokenOperationPageDto.java

@@ -0,0 +1,34 @@
+package ru.soune.nocopy.dto.tokenoperation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Builder;
+import lombok.Data;
+import ru.soune.nocopy.entity.tokenoperation.TokenOperation;
+
+import java.util.List;
+
+@Data
+@Builder
+public class TokenOperationPageDto {
+
+    @JsonProperty("content")
+    private List<TokenOperation> content;
+
+    @JsonProperty("page_number")
+    private int pageNumber;
+
+    @JsonProperty("page_size")
+    private int pageSize;
+
+    @JsonProperty("total_elements")
+    private long totalElements;
+
+    @JsonProperty("total_pages")
+    private int totalPages;
+
+    @JsonProperty("is_last")
+    private boolean last;
+
+    @JsonProperty("is_first")
+    private boolean first;
+}

src/main/java/ru/soune/nocopy/dto/tokenoperation/TokenOperationRequest.java

@@ -0,0 +1,43 @@
+package ru.soune.nocopy.dto.tokenoperation;
+
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import ru.soune.nocopy.entity.tokenoperation.OperationType;
+
+@Data
+public class TokenOperationRequest {
+
+    @JsonProperty("action")
+    private String action;
+
+    @JsonProperty("operation_id")
+    private Long operationId;
+
+    @JsonProperty("operation_type")
+    private OperationType operationType;
+
+    @JsonProperty("spent")
+    private Long spent;
+
+    @JsonProperty("page")
+    private Integer page = 0;
+
+    @JsonProperty("size")
+    private Integer size = 20;
+
+    @JsonProperty("sort_by")
+    private String sortBy = "createdAt";
+
+    @JsonProperty("sort_direction")
+    private String sortDirection = "desc";
+
+    @JsonProperty("min_spent")
+    private Long minSpent;
+
+    @JsonProperty("max_spent")
+    private Long maxSpent;
+
+    @JsonProperty("updates")
+    private Object updates;
+}

src/main/java/ru/soune/nocopy/dto/tokenoperation/TokenOperationResponse.java

@@ -0,0 +1,37 @@
+package ru.soune.nocopy.dto.tokenoperation;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.Map;
+
+@Data
+@Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class TokenOperationResponse {
+
+    @JsonProperty("success")
+    private Boolean success;
+
+    @JsonProperty("message")
+    private String message;
+
+    @JsonProperty("data")
+    private Object data;
+
+    @JsonProperty("total_elements")
+    private Long totalElements;
+
+    @JsonProperty("total_pages")
+    private Integer totalPages;
+
+    @JsonProperty("current_page")
+    private Integer currentPage;
+
+    @JsonProperty("page_size")
+    private Integer pageSize;
+
+    @JsonProperty("statistics")
+    private Map<String, Object> statistics;
+}

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

@@ -0,0 +1,56 @@
+package ru.soune.nocopy.dto.user;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import ru.soune.nocopy.entity.user.SubscriptionType;
+
+import java.time.LocalDate;
+
+@Data
+public class UserAdditionalInfoBody {
+
+    @JsonProperty("action")
+    private String action;
+
+    @JsonProperty("user_id")
+    private Long userId;
+
+    @JsonProperty("ip_address")
+    private String ipAddress;
+
+    @JsonProperty("user_agent")
+    private String userAgent;
+
+    @JsonProperty("page")
+    private int page = 0;
+
+    @JsonProperty("size")
+    private int size = 5;
+
+    @JsonProperty("sort_by")
+    private String sortBy;
+
+    @JsonProperty("sort_direction")
+    private String sortDirection = "desc";
+
+    @JsonProperty("full_name")
+    private String fullName;
+
+    @JsonProperty("email")
+    private String email;
+
+    @JsonProperty("is_active")
+    private Boolean isActive;
+
+    @JsonProperty("email_verified")
+    private Boolean emailVerified;
+
+    @JsonProperty("sub_type")
+    private SubscriptionType subscriptionType;
+
+    @JsonProperty("date_from")
+    private LocalDate dateFrom;
+
+    @JsonProperty("date_to")
+    private LocalDate dateTo;
+}

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

@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
 import ru.soune.nocopy.dto.tarriff.TariffDTO;
 import ru.soune.nocopy.dto.tarriff.TariffInfoDTO;
 import ru.soune.nocopy.entity.user.GenderType;
+import ru.soune.nocopy.entity.user.ModerationStatus;
 import ru.soune.nocopy.entity.user.SubscriptionType;
 
 import java.time.LocalDate;
@@ -26,8 +27,9 @@ public class UserDTO {
     private GenderType genderType;
     private LocalDate birthday;
     private LocalDateTime createdAt;
-    private SubscriptionType subscriptionType;
+    private String subscriptionType;
     private List<TariffDTO> tariffs;
     private TariffInfoDTO tariffInfo;
     private Long permission;
+    private ModerationStatus verifiedStatus;
 }

src/main/java/ru/soune/nocopy/dto/user/moderation/UserVerificationRequest.java

@@ -0,0 +1,22 @@
+package ru.soune.nocopy.dto.user.moderation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
+public class UserVerificationRequest {
+    @JsonProperty("message")
+    private String message;
+
+    @JsonProperty("user_id")
+    private Long userId;
+
+    @JsonProperty("verified")
+    private Boolean verified;
+
+    @JsonProperty("admin_id")
+    private Long adminId;
+
+    @JsonProperty("action")
+    private String action;
+}

src/main/java/ru/soune/nocopy/dto/user/moderation/UserVerificationResponse.java

@@ -0,0 +1,15 @@
+package ru.soune.nocopy.dto.user.moderation;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@Builder
+public class UserVerificationResponse {
+    private Long userVerificationId;
+    private Long userId;
+    private LocalDateTime updateTime;
+    private String moderationStatus;
+}

src/main/java/ru/soune/nocopy/dto/violation/FileViolationSummaryDTO.java

@@ -18,5 +18,7 @@ public class FileViolationSummaryDTO {
     private FileStatus status;
     private LocalDateTime createdAt;
     private long violationCount;
+    private long countLawCase;
+    private long countComplaint;
     private LocalDateTime latestViolationDate;
 }

src/main/java/ru/soune/nocopy/dto/violation/ViolationNotionRequest.java

@@ -1,12 +1,20 @@
 package ru.soune.nocopy.dto.violation;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 @Data
 public class ViolationNotionRequest {
-    private String token;
+
+    @JsonProperty("action")
     private String action;
+
+    @JsonProperty("violation_id")
     private Long violationId;
+
+    @JsonProperty("notion_id")
     private Long notionId;
+
+    @JsonProperty("message")
     private String message;
 }

src/main/java/ru/soune/nocopy/dto/violation/ViolationRequest.java

@@ -10,14 +10,8 @@ public class ViolationRequest {
     @JsonProperty("file_id")
     private String fileId;
 
-    @JsonProperty("page")
+    @JsonProperty("violation_id")
-    private Integer page = 0;
+    private Long violationId;
-
-    @JsonProperty("size")
-    private Integer size = 10;
-
-    @JsonProperty("sort_direction")
-    private String sortDirection = "desc";
 
     @JsonProperty("status")
     private String status;
@@ -28,12 +22,22 @@ public class ViolationRequest {
     @JsonProperty("end_date")
     private String endDate;
 
-    @JsonProperty("group_by")
-    private String groupBy;
-
     @JsonProperty("action")
     private String action;
 
-    @JsonProperty("token")
+    @JsonProperty("file_name")
-    private String token;
+    private String fileName = null;
+
+    @JsonProperty("page")
+    private Integer page = 0;
+
+    @JsonProperty("size")
+    private Integer size = 10;
+
+    @JsonProperty("sort_direction")
+    private String sortDirection = "desc";
+
+    @JsonProperty("group_by")
+    private String groupBy;
+
 }

src/main/java/ru/soune/nocopy/dto/violation/ViolationResponse.java

@@ -58,6 +58,12 @@ public class ViolationResponse {
         @JsonProperty("created_date")
         private LocalDateTime createdDate;
 
+        @JsonProperty("country")
+        private String country;
+
+        @JsonProperty("country_code")
+        private String countryCode;
+
         @JsonProperty("file_id")
         private String fileId;
 

src/main/java/ru/soune/nocopy/dto/violation/ViolationStatisticsRequest.java

@@ -6,9 +6,6 @@ import lombok.Data;
 @Data
 public class ViolationStatisticsRequest {
 
-    @JsonProperty("token")
-    private String token;
-
     @JsonProperty("file_id")
     private String fileId;
 

src/main/java/ru/soune/nocopy/dto/violation/ViolationStatisticsResponse.java

@@ -14,6 +14,12 @@ public class ViolationStatisticsResponse {
     @JsonProperty("new_violations")
     private long newViolations;
 
+    @JsonProperty("total_complaints")
+    private Long totalComplaints;
+
+    @JsonProperty("total_law_cases")
+    private Long totalLawCases;
+
     @JsonProperty("in_progress_violations")
     private long inProgressViolations;
 

src/main/java/ru/soune/nocopy/entity/company/Company.java

@@ -51,7 +51,7 @@ public class Company {
     @ToString.Exclude
     private List<User> users = new ArrayList<>();
 
-    @OneToOne(cascade = CascadeType.ALL)
+    @OneToOne(cascade = CascadeType.MERGE)
     @JoinColumn(name = "tariff_info_id")
     private TariffInfo tariffInfo;
 }

src/main/java/ru/soune/nocopy/entity/complaint/ComplaintEntity.java

@@ -0,0 +1,60 @@
+package ru.soune.nocopy.entity.complaint;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import jakarta.persistence.*;
+import lombok.*;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+import ru.soune.nocopy.entity.violation.Violation;
+
+import java.time.LocalDateTime;
+
+@Entity
+@Table(name = "complaint")
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Getter @Setter
+@EntityListeners(AuditingEntityListener.class)
+public class ComplaintEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(name = "status")
+    @Enumerated(EnumType.STRING)
+    private ComplaintStatus status;
+
+    @Column(name = "complaint_text", columnDefinition = "TEXT")
+    private String complaintText;
+
+    @Column(name = "email")
+    private String email;
+
+    @OneToOne(cascade = CascadeType.ALL)
+    @JoinColumn(name = "violation_id")
+    @ToString.Exclude
+    @JsonIgnore
+    private Violation violation;
+
+    @Column(name = "created_at", updatable = false)
+    @CreatedDate
+    private LocalDateTime createdAt;
+
+    @Column(name = "updated_at")
+    @LastModifiedDate
+    private LocalDateTime updatedAt;
+
+    @Column(name = "not_moderated_file")
+    private Boolean not_moderated_file;
+
+    @PrePersist
+    public void prePersist() {
+        if (this.createdAt == null) {
+            this.createdAt = LocalDateTime.now();
+        }
+        this.updatedAt = LocalDateTime.now();
+    }
+}

src/main/java/ru/soune/nocopy/entity/complaint/ComplaintStatus.java

@@ -0,0 +1,5 @@
+package ru.soune.nocopy.entity.complaint;
+
+public enum ComplaintStatus {
+    CREATED, SHOWED, IN_WORK, COMPLETED, CANCELLED
+}

src/main/java/ru/soune/nocopy/entity/complaint/LawCase.java

@@ -0,0 +1,67 @@
+package ru.soune.nocopy.entity.complaint;
+
+import jakarta.persistence.*;
+import lombok.*;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedDate;
+import ru.soune.nocopy.entity.user.User;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@Getter @Setter
+@Table(name = "law_case")
+public class LawCase {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id", nullable = false)
+    @ToString.Exclude
+    private User user;
+
+    @Column(name = "name")
+    private String name;
+
+    @Column(length = 500, name = "description")
+    private String description;
+
+    @Column(name = "amount")
+    private BigDecimal amount;
+
+    @Column(name = "priority")
+    @Enumerated(EnumType.STRING)
+    private LawCasePriority priority;
+
+    @Column(name = "type")
+    @Enumerated(EnumType.STRING)
+    private LawCaseType type = LawCaseType.ACTIVE;
+
+    @CreatedDate
+    @Column(name = "created_at", updatable = false)
+    private LocalDateTime createdAt;
+
+    @LastModifiedDate
+    @Column(name = "updated_at")
+    private LocalDateTime updatedAt;
+
+    @Column(name = "lawyer")
+    private String lawyer;
+
+    @Column(name = "violation_id")
+    private Long violationId;
+
+    @PrePersist
+    public void prePersist() {
+        if (this.createdAt == null) {
+            this.createdAt = LocalDateTime.now();
+        }
+        this.updatedAt = LocalDateTime.now();
+    }
+}

src/main/java/ru/soune/nocopy/entity/complaint/LawCasePriority.java

@@ -0,0 +1,12 @@
+package ru.soune.nocopy.entity.complaint;
+
+public enum LawCasePriority {
+   CRITICAL("critical"), HIGH("high"),
+    MIDDLE("middle"), LOW("low");
+
+   private String name;
+
+   private LawCasePriority(String name) {
+       this.name = name;
+   }
+}

src/main/java/ru/soune/nocopy/entity/complaint/LawCaseType.java

@@ -0,0 +1,15 @@
+package ru.soune.nocopy.entity.complaint;
+
+import lombok.Getter;
+
+@Getter
+public enum LawCaseType {
+    ACTIVE("active"), CLOSED("closed"),
+    COMPLETED("completed");
+
+    private String name;
+
+    private LawCaseType(String name) {
+        this.name = name;
+    }
+}

src/main/java/ru/soune/nocopy/entity/docviewer/DockView.java

@@ -0,0 +1,48 @@
+package ru.soune.nocopy.entity.docviewer;
+
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+@Table(name = "dock_view")
+@RequiredArgsConstructor
+@AllArgsConstructor
+@Entity
+@Setter @Getter
+public class DockView {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(name = "viewer_id")
+    private Long viewerId;
+
+    @Column(name = "viewer_ip")
+    private String viewerIp;
+
+    @Column(name = "user_agent")
+    private String userAgent;
+
+    @Column(name = "file_id")
+    private String fileId;
+
+    @Column(name = "geo_name_ru")
+    private String geoNameRu;
+
+    @Column(name = "geo_name_en")
+    private String geoNameEn;
+
+    @Column(name = "viewer_name")
+    private String viewerName;
+
+    @Column(name = "document_name")
+    private String docName;
+
+    @Column(name = "created_at",updatable = false)
+    private LocalDateTime createdAt = LocalDateTime.now();
+}

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

@@ -0,0 +1,9 @@
+package ru.soune.nocopy.entity.file;
+
+public enum AppealStatus {
+    PENDING,
+    IN_REVIEW,
+    APPROVED,
+    REJECTED,
+    EXPIRED
+}