From 549d248cb76e27339ab17f9bccaeea663351e082 Mon Sep 17 00:00:00 2001
From: vladp <vlad.popovtsevv@gmail.com>
Date: Wed, 1 Apr 2026 11:43:06 +0700
Subject: [PATCH] dev add notification entity

---
 .../configuration/ApplicationConfig.java      | 28 ++++++++-----------
 .../service/file/FileEntityService.java       |  8 +++---
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/main/java/ru/soune/nocopy/configuration/ApplicationConfig.java b/src/main/java/ru/soune/nocopy/configuration/ApplicationConfig.java
index 92598e7..b33c275 100644
--- a/src/main/java/ru/soune/nocopy/configuration/ApplicationConfig.java
+++ b/src/main/java/ru/soune/nocopy/configuration/ApplicationConfig.java
@@ -12,21 +12,17 @@ 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 ru.soune.nocopy.entity.file.FileEntity;
-import ru.soune.nocopy.entity.file.ProtectionStatus;
-import ru.soune.nocopy.repository.FileEntityRepository;
-import ru.soune.nocopy.util.FileUtil;
 
-import java.util.List;
+import java.util.Collections;
 
 @Configuration
 @EnableAutoConfiguration
 @AllArgsConstructor
 public class ApplicationConfig {
 
-    private final FileEntityRepository fileEntityRepository;
+//    private final FileEntityRepository fileEntityRepository;
 
-    private final FileUtil fileUtil;
+//    private final FileUtil fileUtil;
 
     @Bean
     PasswordEncoder passwordEncoder() {
@@ -44,11 +40,11 @@ public class ApplicationConfig {
             AudioFilePathProvider audioFilePathProvider,
             DocumentLocalSearch documentLocalSearch) {
 
-        List<FileProtector.FileInfo> initialFiles = loadProcessingFile();
+//        List<FileProtector.FileInfo> initialFiles = loadProcessingFile();
 
         //TODO инициализация файлов при создании
         return new com.vrt.NoCopyFileService(
-                initialFiles,
+                Collections.emptyList(),
                 fileProvider,
                 processingListener,
                 imageUniqueCheck,
@@ -59,12 +55,12 @@ public class ApplicationConfig {
         );
     }
 
-    private List<FileProtector.FileInfo> loadProcessingFile() {
-        List<FileEntity> byProtectionStatus =
-                fileEntityRepository.findByProtectionStatus(ProtectionStatus.PROCESSING);
-
-        return byProtectionStatus.stream().map(fileEntity ->
-                fileUtil.createFileInfo(fileEntity, null)).toList();
-    }
+//    private List<FileProtector.FileInfo> loadProcessingFile() {
+//        List<FileEntity> byProtectionStatus =
+//                fileEntityRepository.findByProtectionStatus(ProtectionStatus.PROCESSING);
+//
+//        return byProtectionStatus.stream().map(fileEntity ->
+//                fileUtil.createFileInfo(fileEntity, null)).toList();
+//    }
 }
 
diff --git a/src/main/java/ru/soune/nocopy/service/file/FileEntityService.java b/src/main/java/ru/soune/nocopy/service/file/FileEntityService.java
index 757d693..bb70f14 100644
--- a/src/main/java/ru/soune/nocopy/service/file/FileEntityService.java
+++ b/src/main/java/ru/soune/nocopy/service/file/FileEntityService.java
@@ -78,11 +78,11 @@ public class FileEntityService {
                     .map(User::getId)
                     .toList()) {
                 allFiles.addAll(fileEntityRepository.findByUserIdAndStatusIn(uId,
-                        List.of(FileStatus.ACTIVE, FileStatus.BLOCKED)));
+                        List.of(FileStatus.ACTIVE, FileStatus.BLOCKED, FileStatus.MODERATION)));
             }
         } else {
             allFiles = fileEntityRepository.findByUserIdAndStatusIn(userId,
-                    List.of(FileStatus.ACTIVE, FileStatus.BLOCKED));
+                    List.of(FileStatus.ACTIVE, FileStatus.BLOCKED, FileStatus.MODERATION));
         }
 
         return allFiles;
@@ -98,12 +98,12 @@ public class FileEntityService {
                     .map(User::getId)
                     .toList()) {
                 allFiles.addAll(fileEntityRepository.findByUserIdAndStatusIn(uId,
-                        List.of(FileStatus.ACTIVE, FileStatus.BLOCKED)));
+                        List.of(FileStatus.ACTIVE, FileStatus.BLOCKED, FileStatus.MODERATION)));
             }
 
         } else {
             allFiles = fileEntityRepository.findByUserIdAndStatusIn(userId,
-                    List.of(FileStatus.ACTIVE, FileStatus.BLOCKED));
+                    List.of(FileStatus.ACTIVE, FileStatus.BLOCKED, FileStatus.MODERATION));
         }
 
         int start = (page - 1) * pageSize;