PATCH: Fixed database not returning data in recommendations

UPDATE: Decreased polling time to 1 second for later use

web_server/utils/recommendation_utils.py

@@ -5,8 +5,8 @@ def user_recommendation_category(user_id: int) -> Optional[int]:
     """
     Queries user_preferences database to find users favourite streaming category and returns the category
     """
-    with Database() as db:
-        data = db.fetchone("""
+    db = Database()
+    data = db.fetchone("""
             SELECT category_id 
             FROM user_preferences 
             WHERE user_id = ? 
@@ -20,14 +20,18 @@ def followed_categories_recommendations(user_id : int):
     """
     Returns top 25 streams given a users category following
     """
-    with Database() as db:
-        categories = db.fetchall("""
-                             SELECT user_id, title, num_viewers, categories.category_name 
-                             FROM streams 
-                             JOIN categories ON streams.category_id = categories.category_id
-                             WHERE category_id IN (SELECT category_id FROM categories WHERE user_id = ?)
-                             ORDER BY num_viewers DESC
-                             LIMIT 25;  """, (user_id,))
+    db = Database()
+    # TODO: Change this to do what the function says
+    categories = db.fetchall("""
+                        SELECT s.stream_id, s.title, u.username, s.num_viewers, c.category_name
+                        FROM streams AS s
+                        JOIN users AS u ON u.user_id = s.user_id
+                        JOIN categories AS c ON s.category_id = c.category_id
+                        JOIN followed_categories AS f ON s.category_id = f.category_id
+                        WHERE f.user_id = ?
+                        ORDER BY s.num_viewers DESC
+                        LIMIT 25;
+                    """, (user_id,))
     return categories
 
 #TODO Needs to be reworked to get categories instead of streams of categories
@@ -36,8 +40,8 @@ def recommendations_based_on_category(category_id: int) -> Optional[List[Tuple[i
     Queries stream database to get top 25 most viewed streams based on given category and returns 
     (user_id, title, username, num_viewers, category_name)
     """
-    with Database() as db:
-        data = db.fetchall("""
+    db = Database()
+    data = db.fetchall("""
         SELECT streams.category_id, streams.user_id, streams.title, users.username, streams.num_viewers, categories.category_name
         FROM streams
         JOIN users ON users.user_id = streams.user_id
@@ -53,8 +57,8 @@ def default_recommendations():
     Return a list of 25 recommended live streams by number of viewers
     (user_id, title, username, num_viewers, category_name)
     """
-    with Database() as db:
-        data = db.fetchall("""
+    db = Database()
+    data = db.fetchall("""
         SELECT stream_id, users.user_id, title, username, num_viewers, category_name
         FROM streams 
         JOIN users ON users.user_id = streams.user_id 
@@ -68,8 +72,8 @@ def category_recommendations():
     """
     Returns a list of the top 5 most popular categories
     """
-    with Database() as db:
-        categories = db.fetchall("""
+    db = Database()
+    categories = db.fetchall("""
             SELECT categories.category_id, categories.category_name
             FROM streams
             JOIN categories ON streams.category_id = categories.category_id