From d2555845550e51dba63bced64ade2ac17e31b124 Mon Sep 17 00:00:00 2001 From: sshkurov Date: Fri, 4 Feb 2022 08:10:24 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=B4=D1=83=D0=B1=D0=BB=D0=B8=D1=80=D1=83?= =?UTF-8?q?=D1=8E=D1=89=D0=B8=D0=B5=D1=81=D1=8F=20=D0=BF=D0=B0=D0=BA=D0=B5?= =?UTF-8?q?=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru/serega6531/packmate/repository/StreamRepository.java | 2 +- src/main/java/ru/serega6531/packmate/service/StreamService.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/ru/serega6531/packmate/repository/StreamRepository.java b/src/main/java/ru/serega6531/packmate/repository/StreamRepository.java index 4c7ff2a..1eecf35 100644 --- a/src/main/java/ru/serega6531/packmate/repository/StreamRepository.java +++ b/src/main/java/ru/serega6531/packmate/repository/StreamRepository.java @@ -17,7 +17,7 @@ public interface StreamRepository extends JpaRepository, JpaSpecif long deleteByEndTimestampBeforeAndFavoriteIsFalse(long threshold); @Query("SELECT s FROM Stream s " + - "LEFT JOIN FETCH s.packets AS packets " + + "JOIN FETCH s.packets AS packets " + "LEFT JOIN FETCH packets.matches " + "WHERE s.id = :id" ) diff --git a/src/main/java/ru/serega6531/packmate/service/StreamService.java b/src/main/java/ru/serega6531/packmate/service/StreamService.java index 6a254a9..4563f4d 100644 --- a/src/main/java/ru/serega6531/packmate/service/StreamService.java +++ b/src/main/java/ru/serega6531/packmate/service/StreamService.java @@ -247,6 +247,7 @@ public class StreamService { public List getPackets(long streamId) { return repository.getStreamWithPackets(streamId) .map(Stream::getPackets) + .map(packets -> packets.stream().distinct().collect(Collectors.toList())) .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND)); }