FEAT UPDATE: Updated Utils to use new database. Changed route arguments. Added unfollow feature

web_server/utils/recommendation_utils.py

@@ -1,12 +1,12 @@
 from database.database import Database
-from typing import Optional, List, Tuple
+from typing import Optional, List
 
 def user_recommendation_category(user_id: int) -> Optional[int]:
     """
     Queries user_preferences database to find users favourite streaming category and returns the category
     """
-    db = Database()
-    data = db.fetchone("""
+    with Database() as db:
+        data = db.fetchone("""
             SELECT category_id 
             FROM user_preferences 
             WHERE user_id = ? 
@@ -15,66 +15,60 @@ def user_recommendation_category(user_id: int) -> Optional[int]:
         """, (user_id,))
     return data
 
-#TODO Needs to be reworked to get categories instead of streams of categories (below can be done in another function - get_streams_by_category)
-def followed_categories_recommendations(user_id : int):
+def followed_categories_recommendations(user_id : int) -> Optional[List[dict]]:
     """
     Returns top 25 streams given a users category following
     """
-    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 = c.category_id
-                        WHERE f.user_id = ?
-                        ORDER BY s.num_viewers DESC
-                        LIMIT 25;
+    with Database() as db:
+        streams = db.fetchall("""
+            SELECT stream_id, title, username, num_viewers, category_name 
+            FROM streams 
+            JOIN users ON users.user_id = streams.user_id
+            JOIN categories ON streams.category_id = categories.category_id
+            WHERE categories.category_id IN (SELECT category_id FROM followed_categories WHERE user_id = ?)
+            ORDER BY num_viewers DESC
+            LIMIT 25;
+        """, (user_id,))
+    return streams
 
-                    """, (user_id,))
-    return categories
-
-#TODO Needs to be reworked to get categories instead of streams of categories
-def recommendations_based_on_category(category_id: int) -> Optional[List[Tuple[int, str, int]]]:
+def recommendations_based_on_category(category_id: int) -> Optional[List[dict]]:
     """
-    Queries stream database to get top 25 most viewed streams based on given category and returns 
-    (user_id, title, username, num_viewers, category_name)
+    Queries stream database to get top 25 most viewed streams based on given category
     """
-    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
-        JOIN categories ON streams.category_id = categories.category_id
-        WHERE categories.category_id = ? 
-        ORDER BY num_viewers DESC 
-        LIMIT 25
-                           """, (category_id,))
-    return data
+    with Database() as db:
+        streams = db.fetchall("""
+            SELECT streams.stream_id, title, username, num_viewers, category_name
+            FROM streams 
+            JOIN users ON users.user_id = streams.user_id
+            JOIN categories ON streams.category_id = categories.category_id
+            WHERE categories.category_id = ? 
+            ORDER BY num_viewers DESC 
+            LIMIT 25
+        """, (category_id,))
+    return streams
 
-def default_recommendations():
+
+def default_recommendations() -> Optional[List[dict]]:
     """
     Return a list of 25 recommended live streams by number of viewers
-    (user_id, title, username, num_viewers, category_name)
     """
-    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 
-        JOIN categories ON streams.category_id = categories.category_id
-        ORDER BY num_viewers DESC 
-        LIMIT 25;
-    """)
-    return data
+    with Database() as db:
+        data = db.fetchall("""
+            SELECT streams.stream_id, title, username, num_viewers, category_name
+            FROM streams 
+            JOIN users ON users.user_id = streams.user_id 
+            JOIN categories ON streams.category_id = categories.category_id
+            ORDER BY num_viewers DESC 
+            LIMIT 25;
+        """)
+        return data
 
-def category_recommendations():
+def category_recommendations() -> Optional[List[dict]]:
     """
-    Returns a list of the top 5 most popular categories
+    Returns a list of the top 5 most popular live categories
     """
-    db = Database()
-    categories = db.fetchall("""
+    with Database() as db:
+        categories = db.fetchall("""
             SELECT categories.category_id, categories.category_name
             FROM streams
             JOIN categories ON streams.category_id = categories.category_id
@@ -83,5 +77,4 @@ def category_recommendations():
             ORDER BY SUM(streams.num_viewers) DESC
             LIMIT 5;
         """)
-    return categories
-
+    return categories