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

Use Uuid consistently in db methods

Browse Source
This commit is contained in:
Greg Shuflin 2025-02-05 16:36:18 -08:00
parent 241bb3fba4
commit 286f4273bf
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/poll.rs
View File

@ -26,7 +26,7 @@ pub struct EntryStateUpdate {
read: Option<bool>, read: Option<bool>,
} }
async fn read_entries(feed_id: &str, db: &mut SqliteConnection) -> Result<Vec<Entry>, Status> { async fn read_entries(feed_id: &Uuid, db: &mut SqliteConnection) -> Result<Vec<Entry>, Status> {
let rows = sqlx::query!( let rows = sqlx::query!(
r#" r#"
SELECT SELECT
@ -86,13 +86,13 @@ pub async fn poll_feed(
feed_id: Uuid, feed_id: Uuid,
user: AuthenticatedUser, user: AuthenticatedUser,
) -> Result<Json<FeedPollResponse>, Status> { ) -> Result<Json<FeedPollResponse>, Status> {
let feed_id = feed_id.to_string();
let user_id = user.user_id.to_string(); let user_id = user.user_id.to_string();
let feed_id_str = feed_id.to_string();
// Get the feed URL from the database, ensuring it belongs to the authenticated user // Get the feed URL from the database, ensuring it belongs to the authenticated user
let feed = sqlx::query!( let feed = sqlx::query!(
r#"SELECT url, last_checked_time as "last_checked_time: chrono::DateTime<chrono::Utc>" FROM feeds WHERE feed_id = ? AND user_id = ?"#, r#"SELECT url, last_checked_time as "last_checked_time: chrono::DateTime<chrono::Utc>" FROM feeds WHERE feed_id = ? AND user_id = ?"#,
feed_id, feed_id_str,
user_id user_id
) )
.fetch_optional(&mut **db) .fetch_optional(&mut **db)

4
src/poll_utils.rs
View File

@ -23,7 +23,6 @@ pub struct Entry {
pub marked_read: Option<DateTime<Utc>>, pub marked_read: Option<DateTime<Utc>>,
} }
///
/// Perform the request to fetch from the remote feed url /// Perform the request to fetch from the remote feed url
pub async fn fetch_new_entries(url: &Url) -> Result<Vec<Entry>, Status> { pub async fn fetch_new_entries(url: &Url) -> Result<Vec<Entry>, Status> {
let feed_data = fetch_feed(url).await.map_err(|_| Status::BadGateway)?; let feed_data = fetch_feed(url).await.map_err(|_| Status::BadGateway)?;
@ -53,7 +52,7 @@ pub async fn fetch_new_entries(url: &Url) -> Result<Vec<Entry>, Status> {
pub async fn update_entry_db( pub async fn update_entry_db(
entries: &Vec<Entry>, entries: &Vec<Entry>,
feed_id: &str, feed_id: &Uuid,
db: &mut SqliteConnection, db: &mut SqliteConnection,
) -> Result<(), Status> { ) -> Result<(), Status> {
// Start a transaction for batch update // Start a transaction for batch update
@ -65,6 +64,7 @@ pub async fn update_entry_db(
let now = Utc::now().to_rfc3339(); let now = Utc::now().to_rfc3339();
// Update the feed's last_checked_time // Update the feed's last_checked_time
let feed_id = feed_id.to_string();
sqlx::query!( sqlx::query!(
"UPDATE feeds SET last_checked_time = ? WHERE feed_id = ?", "UPDATE feeds SET last_checked_time = ? WHERE feed_id = ?",
now, now,