Replaces DatetimeUtc with DateUtc where appropriate

5 files changed, 19 insertions, 27 deletions

diff --git a/rust/actualbudget_to_schist_transformer/src/schist_state.rs b/rust/actualbudget_to_schist_transformer/src/schist_state.rs
index 92c97b3..e72d56a 100644
--- a/rust/actualbudget_to_schist_transformer/src/schist_state.rs
+++ b/rust/actualbudget_to_schist_transformer/src/schist_state.rs
@@ -1,17 +1,11 @@
 use anyhow::Result;
 use diesel::SqliteConnection;
 use schist_models::{
-    account::Account,
-    budget_drip::BudgetDrip,
-    category::Category,
-    category_transfer::CategoryTransfer,
-    datetime_utc::DatetimeUtc,
-    transaction::Transaction,
-    transaction_categorisation::TransactionCategorisation,
+    account::Account, budget_drip::BudgetDrip, category::Category, category_transfer::CategoryTransfer, date_utc::DateUtc, transaction::Transaction, transaction_categorisation::TransactionCategorisation
 };
 
 pub struct SchistState {
-    pub first_transaction_date: DatetimeUtc,
+    pub first_transaction_date: DateUtc,
     pub accounts: Vec<Account>,
     pub categories: Vec<Category>,
     pub budget_drips: Vec<BudgetDrip>,
diff --git a/rust/actualbudget_to_schist_transformer/src/transform_state/transform_accounts.rs b/rust/actualbudget_to_schist_transformer/src/transform_state/transform_accounts.rs
index 917c62d..68691eb 100644
--- a/rust/actualbudget_to_schist_transformer/src/transform_state/transform_accounts.rs
+++ b/rust/actualbudget_to_schist_transformer/src/transform_state/transform_accounts.rs
@@ -1,11 +1,11 @@
 use actualbudget_models::ActualbudgetAccount;
-use schist_models::{account::Account, datetime_utc::DatetimeUtc};
+use schist_models::{account::Account, date_utc::DateUtc};
 
 use super::transform_id;
 
 pub fn transform_accounts(
     actualbudget_accounts: &[ActualbudgetAccount],
-    first_transaction_date: &DatetimeUtc,
+    first_transaction_date: &DateUtc,
 ) -> Vec<Account> {
     let mut accounts = Vec::<Account>::new();
     for account in actualbudget_accounts {
@@ -16,7 +16,7 @@ pub fn transform_accounts(
 
 fn transform_account(
     actualbudget_account: &ActualbudgetAccount,
-    opening_date: &DatetimeUtc,
+    opening_date: &DateUtc,
 ) -> Account {
     Account {
         id: transform_id(&actualbudget_account.id.clone()),
diff --git a/rust/actualbudget_to_schist_transformer/src/transform_state/transform_date.rs b/rust/actualbudget_to_schist_transformer/src/transform_state/transform_date.rs
index 0e3acca..885ed84 100644
--- a/rust/actualbudget_to_schist_transformer/src/transform_state/transform_date.rs
+++ b/rust/actualbudget_to_schist_transformer/src/transform_state/transform_date.rs
@@ -1,31 +1,31 @@
-use anyhow::Result;
 use actualbudget_models::ActualbudgetDate;
-use schist_models::datetime_utc::DatetimeUtc;
+use anyhow::Result;
+use schist_models::date_utc::DateUtc;
 
-pub fn transform_date(actualbudget_date: &ActualbudgetDate) -> Result<DatetimeUtc> {
-    actualbudget_date.to_iso().parse()
+pub fn transform_date(actualbudget_date: &ActualbudgetDate) -> Result<DateUtc> {
+    actualbudget_date.to_iso_date().parse()
 }
 
 #[cfg(test)]
 mod test {
     use actualbudget_models::ActualbudgetDate;
-    use schist_models::datetime_utc::DatetimeUtc;
+    use schist_models::date_utc::DateUtc;
 
     use super::transform_date;
 
     #[test]
     fn when_utc_epoch_as_day_then_utc_epoch() {
         let actualbudget_date = ActualbudgetDate::from_i32(19700101);
-        let datetime_utc = transform_date(&actualbudget_date).unwrap();
-        let expected_datetime_utc: DatetimeUtc = "1970-01-01T00:00:00.000Z".parse().unwrap();
-        assert_eq!(expected_datetime_utc, datetime_utc);
+        let date_utc = transform_date(&actualbudget_date).unwrap();
+        let expected_date_utc: DateUtc = "1970-01-01".parse().unwrap();
+        assert_eq!(expected_date_utc, date_utc);
     }
 
         #[test]
         fn when_utc_epoch_as_month_then_utc_epoch() {
             let actualbudget_date = ActualbudgetDate::from_i32(197001);
-            let datetime_utc = transform_date(&actualbudget_date).unwrap();
-            let expected_datetime_utc: DatetimeUtc = "1970-01-01T00:00:00.000Z".parse().unwrap();
-            assert_eq!(expected_datetime_utc, datetime_utc);
+            let date_utc = transform_date(&actualbudget_date).unwrap();
+            let expected_date_utc: DateUtc = "1970-01-01".parse().unwrap();
+            assert_eq!(expected_date_utc, date_utc);
         }
 }
diff --git a/rust/actualbudget_to_schist_transformer/src/transform_state/transform_state.rs b/rust/actualbudget_to_schist_transformer/src/transform_state/transform_state.rs
index 3bcbe5d..395b72b 100644
--- a/rust/actualbudget_to_schist_transformer/src/transform_state/transform_state.rs
+++ b/rust/actualbudget_to_schist_transformer/src/transform_state/transform_state.rs
@@ -1,5 +1,5 @@
 use anyhow::{bail, Context, Result};
-use schist_models::{account::Account, category::Category, category_transfer::CategoryTransfer, date_utc::DateUtc, datetime_utc::DatetimeUtc, transaction::Transaction, transaction_categorisation::TransactionCategorisation};
+use schist_models::{account::Account, category::Category, category_transfer::CategoryTransfer, date_utc::DateUtc, transaction::Transaction, transaction_categorisation::TransactionCategorisation};
 
 use crate::{actualbudget_state::ActualbudgetState, schist_state::SchistState};
 
@@ -43,9 +43,7 @@ fn transform_state_without_context(actualbudget_state: ActualbudgetState) -> Res
     })
 }
 
-fn find_date_before(datetime: &DatetimeUtc) -> Result<DateUtc> {
-    let date: DateUtc = datetime.into();
-
+fn find_date_before(date: &DateUtc) -> Result<DateUtc> {
     for days_before in 0..31 {
         let result = date.sub_days(days_before);
         if result.is_ok() {
diff --git a/rust/actualbudget_to_schist_transformer/src/transform_state/transform_transactions.rs b/rust/actualbudget_to_schist_transformer/src/transform_state/transform_transactions.rs
index 3fbcb0f..36f3d81 100644
--- a/rust/actualbudget_to_schist_transformer/src/transform_state/transform_transactions.rs
+++ b/rust/actualbudget_to_schist_transformer/src/transform_state/transform_transactions.rs
@@ -1,4 +1,4 @@
-use anyhow::Result;
+use anyhow::{Context, Result};
 use actualbudget_models::{ActualbudgetAccount, ActualbudgetTransaction};
 use schist_models::{transaction::Transaction, transaction_categorisation::TransactionCategorisation};