diff --git a/src/main/java/ru/soune/nocopy/service/file/FileStatsService.java b/src/main/java/ru/soune/nocopy/service/file/FileStatsService.java index 8407ad1..f8994e7 100644 --- a/src/main/java/ru/soune/nocopy/service/file/FileStatsService.java +++ b/src/main/java/ru/soune/nocopy/service/file/FileStatsService.java @@ -25,8 +25,12 @@ public class FileStatsService { private final UserRepository userRepository; + private final FileEntityService fileEntityService; + public FileInfoUserResponse getUserFileStats(Long userId) { - List userFiles = fileEntityRepository.findByUserId(userId); + List userFiles = fileEntityService.getAllUserFiles(userId, List.of(FileStatus.ACTIVE, + FileStatus.BLOCKED, FileStatus.MODERATION)); + return calculateStats(userFiles); } @@ -34,32 +38,24 @@ public class FileStatsService { return FileInfoUserResponse.builder() .allFileSize(calculateTotalSize(files)) .fileCount(calculateTotalCount(files)) - .filesCheck(calculateByStatus(files, FileStatus.CHECKED)) - .filesViolation(calculateByStatus(files, FileStatus.VIOLATION)) +// .filesCheck(calculateByStatus(files, FileStatus.CHECKED)) +// .filesViolation(calculateByStatus(files, FileStatus.VIOLATION)) .protectedFilesCount(protectedUserFiles(files)) .imagesSize(calculateMediaSize(files, FileType.IMAGE)) .imagesCount(calculateMediaCount(files, FileType.IMAGE)) - .imagesCheck(calculateMediaByStatus(files, FileType.IMAGE, FileStatus.CHECKED)) - .imagesViolations(calculateMediaByStatus(files, FileType.IMAGE, FileStatus.VIOLATION)) .protectedImageFilesCount(protectedUserFiles(files, FileType.IMAGE)) .videosSize(calculateMediaSize(files, FileType.VIDEO)) .videosCount(calculateMediaCount(files, FileType.VIDEO)) - .videosCheck(calculateMediaByStatus(files, FileType.VIDEO, FileStatus.CHECKED)) - .videosViolations(calculateMediaByStatus(files, FileType.VIDEO, FileStatus.VIOLATION)) .protectedVideoFilesCount(protectedUserFiles(files, FileType.VIDEO)) .audiosSize(calculateMediaSize(files, FileType.AUDIO)) .audiosCount(calculateMediaCount(files, FileType.AUDIO)) - .audiosCheck(calculateMediaByStatus(files, FileType.AUDIO, FileStatus.CHECKED)) - .audiosViolations(calculateMediaByStatus(files, FileType.AUDIO, FileStatus.VIOLATION)) .protectedAudioFilesCount(protectedUserFiles(files, FileType.AUDIO)) .documentSize(calculateMediaSize(files, FileType.DOCUMENT)) .documentCount(calculateMediaCount(files, FileType.DOCUMENT)) - .documentCheck(calculateMediaByStatus(files, FileType.DOCUMENT, FileStatus.CHECKED)) - .documentViolations(calculateMediaByStatus(files, FileType.DOCUMENT, FileStatus.VIOLATION)) .protectedDocumentFilesCount(protectedUserFiles(files, FileType.DOCUMENT)) .build(); }