dev add notification entity
Test Workflow / test (push) Successful in 14s

This commit is contained in:
vladp
2026-04-01 11:43:06 +07:00
parent 9a3a8bde05
commit 549d248cb7
2 changed files with 16 additions and 20 deletions
@@ -12,21 +12,17 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder; 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 @Configuration
@EnableAutoConfiguration @EnableAutoConfiguration
@AllArgsConstructor @AllArgsConstructor
public class ApplicationConfig { public class ApplicationConfig {
private final FileEntityRepository fileEntityRepository; // private final FileEntityRepository fileEntityRepository;
private final FileUtil fileUtil; // private final FileUtil fileUtil;
@Bean @Bean
PasswordEncoder passwordEncoder() { PasswordEncoder passwordEncoder() {
@@ -44,11 +40,11 @@ public class ApplicationConfig {
AudioFilePathProvider audioFilePathProvider, AudioFilePathProvider audioFilePathProvider,
DocumentLocalSearch documentLocalSearch) { DocumentLocalSearch documentLocalSearch) {
List<FileProtector.FileInfo> initialFiles = loadProcessingFile(); // List<FileProtector.FileInfo> initialFiles = loadProcessingFile();
//TODO инициализация файлов при создании //TODO инициализация файлов при создании
return new com.vrt.NoCopyFileService( return new com.vrt.NoCopyFileService(
initialFiles, Collections.emptyList(),
fileProvider, fileProvider,
processingListener, processingListener,
imageUniqueCheck, imageUniqueCheck,
@@ -59,12 +55,12 @@ public class ApplicationConfig {
); );
} }
private List<FileProtector.FileInfo> loadProcessingFile() { // private List<FileProtector.FileInfo> loadProcessingFile() {
List<FileEntity> byProtectionStatus = // List<FileEntity> byProtectionStatus =
fileEntityRepository.findByProtectionStatus(ProtectionStatus.PROCESSING); // fileEntityRepository.findByProtectionStatus(ProtectionStatus.PROCESSING);
//
return byProtectionStatus.stream().map(fileEntity -> // return byProtectionStatus.stream().map(fileEntity ->
fileUtil.createFileInfo(fileEntity, null)).toList(); // fileUtil.createFileInfo(fileEntity, null)).toList();
} // }
} }
@@ -78,11 +78,11 @@ public class FileEntityService {
.map(User::getId) .map(User::getId)
.toList()) { .toList()) {
allFiles.addAll(fileEntityRepository.findByUserIdAndStatusIn(uId, allFiles.addAll(fileEntityRepository.findByUserIdAndStatusIn(uId,
List.of(FileStatus.ACTIVE, FileStatus.BLOCKED))); List.of(FileStatus.ACTIVE, FileStatus.BLOCKED, FileStatus.MODERATION)));
} }
} else { } else {
allFiles = fileEntityRepository.findByUserIdAndStatusIn(userId, allFiles = fileEntityRepository.findByUserIdAndStatusIn(userId,
List.of(FileStatus.ACTIVE, FileStatus.BLOCKED)); List.of(FileStatus.ACTIVE, FileStatus.BLOCKED, FileStatus.MODERATION));
} }
return allFiles; return allFiles;
@@ -98,12 +98,12 @@ public class FileEntityService {
.map(User::getId) .map(User::getId)
.toList()) { .toList()) {
allFiles.addAll(fileEntityRepository.findByUserIdAndStatusIn(uId, allFiles.addAll(fileEntityRepository.findByUserIdAndStatusIn(uId,
List.of(FileStatus.ACTIVE, FileStatus.BLOCKED))); List.of(FileStatus.ACTIVE, FileStatus.BLOCKED, FileStatus.MODERATION)));
} }
} else { } else {
allFiles = fileEntityRepository.findByUserIdAndStatusIn(userId, allFiles = fileEntityRepository.findByUserIdAndStatusIn(userId,
List.of(FileStatus.ACTIVE, FileStatus.BLOCKED)); List.of(FileStatus.ACTIVE, FileStatus.BLOCKED, FileStatus.MODERATION));
} }
int start = (page - 1) * pageSize; int start = (page - 1) * pageSize;