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

fix sync missing articles

Browse Source
This commit is contained in:
Mathias Rothenhaeusler
2026-06-10 06:08:17 +02:00
parent 972e967432
commit 0420cf0dd5
3 changed files with 48 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/reader/sync.rs
+2 -123
View File
@@ -12,7 +12,7 @@ use crate::{
},
};
use actix_web::{web, HttpRequest, HttpResponse, Responder};
use chrono::{DateTime, Duration, Local, NaiveDateTime};
use chrono::{DateTime, Local, NaiveDateTime};
use dateparser::parse;
use diesel::prelude::*;
use rss::Item;
@@ -127,28 +127,9 @@ fn create_feed_item(item: Item, feed: &Feed, connection: &mut PgConnection) {
}
}
// Only read items are purged, and only once they're old — unread items are
// kept regardless of age so infrequently-updated feeds (or infrequent syncs)
// don't lose articles the user hasn't seen yet. Items without a `created_ts`
// (e.g. ones inserted before this column existed, or whose feed didn't
// provide a publish date) are left alone — `lt` never matches NULL.
fn delete_old_feed_items(connection: &mut PgConnection) {
let cutoff = Local::now().naive_local() - Duration::days(14);
let result = diesel::delete(
feed_item::table
.filter(feed_item::read.eq(true))
.filter(feed_item::created_ts.lt(cutoff)),
)
.execute(connection);
log::info!("Deleted old read feed items (older than 2 weeks): {:?}", result);
}
pub async fn sync(_req: HttpRequest, data: web::Json<JsonUser>) -> impl Responder {
let mut connection: diesel::PgConnection = establish_connection();
delete_old_feed_items(&mut connection);
let req_user_id: i32 = data.user_id;
let feeds: Vec<Feed> = feed::table
@@ -183,6 +164,7 @@ mod tests {
use crate::models::user::rss_user::User;
use crate::schema::users;
use crate::test_helpers::unique_suffix;
use chrono::Duration;
use super::*;
@@ -270,109 +252,6 @@ mod tests {
);
}
#[actix_web::test]
async fn delete_old_feed_items_removes_only_old_read_items() {
let mut connection = establish_connection();
let suffix = unique_suffix();
let new_user = NewUser::new(
format!("cleanup_test_{suffix}"),
format!("cleanup_{suffix}@example.test"),
"secret".to_string(),
);
let user: User = diesel::insert_into(users::table)
.values(&new_user)
.get_result(&mut connection)
.unwrap();
let new_feed = NewFeed::new(
format!("Cleanup test feed {suffix}"),
format!("https://example.test/feed/{suffix}"),
user.id,
);
let feed: Feed = diesel::insert_into(feed::table)
.values(&new_feed)
.get_result(&mut connection)
.unwrap();
let now = Local::now().naive_local();
let old_read_item = NewFeedItem::new(
feed.id,
"old read content".to_string(),
format!("Old read article {suffix}"),
format!("https://example.test/article/old-read-{suffix}"),
Some(now - Duration::days(20)),
);
let old_unread_item = NewFeedItem::new(
feed.id,
"old unread content".to_string(),
format!("Old unread article {suffix}"),
format!("https://example.test/article/old-unread-{suffix}"),
Some(now - Duration::days(20)),
);
let recent_read_item = NewFeedItem::new(
feed.id,
"recent content".to_string(),
format!("Recent article {suffix}"),
format!("https://example.test/article/recent-{suffix}"),
Some(now - Duration::days(1)),
);
let old_read: FeedItem = diesel::insert_into(feed_item::table)
.values(&old_read_item)
.get_result(&mut connection)
.unwrap();
diesel::update(&old_read)
.set(feed_item::read.eq(true))
.execute(&mut connection)
.unwrap();
let old_unread: FeedItem = diesel::insert_into(feed_item::table)
.values(&old_unread_item)
.get_result(&mut connection)
.unwrap();
let recent: FeedItem = diesel::insert_into(feed_item::table)
.values(&recent_read_item)
.get_result(&mut connection)
.unwrap();
diesel::update(&recent)
.set(feed_item::read.eq(true))
.execute(&mut connection)
.unwrap();
delete_old_feed_items(&mut connection);
let remaining: Vec<FeedItem> = feed_item::table
.filter(feed_id.eq(feed.id))
.load(&mut connection)
.unwrap();
let remaining_ids: Vec<i32> = remaining.iter().map(|item| item.id).collect();
assert!(
!remaining_ids.contains(&old_read.id),
"old read item should have been deleted"
);
assert!(
remaining_ids.contains(&old_unread.id),
"old unread item should be kept"
);
assert!(
remaining_ids.contains(&recent.id),
"recent item should be kept"
);
diesel::delete(feed_item::table.filter(feed_id.eq(feed.id)))
.execute(&mut connection)
.ok();
diesel::delete(feed::table.filter(feed::id.eq(feed.id)))
.execute(&mut connection)
.ok();
diesel::delete(users::table.filter(users::id.eq(user.id)))
.execute(&mut connection)
.ok();
}
#[actix_web::test]
async fn create_feed_item_inserts_articles_older_than_two_weeks() {
let mut connection = establish_connection();