From 7b511677c90d3d680c5620876a5559f9fa0f190f Mon Sep 17 00:00:00 2001 From: ThisBirchWood <98231127+ThisBirchWood@users.noreply.github.com> Date: Tue, 28 Jan 2025 09:06:54 +0000 Subject: [PATCH] Patch: Adjusted SQL schema to remove errors, and added sample data to test Flask routes --- web_server/database/app.db | Bin 73728 -> 73728 bytes web_server/database/streaming.sql | 4 +- web_server/database/testing_data.sql | 55 +++++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 web_server/database/testing_data.sql diff --git a/web_server/database/app.db b/web_server/database/app.db index a6fa279f14a809694356f6887b233c40e7f21633..d504165d067fe2ca0837306a790884e77a5d68f7 100644 GIT binary patch delta 1983 zcmaJ=U2GIp6uv(*ots`ykl&X!NsCB5RtC+4D!`_$bDx!~ii(5L? z%04BYNZ>iLL#ie7rN4z(r#aQ(|m%f@;_qk(zKG(JKj#we@ zJ^2ZVy@KtDInfHH=`rfvA4;pxXR#3SPO&W!InqGvB-_qnk__-6t6VGb&Y@~qIlrM=tY~Gf<*K$;Dvoe1NYv`JtmSei zxkge@Vo{o`?#tHK*6n(UTXqHXc($I0zq7?gsrERxh6=?>UgIO&Zn%E9UK_4dcXqC& z3R=x5?KZK-bKDP00-P-m7M_do|AV);j!t4mIxOE%4)(SSsY#gy` z>Pk1`z`a=<=@;xr5jwd!dPOW<>75U9Lw))3S=m zvNTZXlK-W7>VF9*GRUa8x1*94k=Z0-f3PX`1G~s3 zfqj}SS7nM81ctXr6t%->Ly^#;CQ8wLFrOhpQQYshiXk=V<4e)#(Sc?)3RhyVRM5J? zp4TKe;v!;yK?8qg-?57TpJfj#q9a(A!-{AGmLx?H^g+5`!=mKf&v}0EK?UmWCuu#Q4g703#{+0n8co0~j6xog-o<{sCXrZi delta 1791 zcmZ8hZD<@t7{1xv+q?aoq>x-O4Vge(}iR96>RH|SUDYxE)c{NNYYND z5A@S5^B{f6Sf~FfR$_^iO8x?&=d~Vsk6DuN6SN4iytX{~!SBmJI(mw3%SYw4@bPLO zg+N|yKS{gw>r&&yMd^m-Rt#>z*CBx!d&mCVzG@%0HR~tqwspqpGygQVs_B+@%}O6s z0qE?&P%4*5an5n^v4tWb^J&lVvKhzCc!S6t9L3pD$2ny4wFj{+*VcNIi}?~_&okx1 zUV_62uEhzx*s2rUQ{^J*M`3}W63H=2r7?*m(7=geZW&T$^_3#b$>5y4vYiv&fB z1O@rRc@%}>eLl<`ZPx2?z1ZMeWw256=8V+!`b++md|@H&RhnFSTy&qV0$@f$ zJWYZeOTWjU>$0`O8ecn%wc6UlkLGhsUWk?miO_ObMt%_NCGsRANiJ;!SCTcG&hU5v zWzkZ;P>x8cAB{6(%;7+@Er;7Wp5WXGoTyWWrWZ*8UCIZ6s78TYju3g46e7g#OEKD0 z8b_Rr%J=BS6}4U)cQTBa*k$DN^Ka6OM;&1{&N*2euT!$q?CKyNF#?OFh=rxSM4oI& z;Z@3FrB7v@neAbzol=#4rospH9lm4)?A=!JW)-cJ4S*a?B_)+F0;>WuQqOq-(v__C;S`k zz~A66a2tLLzlLAH&)~=KeRvz*gg4+uHI2@}N8;frig}Qs0z@4 zu8W{)Vm2u!MNG&E5miYQF)qc$GDQ(VmPL>xMbR|P;>}>UBk;E>yzocY^%lUo0z499 za;xxH_yer4{;&z(VLjqySY&--22Q{uOz?hKG38FMTMHM%2H@EZz_l8HW8MYMh|vJB z-T)434PZFg0EQBG!Gn&g-bGF}-T(%b27u)T;7NwuS-**{^&tRqOI5k>kFZ|vkWh5U Ow^mwsJ?fK+nEW3C>8^1A diff --git a/web_server/database/streaming.sql b/web_server/database/streaming.sql index 5a51dba..c71bca7 100644 --- a/web_server/database/streaming.sql +++ b/web_server/database/streaming.sql @@ -17,12 +17,11 @@ CREATE TABLE stream_tags DROP TABLE IF EXISTS chat; CREATE TABLE chat ( - message_id INTEGER PRIMARY KEY AUTOINCREMENT, + message_id INTEGER PRIMARY KEY AUTOINCREMENT , stream_id INTEGER NOT NULL, chatter_id VARCHAR(50) NOT NULL, message VARCHAR(256) NOT NULL, time_sent DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, - PRIMARY KEY (message_id, stream_id), FOREIGN KEY (chatter_id) REFERENCES users(user_id), FOREIGN KEY (stream_id) REFERENCES streams(stream_id) ON DELETE CASCADE ); @@ -59,5 +58,6 @@ CREATE TABLE streamers streamer_id INTEGER NOT NULL, since DATETIME, isPartnered BOOLEAN NOT NULL DEFAULT 0, + stream_key VARCHAR(60) NOT NULL, FOREIGN KEY(user_id) REFERENCES users(user_id) ON DELETE CASCADE ); diff --git a/web_server/database/testing_data.sql b/web_server/database/testing_data.sql new file mode 100644 index 0000000..4b617e5 --- /dev/null +++ b/web_server/database/testing_data.sql @@ -0,0 +1,55 @@ +-- Sample data for categories +INSERT INTO categories (category_name) VALUES +('Gaming'), +('Music'), +('Art'), +('Education'), +('Sports'); + +-- Sample data for users +INSERT INTO users (username, password, email, num_followers, bio) VALUES +('GamerDude', 'password123', 'gamerdude@example.com', 500, 'Streaming my gaming adventures!'), +('MusicLover', 'music4life', 'musiclover@example.com', 1200, 'I share my favorite tunes.'), +('ArtFan', 'artistic123', 'artfan@example.com', 300, 'Exploring the world of art.'), +('EduGuru', 'learn123', 'eduguru@example.com', 800, 'Teaching everything I know.'), +('SportsStar', 'sports123', 'sportsstar@example.com', 2000, 'Join me for live sports updates!'); + +-- Sample data for streamers +INSERT INTO streamers (user_id, streamer_id, since, stream_key, isPartnered) VALUES +(1, 101, '2023-01-01', '1234', 1), +(2, 102, '2022-05-15', '2345', 0), +(3, 103, '2023-03-20', '3456', 0), +(4, 104, '2021-11-05', '4567', 1), +(5, 105, '2020-07-18', '5678', 1); + +-- Sample data for streams +INSERT INTO streams (streamer_id, stream_id, title, start_time, num_viewers, isLive, vod_id, category_id) VALUES +(101, 1001, 'Epic Gaming Session', '2025-01-25 18:00:00', 150, 1, NULL, 1), +(102, 1002, 'Live Music Jam', '2025-01-25 20:00:00', 350, 1, NULL, 2), +(103, 1003, 'Sketching Live', '2025-01-24 15:00:00', 80, 0, 201, 3), +(104, 1004, 'Math Made Easy', '2025-01-23 10:00:00', 400, 0, 202, 4), +(105, 1005, 'Sports Highlights', '2025-01-25 12:00:00', 500, 1, NULL, 5); + +-- Sample data for follows +INSERT INTO follows (user_id, streamer_id, since) VALUES +(1, 102, '2024-12-01'), +(2, 101, '2024-11-15'), +(3, 103, '2024-10-20'), +(4, 104, '2024-09-12'), +(5, 105, '2024-08-30'); + +-- Sample data for user_preferences +INSERT INTO user_preferences (user_id, category_id, favourability) VALUES +(1, 1, 10), +(2, 2, 9), +(3, 3, 8), +(4, 4, 7), +(5, 5, 10); + +-- Sample data for subscribes +INSERT INTO subscribes (user_id, streamer_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');