Replace janus_rtc_stream with recording in balancer queries (#164)

src/app/endpoint/rtc.rs

@@ -779,26 +779,23 @@ mod test {
                             .backend(&backend1)
                             .insert(&conn);
 
-                        let stream1 = factory::JanusRtcStream::new(USR_AUDIENCE)
+                        factory::JanusRtcStream::new(USR_AUDIENCE)
                             .rtc(&rtc1)
                             .backend(&backend1)
                             .insert(&conn);
 
-                        crate::db::janus_rtc_stream::start(stream1.id(), &conn).unwrap();
-
                         let s1a1 = TestAgent::new("web", "s1a1", USR_AUDIENCE);
                         shared_helpers::insert_agent(&conn, s1a1.agent_id(), rtc1.room_id());
 
-                        // The second backend has 1 stream with 2 agents but it's not started
-                        // so it doesn't make any load on the backend.
+                        // The second backend has 1 stream with 2 agents.
                         let rtc2 = shared_helpers::insert_rtc(&conn);
 
                         factory::Recording::new()
                             .rtc(&rtc2)
                             .backend(&backend2)
                             .insert(&conn);
 
-                        let _stream2 = factory::JanusRtcStream::new(USR_AUDIENCE)
+                        factory::JanusRtcStream::new(USR_AUDIENCE)
                             .rtc(&rtc2)
                             .backend(&backend2)
                             .insert(&conn);
@@ -812,7 +809,7 @@ mod test {
                         // The new rtc for which we will balance the stream.
                         let rtc3 = shared_helpers::insert_rtc(&conn);
 
-                        (rtc3, backend1)
+                        (rtc3, backend2)
                     })
                     .unwrap();
 

src/db/janus_backend.rs

@@ -208,26 +208,26 @@ const MOST_LOADED_SQL: &str = r#"
             SELECT *
             FROM room
             WHERE backend = 'janus'
-            AND   NOW() < UPPER(time)
+            AND   UPPER(time) BETWEEN NOW() AND NOW() + INTERVAL '1 day'
         ),
         janus_backend_load AS (
             SELECT
                 backend_id,
                 SUM(GREATEST(taken, reserve)) AS load
             FROM (
                 SELECT DISTINCT ON(backend_id, room_id)
-                    jrs.backend_id,
+                    rec.backend_id,
                     rtc.room_id,
                     COALESCE(rl.taken, 0)   AS taken,
                     COALESCE(ar.reserve, 0) AS reserve
-                FROM janus_rtc_stream AS jrs
+                FROM recording AS rec
                 INNER JOIN rtc
-                ON rtc.id = jrs.rtc_id
+                ON rtc.id = rec.rtc_id
                 LEFT JOIN active_room AS ar
                 ON ar.id = rtc.room_id
                 LEFT JOIN room_load AS rl
                 ON rl.room_id = rtc.room_id
-                WHERE LOWER(jrs.time) IS NOT NULL
+                WHERE rec.status = 'in_progress'
             ) AS sub
             GROUP BY backend_id
         )
@@ -268,25 +268,25 @@ const LEAST_LOADED_SQL: &str = r#"
             SELECT *
             FROM room
             WHERE backend = 'janus'
-            AND   NOW() < UPPER(time)
+            AND   UPPER(time) BETWEEN NOW() AND NOW() + INTERVAL '1 day'
         ),
         janus_backend_load AS (
             SELECT
                 backend_id,
                 SUM(taken) AS load
             FROM (
                 SELECT DISTINCT ON(backend_id, room_id)
-                    jrs.backend_id,
+                    rec.backend_id,
                     rtc.room_id,
                     COALESCE(rl.taken, 0) AS taken
-                FROM janus_rtc_stream AS jrs
+                FROM recording AS rec
                 INNER JOIN rtc
-                ON rtc.id = jrs.rtc_id
+                ON rtc.id = rec.rtc_id
                 LEFT JOIN active_room AS ar
                 ON ar.id = rtc.room_id
                 LEFT JOIN room_load AS rl
                 ON rl.room_id = rtc.room_id
-                WHERE LOWER(jrs.time) IS NOT NULL
+                WHERE rec.status = 'in_progress'
             ) AS sub
             GROUP BY backend_id
         )
@@ -332,26 +332,26 @@ const FREE_CAPACITY_SQL: &str = r#"
             SELECT *
             FROM room
             WHERE backend = 'janus'
-            AND   NOW() < UPPER(time)
+            AND   UPPER(time) BETWEEN NOW() AND NOW() + INTERVAL '1 day'
         ),
         janus_backend_load AS (
             SELECT
                 backend_id,
                 SUM(GREATEST(taken, reserve)) AS load
             FROM (
                 SELECT DISTINCT ON(backend_id, room_id)
-                    jrs.backend_id,
+                    rec.backend_id,
                     rtc.room_id,
                     COALESCE(rl.taken, 0)   AS taken,
                     COALESCE(ar.reserve, 0) AS reserve
-                FROM janus_rtc_stream AS jrs
+                FROM recording AS rec
                 INNER JOIN rtc
-                ON rtc.id = jrs.rtc_id
+                ON rtc.id = rec.rtc_id
                 LEFT JOIN active_room AS ar
                 ON ar.id = rtc.room_id
                 LEFT JOIN room_load AS rl
                 ON rl.room_id = rtc.room_id
-                WHERE LOWER(jrs.time) IS NOT NULL
+                WHERE rec.status = 'in_progress'
             ) AS sub
             GROUP BY backend_id
         )
@@ -365,11 +365,11 @@ const FREE_CAPACITY_SQL: &str = r#"
     FROM rtc
     LEFT JOIN room_load as rl
     ON rl.room_id = rtc.room_id
-    LEFT JOIN janus_rtc_stream AS jrs
-    ON  jrs.rtc_id = rtc.id
-    AND LOWER(jrs.time) IS NOT NULL AND UPPER(jrs.time) IS NULL
+    LEFT JOIN recording AS rec
+    ON  rec.rtc_id = rtc.id
+    AND rec.status = 'in_progress'
     LEFT JOIN janus_backend AS jb
-    ON jb.id = jrs.backend_id
+    ON jb.id = rec.backend_id
     LEFT JOIN janus_backend_load AS jbl
     ON jbl.backend_id = jb.id
     WHERE rtc.id = $1