From eb65e71cfb789e2951cd3dd7c540d49a6e776345 Mon Sep 17 00:00:00 2001
From: Chris-1010 <122332721@umail.ucc.ie>
Date: Thu, 27 Feb 2025 11:54:40 +0000
Subject: [PATCH] REFACTOR: Remove `current_stream_title` and
 `current_selected_category_id` from `users` table

---
 web_server/blueprints/streams.py     |  3 +--
 web_server/database/testing_data.sql | 12 ++++++------
 web_server/database/users.sql        |  3 ---
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/web_server/blueprints/streams.py b/web_server/blueprints/streams.py
index e9a7b56..854ce78 100644
--- a/web_server/blueprints/streams.py
+++ b/web_server/blueprints/streams.py
@@ -215,8 +215,7 @@ def publish_stream():
 
 
     with Database() as db:
-        user_info = db.fetchone("""SELECT user_id, username, current_stream_title, 
-                                current_selected_category_id, is_live
+        user_info = db.fetchone("""SELECT user_id, username, is_live
                                 FROM users 
                                 WHERE stream_key = ?""", (data['stream_key'],))
 
diff --git a/web_server/database/testing_data.sql b/web_server/database/testing_data.sql
index 710d14c..07e38a8 100644
--- a/web_server/database/testing_data.sql
+++ b/web_server/database/testing_data.sql
@@ -1,10 +1,10 @@
 -- Sample Data for users
-INSERT INTO users (username, password, email, num_followers, stream_key, is_partnered, bio, is_live, is_admin, current_stream_title, current_selected_category_id) VALUES 
-('GamerDude', 'password123', 'gamerdude@example.com', 500, '1234', 0, 'Streaming my gaming adventures!', 1, 0, 'Game On!', 1),
-('MusicLover', 'music4life', 'musiclover@example.com', 1200, '2345', 0, 'I share my favorite tunes.', 1, 0, 'Live Music Jam', 2),
-('ArtFan', 'artistic123', 'artfan@example.com', 300, '3456', 0, 'Exploring the world of art.', 1, 0, 'Sketching Live', 3),
-('EduGuru', 'learn123', 'eduguru@example.com', 800, '4567', 0, 'Teaching everything I know.', 1, 0, 'Math Made Easy', 4),
-('SportsStar', 'sports123', 'sportsstar@example.com', 2000, '5678', 0, 'Join me for live sports updates!', 1, 0, 'Sports Highlights', 5);
+INSERT INTO users (username, password, email, num_followers, stream_key, is_partnered, bio, is_live, is_admin) VALUES 
+('GamerDude', 'password123', 'gamerdude@example.com', 500, '1234', 0, 'Streaming my gaming adventures!', 1, 0),
+('MusicLover', 'music4life', 'musiclover@example.com', 1200, '2345', 0, 'I share my favorite tunes.', 1, 0),
+('ArtFan', 'artistic123', 'artfan@example.com', 300, '3456', 0, 'Exploring the world of art.', 1, 0),
+('EduGuru', 'learn123', 'eduguru@example.com', 800, '4567', 0, 'Teaching everything I know.', 1, 0),
+('SportsStar', 'sports123', 'sportsstar@example.com', 2000, '5678', 0, 'Join me for live sports updates!', 1, 0);
 
 INSERT INTO users (username, password, email, num_followers, stream_key, is_partnered, bio, is_live, is_admin) VALUES 
 ('GamerDude2', 'password123', 'gamerdude3@gmail.com', 3200, '7890', 0, 'Streaming my gaming adventures!', 0, 0),
diff --git a/web_server/database/users.sql b/web_server/database/users.sql
index 5fae6c9..8584b16 100644
--- a/web_server/database/users.sql
+++ b/web_server/database/users.sql
@@ -11,9 +11,6 @@ CREATE TABLE users
     is_live BOOLEAN NOT NULL DEFAULT 0,
     bio VARCHAR(1024) DEFAULT 'This user does not have a Bio.',
     is_admin BOOLEAN NOT NULL DEFAULT 0,
-
-    current_stream_title VARCHAR(100) DEFAULT 'Stream',
-    current_selected_category_id INTEGER DEFAULT 1
 );
 
 SELECT * FROM users;