greg/rss-reader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Genericize Feed::write_to_db

Browse Source
This commit is contained in:
Greg Shuflin 2025-02-04 01:01:02 -08:00
parent c74ebbe5fa
commit 6e815a94a0
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/feeds.rs
View File

@ -4,6 +4,7 @@ use rocket_db_pools::Connection;
use sqlx::types::JsonValue; use sqlx::types::JsonValue;
use url::Url; use url::Url;
use uuid::Uuid; use uuid::Uuid;
use sqlx::Executor;
use crate::feed_utils::fetch_feed; use crate::feed_utils::fetch_feed;
use crate::user::AuthenticatedUser; use crate::user::AuthenticatedUser;
@ -35,7 +36,10 @@ impl Feed {
} }
} }
pub async fn write_to_database(&self, mut db: Connection<Db>) -> Result<(), sqlx::Error> { pub async fn write_to_database<'a, E>(&self, executor: E) -> sqlx::Result<()>
where
E: Executor<'a, Database = sqlx::Sqlite>
{
// Convert categorization to JSON value // Convert categorization to JSON value
let categorization_json = serde::json::to_value(&self.categorization).map_err(|e| { let categorization_json = serde::json::to_value(&self.categorization).map_err(|e| {
eprintln!("Failed to serialize categorization: {}", e); eprintln!("Failed to serialize categorization: {}", e);
@ -53,7 +57,7 @@ impl Feed {
.bind(self.added_time.to_rfc3339()) .bind(self.added_time.to_rfc3339())
.bind(self.last_checked_time.to_rfc3339()) .bind(self.last_checked_time.to_rfc3339())
.bind(categorization_json.to_string()) .bind(categorization_json.to_string())
.execute(&mut **db) .execute(executor)
.await?; .await?;
Ok(()) Ok(())
@ -70,7 +74,7 @@ pub struct NewFeed {
#[post("/feeds", data = "<new_feed>")] #[post("/feeds", data = "<new_feed>")]
pub async fn create_feed( pub async fn create_feed(
db: Connection<Db>, mut db: Connection<Db>,
new_feed: Json<NewFeed>, new_feed: Json<NewFeed>,
user: AuthenticatedUser, user: AuthenticatedUser,
) -> Result<Json<Feed>, Status> { ) -> Result<Json<Feed>, Status> {
@ -97,7 +101,7 @@ pub async fn create_feed(
let mut feed = Feed::new(name, new_feed.url, user.user_id); let mut feed = Feed::new(name, new_feed.url, user.user_id);
feed.categorization = new_feed.categorization; feed.categorization = new_feed.categorization;
match feed.write_to_database(db).await { match feed.write_to_database(&mut **db).await {
Ok(_) => Ok(Json(feed)), Ok(_) => Ok(Json(feed)),
Err(e) => { Err(e) => {
eprintln!("Database error: {}", e); eprintln!("Database error: {}", e);