From c83dc10125dd23381dfcd33ebf2defc50bf0a076 Mon Sep 17 00:00:00 2001 From: backdev-1 Date: Wed, 27 May 2026 16:31:08 +0700 Subject: [PATCH] dev add tariff info and control --- src/main/java/ru/soune/nocopy/handler/TariffInfoHandler.java | 1 - .../ru/soune/nocopy/handler/TariffInformationHandler.java | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/ru/soune/nocopy/handler/TariffInfoHandler.java b/src/main/java/ru/soune/nocopy/handler/TariffInfoHandler.java index c56dd12..e6311d3 100644 --- a/src/main/java/ru/soune/nocopy/handler/TariffInfoHandler.java +++ b/src/main/java/ru/soune/nocopy/handler/TariffInfoHandler.java @@ -20,7 +20,6 @@ import ru.soune.nocopy.service.tariff.TariffInfoService; import java.time.LocalDateTime; import java.util.List; import java.util.Map; -import java.util.Optional; import java.util.stream.Collectors; @Component diff --git a/src/main/java/ru/soune/nocopy/handler/TariffInformationHandler.java b/src/main/java/ru/soune/nocopy/handler/TariffInformationHandler.java index a8001ae..f943e8f 100644 --- a/src/main/java/ru/soune/nocopy/handler/TariffInformationHandler.java +++ b/src/main/java/ru/soune/nocopy/handler/TariffInformationHandler.java @@ -60,7 +60,7 @@ public class TariffInformationHandler implements RequestHandler { int page = req.getPage() != null ? req.getPage() : 0; int pageSize = req.getSize() != null ? req.getSize() : 5; String sortDirection = req.getSortDirection() != null ? req.getSortDirection() : "desc"; - String sortBy = req.getSortBy() != null ? req.getSortBy() : "updatedAt"; + String sortBy = req.getSortBy() != null ? req.getSortBy() : "tariffName"; Pageable pageable = PageRequest.of(page, pageSize, Sort.by(Sort.Direction.fromString(sortDirection), sortBy)); Page allTariffs = tariffService.getTariffs(pageable); @@ -87,7 +87,7 @@ public class TariffInformationHandler implements RequestHandler { int page = req.getPage() != null ? req.getPage() : 0; int pageSize = req.getSize() != null ? req.getSize() : 5; String sortDirection = req.getSortDirection() != null ? req.getSortDirection() : "desc"; - String sortBy = req.getSortBy() != null ? req.getSortBy() : "updatedAt"; + String sortBy = req.getSortBy() != null ? req.getSortBy() : "tariffName"; Pageable pageable = PageRequest.of(page, pageSize, Sort.by(Sort.Direction.fromString(sortDirection), sortBy));