From 613d50605f1c547593cac2acf30f94215597311a Mon Sep 17 00:00:00 2001 From: EvanLin3141 Date: Sat, 1 Mar 2025 22:11:41 +0000 Subject: [PATCH] BUG: /categories/recommended --- frontend/src/hooks/useContent.ts | 7 +++++-- web_server/blueprints/streams.py | 3 +-- web_server/utils/recommendation_utils.py | 6 +++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/frontend/src/hooks/useContent.ts b/frontend/src/hooks/useContent.ts index d705885..3113994 100644 --- a/frontend/src/hooks/useContent.ts +++ b/frontend/src/hooks/useContent.ts @@ -9,7 +9,7 @@ import { getCategoryThumbnail } from "../utils/thumbnailUtils"; // Process API data into our VodType structure const processVodData = (data: any[]): VodType[] => { - console.log("Raw API VOD Data:", data); // Debugging + return data.map((vod) => ({ type: "vod", id: vod.id, // Ensure this matches API response @@ -40,6 +40,7 @@ const processStreamData = (data: any[]): StreamType[] => { }; const processCategoryData = (data: any[]): CategoryType[] => { + console.log("Raw API VOD Data:", data); // Debugging return data.map((category) => ({ type: "category", id: category.category_id, @@ -135,6 +136,9 @@ export function useCategories(customUrl?: string): { [isLoggedIn, customUrl] ); + console.log("Fetched Cat Data:", data); // Debugging + + return { categories: data, isLoading, error }; } @@ -150,7 +154,6 @@ export function useVods(customUrl?: string): { [customUrl] ); - console.log("Fetched VODs Data:", data); // Debugging return { vods: data, isLoading, error }; } diff --git a/web_server/blueprints/streams.py b/web_server/blueprints/streams.py index b8233d4..48813f0 100644 --- a/web_server/blueprints/streams.py +++ b/web_server/blueprints/streams.py @@ -60,7 +60,6 @@ def recommended_streams() -> list[dict]: """ user_id = session.get("user_id") - # Get the user's most popular categories category = get_user_preferred_category(user_id) streams = get_streams_based_on_category(category) @@ -112,7 +111,7 @@ def recommended_categories() -> list | list[dict]: """ user_id = session.get("user_id") - categories = get_user_category_recommendations(user_id) + categories = get_user_category_recommendations(1) return jsonify(categories) diff --git a/web_server/utils/recommendation_utils.py b/web_server/utils/recommendation_utils.py index 63bf416..dbecaa6 100644 --- a/web_server/utils/recommendation_utils.py +++ b/web_server/utils/recommendation_utils.py @@ -81,7 +81,7 @@ def get_highest_view_categories(no_categories: int = 4, offset: int = 0) -> Opti """, (no_categories, offset)) return categories -def get_user_category_recommendations(user_id: int, no_categories: int = 4) -> Optional[List[dict]]: +def get_user_category_recommendations(user_id: 1, no_categories: int = 4) -> Optional[List[dict]]: """ Queries user_preferences database to find users top favourite streaming category and returns the category """ @@ -90,8 +90,8 @@ def get_user_category_recommendations(user_id: int, no_categories: int = 4) -> O SELECT categories.category_id, categories.category_name FROM categories JOIN user_preferences ON categories.category_id = user_preferences.category_id - WHERE user_id = ? - ORDER BY favourability DESC + WHERE user_preferences.user_id = ? + ORDER BY user_preferences.favourability DESC LIMIT ? """, (user_id, no_categories)) return categories \ No newline at end of file