From 90ef8ffe9e71ba233c7e6b9ba43b2a1f0f251f5e Mon Sep 17 00:00:00 2001 From: Shamir Khodzha Date: Fri, 21 Aug 2020 17:28:15 +0300 Subject: [PATCH] fixed duplicate rooms in finished_without_recordings query --- src/db/room.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/db/room.rs b/src/db/room.rs index ab1bba2b..cf35a962 100644 --- a/src/db/room.rs +++ b/src/db/room.rs @@ -214,6 +214,7 @@ pub(crate) fn finished_without_recordings( super::rtc::ALL_COLUMNS, super::janus_backend::ALL_COLUMNS, )) + .distinct_on(room::id) .load(conn) } @@ -353,6 +354,9 @@ mod tests { let _rtc3 = shared_helpers::insert_rtc_with_room(&conn, &room3); shared_helpers::insert_janus_rtc_stream(&conn, &backend1, &rtc1); + // we insert two rtc_streams to simulate stream stop & start + // this should not affect number of returned rooms (there was a bug when it did) + shared_helpers::insert_janus_rtc_stream(&conn, &backend2, &rtc2); shared_helpers::insert_janus_rtc_stream(&conn, &backend2, &rtc2); let rooms = finished_without_recordings(&conn)