diff --git a/src/db.rs b/src/db.rs index fd83a5f..ffef634 100644 --- a/src/db.rs +++ b/src/db.rs @@ -1,8 +1,8 @@ pub mod json; use crate::models::*; -use std::io; use serde_json; +use std::io; #[derive(Debug)] pub enum Error { @@ -18,7 +18,7 @@ impl From for Error { } impl From for Error { - fn from(e: serde_json::Error) -> Self{ + fn from(e: serde_json::Error) -> Self { Self::Json(e.to_string()) } } @@ -26,7 +26,12 @@ impl From for Error { pub trait Storage { fn add_category(&mut self, category: NewCategory) -> Result; fn add_series(&mut self, category_id: i32, series: NewSeries) -> Result; - fn add_series_point(&mut self, category_id: i32, series_id: i32, series_point: NewSeriesPoint) -> Result; + fn add_series_point( + &mut self, + category_id: i32, + series_id: i32, + series_point: NewSeriesPoint, + ) -> Result; //fn add_user(&mut self, id: i32, user: NewUser) -> Result; fn get_category(&self, id: i32) -> Option; fn get_series(&self, category_id: i32, series_id: i32) -> Option; diff --git a/src/db/json.rs b/src/db/json.rs index e838221..4f80126 100644 --- a/src/db/json.rs +++ b/src/db/json.rs @@ -9,7 +9,9 @@ impl JsonDb { pub fn new(value: Option) -> Self { match value { Some(value) => JsonDb { value }, - None => JsonDb { value: String::from("[]") }, + None => JsonDb { + value: String::from("[]"), + }, } } @@ -26,7 +28,7 @@ impl JsonDb { Ok(d) => { self.value = d; Ok(()) - }, + } Err(e) => Err(Error::from(e)), } } @@ -41,7 +43,7 @@ impl Storage for JsonDb { max_id = cat.id } } - let created = Category::new(max_id+1, category); + let created = Category::new(max_id + 1, category); data.push(created); self.save(data)?; @@ -61,25 +63,29 @@ impl Storage for JsonDb { } if let None = cat { - return Err(Error::Generic ("Unable to find category".to_owned())); + return Err(Error::Generic("Unable to find category".to_owned())); } let cat = cat.unwrap(); - for series in cat.series.iter().clone() { if series.id > max_id { max_id = series.id; } } - let created = Series::new(max_id+1, series); + let created = Series::new(max_id + 1, series); cat.series.push(created); self.save(data)?; Ok(max_id + 1) } - fn add_series_point(&mut self, category_id: i32, series_id: i32, series_point: NewSeriesPoint) -> Result { + fn add_series_point( + &mut self, + category_id: i32, + series_id: i32, + series_point: NewSeriesPoint, + ) -> Result { let mut max_id = 1; let mut cat: Option<&mut Category> = None; let mut series: Option<&mut Series> = None; @@ -93,7 +99,7 @@ impl Storage for JsonDb { } if let None = cat { - return Err(Error::Generic ("Unable to find category".to_owned())); + return Err(Error::Generic("Unable to find category".to_owned())); } let cat = cat.unwrap(); @@ -105,7 +111,7 @@ impl Storage for JsonDb { } if let None = series { - return Err(Error::Generic ("Unable to find series".to_owned())); + return Err(Error::Generic("Unable to find series".to_owned())); } let series: &mut Series = series.unwrap(); @@ -148,7 +154,7 @@ impl Storage for JsonDb { for series_opt in cat.series { if series_opt.id == series_id { - return Some(series_opt) + return Some(series_opt); } } diff --git a/src/lib.rs b/src/lib.rs index 8be5d85..a71d8ce 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,5 +1,5 @@ -mod utils; -pub mod models; pub mod db; +pub mod models; +mod utils; use wasm_bindgen::prelude::*; diff --git a/src/models/category.rs b/src/models/category.rs index dc36e9b..c9b8895 100644 --- a/src/models/category.rs +++ b/src/models/category.rs @@ -1,5 +1,5 @@ use crate::models::Series; -use serde::{ Serialize, Deserialize }; +use serde::{Deserialize, Serialize}; #[derive(Debug, Serialize, Deserialize)] pub struct Category { diff --git a/src/models/series.rs b/src/models/series.rs index aa3e043..93ee94c 100644 --- a/src/models/series.rs +++ b/src/models/series.rs @@ -1,6 +1,6 @@ -use chrono; use super::series_point::SeriesPoint; -use serde::{ Serialize, Deserialize }; +use chrono; +use serde::{Deserialize, Serialize}; use serde_with; #[serde_with::serde_as] diff --git a/src/models/series_point.rs b/src/models/series_point.rs index 4eac7d3..4632363 100644 --- a/src/models/series_point.rs +++ b/src/models/series_point.rs @@ -1,6 +1,6 @@ -use chrono; use super::series_type::SeriesType; -use serde::{ Serialize, Deserialize }; +use chrono; +use serde::{Deserialize, Serialize}; #[derive(Debug, Serialize, Deserialize)] pub struct SeriesPoint { diff --git a/src/models/series_type.rs b/src/models/series_type.rs index 64cf626..24b10fc 100644 --- a/src/models/series_type.rs +++ b/src/models/series_type.rs @@ -1,4 +1,4 @@ -use serde::{ Serialize, Deserialize }; +use serde::{Deserialize, Serialize}; #[derive(Debug, Serialize, Deserialize)] pub enum SeriesType { diff --git a/src/models/user.rs b/src/models/user.rs index 1366763..6f0435a 100644 --- a/src/models/user.rs +++ b/src/models/user.rs @@ -1,4 +1,4 @@ -use serde::{ Serialize, Deserialize }; +use serde::{Deserialize, Serialize}; #[derive(Debug, Serialize, Deserialize)] pub struct User {