backdev/no-copy
1
0
Fork 0
Code Issues Pull Requests 5 Actions Packages Projects Releases Wiki Activity

dev change sort user all files
Test Workflow / test (push) Successful in 5s
Details

Browse Source
This commit is contained in:
vladp
2026-04-13 17:16:32 +07:00
parent b859b175f0
commit 40c9b2a796
4 changed files with 132 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/ru/soune/nocopy/entity/file/FileEntity.java
+6
View File
@@ -6,8 +6,10 @@ 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.monitoring.FileMonitoringEntity;
import java.time.LocalDateTime;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
@Data
@@ -94,6 +96,10 @@ public class FileEntity {
@JsonIgnore
private ImageHashEntity imageHash;
@OneToMany(mappedBy = "file", fetch = FetchType.LAZY)
@JsonIgnore
private List<FileMonitoringEntity> monitorings;
@PrePersist
public void prePersist() {
if (this.supportId == null) {
src/main/java/ru/soune/nocopy/handler/FileEntityHandler.java
+79 -34
View File
@@ -4,6 +4,9 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Component;
import ru.soune.nocopy.dto.*;
import ru.soune.nocopy.dto.file.*;
@@ -230,46 +233,21 @@ public class FileEntityHandler implements RequestHandler {
Long userId = authService.useUserAuthToken(fileRequest.getToken());
int page = fileRequest.getPage() != null ? fileRequest.getPage() : 1;
int pageSize = fileRequest.getPageSize() != null ? fileRequest.getPageSize() : 20;
String sortBy = fileRequest.getSortBy() != null ? fileRequest.getSortBy() : "fileName";
SortOrder sortOrder = SortOrder.fromString(fileRequest.getSortOrder());
FileResponse allFiles = fileEntityService.getUserFiles(userId, 1, 1000, request.getVersion());
String searchQuery = fileRequest.getQuery() != null ? fileRequest.getQuery().toLowerCase().trim() : "";
String[] searchTerms = searchQuery.split("\\s+");
String filterType = fileRequest.getType();
String dateFilter = fileRequest.getDateFilter();
List<FileEntityResponse> filteredFiles = allFiles.getFiles().stream()
.filter(f -> matchesSearch(f, searchTerms, searchQuery, filterType))
.filter(f -> matchesDateFilter(f, dateFilter))
.collect(Collectors.toList());
Comparator<FileEntityResponse> comparator = getComparator(sortBy, sortOrder);
filteredFiles.sort(comparator);
int start = (page - 1) * pageSize;
int end = Math.min(start + pageSize, filteredFiles.size());
if (start >= filteredFiles.size()) {
return createEmptyResponse(request, page, pageSize, sortBy, sortOrder.getValue());
}
List<FileEntityResponse> paginatedFiles = filteredFiles.subList(start, end);
long totalSize = paginatedFiles.stream()
.mapToLong(FileEntityResponse::getFileSize)
.sum();
Sort sort = Sort.by(fileRequest.getSortOrder().equalsIgnoreCase("desc") ? Sort.Direction.DESC :
Sort.Direction.ASC, sortBy);
Pageable pageable = PageRequest.of(page, pageSize, sort);
FileResponse userFiles = fileEntityService.getUserFiles(userId, pageable, request.getVersion());
FileListResponse response = FileListResponse.builder()
.files(paginatedFiles)
.totalCount(filteredFiles.size())
.totalSize(totalSize)
.formattedTotalSize(fileEntityService.formatFileSize(totalSize))
.files(userFiles.getFiles())
.totalCount(userFiles.getTotalCount())
.totalSize(userFiles.getTotalSize())
.formattedTotalSize(fileEntityService.formatFileSize(userFiles.getTotalSize()))
.page(page)
.pageSize(pageSize)
.sortBy(sortBy)
.sortOrder(sortOrder.getValue())
.sortOrder(fileRequest.getSortOrder())
.build();
return new BaseResponse(request.getMsgId(),
@@ -289,6 +267,73 @@ public class FileEntityHandler implements RequestHandler {
}
}
/**
*
* private BaseResponse handleSearchFiles(BaseRequest request, FileEntityRequest fileRequest) {
* try {
* Long userId = authService.useUserAuthToken(fileRequest.getToken());
* int page = fileRequest.getPage() != null ? fileRequest.getPage() : 1;
* int pageSize = fileRequest.getPageSize() != null ? fileRequest.getPageSize() : 20;
*
* String sortBy = fileRequest.getSortBy() != null ? fileRequest.getSortBy() : "fileName";
* SortOrder sortOrder = SortOrder.fromString(fileRequest.getSortOrder());
*
* FileResponse allFiles = fileEntityService.getUserFiles(userId, 1, 1000, request.getVersion());
*
* String searchQuery = fileRequest.getQuery() != null ? fileRequest.getQuery().toLowerCase().trim() : "";
* String[] searchTerms = searchQuery.split("\\s+");
* String filterType = fileRequest.getType();
* String dateFilter = fileRequest.getDateFilter();
*
* List<FileEntityResponse> filteredFiles = allFiles.getFiles().stream()
* .filter(f -> matchesSearch(f, searchTerms, searchQuery, filterType))
* .filter(f -> matchesDateFilter(f, dateFilter))
* .collect(Collectors.toList());
*
* Comparator<FileEntityResponse> comparator = getComparator(sortBy, sortOrder);
* filteredFiles.sort(comparator);
*
* int start = (page - 1) * pageSize;
* int end = Math.min(start + pageSize, filteredFiles.size());
*
* if (start >= filteredFiles.size()) {
* return createEmptyResponse(request, page, pageSize, sortBy, sortOrder.getValue());
* }
*
* List<FileEntityResponse> paginatedFiles = filteredFiles.subList(start, end);
* long totalSize = paginatedFiles.stream()
* .mapToLong(FileEntityResponse::getFileSize)
* .sum();
*
* FileListResponse response = FileListResponse.builder()
* .files(paginatedFiles)
* .totalCount(filteredFiles.size())
* .totalSize(totalSize)
* .formattedTotalSize(fileEntityService.formatFileSize(totalSize))
* .page(page)
* .pageSize(pageSize)
* .sortBy(sortBy)
* .sortOrder(sortOrder.getValue())
* .build();
*
* return new BaseResponse(request.getMsgId(),
* MessageCode.SUCCESS.getCode(),
* MessageCode.SUCCESS.getDescription(),
* response);
*
* } catch (NotFoundAuthToken e) {
* return new BaseResponse(request.getMsgId(),
* MessageCode.INVALID_TOKEN.getCode(),
* "Authentication required", null);
* } catch (Exception e) {
* log.error("Error searching files", e);
* return new BaseResponse(request.getMsgId(),
* MessageCode.FILE_UPLOAD_ERROR.getCode(),
* "Failed to search files: " + e.getMessage(), null);
* }
* }
*/
private boolean matchesDateFilter(FileEntityResponse file, String dateFilter) {
if (dateFilter == null || dateFilter.isEmpty()) {
return true;
src/main/java/ru/soune/nocopy/repository/FileEntityRepository.java
+17
View File
@@ -10,6 +10,7 @@ import ru.soune.nocopy.entity.file.FileEntity;
import ru.soune.nocopy.entity.file.FileStatus;
import ru.soune.nocopy.entity.file.ProtectionStatus;
import java.time.LocalDateTime;
import java.util.Collection;
import java.util.List;
import java.util.Optional;
@@ -78,4 +79,20 @@ public interface FileEntityRepository extends JpaRepository<FileEntity, String>
@Query("SELECT f FROM FileEntity f WHERE f.userId = :userId AND f.status IN :statuses")
List<FileEntity> findByStatuses(Long userId, @Param("statuses") List<String> statuses);
@Query("SELECT DISTINCT f FROM FileEntity f " +
"LEFT JOIN FileMonitoringEntity m ON f.id = m.file.id " +
"WHERE f.userId IN :userIds " +
"AND f.status IN :statuses")
Page<FileEntity> findFiles(
@Param("userIds") List<Long> userIds,
@Param("statuses") List<FileStatus> statuses,
Pageable pageable);
@Query("SELECT SUM(f.fileSize) FROM FileEntity f " +
"WHERE f.userId IN :userIds " +
"AND f.status IN :statuses")
Long sumFileSize(
@Param("userIds") List<Long> userIds,
@Param("statuses") List<FileStatus> statuses);
}
src/main/java/ru/soune/nocopy/service/file/FileEntityService.java
+30
View File
@@ -3,6 +3,8 @@ package ru.soune.nocopy.service.file;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import ru.soune.nocopy.dto.file.FileEntityResponse;
@@ -104,6 +106,34 @@ public class FileEntityService {
return allFiles;
}
@Transactional(readOnly = true)
public FileResponse getUserFiles(Long userId, Pageable pageable, int version) {
User user = userRepository.findById(userId).orElseThrow();
List<User> users = user.getCompany() != null ?
userRepository.findByCompanyId(user.getCompany().getId()) : List.of(user);
List<FileStatus> statusesForSearch = List.of(FileStatus.ACTIVE, FileStatus.BLOCKED, FileStatus.MODERATION);
Page<FileEntity> files = fileEntityRepository.findFiles(users.stream().map(User::getId).toList(),
statusesForSearch, pageable);
Long totalSize = fileEntityRepository.sumFileSize(
users.stream().map(User::getId).toList(),
statusesForSearch);
List<FileEntityResponse> filesToResponse = files.stream()
.map(file -> convertToResponse(file, version))
.toList();
return FileResponse.builder()
.files(filesToResponse)
.totalCount((int) files.getTotalElements())
.totalSize(totalSize != null ? totalSize : 0L)
.formattedTotalSize(formatFileSize(totalSize != null ? totalSize : 0L))
.page(pageable.getPageNumber() + 1)
.pageSize(pageable.getPageSize())
.build();
}
@Transactional(readOnly = true)
public FileResponse getUserFiles(Long userId, int page, int pageSize, int version) {
User user = userRepository.findById(userId).orElseThrow();