From ceb800974287eb56df050af2416cab5b8068b37e Mon Sep 17 00:00:00 2001
From: serega6531 <shk@nextbi.ru>
Date: Fri, 17 May 2019 21:03:08 +0300
Subject: [PATCH] =?UTF-8?q?=D0=95=D1=89=D1=91=20=D1=80=D0=B0=D0=B7=20?=
 =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20?=
 =?UTF-8?q?=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../packmate/repository/PacketRepository.java        |  2 --
 .../serega6531/packmate/service/PacketService.java   | 12 ++++--------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/main/java/ru/serega6531/packmate/repository/PacketRepository.java b/src/main/java/ru/serega6531/packmate/repository/PacketRepository.java
index 63c3431..8941d6a 100644
--- a/src/main/java/ru/serega6531/packmate/repository/PacketRepository.java
+++ b/src/main/java/ru/serega6531/packmate/repository/PacketRepository.java
@@ -9,8 +9,6 @@ import java.util.List;
 
 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> findAllByStreamAndIdLessThan(Stream stream, long packetId, Pageable pageable);
diff --git a/src/main/java/ru/serega6531/packmate/service/PacketService.java b/src/main/java/ru/serega6531/packmate/service/PacketService.java
index f201af6..7d927a7 100644
--- a/src/main/java/ru/serega6531/packmate/service/PacketService.java
+++ b/src/main/java/ru/serega6531/packmate/service/PacketService.java
@@ -24,14 +24,10 @@ public class PacketService {
     public List<Packet> getPacketsForStream(Pagination pagination, Stream stream) {
         PageRequest page = PageRequest.of(0, pagination.getPageSize(), pagination.getDirection(), "id");
 
-        if(pagination.isFetchLatest()) { // последние пакеты
-            return repository.findAllByStream(stream, page);
-        } else {
-            if (pagination.getDirection() == Sort.Direction.ASC) {  // более новые пакеты
-                return repository.findAllByStreamAndIdGreaterThan(stream, pagination.getStartingFrom(), page);
-            } else {  // более старые пакеты
-                return repository.findAllByStreamAndIdLessThan(stream, pagination.getStartingFrom(), page);
-            }
+        if (pagination.getDirection() == Sort.Direction.ASC) {  // более новые пакеты
+            return repository.findAllByStreamAndIdGreaterThan(stream, pagination.getStartingFrom(), page);
+        } else {  // более старые пакеты
+            return repository.findAllByStreamAndIdLessThan(stream, pagination.getStartingFrom(), page);
         }
     }