0xb00b5/0xb00b5-packmate
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Исправлена пагинация пакетов

Browse Source
This commit is contained in:
sshkurov
2022-02-06 10:50:32 +03:00
parent 56ed2f5878
commit b48e23fdc5
7 changed files with 52 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/ru/serega6531/packmate/service/StreamService.java
View File

@@ -1,10 +1,12 @@
package ru.serega6531.packmate.service;
import lombok.extern.slf4j.Slf4j;
import org.jetbrains.annotations.Nullable;
import org.modelmapper.ModelMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.scheduling.annotation.Async;
@@ -242,8 +244,9 @@ public class StreamService {
return saved;
}
public List<Packet> getPackets(long streamId) {
return repository.getPackets(streamId);
public List<Packet> getPackets(long streamId, @Nullable Long startingFrom, int pageSize) {
// long safeStartingFrom = startingFrom != null ? startingFrom : 0;
return repository.getPackets(streamId, startingFrom, Pageable.ofSize(pageSize));
}
/**
@@ -259,17 +262,13 @@ public class StreamService {
repository.setFavorite(id, favorite);
}
public List<Stream> findAll(Pagination pagination, Optional<Integer> service, boolean onlyFavorites) {
PageRequest page = PageRequest.of(0, pagination.getPageSize(), pagination.getDirection(), "id");
public List<Stream> findAll(StreamPagination pagination, Optional<Integer> service, boolean onlyFavorites) {
PageRequest page = PageRequest.of(0, pagination.getPageSize(), Sort.Direction.DESC, "id");
Specification<Stream> spec = Specification.where(null);
if (pagination.getStartingFrom() != null) {
if (pagination.getDirection() == Sort.Direction.ASC) {
spec = spec.and(streamIdGreaterThan(pagination.getStartingFrom()));
} else {
spec = spec.and(streamIdLessThan(pagination.getStartingFrom()));
}
spec = spec.and(streamIdLessThan(pagination.getStartingFrom()));
}
if (service.isPresent()) {