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)); }