fixed duplicate rooms in finished_without_recordings query

foxford · Aug 21, 2020 · 90ef8ff · 90ef8ff
1 parent 7b15655
commit 90ef8ff
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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)