diff options
Diffstat (limited to 'crates/rocie-server')
| -rw-r--r-- | crates/rocie-server/src/api/set/no_auth/mod.rs | 4 | ||||
| -rw-r--r-- | crates/rocie-server/src/storage/mod.rs | 2 | ||||
| -rw-r--r-- | crates/rocie-server/src/storage/sql/get/product_amount/mod.rs | 6 | ||||
| -rw-r--r-- | crates/rocie-server/src/storage/sql/insert/mod.rs | 2 | ||||
| -rw-r--r-- | crates/rocie-server/src/storage/sql/product.rs | 4 | ||||
| -rw-r--r-- | crates/rocie-server/tests/_testenv/init.rs | 2 | ||||
| -rw-r--r-- | crates/rocie-server/tests/product_parents/mod.rs | 2 | ||||
| -rw-r--r-- | crates/rocie-server/tests/product_parents/query.rs | 15 | ||||
| -rw-r--r-- | crates/rocie-server/tests/tests.rs | 4 | ||||
| -rw-r--r-- | crates/rocie-server/tests/units/mod.rs | 2 |
10 files changed, 28 insertions, 15 deletions
diff --git a/crates/rocie-server/src/api/set/no_auth/mod.rs b/crates/rocie-server/src/api/set/no_auth/mod.rs index 27783fc..8a67d57 100644 --- a/crates/rocie-server/src/api/set/no_auth/mod.rs +++ b/crates/rocie-server/src/api/set/no_auth/mod.rs @@ -3,5 +3,7 @@ use actix_web::web; pub(crate) mod user; pub(crate) fn register_paths(cfg: &mut web::ServiceConfig) { - cfg.service(user::login).service(user::logout).service(user::provision); + cfg.service(user::login) + .service(user::logout) + .service(user::provision); } diff --git a/crates/rocie-server/src/storage/mod.rs b/crates/rocie-server/src/storage/mod.rs index 509d15d..55745c0 100644 --- a/crates/rocie-server/src/storage/mod.rs +++ b/crates/rocie-server/src/storage/mod.rs @@ -1,3 +1,3 @@ pub(crate) mod migrate; -pub(crate) mod txn_log; pub(crate) mod sql; +pub(crate) mod txn_log; diff --git a/crates/rocie-server/src/storage/sql/get/product_amount/mod.rs b/crates/rocie-server/src/storage/sql/get/product_amount/mod.rs index f82c2a0..9ff2165 100644 --- a/crates/rocie-server/src/storage/sql/get/product_amount/mod.rs +++ b/crates/rocie-server/src/storage/sql/get/product_amount/mod.rs @@ -1,6 +1,10 @@ use crate::{ app::App, - storage::sql::{product::ProductId, product_amount::ProductAmount, unit::{UnitAmount, UnitId}}, + storage::sql::{ + product::ProductId, + product_amount::ProductAmount, + unit::{UnitAmount, UnitId}, + }, }; use sqlx::query; diff --git a/crates/rocie-server/src/storage/sql/insert/mod.rs b/crates/rocie-server/src/storage/sql/insert/mod.rs index 54717c3..673cbdd 100644 --- a/crates/rocie-server/src/storage/sql/insert/mod.rs +++ b/crates/rocie-server/src/storage/sql/insert/mod.rs @@ -10,9 +10,9 @@ use sqlx::{SqliteConnection, query}; pub(crate) mod barcode; pub(crate) mod product; pub(crate) mod product_parent; +pub(crate) mod recipe; pub(crate) mod unit; pub(crate) mod unit_property; -pub(crate) mod recipe; pub(crate) mod user; pub(crate) trait Transactionable: diff --git a/crates/rocie-server/src/storage/sql/product.rs b/crates/rocie-server/src/storage/sql/product.rs index 8d2c951..00c79d3 100644 --- a/crates/rocie-server/src/storage/sql/product.rs +++ b/crates/rocie-server/src/storage/sql/product.rs @@ -1,7 +1,9 @@ use serde::{Deserialize, Serialize}; use utoipa::ToSchema; -use crate::storage::sql::{barcode::Barcode, mk_id, product_parent::ProductParentId, unit_property::UnitPropertyId}; +use crate::storage::sql::{ + barcode::Barcode, mk_id, product_parent::ProductParentId, unit_property::UnitPropertyId, +}; /// The base of rocie. /// diff --git a/crates/rocie-server/tests/_testenv/init.rs b/crates/rocie-server/tests/_testenv/init.rs index 5318238..37d50ff 100644 --- a/crates/rocie-server/tests/_testenv/init.rs +++ b/crates/rocie-server/tests/_testenv/init.rs @@ -114,7 +114,7 @@ impl TestEnv { pub(crate) async fn new(name: &'static str) -> TestEnv { let env = Self::new_no_login(name); - request!( + request!( env, provision(UserStub { description: Some("Test user, used during test runs".to_string()), diff --git a/crates/rocie-server/tests/product_parents/mod.rs b/crates/rocie-server/tests/product_parents/mod.rs index 46ec0ca..d3799a7 100644 --- a/crates/rocie-server/tests/product_parents/mod.rs +++ b/crates/rocie-server/tests/product_parents/mod.rs @@ -1,2 +1,2 @@ -mod register; mod query; +mod register; diff --git a/crates/rocie-server/tests/product_parents/query.rs b/crates/rocie-server/tests/product_parents/query.rs index 635a0ba..b05ad7c 100644 --- a/crates/rocie-server/tests/product_parents/query.rs +++ b/crates/rocie-server/tests/product_parents/query.rs @@ -1,6 +1,8 @@ use rocie_client::{ apis::{ - api_get_auth_product_api::{products_by_product_parent_id_direct, products_by_product_parent_id_indirect}, + api_get_auth_product_api::{ + products_by_product_parent_id_direct, products_by_product_parent_id_indirect, + }, api_get_auth_product_parent_api::{product_parents_toplevel, product_parents_under}, api_set_auth_product_api::register_product, api_set_auth_product_parent_api::register_product_parent, @@ -111,10 +113,13 @@ async fn test_product_parent_query_product() { ); assert_eq!( - request!(env, products_by_product_parent_id_indirect(parent_dairy_milk)) - .into_iter() - .map(|product| product.name) - .collect::<Vec<_>>(), + request!( + env, + products_by_product_parent_id_indirect(parent_dairy_milk) + ) + .into_iter() + .map(|product| product.name) + .collect::<Vec<_>>(), vec!["Soy milk".to_owned()], ); diff --git a/crates/rocie-server/tests/tests.rs b/crates/rocie-server/tests/tests.rs index 4a218d1..373b573 100644 --- a/crates/rocie-server/tests/tests.rs +++ b/crates/rocie-server/tests/tests.rs @@ -3,8 +3,8 @@ mod _testenv; pub(crate) use _testenv as testenv; -mod products; mod product_parents; -mod units; +mod products; mod recipies; +mod units; mod users; diff --git a/crates/rocie-server/tests/units/mod.rs b/crates/rocie-server/tests/units/mod.rs index 0481d71..54ff0ab 100644 --- a/crates/rocie-server/tests/units/mod.rs +++ b/crates/rocie-server/tests/units/mod.rs @@ -1,2 +1,2 @@ -mod register; mod fetch; +mod register; |
