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

Ещё раз исправлена ошибка

Browse Source
This commit is contained in:
serega6531
2019-05-17 21:03:08 +03:00
parent 042d9b6c3b
commit ceb8009742
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/ru/serega6531/packmate/repository/PacketRepository.java
View File

@@ -9,8 +9,6 @@ import java.util.List;
public interface PacketRepository extends JpaRepository<Packet, Long> { public interface PacketRepository extends JpaRepository<Packet, Long> {
List<Packet> findAllByStream(Stream stream, Pageable pageable);
List<Packet> findAllByStreamAndIdGreaterThan(Stream stream, long packetId, Pageable pageable); List<Packet> findAllByStreamAndIdGreaterThan(Stream stream, long packetId, Pageable pageable);
List<Packet> findAllByStreamAndIdLessThan(Stream stream, long packetId, Pageable pageable); List<Packet> findAllByStreamAndIdLessThan(Stream stream, long packetId, Pageable pageable);

12
src/main/java/ru/serega6531/packmate/service/PacketService.java
View File

@@ -24,14 +24,10 @@ public class PacketService {
public List<Packet> getPacketsForStream(Pagination pagination, Stream stream) { public List<Packet> getPacketsForStream(Pagination pagination, Stream stream) {
PageRequest page = PageRequest.of(0, pagination.getPageSize(), pagination.getDirection(), "id"); PageRequest page = PageRequest.of(0, pagination.getPageSize(), pagination.getDirection(), "id");
if(pagination.isFetchLatest()) { // последние пакеты if (pagination.getDirection() == Sort.Direction.ASC) { // более новые пакеты
return repository.findAllByStream(stream, page); return repository.findAllByStreamAndIdGreaterThan(stream, pagination.getStartingFrom(), page);
} else { } else { // более старые пакеты
if (pagination.getDirection() == Sort.Direction.ASC) { // более новые пакеты return repository.findAllByStreamAndIdLessThan(stream, pagination.getStartingFrom(), page);
return repository.findAllByStreamAndIdGreaterThan(stream, pagination.getStartingFrom(), page);
} else { // более старые пакеты
return repository.findAllByStreamAndIdLessThan(stream, pagination.getStartingFrom(), page);
}
} }
} }