From afe78f74f2ab53d60b2dacbb03d03ba8733e80fa Mon Sep 17 00:00:00 2001 From: backdev-1 Date: Fri, 15 May 2026 15:41:24 +0700 Subject: [PATCH] dev add tarriff description --- .../ru/soune/nocopy/service/tariff/TariffService.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/ru/soune/nocopy/service/tariff/TariffService.java b/src/main/java/ru/soune/nocopy/service/tariff/TariffService.java index 953c3ee..ec0d653 100644 --- a/src/main/java/ru/soune/nocopy/service/tariff/TariffService.java +++ b/src/main/java/ru/soune/nocopy/service/tariff/TariffService.java @@ -85,9 +85,9 @@ public class TariffService { public TariffDTO updateTariff(Long id, TariffDTO tariffDTO, TariffRequest tariffRequest) { Tariff tariff = tariffRepository.findById(id) .orElseThrow(() -> new TariffNotFoundException("Tariff not found")); - updateTariffFromDTO(tariff, tariffDTO, tariffRequest); + Tariff updateTariffFromDTO = updateTariffFromDTO(tariff, tariffDTO, tariffRequest); - return convertToDTO(tariffRepository.save(tariff)); + return convertToDTO(tariffRepository.save(updateTariffFromDTO)); } @Transactional @@ -112,7 +112,7 @@ public class TariffService { ); } - private void updateTariffFromDTO(Tariff tariff, TariffDTO dto, TariffRequest tariffRequest) { + private Tariff updateTariffFromDTO(Tariff tariff, TariffDTO dto, TariffRequest tariffRequest) { tariff.setType(tariffRequest.getType() == null ? dto.getType(): tariffRequest.getType()); tariff.setName(tariffRequest.getName() == null ? dto.getName(): tariffRequest.getName()); tariff.setPrice(tariffRequest.getPrice() == 0 ? dto.getPrice(): tariffRequest.getPrice()); @@ -124,5 +124,7 @@ public class TariffService { tariff.setDescription(tariffRequest.getDescription() == null ? dto.getDescription(): tariffRequest.getDescription()); tariff.setTariffTerm(tariffRequest.getTariffTerm() == null ? TariffTimeTerm.valueOf(dto.getTariffTerm().toUpperCase()): TariffTimeTerm.valueOf(tariffRequest.getTariffTerm())); + + return tariff; } }