diff --git a/src/main/java/ru/soune/nocopy/controller/UserController.java b/src/main/java/ru/soune/nocopy/controller/UserController.java index 52f9e12..d816ec6 100644 --- a/src/main/java/ru/soune/nocopy/controller/UserController.java +++ b/src/main/java/ru/soune/nocopy/controller/UserController.java @@ -95,7 +95,14 @@ public class UserController { fileStatsService.filesCompanyCount(user.getId()): fileStatsService.filesUserCount(user.getId()); - TariffInfo personalTariffInfo = user.getPersonalTariffInfo(); + TariffInfo personalTariffInfo; + + if (user.getCompany() == null) { + personalTariffInfo = user.getPersonalTariffInfo(); + } else { + personalTariffInfo = user.getCompany().getTariffInfo(); + } + Tariff tariff = personalTariffInfo.getTariff(); TariffInfoDTO infoDTO = TariffInfoDTO.builder().tokens(personalTariffInfo.getTokens()) diff --git a/src/main/java/ru/soune/nocopy/service/tariff/TariffInfoService.java b/src/main/java/ru/soune/nocopy/service/tariff/TariffInfoService.java index cb73174..88bcbe4 100644 --- a/src/main/java/ru/soune/nocopy/service/tariff/TariffInfoService.java +++ b/src/main/java/ru/soune/nocopy/service/tariff/TariffInfoService.java @@ -53,7 +53,7 @@ public class TariffInfoService { Integer tokens = activeTariffInfo.getTokens(); - if (tokens > 0 && (tokens - TariffConstants.TOKEN_VALUE) > 0) { + if (tokens - TariffConstants.TOKEN_VALUE > 0) { activeTariffInfo.setTokens(activeTariffInfo.getTokens() - TariffConstants.TOKEN_VALUE); tariffInfoRepository.save(activeTariffInfo);