claude rework

src/reader/add.rs

@@ -42,3 +42,28 @@ pub async fn add(new_feed: web::Json<NewFeedSchema>) -> HttpResponse {
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use actix_web::http::StatusCode;
+    use actix_web::{test, web, App};
+
+    use super::add;
+    use crate::test_helpers::unique_suffix;
+
+    #[actix_web::test]
+    async fn add_fails_for_unfetchable_feed_url() {
+        let app = test::init_service(App::new().route("/add", web::post().to(add))).await;
+        let req = test::TestRequest::post()
+            .uri("/add")
+            .set_json(serde_json::json!({
+                "title": "Bad feed",
+                "url": format!("not-a-valid-url-{}", unique_suffix()),
+                "user_id": 1
+            }))
+            .to_request();
+        let resp = test::call_service(&app, req).await;
+
+        assert_eq!(StatusCode::NOT_FOUND, resp.status());
+    }
+}

src/reader/get.rs

@@ -72,3 +72,44 @@ pub async fn get(path: web::Path<JsonUser>, req: HttpRequest) -> impl Responder
 
     articles.respond_to(&request)
 }
+
+#[cfg(test)]
+mod tests {
+    use actix_web::http::StatusCode;
+    use actix_web::{test, web, App};
+
+    use super::get;
+    use crate::database::establish_connection;
+    use crate::test_helpers::{
+        delete_feed, delete_feed_item, delete_user, insert_feed, insert_feed_item, insert_user,
+    };
+
+    #[actix_web::test]
+    async fn get_returns_only_unread_items() {
+        let mut connection = establish_connection();
+        let user = insert_user(&mut connection, "secret");
+        let feed = insert_feed(&mut connection, user.id);
+        let unread = insert_feed_item(&mut connection, feed.id, false);
+        let read = insert_feed_item(&mut connection, feed.id, true);
+
+        let app =
+            test::init_service(App::new().route("/get/{user_id}", web::get().to(get))).await;
+        let req = test::TestRequest::get()
+            .uri(&format!("/get/{}", user.id))
+            .to_request();
+        let resp = test::call_service(&app, req).await;
+
+        assert_eq!(StatusCode::OK, resp.status());
+
+        let body = test::read_body(resp).await;
+        let body_str = String::from_utf8(body.to_vec()).unwrap();
+
+        assert!(body_str.contains(&unread.title));
+        assert!(!body_str.contains(&read.title));
+
+        delete_feed_item(&mut connection, unread.id);
+        delete_feed_item(&mut connection, read.id);
+        delete_feed(&mut connection, feed.id);
+        delete_user(&mut connection, user.id);
+    }
+}

src/reader/mark_read.rs

@@ -29,3 +29,55 @@ pub async fn mark_read(_req: HttpRequest, path: web::Path<ReadItem>) -> impl Res
 
     HttpResponse::Ok()
 }
+
+#[cfg(test)]
+mod tests {
+    use actix_web::http::StatusCode;
+    use actix_web::{test, web, App};
+    use diesel::prelude::*;
+
+    use super::mark_read;
+    use crate::database::establish_connection;
+    use crate::models::feed_item::rss_feed_item::FeedItem;
+    use crate::schema::feed_item;
+    use crate::test_helpers::{
+        delete_feed, delete_feed_item, delete_user, insert_feed, insert_feed_item, insert_user,
+    };
+
+    #[actix_web::test]
+    async fn mark_read_flips_the_read_flag() {
+        let mut connection = establish_connection();
+        let user = insert_user(&mut connection, "secret");
+        let feed = insert_feed(&mut connection, user.id);
+        let item = insert_feed_item(&mut connection, feed.id, false);
+
+        let app =
+            test::init_service(App::new().route("/read/{id}", web::put().to(mark_read))).await;
+        let req = test::TestRequest::put()
+            .uri(&format!("/read/{}", item.id))
+            .to_request();
+        let resp = test::call_service(&app, req).await;
+
+        assert_eq!(StatusCode::OK, resp.status());
+
+        let updated: FeedItem = feed_item::table
+            .find(item.id)
+            .first(&mut connection)
+            .unwrap();
+        assert!(updated.read);
+
+        delete_feed_item(&mut connection, item.id);
+        delete_feed(&mut connection, feed.id);
+        delete_user(&mut connection, user.id);
+    }
+
+    #[actix_web::test]
+    async fn mark_read_returns_not_found_for_unknown_id() {
+        let app =
+            test::init_service(App::new().route("/read/{id}", web::put().to(mark_read))).await;
+        let req = test::TestRequest::put().uri("/read/999999999").to_request();
+        let resp = test::call_service(&app, req).await;
+
+        assert_eq!(StatusCode::NOT_FOUND, resp.status());
+    }
+}

