refactor: Reuse logic to get today's birthdays

ducdetronquito · Dec 26, 2023 · 153f808 · 153f808
1 parent 3380a2e
commit 153f808
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -70,16 +70,6 @@ pub fn get_all_birthdays() -> Result<Vec<Birthday>> {
     Ok(birthdays.unwrap())
 }
 
-pub fn get_birthdays_for_date(date: NaiveDate) -> Result<Vec<Birthday>> {
-    let birthdays = get_all_birthdays()?
-        .into_iter()
-        .filter(|birthday| {
-            birthday.date.month() == date.month() && birthday.date.day() == date.day()
-        })
-        .collect();
-    Ok(birthdays)
-}
-
 pub fn get_next_birthday(today: NaiveDate) -> Result<Option<Birthday>> {
     let mut birthdays = get_all_birthdays()?;
     birthdays.sort_by_key(|birthday| birthday.next(today));

diff --git a/src/main.rs b/src/main.rs
@@ -1,6 +1,6 @@
 use anyhow::Result;
 use birthday::Birthday;
-use chrono::Utc;
+use chrono::{Datelike, Utc};
 use clap::{Parser, Subcommand};
 
 #[derive(Parser, Debug)]
@@ -66,7 +66,12 @@ fn main() -> Result<()> {
         }
         Command::Today {} => {
             let today = Utc::now().date_naive();
-            let birthdays = birthday::get_birthdays_for_date(today)?;
+            let birthdays = birthday::search_birthdays(
+                None,
+                Some(today.year()),
+                Some(today.month()),
+                Some(today.day()),
+            )?;
             print_birthdays(birthdays);
             Ok(())
         }