Update src/streamlit_app.py

src/streamlit_app.py

@@ -211,8 +211,7 @@ def add_example_topic(topic_id, topic_title, topic_description, comments_list):
                 elif comment_text in anti_tech_comments:
                     vote_type = 'disagree'
                 else:
-                    # For neutral/other comments, a chance of neutral or skipping
-                    vote_type = random.choice(['neutral'] * 2 + [None] * 3) # More likely neutral or skip
+                    vote_type = 'neutral'
 
                 if vote_type:
                      # Generate UUID for vote ID and append to list
@@ -232,8 +231,7 @@ def add_example_topic(topic_id, topic_title, topic_description, comments_list):
                 elif comment_text in anti_tech_comments:
                     vote_type = 'agree'
                 else:
-                    # For neutral/other comments, a chance of neutral or skipping
-                    vote_type = random.choice(['neutral'] * 2 + [None] * 3) # More likely neutral or skip
+                    vote_type = 'neutral'
 
                 if vote_type:
                      # Generate UUID for vote ID and append to list
@@ -247,7 +245,7 @@ def add_example_topic(topic_id, topic_title, topic_description, comments_list):
                 if not comment_id: continue
 
                 # Mostly neutral, some random agree/disagree, many skipped
-                vote_type = random.choice(['neutral'] * 5 + ['agree', 'disagree'] + [None] * 5) # Weighted towards neutral and skipping
+                vote_type = random.choice(['neutral'] * 8 + ['agree', 'disagree'])
 
                 if vote_type:
                      # Generate UUID for vote ID and append to list
@@ -305,6 +303,21 @@ def add_dummy_topic():
         "Another set of orders. Understood, sir!",
         "Excellent... with this, I will have even greater control over the galaxy... cackles maniacally"
     ]
+    local_con = None
+    try:
+        local_con = duckdb.connect(database=DB_PATH, read_only=True)
+        # Check if the example topic already exists
+        result = local_con.execute("SELECT * FROM topics WHERE id = ?", [example_topic_id]).fetchone()
+        if result:
+            print(f"INFO: Topic '{example_topic_id}' already exists. Skipping dummy data insertion.")
+            return # Skip adding dummy data if topic exists
+    except Exception as e:
+        # Log error but continue, assuming topic doesn't exist if check fails
+        print(f"WARNING: Error checking for existing topic '{example_topic_id}': {e}")
+        # Don't return, proceed with adding data in case of check error
+    finally:
+        if local_con:
+            local_con.close()
     add_example_topic(example_topic_id, example_topic_title, example_topic_description, example_comments)
 
 
@@ -804,7 +817,7 @@ def get_random_unvoted_comment(user_id, topic_id):
             FROM comments c
             WHERE c.topic_id = ?
             AND NOT EXISTS (
-                SELECT 1 FROM votes v
+                SELECT * FROM votes v
                 WHERE v.comment_id = c.id AND v.user_id = ?
             )
             ORDER BY RANDOM()
@@ -1037,13 +1050,27 @@ def view_topic_page():
             progress_exists = False
             try:
                 local_con = duckdb.connect(database=DB_PATH, read_only=True)
-                # Query the user_progress table for a record matching user_id and topic_id
-                result = local_con.execute("""
-                    SELECT 1 FROM user_progress
+
+                # Check if the user has voted on any comment in this topic
+                # This requires joining votes with comments to filter by topic_id
+                voted_result = local_con.execute("""
+                    SELECT 1
+                    FROM votes v
+                    JOIN comments c ON v.comment_id = c.id
+                    WHERE v.user_id = ? AND c.topic_id = ?
+                    LIMIT 1
+                """, [user_id, topic_id]).fetchone()
+
+                # Check if the user has submitted any comment in this topic
+                commented_result = local_con.execute("""
+                    SELECT 1
+                    FROM comments
                     WHERE user_id = ? AND topic_id = ?
                     LIMIT 1
                 """, [user_id, topic_id]).fetchone()
-                progress_exists = result is not None
+
+                # Progress exists if the user has either voted or commented in this topic
+                progress_exists = voted_result is not None or commented_result is not None
             except Exception as e:
                 # Log error but don't stop the app. Assume no progress on error.
                 st.error(f"Error checking user progress for greeting: {e}")