@@ -12,6 +12,7 @@ import ru.soune.nocopy.entity.search.SearchStatus;
|
|||||||
import ru.soune.nocopy.repository.FileEntityRepository;
|
import ru.soune.nocopy.repository.FileEntityRepository;
|
||||||
import ru.soune.nocopy.repository.FileMonitoringRepository;
|
import ru.soune.nocopy.repository.FileMonitoringRepository;
|
||||||
import ru.soune.nocopy.repository.GlobalSearchTaskRepository;
|
import ru.soune.nocopy.repository.GlobalSearchTaskRepository;
|
||||||
|
import ru.soune.nocopy.service.file.FileEntityService;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
@@ -30,6 +31,8 @@ public class GlobalSearchService {
|
|||||||
|
|
||||||
private final GlobalSearchAsyncProcessor asyncProcessor;
|
private final GlobalSearchAsyncProcessor asyncProcessor;
|
||||||
|
|
||||||
|
private final FileEntityService fileEntityService;
|
||||||
|
|
||||||
@Transactional
|
@Transactional
|
||||||
public String startSearch(GlobalSearchStartRequest request, Long userId, List<FileEntity> filesToProcess) {
|
public String startSearch(GlobalSearchStartRequest request, Long userId, List<FileEntity> filesToProcess) {
|
||||||
GlobalSearchTask task = new GlobalSearchTask();
|
GlobalSearchTask task = new GlobalSearchTask();
|
||||||
@@ -56,7 +59,12 @@ public class GlobalSearchService {
|
|||||||
.map(FileMonitoringEntity::getFile)
|
.map(FileMonitoringEntity::getFile)
|
||||||
.toList();
|
.toList();
|
||||||
} else {
|
} else {
|
||||||
return fileEntityRepository.findAllById(request.getFileIds());
|
List<String> fileIds = request.getFileIds().isEmpty() ? fileEntityService.getAllUserFiles(userId)
|
||||||
|
.stream()
|
||||||
|
.map(FileEntity::getId)
|
||||||
|
.toList(): request.getFileIds();
|
||||||
|
|
||||||
|
return fileEntityRepository.findAllById(fileIds);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user