@@ -18,6 +18,7 @@ import org.springframework.web.multipart.MultipartFile;
|
||||
import ru.soune.nocopy.dto.file.UploadProgressResponse;
|
||||
import ru.soune.nocopy.entity.file.*;
|
||||
import ru.soune.nocopy.entity.notification.NotificationType;
|
||||
import ru.soune.nocopy.entity.tokenoperation.OperationType;
|
||||
import ru.soune.nocopy.exception.*;
|
||||
import ru.soune.nocopy.repository.FileEntityRepository;
|
||||
import ru.soune.nocopy.repository.FileUploadSessionRepository;
|
||||
@@ -441,7 +442,7 @@ public class FileUploadServiceImpl implements FileUploadService {
|
||||
if (status != FileStatus.TEMP) {
|
||||
String fileType = session.getFileType();
|
||||
|
||||
tariffInfoService.writeOffTokens(session.getUserId(), costService.protectFileCost(fileType));
|
||||
tariffInfoService.writeOffTokens(session.getUserId(), costService.protectFileCost(fileType), OperationType.FILE_UPLOAD);
|
||||
}
|
||||
} else {
|
||||
sessionRepository.save(session);
|
||||
|
||||
@@ -15,6 +15,7 @@ import ru.soune.nocopy.entity.notification.NotificationMessage;
|
||||
import ru.soune.nocopy.entity.notification.NotificationType;
|
||||
import ru.soune.nocopy.entity.tarif.TariffInfo;
|
||||
import ru.soune.nocopy.entity.tarif.TariffType;
|
||||
import ru.soune.nocopy.entity.tokenoperation.OperationType;
|
||||
import ru.soune.nocopy.entity.user.User;
|
||||
import ru.soune.nocopy.exception.TariffNotFoundException;
|
||||
import ru.soune.nocopy.repository.FileMonitoringRepository;
|
||||
@@ -66,7 +67,7 @@ public class MonitoringSearchService {
|
||||
TariffDTO tariffMonitoring = tariffService.getTariffByType(TariffType.valueOf(monitoringType.name()));
|
||||
|
||||
try {
|
||||
tariffInfoService.writeOffTokens(monitoring.getUserId(), tariffMonitoring.getTokens());
|
||||
tariffInfoService.writeOffTokens(monitoring.getUserId(), tariffMonitoring.getTokens(), OperationType.MONITORING);
|
||||
|
||||
boolean useYandex = searchProperties.getEngines().getOrDefault("yandex",
|
||||
new SearchProperties.EngineConfig()).isEnabled();
|
||||
|
||||
@@ -12,6 +12,7 @@ import ru.soune.nocopy.entity.notification.NotificationType;
|
||||
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.repository.FileEntityRepository;
|
||||
import ru.soune.nocopy.repository.GlobalSearchResultRepository;
|
||||
import ru.soune.nocopy.repository.GlobalSearchTaskRepository;
|
||||
@@ -59,7 +60,7 @@ public class GlobalSearchAsyncProcessor {
|
||||
FileEntity file = fileEntityRepository.findById(uuid)
|
||||
.orElseThrow(() -> new RuntimeException("File not found: " + uuid));
|
||||
|
||||
tariffInfoService.writeOffTokens(userId, TariffConstants.TOKEN_VALUE_FOR_SEARCH);
|
||||
tariffInfoService.writeOffTokens(userId, TariffConstants.TOKEN_VALUE_FOR_SEARCH, OperationType.GLOBAL_SEARCH);
|
||||
GlobalSearchResult result = processFile(file, taskId, userId);
|
||||
globalSearchResultRepository.save(result);
|
||||
|
||||
|
||||
@@ -10,12 +10,14 @@ import ru.soune.nocopy.entity.tarif.Tariff;
|
||||
import ru.soune.nocopy.entity.tarif.TariffInfo;
|
||||
import ru.soune.nocopy.entity.tarif.TariffStatus;
|
||||
import ru.soune.nocopy.entity.tarif.TariffType;
|
||||
import ru.soune.nocopy.entity.tokenoperation.OperationType;
|
||||
import ru.soune.nocopy.entity.user.User;
|
||||
import ru.soune.nocopy.exception.TariffNotFoundException;
|
||||
import ru.soune.nocopy.repository.TariffInfoRepository;
|
||||
import ru.soune.nocopy.repository.TariffRepository;
|
||||
import ru.soune.nocopy.repository.UserRepository;
|
||||
import ru.soune.nocopy.service.mail.EmailService;
|
||||
import ru.soune.nocopy.service.tokenoperation.TokenOperationService;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.time.LocalDateTime;
|
||||
@@ -35,6 +37,8 @@ public class TariffInfoService {
|
||||
|
||||
private EmailService emailService;
|
||||
|
||||
private TokenOperationService tokenOperationService;
|
||||
|
||||
public TariffInfo createTariffInfo(LocalDateTime startTariff, LocalDateTime endTariff, TariffStatus tariffStatus,
|
||||
Integer tokens) {
|
||||
TariffInfo tariffInfo = new TariffInfo();
|
||||
@@ -48,7 +52,7 @@ public class TariffInfoService {
|
||||
}
|
||||
|
||||
// @Transactional
|
||||
public void writeOffTokens(long userId, Integer value) throws MessagingException, IOException {
|
||||
public void writeOffTokens(long userId, Integer value, OperationType operationType) throws MessagingException, IOException {
|
||||
User user = userRepository.findById(userId).orElseThrow();
|
||||
|
||||
TariffInfo activeTariffInfo;
|
||||
@@ -60,6 +64,8 @@ public class TariffInfoService {
|
||||
}
|
||||
|
||||
writeOffTokensForTariff(activeTariffInfo, value);
|
||||
|
||||
tokenOperationService.create(operationType, userId, Long.valueOf(value));
|
||||
}
|
||||
|
||||
public void writeOffTokensForTariff(TariffInfo activeTariffInfo, Integer value) throws MessagingException, IOException {
|
||||
|
||||
@@ -0,0 +1,122 @@
|
||||
package ru.soune.nocopy.service.tokenoperation;
|
||||
|
||||
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.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import ru.soune.nocopy.entity.tokenoperation.OperationType;
|
||||
import ru.soune.nocopy.entity.tokenoperation.TokenOperation;
|
||||
import ru.soune.nocopy.repository.TokenOperationRepository;
|
||||
|
||||
import jakarta.persistence.EntityNotFoundException;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Slf4j
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
@Transactional(readOnly = true)
|
||||
public class TokenOperationService {
|
||||
|
||||
private final TokenOperationRepository repository;
|
||||
|
||||
@Transactional
|
||||
public TokenOperation create(OperationType operationType, Long userId, Long spent) {
|
||||
TokenOperation tokenOperation = new TokenOperation();
|
||||
|
||||
tokenOperation.setOperationType(operationType);
|
||||
tokenOperation.setUserId(userId);
|
||||
tokenOperation.setSpent(spent);
|
||||
tokenOperation.setCreatedAt(LocalDateTime.now());
|
||||
|
||||
return repository.save(tokenOperation);
|
||||
}
|
||||
|
||||
public TokenOperation findById(Long id) {
|
||||
log.debug("Finding token operation by id: {}", id);
|
||||
return repository.findById(id)
|
||||
.orElseThrow(() -> new EntityNotFoundException("TokenOperation not found with id: " + id));
|
||||
}
|
||||
|
||||
public Page<TokenOperation> findAll(int page, int size, String sortBy, String direction) {
|
||||
log.debug("Finding all operations with pagination: page={}, size={}, sortBy={}, dir={}",
|
||||
page, size, sortBy, direction);
|
||||
|
||||
Sort sort = direction.equalsIgnoreCase("desc")
|
||||
? Sort.by(sortBy).descending()
|
||||
: Sort.by(sortBy).ascending();
|
||||
|
||||
Pageable pageable = PageRequest.of(page, size, sort);
|
||||
return repository.findAll(pageable);
|
||||
}
|
||||
|
||||
public Page<TokenOperation> findByFilters(
|
||||
Long userId,
|
||||
OperationType operationType,
|
||||
Long minSpent,
|
||||
Long maxSpent,
|
||||
int page,
|
||||
int size,
|
||||
String sortBy,
|
||||
String direction) {
|
||||
|
||||
log.debug("Finding by filters: userId={}, type={}, minSpent={}, maxSpent={}",
|
||||
userId, operationType, minSpent, maxSpent);
|
||||
|
||||
Sort sort = Sort.by(Sort.Direction.fromString(direction), sortBy);
|
||||
Pageable pageable = PageRequest.of(page, size, sort);
|
||||
|
||||
return repository.findByFilters(userId, operationType, minSpent, maxSpent, pageable);
|
||||
}
|
||||
|
||||
public Page<TokenOperation> findByUserId(Long userId, int page, int size) {
|
||||
log.debug("Finding operations for user id: {}", userId);
|
||||
Pageable pageable = PageRequest.of(page, size, Sort.by("id").descending());
|
||||
return repository.findByUserId(userId, pageable);
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public TokenOperation update(Long id, TokenOperation updatedOperation) {
|
||||
log.info("Updating token operation with id: {}", id);
|
||||
|
||||
TokenOperation existing = findById(id);
|
||||
|
||||
existing.setOperationType(updatedOperation.getOperationType());
|
||||
existing.setUserId(updatedOperation.getUserId());
|
||||
existing.setSpent(updatedOperation.getSpent());
|
||||
|
||||
return repository.save(existing);
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public void deleteById(Long id) {
|
||||
log.info("Deleting token operation with id: {}", id);
|
||||
|
||||
if (!repository.existsById(id)) {
|
||||
throw new EntityNotFoundException("TokenOperation not found with id: " + id);
|
||||
}
|
||||
repository.deleteById(id);
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public void deleteByUserId(Long userId) {
|
||||
log.warn("Deleting all operations for user id: {}", userId);
|
||||
List<TokenOperation> userOps = repository.findByUserId(userId);
|
||||
repository.deleteAll(userOps);
|
||||
}
|
||||
|
||||
public Long getTotalSpentByUserAndType(Long userId, OperationType type) {
|
||||
Long sum = repository.sumSpentByUserAndType(userId, type);
|
||||
return sum != null ? sum : 0L;
|
||||
}
|
||||
|
||||
public Long countByUserId(Long userId) {
|
||||
return repository.countByUserId(userId);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user