UPDATE: removed two utils files and migrated then to utils in blueprints

web_server/blueprints/utils.py

@@ -1,6 +1,8 @@
 from flask import redirect, url_for, request, g, session
 from functools import wraps
 from re import match
+from database.database import Database
+from typing import Optional, List
 
 def logged_in_user():
     """
@@ -67,3 +69,38 @@ def sanitizer(user_input: str, input_type="username") -> str:
         raise ValueError("Unaccepted character or length in input")
 
     return sanitised_input
+
+def categories() -> Optional[List[dict]]:
+    """
+    Returns all possible streaming categories
+    """
+    with Database() as db:
+        all_categories = db.fetchall("SELECT * FROM categories")
+    
+    return all_categories
+
+def tags() -> Optional[List[dict]]:
+    """
+    Returns all possible streaming tags
+    """
+    with Database() as db:
+        all_tags = db.fetchall("SELECT * FROM tags")
+    
+    return all_tags
+
+def most_popular_category() -> Optional[List[dict]]:
+    """
+    Returns the most popular category based on live stream viewers
+    """
+    with Database() as db:
+        category = db.fetchone("""
+            SELECT categories.category_id, categories.category_name
+            FROM streams
+            JOIN categories ON streams.category_id = categories.category_id
+            WHERE streams.isLive = 1
+            GROUP BY categories.category_name
+            ORDER BY SUM(streams.num_viewers) DESC
+            LIMIT 1;
+        """)
+    
+    return category

web_server/utils/utils.py

@@ -1,37 +0,0 @@
-from database.database import Database
-from typing import Optional, List
-
-def categories() -> Optional[List[dict]]:
-    """
-    Returns all possible streaming categories
-    """
-    with Database() as db:
-        all_categories = db.fetchall("SELECT * FROM categories")
-    
-    return all_categories
-
-def tags() -> Optional[List[dict]]:
-    """
-    Returns all possible streaming tags
-    """
-    with Database() as db:
-        all_tags = db.fetchall("SELECT * FROM tags")
-    
-    return all_tags
-
-def most_popular_category() -> Optional[List[dict]]:
-    """
-    Returns the most popular category based on live stream viewers
-    """
-    with Database() as db:
-        category = db.fetchone("""
-            SELECT categories.category_id, categories.category_name
-            FROM streams
-            JOIN categories ON streams.category_id = categories.category_id
-            WHERE streams.isLive = 1
-            GROUP BY categories.category_name
-            ORDER BY SUM(streams.num_viewers) DESC
-            LIMIT 1;
-        """)
-    
-    return category