src/reader/sync.rs

@@ -19,38 +19,19 @@ use rss::Item;
 use scraper::{Html, Selector};
 
 fn get_date(date_str: &str) -> Result<NaiveDateTime, chrono::ParseError> {
-    // let format_string = "%a, %d %b %Y %H:%M:%S %z";
-    let format_string = "%Y-%m-%dT%H:%M:%S%Z";
-
-    let result = parse(date_str).unwrap();
-    log::info!("Date: {:?}", result);
-
-    match NaiveDateTime::parse_from_str(&result.to_string(), format_string) {
-        Ok(r) => Ok(r),
-        Err(_) => {
-            let datetime = DateTime::parse_from_rfc2822(date_str);
-            match datetime {
-                Ok(r) => NaiveDateTime::parse_from_str(&r.to_rfc3339(), format_string),
-                Err(_) => match DateTime::parse_from_rfc2822(date_str) {
-                    Ok(r) => NaiveDateTime::parse_from_str(&r.to_rfc3339(), format_string),
-                    Err(e) => Err(e),
-                },
-            }
-        }
+    if let Ok(result) = parse(date_str) {
+        log::info!("Date: {:?}", result);
+        return Ok(result.with_timezone(&Local).naive_local());
     }
+
+    DateTime::parse_from_rfc2822(date_str).map(|dt| dt.with_timezone(&Local).naive_local())
 }
 
 fn create_feed_item(item: Item, feed: &Feed, connection: &mut PgConnection) {
     let item_title = item.title.clone().unwrap();
     log::info!("Create feed item: {}", item_title);
 
-    let base_content: &str = match item.content() {
-        Some(c) => c,
-        None => match item.description() {
-            Some(c) => c,
-            None => "",
-        },
-    };
+    let base_content: &str = item.content().or(item.description()).unwrap_or_default();
 
     let frag = Html::parse_fragment(base_content);
     let mut content = "".to_string();
@@ -133,3 +114,79 @@ pub async fn sync(_req: HttpRequest, data: web::Json<JsonUser>) -> impl Responde
 
     HttpResponse::Ok()
 }
+
+#[cfg(test)]
+mod tests {
+    use crate::models::feed::new_feed::NewFeed;
+    use crate::models::user::new_user::NewUser;
+    use crate::models::user::rss_user::User;
+    use crate::schema::users;
+    use crate::test_helpers::unique_suffix;
+
+    use super::*;
+
+    #[test]
+    fn get_date_parses_iso8601_dates() {
+        assert!(get_date("2024-01-01T12:00:00Z").is_ok());
+    }
+
+    #[test]
+    fn get_date_parses_rfc2822_dates() {
+        assert!(get_date("Tue, 03 Jun 2025 10:00:00 GMT").is_ok());
+    }
+
+    #[test]
+    fn get_date_returns_err_for_unparseable_dates() {
+        assert!(get_date("not-a-date").is_err());
+    }
+
+    #[actix_web::test]
+    async fn create_feed_item_does_not_duplicate_existing_items() {
+        let mut connection = establish_connection();
+        let suffix = unique_suffix();
+
+        let new_user = NewUser::new(
+            format!("sync_test_{suffix}"),
+            format!("sync_{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!("Sync 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 mut item = Item::default();
+        item.set_title(Some(format!("Sync test article {suffix}")));
+        item.set_link(Some(format!("https://example.test/article/{suffix}")));
+        item.set_content(Some("<p>Hello world</p>".to_string()));
+
+        create_feed_item(item.clone(), &feed, &mut connection);
+        create_feed_item(item, &feed, &mut connection);
+
+        let items: Vec<FeedItem> = feed_item::table
+            .filter(feed_id.eq(feed.id))
+            .load(&mut connection)
+            .unwrap();
+        assert_eq!(1, items.len(), "duplicate feed items should not be created");
+
+        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();
+    }
+}