Merge pull request #24 from codehearts/update-crates

Update crates

Author: codehearts

Cargo.lock

@@ -10,14 +10,16 @@ license = "MIT"
 edition = "2021"
 
 [dependencies]
-chrono = { version="0.4", default-features=false, features=["clock", "serde"] }
-config = { version="0.10", default-features=false, features=["yaml"] }
+config = { version="0.11", default-features=false, features=["yaml"] }
 diesel = { version="1.4", default-features=false, features=["sqlite"] }
 serde = { version="1.0", default-features=false, features=["derive", "std"] }
 serde_json = "1.0"
 structopt = "0.3"
-tokio = { version="0.2", default-features=false, features=["macros", "rt-threaded", "stream", "time"] }
 thiserror = "1.0"
+time = { version="0.3", default-features=false, features=["local-offset", "macros", "serde", "serde-human-readable", "std"] }
+tokio = { version="1.0", default-features=false, features=["macros", "rt-multi-thread", "time"] }
+tokio-stream = { version="0.1", default-features=false }
+tokio-util = { version="0.6", default-features=false, features=["time"] }
 
 # Console integration
 colored = { version="2.0", default-features=false }

Cargo.toml

@@ -1 +1 @@
-1.57.0
+1.64.0

rust-toolchain

@@ -3,8 +3,8 @@
 use super::{Command, Providers};
 use crate::reminder::model::{NewReminder, UpdatedReminder};
 use crate::Schedule;
-use chrono::{DateTime, Datelike, TimeZone, Utc, Weekday};
 use structopt::StructOpt;
+use time::{OffsetDateTime, Weekday};
 
 #[derive(StructOpt)]
 /// Commands for reminder management
@@ -104,10 +104,17 @@ impl Command for Reminder {
 }
 
 /// Returns the start of the current week
-fn get_start_of_this_week() -> DateTime<Utc> {
-    let iso_week = Utc::today().iso_week();
-    Utc.isoywd(iso_week.year(), iso_week.week(), Weekday::Mon)
-        .and_hms(0, 0, 0)
+fn get_start_of_this_week() -> OffsetDateTime {
+    let mut today = OffsetDateTime::now_utc().date();
+
+    while today.weekday() != Weekday::Monday {
+        match today.previous_day() {
+            Some(date) => today = date,
+            None => break,
+        }
+    }
+
+    today.midnight().assume_utc()
 }
 
 #[cfg(test)]
@@ -116,9 +123,9 @@ mod tests {
     use crate::reminder::{model, provider::MockProvidable};
     use mockall::predicate::eq;
 
-    const SCHEDULE_ROADHOUSE: &str = r#"{"mon":["21:00:00"]}"#;
-    const SCHEDULE_253: &str = r#"{"wed":["14:53:00"]}"#;
-    const SCHEDULE_254: &str = r#"{"wed":["14:54:00"]}"#;
+    const SCHEDULE_ROADHOUSE: &str = r#"{"Monday":["21:00:00.0"]}"#;
+    const SCHEDULE_253: &str = r#"{"Wednesday":["14:53:00.0"]}"#;
+    const SCHEDULE_254: &str = r#"{"Wednesday":["14:54:00.0"]}"#;
 
     const ASSIGNEES_ROADHOUSE: [i32; 2] = [1, 2];
     const ASSIGNEES_253: [i32; 2] = [3, 4];

src/command/reminder.rs

@@ -8,7 +8,7 @@ use serde::Deserialize;
 use std::collections::BTreeMap;
 
 /// All configurable properties of the app
-#[derive(Debug, Deserialize, PartialEq)]
+#[derive(Debug, Deserialize, Eq, PartialEq)]
 pub struct Config {
     /// Configuration for the database
     pub database: Database,
@@ -17,14 +17,14 @@ pub struct Config {
 }
 
 /// All configurable database properties
-#[derive(Debug, Deserialize, PartialEq)]
+#[derive(Debug, Deserialize, Eq, PartialEq)]
 pub struct Database {
     /// Configuration for the sqlite database
     pub sqlite: SqliteDatabase,
 }
 
 /// All configurable sqlite database properties
-#[derive(Debug, Deserialize, PartialEq)]
+#[derive(Debug, Deserialize, Eq, PartialEq)]
 pub struct SqliteDatabase {
     /// Path to the sqlite database
     pub path: String,