From 0472ae2a149cebf231b7ae2ffd0e36c7057dff34 Mon Sep 17 00:00:00 2001
From: Greg Shuflin <greg@everydayimshuflin.com>
Date: Mon, 3 Feb 2025 16:32:40 -0800
Subject: [PATCH] Add categories to demo feeds

---
 ...4bed433100db0435c55fca5c239b4e5f58380e14697c3a0.json} | 4 ++--
 src/demo.rs                                              | 9 ++++++---
 src/feeds.rs                                             | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)
 rename .sqlx/{query-7fa0f8d0047afea873a0622bcc26d7a5f903e11d59158768c41125ad36fa4810.json => query-7c3a826ac9b9105554bed433100db0435c55fca5c239b4e5f58380e14697c3a0.json} (89%)

diff --git a/.sqlx/query-7fa0f8d0047afea873a0622bcc26d7a5f903e11d59158768c41125ad36fa4810.json b/.sqlx/query-7c3a826ac9b9105554bed433100db0435c55fca5c239b4e5f58380e14697c3a0.json
similarity index 89%
rename from .sqlx/query-7fa0f8d0047afea873a0622bcc26d7a5f903e11d59158768c41125ad36fa4810.json
rename to .sqlx/query-7c3a826ac9b9105554bed433100db0435c55fca5c239b4e5f58380e14697c3a0.json
index 966b112..5ef81ad 100644
--- a/.sqlx/query-7fa0f8d0047afea873a0622bcc26d7a5f903e11d59158768c41125ad36fa4810.json
+++ b/.sqlx/query-7c3a826ac9b9105554bed433100db0435c55fca5c239b4e5f58380e14697c3a0.json
@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "\n        SELECT \n            feed_id as \"feed_id: String\",\n            name,\n            url,\n            user_id as \"user_id: String\",\n            added_time as \"added_time: chrono::DateTime<chrono::Utc>\",\n            last_checked_time as \"last_checked_time: chrono::DateTime<chrono::Utc>\",\n            categorization as \"categorization: JsonValue\"\n        FROM feeds\n        WHERE user_id = ?\n        ORDER BY added_time DESC\n        ",
+  "query": "\n        SELECT \n            feed_id as \"feed_id: String\",\n            name,\n            url,\n            user_id as \"user_id: String\",\n            added_time as \"added_time: chrono::DateTime<chrono::Utc>\",\n            last_checked_time as \"last_checked_time: chrono::DateTime<chrono::Utc>\",\n            categorization as \"categorization: JsonValue\"\n        FROM feeds\n        WHERE user_id = ?\n        ORDER BY name ASC\n        ",
   "describe": {
     "columns": [
       {
@@ -52,5 +52,5 @@
       false
     ]
   },
-  "hash": "7fa0f8d0047afea873a0622bcc26d7a5f903e11d59158768c41125ad36fa4810"
+  "hash": "7c3a826ac9b9105554bed433100db0435c55fca5c239b4e5f58380e14697c3a0"
 }
diff --git a/src/demo.rs b/src/demo.rs
index 7f3601d..90c1d30 100644
--- a/src/demo.rs
+++ b/src/demo.rs
@@ -46,25 +46,28 @@ pub async fn setup_demo_data(pool: &sqlx::SqlitePool) {
     .await
     .expect("Failed to create demo user");
 
-    let bbc_news = Feed::new(
+    let mut bbc_news = Feed::new(
         "BBC News".to_string(),
         "https://feeds.bbci.co.uk/news/world/us_and_canada/rss.xml"
             .parse()
             .unwrap(),
         demo_id,
     );
+    bbc_news.categorization = vec!["News".to_string()];
 
-    let xkcd = Feed::new(
+    let mut xkcd = Feed::new(
         "XKCD".to_string(),
         "https://xkcd.com/atom.xml".parse().unwrap(),
         demo_id,
     );
+    xkcd.categorization = vec!["Webcomic".to_string()];
 
-    let isidore = Feed::new(
+    let mut isidore = Feed::new(
         "Isidore & Friends".to_string(),
         "https://isidore.webcomic.ws/rss/".parse().unwrap(),
         demo_id,
     );
+    isidore.categorization = vec!["Webcomic".to_string()];
 
     let feeds = [bbc_news, xkcd, isidore];
 
diff --git a/src/feeds.rs b/src/feeds.rs
index 0ea8110..4aaa124 100644
--- a/src/feeds.rs
+++ b/src/feeds.rs
@@ -130,7 +130,7 @@ pub async fn list_feeds(
             categorization as "categorization: JsonValue"
         FROM feeds
         WHERE user_id = ?
-        ORDER BY added_time DESC
+        ORDER BY name ASC
         "#,
         user_id
     )