dev add
Test Workflow / test (push) Successful in 4s

This commit is contained in:
vladp
2026-02-04 11:47:43 +07:00
parent 06a6196a26
commit 7a809e6b8c
11 changed files with 152 additions and 17 deletions
@@ -8,9 +8,11 @@ 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.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 java.time.LocalDateTime;
import java.util.List;
@@ -24,20 +26,47 @@ public class TariffInfoService {
private TariffRepository tariffRepository;
public TariffInfo createTariffInfo(LocalDateTime startTariff, LocalDateTime endTariff, TariffStatus tariffStatus) {
private UserRepository userRepository;
public TariffInfo createTariffInfo(LocalDateTime startTariff, LocalDateTime endTariff, TariffStatus tariffStatus,
Integer tokens) {
TariffInfo tariffInfo = new TariffInfo();
tariffInfo.setStartTariff(startTariff);
tariffInfo.setStatus(tariffStatus);
tariffInfo.setEndTariff(endTariff);
tariffInfo.setTokens(tokens);
return tariffInfoRepository.save(tariffInfo);
}
@Transactional
public void writeOffTokens(long userId) {
User user = userRepository.findById(userId).orElseThrow();
TariffInfo activeTariffInfo;
if (user.getCompany() == null) {
activeTariffInfo = user.getPersonalTariffInfo();
} else {
activeTariffInfo = user.getCompany().getTariffInfo();
}
Integer tokens = activeTariffInfo.getTokens();
if (tokens > 0 && (tokens - TariffConstants.TOKEN_VALUE) > 0) {
activeTariffInfo.setTokens(activeTariffInfo.getTokens() - TariffConstants.TOKEN_VALUE);
tariffInfoRepository.save(activeTariffInfo);
} else {
throw new TariffNotFoundException("User not have tokens for protect");
}
}
public TariffInfo createTariffInfo(TariffType tariffType) {
Tariff tariff = tariffRepository.findByType(tariffType.toString()).orElseThrow();
TariffInfo tariffInfo = createTariffInfo(LocalDateTime.now(), LocalDateTime.now().plusDays(30),
TariffStatus.ACTIVE);
TariffStatus.ACTIVE, tariff.getTokens());
tariffInfo.setTariff(tariff);
return tariffInfoRepository.save(tariffInfo);
@@ -71,7 +100,9 @@ public class TariffInfoService {
public TariffInfoDTO updateTariffInfo(String id, TariffInfoDTO tariffInfoDTO) {
TariffInfo tariffInfo = tariffInfoRepository.findById(id)
.orElseThrow(() -> new TariffNotFoundException("Tariff not found"));
updateTariffInfoFromDTO(tariffInfo, tariffInfoDTO);
return convertToInfoDTO(tariffInfoRepository.save(tariffInfo));
}
@@ -87,8 +118,9 @@ public class TariffInfoService {
tariffInfo.getStartTariff(),
tariffInfo.getEndTariff(),
tariffInfo.getTariff() != null ? tariffInfo.getTariff().getId() : null,
tariffInfo.getTariff() != null ? tariffInfo.getTariff().getName() : null
);
tariffInfo.getTariff() != null ? tariffInfo.getTariff().getName() : null, tariffInfo.getTokens(),
tariffInfo.getTariff().getDiskSize(), 0L, 0,
tariffInfo.getTariff().getMaxFilesCount());
}
private void updateTariffInfoFromDTO(TariffInfo tariffInfo, TariffInfoDTO dto) {