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

dev add context for notifcations
Test Workflow / test (push) Has been cancelled
Details

Browse Source
This commit is contained in:
backdev
2026-05-13 16:00:35 +07:00
parent 17850710b5
commit 51feca36d0
4 changed files with 97 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/ru/soune/nocopy/service/search/GlobalSearchAsyncProcessor.java
+86 -21
View File
@@ -2,6 +2,7 @@ package ru.soune.nocopy.service.search;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import jakarta.mail.MessagingException;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Async;
@@ -16,6 +17,7 @@ import ru.soune.nocopy.entity.search.GlobalSearchResult;
import ru.soune.nocopy.entity.search.GlobalSearchTask;
import ru.soune.nocopy.entity.search.SearchStatus;
import ru.soune.nocopy.entity.tokenoperation.OperationType;
import ru.soune.nocopy.exception.TaskCancelledException;
import ru.soune.nocopy.repository.FileEntityRepository;
import ru.soune.nocopy.repository.GlobalSearchResultRepository;
import ru.soune.nocopy.repository.GlobalSearchTaskRepository;
@@ -53,35 +55,98 @@ public class GlobalSearchAsyncProcessor {
private final FileEntityRepository fileEntityRepository;
// @Async
// public void processFilesAsync(String taskId, List<String> filesToProcess, Long userId) {
// try {
// for (int i = 0; i < filesToProcess.size(); i++) {
// String uuid = filesToProcess.get(i);
// log.info("UUID: " + uuid);
// FileEntity file = fileEntityRepository.findById(uuid).orElse(null);
//
// if (file == null) continue;
//
// tariffInfoService.writeOffTokens(userId, TariffConstants.TOKEN_VALUE_FOR_SEARCH,
// OperationType.GLOBAL_SEARCH);
// GlobalSearchResult result = processFile(file, taskId, userId);
// globalSearchResultRepository.save(result);
//
// task.setProcessedFiles(i + 1);
// task.setUpdatedAt(LocalDateTime.now());
// globalSearchTaskRepository.save(task);
// }
//
// task.setStatus(SearchStatus.COMPLETED.name());
// task.setUpdatedAt(LocalDateTime.now());
// GlobalSearchTask save = globalSearchTaskRepository.save(task);
//
// addSearchResultNotification(save, filesToProcess, userId);
// } catch (Exception e) {
// task.setStatus(SearchStatus.FAILED.name());
// task.setUpdatedAt(LocalDateTime.now());
// globalSearchTaskRepository.save(task);
// }
// }
@Async
public void processFilesAsync(GlobalSearchTask task, List<String> filesToProcess, Long userId) {
public void processFilesAsync(String taskId, List<String> filesToProcess, Long userId) {
try {
for (int i = 0; i < filesToProcess.size(); i++) {
String uuid = filesToProcess.get(i);
log.info("UUID: " + uuid);
FileEntity file = fileEntityRepository.findById(uuid).orElse(null);
if (file == null) continue;
tariffInfoService.writeOffTokens(userId, TariffConstants.TOKEN_VALUE_FOR_SEARCH,
OperationType.GLOBAL_SEARCH);
GlobalSearchResult result = processFile(file, task.getTaskId(), userId);
globalSearchResultRepository.save(result);
task.setProcessedFiles(i + 1);
task.setUpdatedAt(LocalDateTime.now());
globalSearchTaskRepository.save(task);
processOneFile(taskId, filesToProcess.get(i), userId, i);
}
task.setStatus(SearchStatus.COMPLETED.name());
task.setUpdatedAt(LocalDateTime.now());
GlobalSearchTask save = globalSearchTaskRepository.save(task);
addSearchResultNotification(save, filesToProcess, userId);
completeTask(taskId, filesToProcess, userId);
} catch (TaskCancelledException e) {
log.info("Task {} was cancelled", taskId);
} catch (Exception e) {
log.error("Task {} failed", taskId, e);
failTask(taskId);
}
}
@Transactional(propagation = Propagation.REQUIRES_NEW)
public void processOneFile(String taskId, String fileId, Long userId, int index) throws MessagingException, IOException {
GlobalSearchTask task = globalSearchTaskRepository.findById(taskId).orElseThrow();
if (SearchStatus.FAILED.name().equals(task.getStatus())) {
throw new TaskCancelledException("Task " + taskId + " was cancelled");
}
FileEntity file = fileEntityRepository.findById(fileId).orElse(null);
if (file == null) {
log.warn("File not found: {}", fileId);
return;
}
tariffInfoService.writeOffTokens(userId, TariffConstants.TOKEN_VALUE_FOR_SEARCH, OperationType.GLOBAL_SEARCH);
GlobalSearchResult result = processFile(file, taskId, userId);
globalSearchResultRepository.save(result);
task.setProcessedFiles(index + 1);
task.setUpdatedAt(LocalDateTime.now());
globalSearchTaskRepository.save(task);
}
@Transactional(propagation = Propagation.REQUIRES_NEW)
public void completeTask(String taskId, List<String> filesToProcess, Long userId) {
GlobalSearchTask task = globalSearchTaskRepository.findById(taskId).orElseThrow();
task.setStatus(SearchStatus.COMPLETED.name());
task.setUpdatedAt(LocalDateTime.now());
GlobalSearchTask saved = globalSearchTaskRepository.save(task);
addSearchResultNotification(saved, filesToProcess, userId);
}
@Transactional(propagation = Propagation.REQUIRES_NEW)
public void failTask(String taskId) {
try {
GlobalSearchTask task = globalSearchTaskRepository.findById(taskId).orElseThrow();
task.setStatus(SearchStatus.FAILED.name());
task.setUpdatedAt(LocalDateTime.now());
globalSearchTaskRepository.save(task);
} catch (Exception ex) {
log.error("Could not mark task {} as failed", taskId, ex);
}
}
src/main/java/ru/soune/nocopy/service/search/GlobalSearchService.java
+1 -1
View File
@@ -48,7 +48,7 @@ public class GlobalSearchService {
List<String> fileIds = filesToProcess.stream().map(FileEntity::getId).toList();
asyncProcessor.processFilesAsync(save, fileIds, userId);
asyncProcessor.processFilesAsync(save.getTaskId(), fileIds, userId);
return save.getTaskId();
}