From 5d3479e726bf8d0d67b019fbf40dd36e5c32a84c Mon Sep 17 00:00:00 2001
From: white <122345776@umail.ucc.ie>
Date: Thu, 30 Jan 2025 11:24:52 +0000
Subject: [PATCH] UPDATE: Added more complete test queries, fixed
 recommendations queries

---
 web_server/database/app.db               | Bin 73728 -> 73728 bytes
 web_server/database/testing_data.sql     | 103 ++++++++++++++---------
 web_server/utils/recommendation_utils.py |   3 +-
 3 files changed, 64 insertions(+), 42 deletions(-)

diff --git a/web_server/database/app.db b/web_server/database/app.db
index b83ae031cc7ac8cbd59f92bfc7ac56eb26744e53..ce141243015a6713f36a07e205679bdecfc512ba 100644
GIT binary patch
delta 1016
zcmYL`O=w(I6vyv*_uhFQGnq3}jgw^Z@m{Q2Y^J=AeweXsR47qMO4XvqfOaxIlVFm;
zd6P)NMVz7=HwiZjb)^AYtzVGmqKhsfWFZAZ7p+thsDjoA${<uM^#kwRCb&5FUC#NP
zbN=`L=2zMLDqF~BBSOfo?a&B;pBMXry%E{hccO)D5rnG*KeueNH+8|dVic{-#1i{G
zF-l!_Ha!4WttIh+In3CWHnO;Jo7JDKA6?w=0pm100PwIlsP#cAE^C7Ths7uKXu2iw
zHZkQoLh3Kq`{O_91VB-o;)NEOx>GpQTYo5ikADboP&}f)0|&%+`f&)v9^-HD#eL?h
z`my>zA~zC<FKC;Htvx(*=DGTz_<L&uV1Ilu^%nFV(Q}RiZ#uQo*i;zJjz#6_<X9N}
ze@n+NrQgq56gLUp#9weT&f4p^J4q?&8XA1;<daW4y4TbwX&)?2PtJ^6KuP}C%=pw~
zG_m5cOq$~w!9VaPyoT$zCYx7q$l$aU$`hp;HJH5BO5+ig1M?8os$pq5;%SXKP%hQN
z@k(_vjJOFj2eVOFjr8X88A`)%%c%|Ak`u4t{hUz%O=FaT6r)koWI$zClcqRIa19r5
zRI<Zp1~frT90+`Is<J!lc}4e7(F=U7nLQGC;@!%<Pwixj(98}8-s9nEJDdxvrz<mI
zpFLHXlW(<a6QO-avg5n{fr9H50@vQ@wbbqg!M~bH<?bIa%PE3So2MtmqUkNqyDO^+
zJ2gx2NBkN;l`>}~T1LH{b7DG<c)gMD=W_i1g4<v4{GCOf-$6M6$6>1Gxdr*%7U8=c
znyOK8xseA={Mu-fKjL~*%1!(YZ{T&g;~R81m$q@P++&PO_kdEaDKDus&|JQp`4aTZ
zAjr35Wn^Sv>U`>O^4sKGGG~2k9XC%JH;j41*1yu9PTb=E@&*1NyTo3h|IlUaBdrKm
zpa!kv92pwv6=%Di2S-5nG}xlj{Q~re_3js;TkPuzp-U|FOwl)9>lB}L-h#YhI~3cl
z*fz!H6noD$+p5^R6?>OrcPTcj*o<Ovn@uaWMX@QxCKYQb)>N#~WaIOl&(Qw>)R6py

delta 708
zcmYL{K}Zx)7{}i?Z)Rs^+nu+wWxMSb&8!kZZp_YFp_q0NB}k+W)uCWkM|Z<^X=fCK
z4l+`w0_BC+O@g4HB%Fi}5gs~p5>IYmXon&wgCHspsosu?kN4+&@PFU?ejnc(U*yLZ
z`N_1JL<q&1B1{}YFgMklKaoTyZ!AagS42<^kvTadHAP;DD`I>2gD{PM3fDLjKT$eS
zE&PD$u?xI+**iS7x=H6E67Azvy1{kBA=-kQA?jPW8z4oW@*RpI+($C2gOE4qCH!A}
z5g<vghq6(5ddHZ^cnAHN&|`oDv_qPK{j?_af=Z9cTM(m-;afb*{>zGPie283P~vKy
zKIfCv4<8rQi7Q@%|1rD@5cgk4?m{LlCUhO{=&n^5ww;lJ(_bwWY-cYb{(v&8F7U8L
z<_$g;;mHyrKgehDo-FyQ_J-so9ydUL(Q@%VjMLz_RolAh2r`EgFyh!%M^pgo&~Lf+
zP^DV39U-~^@Q)}_#)(NUB5%n((#sw@N8;@`gk-%lf4)*Im&bZ6r$`4XO$~<GmSg+O
zX^z>6v-wLSj#Z`)D~%U-oi?aDUE5BNJ*IVy+SRdUZMZU8Di3LH(bl%fOv5~tHFDX!
zq3z~|1CTXD*2o|7-B<gTNk(DFdk|P=%>+d`2`A(rdNghvWr_6#O!Xh4GR2tc6A+nv
z)%dMYBld0nMM#Udh<qaN$TKoYT-I%YNGU-;pz9@idp+G+WMnN_qcxi|cNueL3I{ia
m0xxG|*}21S8YwRD2I=y88f?0;o(#tH62#bo24Be3Z2UjGd9^zL

diff --git a/web_server/database/testing_data.sql b/web_server/database/testing_data.sql
index c545afc..e30f932 100644
--- a/web_server/database/testing_data.sql
+++ b/web_server/database/testing_data.sql
@@ -1,12 +1,4 @@
--- Sample data for categories
-INSERT INTO categories (category_name) VALUES 
-('Gaming'),
-('Music'),
-('Art'),
-('Education'),
-('Sports');
-
--- Sample data for users
+-- Sample Data for users
 INSERT INTO users (username, password, email, num_followers, stream_key, is_partnered, bio, current_stream_title, current_selected_category_id) VALUES 
 ('GamerDude', 'password123', 'gamerdude@example.com', 500, '1234', 0, 'Streaming my gaming adventures!', 'Epic Gaming Session', 1),
 ('MusicLover', 'music4life', 'musiclover@example.com', 1200, '2345', 0, 'I share my favorite tunes.', 'Live Music Jam', 2),
@@ -14,15 +6,11 @@ INSERT INTO users (username, password, email, num_followers, stream_key, is_part
 ('EduGuru', 'learn123', 'eduguru@example.com', 800, '4567', 0, 'Teaching everything I know.', 'Math Made Easy', 4),
 ('SportsStar', 'sports123', 'sportsstar@example.com', 2000, '5678', 0, 'Join me for live sports updates!', 'Sports Highlights', 5);
 
--- Sample data for streams
-INSERT INTO streams (user_id, title, start_time, num_viewers, isLive, vod_id, category_id) VALUES 
-(1, 'Epic Gaming Session', '2025-01-25 18:00:00', 150, 1, NULL, 1),
-(2, 'Live Music Jam', '2025-01-25 20:00:00', 350, 1, NULL, 2),
-(3, 'Sketching Live', '2025-01-24 15:00:00', 80, 0, 201, 3),
-(4, 'Math Made Easy', '2025-01-23 10:00:00', 400, 0, 202, 4),
-(5, 'Sports Highlights', '2025-01-25 12:00:00', 500, 1, NULL, 5);
+INSERT INTO users (username, password, email, num_followers, stream_key, is_partnered, bio) VALUES 
+('GamerDude2', 'password123', 'gamerdude3@gmail.com', 3200, '7890', 0, 'Streaming my gaming adventures!'),
+('dev', 'scrypt:32768:8:1$avr94c5cplosNUDc$f2ba0738080facada51a1ed370bf869199e121e547fe64a7094ef0330b5db2ab7fff87700898729977f4cd24f17c17b9e8c0c93e7241dcdf9aa522d5d1732626', 'dev@gmail.com', 1, '8080', 0, 'A test account to save that tedious signup each time!');
 
--- Sample data for follows
+-- Sample Data for follows
 INSERT INTO follows (user_id, followed_id, since) VALUES 
 (1, 2, '2024-12-01'),
 (2, 3, '2024-11-15'),
@@ -30,7 +18,7 @@ INSERT INTO follows (user_id, followed_id, since) VALUES
 (4, 5, '2024-09-12'),
 (5, 1, '2024-08-30');
 
--- Sample data for user_preferences
+-- Sample Data for user_preferences
 INSERT INTO user_preferences (user_id, category_id, favourability) VALUES 
 (1, 1, 10),
 (2, 2, 9),
@@ -38,32 +26,65 @@ INSERT INTO user_preferences (user_id, category_id, favourability) VALUES
 (4, 4, 7),
 (5, 5, 10);
 
--- Sample data for subscribes
+-- Sample Data for subscribes
 INSERT INTO subscribes (user_id, subscribed_id, since, expires) VALUES 
-(1, 101, '2024-12-01', '2025-01-01'),
-(2, 102, '2024-11-15', '2025-02-15'),
-(3, 103, '2024-10-20', '2025-01-20'),
-(4, 104, '2024-09-12', '2025-01-12'),
-(5, 105, '2024-08-30', '2025-02-28');
+(1, 2, '2024-12-01', '2025-01-01'),
+(2, 3, '2024-11-15', '2025-02-15'),
+(3, 4, '2024-10-20', '2025-01-20'),
+(4, 5, '2024-09-12', '2025-01-12'),
+(5, 1, '2024-08-30', '2025-02-28');
 
-INSERT INTO users (username, password, email, num_followers, stream_key, is_partnered, bio) VALUES 
-('GamerDude2', 'password123', 'gamerdude3@gmail.com', 3200, '7890', 0, 'Streaming my gaming adventures!'),
-('dev', 'scrypt:32768:8:1$avr94c5cplosNUDc$f2ba0738080facada51a1ed370bf869199e121e547fe64a7094ef0330b5db2ab7fff87700898729977f4cd24f17c17b9e8c0c93e7241dcdf9aa522d5d1732626', 'dev@gmail.com', 1, '8080', 0, 'A test account to save that tedious signup each time!');
+-- Sample Data for followed_categories
+INSERT INTO followed_categories (user_id, category_id) VALUES
+(1, 1),
+(2, 2),
+(3, 3),
+(4, 4),
+(5, 5);
 
+-- Sample Data for categories
+INSERT INTO categories (category_name) VALUES 
+('Gaming'),
+('Music'),
+('Art'),
+('Education'),
+('Sports');
+
+-- Sample Data for streams
+INSERT INTO streams (user_id, title, start_time, num_viewers, isLive, vod_id, category_id) VALUES 
+(1, 'Epic Gaming Session', '2025-01-25 18:00:00', 150, 1, NULL, 1),
+(2, 'Live Music Jam', '2025-01-25 20:00:00', 350, 1, NULL, 2),
+(3, 'Sketching Live', '2025-01-24 15:00:00', 80, 0, 201, 3),
+(4, 'Math Made Easy', '2025-01-23 10:00:00', 400, 0, 202, 4),
+(5, 'Sports Highlights', '2025-01-25 12:00:00', 500, 1, NULL, 5);
+
+-- Sample Data for tags
+INSERT INTO tags(tag_name) VALUES
+('English'),
+('Gaming'),
+('LGBTQIA+');
+
+-- Sample Data for stream_tags
+INSERT INTO stream_tags (stream_id, tag_id) VALUES
+(1, 3),
+(1, 1),
+(2, 1),
+(2, 2);
+
+-- Sample Data for chat
 INSERT INTO chat (stream_id, chatter_id, message) VALUES
-(1, 'Susan', 'Hey Every, loving the stream'),
-(1, 'Susan', 'This stream is crazy man'),
-(1, 'JohnnyHash', 'Woah, cannot believe that');
+(1, 1, 'Hey everyone, loving the stream!'),
+(1, 1, 'This stream is crazy man'),
+(1, 2, 'Woah, cannot believe that');
 
-SELECT * FROM users;
-SELECT * FROM follows;
-SELECT * FROM user_preferences;
-SELECT * FROM subscribes;
-SELECT * FROM categories;
-SELECT * FROM streams;
-SELECT * FROM chat;
-SELECT * FROM tags;
-SELECT * FROM stream_tags;
+SELECT name FROM sqlite_master WHERE type='table';
 
--- To see all tables in the database
-SELECT name FROM sqlite_master WHERE type='table';
\ No newline at end of file
+
+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 = 1
+ORDER BY s.num_viewers DESC
+LIMIT 25;
\ No newline at end of file
diff --git a/web_server/utils/recommendation_utils.py b/web_server/utils/recommendation_utils.py
index 6a064f3..9f40ffd 100644
--- a/web_server/utils/recommendation_utils.py
+++ b/web_server/utils/recommendation_utils.py
@@ -27,10 +27,11 @@ def followed_categories_recommendations(user_id : int):
                         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
+                        JOIN followed_categories AS f ON s.category_id = c.category_id
                         WHERE f.user_id = ?
                         ORDER BY s.num_viewers DESC
                         LIMIT 25;
+
                     """, (user_id,))
     return categories