This commit is contained in:
@@ -20,7 +20,6 @@ import ru.soune.nocopy.service.tariff.TariffInfoService;
|
|||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Optional;
|
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
@Component
|
@Component
|
||||||
|
|||||||
@@ -60,7 +60,7 @@ public class TariffInformationHandler implements RequestHandler {
|
|||||||
int page = req.getPage() != null ? req.getPage() : 0;
|
int page = req.getPage() != null ? req.getPage() : 0;
|
||||||
int pageSize = req.getSize() != null ? req.getSize() : 5;
|
int pageSize = req.getSize() != null ? req.getSize() : 5;
|
||||||
String sortDirection = req.getSortDirection() != null ? req.getSortDirection() : "desc";
|
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));
|
Pageable pageable = PageRequest.of(page, pageSize, Sort.by(Sort.Direction.fromString(sortDirection), sortBy));
|
||||||
|
|
||||||
Page<Tariff> allTariffs = tariffService.getTariffs(pageable);
|
Page<Tariff> allTariffs = tariffService.getTariffs(pageable);
|
||||||
@@ -87,7 +87,7 @@ public class TariffInformationHandler implements RequestHandler {
|
|||||||
int page = req.getPage() != null ? req.getPage() : 0;
|
int page = req.getPage() != null ? req.getPage() : 0;
|
||||||
int pageSize = req.getSize() != null ? req.getSize() : 5;
|
int pageSize = req.getSize() != null ? req.getSize() : 5;
|
||||||
String sortDirection = req.getSortDirection() != null ? req.getSortDirection() : "desc";
|
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));
|
Pageable pageable = PageRequest.of(page, pageSize, Sort.by(Sort.Direction.fromString(sortDirection), sortBy));
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user