Use Utc to construct DateTime

metno · May 29, 2024 · fc59c5d · fc59c5d
1 parent 6961308
commit fc59c5d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/ingestion/src/lib.rs b/ingestion/src/lib.rs
@@ -65,6 +65,7 @@ impl FromRef<IngestorState> for Arc<RwLock<(ParamPermitTable, StationPermitTable
 }
 
 /// Generic container for a piece of data ready to be inserted into the DB
+#[derive(Clone)]
 pub struct Datum {
     timeseries_id: i32,
     timestamp: DateTime<Utc>,

diff --git a/lard_tests/tests/ingestion_integration_test.rs b/lard_tests/tests/ingestion_integration_test.rs
@@ -1,7 +1,4 @@
-// use std::fs;
-use std::str::FromStr;
-
-use chrono::DateTime;
+use chrono::{TimeZone, Utc};
 use lard_ingestion::{insert_data, Datum};
 mod common;
 
@@ -11,19 +8,18 @@ async fn test_insert_data() {
     let mut conn = pool.get().await.unwrap();
 
     // Prepare data
-    let fromtime = DateTime::from_str("2024-05-28T11:06:00Z").unwrap();
-    let totime = DateTime::from_str("2024-05-28T15:06:00Z").unwrap();
-
     let data = vec![
-        Datum::new(1, fromtime, 1.),
-        Datum::new(1, DateTime::from_str("2024-05-28T12:06:00Z").unwrap(), 2.),
-        Datum::new(1, DateTime::from_str("2024-05-28T13:06:00Z").unwrap(), 3.),
-        Datum::new(1, DateTime::from_str("2024-05-28T14:06:00Z").unwrap(), 4.),
-        Datum::new(1, totime, 6.),
+        Datum::new(1, Utc.with_ymd_and_hms(2024, 5, 28, 11, 6, 00).unwrap(), 1.),
+        Datum::new(1, Utc.with_ymd_and_hms(2024, 5, 28, 12, 6, 00).unwrap(), 2.),
+        Datum::new(1, Utc.with_ymd_and_hms(2024, 5, 28, 13, 6, 00).unwrap(), 3.),
+        Datum::new(1, Utc.with_ymd_and_hms(2024, 5, 28, 14, 6, 00).unwrap(), 4.),
+        Datum::new(1, Utc.with_ymd_and_hms(2024, 5, 28, 15, 6, 00).unwrap(), 5.),
     ];
     let data_len = data.len();
 
-    // No error if inserting same data?
+    insert_data(data.clone(), &mut conn).await.unwrap();
+
+    // No error or warning if overwriting data?
     if let Err(e) = insert_data(data, &mut conn).await {
         eprintln!("{}", e);
     }