diff --git a/src/db_api/mod.rs b/src/db_api/mod.rs index 66a437b..d548b56 100644 --- a/src/db_api/mod.rs +++ b/src/db_api/mod.rs @@ -6,7 +6,7 @@ mod items; mod orders; mod pieces; mod recipes; -mod shippments; +mod shipments; mod suppliers; mod transformations; @@ -16,7 +16,7 @@ pub use items::*; pub use orders::*; pub use pieces::*; pub use recipes::*; -pub use shippments::*; +pub use shipments::*; pub use suppliers::*; pub use transformations::*; diff --git a/src/db_api/shippments.rs b/src/db_api/shipments.rs similarity index 98% rename from src/db_api/shippments.rs rename to src/db_api/shipments.rs index 0aad3d2..289b78c 100644 --- a/src/db_api/shippments.rs +++ b/src/db_api/shipments.rs @@ -4,7 +4,7 @@ use uuid::Uuid; use super::RawMaterial; #[derive(Debug)] -pub struct Shippment { +pub struct Shipment { id: Option, supplier_id: i64, request_date: i32, @@ -26,7 +26,7 @@ pub struct ExpectedShippment { pub quantity: i32, } -impl Shippment { +impl Shipment { pub fn new( supplier_id: i64, request_date: i32, @@ -114,9 +114,9 @@ impl Shippment { arrival_date: i32, current_date: i32, con: &mut PgConnection, - ) -> sqlx::Result> { + ) -> sqlx::Result> { sqlx::query_as!( - Shippment, + Shipment, r#" SELECT ship.id, diff --git a/src/db_api/suppliers.rs b/src/db_api/suppliers.rs index e587a3f..16cf003 100644 --- a/src/db_api/suppliers.rs +++ b/src/db_api/suppliers.rs @@ -4,7 +4,7 @@ use sqlx::postgres::types::PgMoney; use sqlx::PgConnection; use uuid::Uuid; -use super::{RawMaterial, Shippment}; +use super::{RawMaterial, Shipment}; #[derive(Debug, Clone)] pub struct Supplier { @@ -20,10 +20,10 @@ impl Supplier { self.delivery_time <= time } - pub fn shippment(&self, order_quantity: i32, due_date: i32) -> Shippment { + pub fn shippment(&self, order_quantity: i32, due_date: i32) -> Shipment { let quantity = order_quantity.max(self.min_order_quantity); let cost = quantity as i64 * self.unit_price.0; - Shippment::new( + Shipment::new( self.id, due_date - self.delivery_time, quantity, diff --git a/src/routes/mod.rs b/src/routes/mod.rs index 754c0a6..e19031d 100644 --- a/src/routes/mod.rs +++ b/src/routes/mod.rs @@ -14,7 +14,7 @@ use uuid::Uuid; use crate::{ db_api::{ - Item, Order, OrderStatus, RawMaterial, Shippment, Transformation, + Item, Order, OrderStatus, RawMaterial, Shipment, Transformation, TransformationDetails, }, scheduler::{Scheduler, CURRENT_DATE}, @@ -323,13 +323,13 @@ pub async fn post_warehouse_action( #[derive(Debug, Deserialize, Serialize)] struct ExpectedShipmentForm { - shippment_id: i64, + shipment_id: i64, material_type: RawMaterial, quantity: i32, } #[get("/materials/expected")] -pub async fn get_expected_shippments( +pub async fn get_expected_shipments( query: Query, pool: Data, ) -> impl Responder { @@ -339,12 +339,12 @@ pub async fn get_expected_shippments( }; let expected = - Shippment::get_expected_for_arrival(query.day as i32, &mut con); + Shipment::get_expected_for_arrival(query.day as i32, &mut con); let response_body = match expected.await { Ok(shipp_vec) => shipp_vec .iter() .map(|s| ExpectedShipmentForm { - shippment_id: s.id, + shipment_id: s.id, material_type: s.material_type, quantity: s.quantity, }) @@ -357,21 +357,21 @@ pub async fn get_expected_shippments( #[derive(Debug, Deserialize)] #[cfg_attr(test, derive(serde::Serialize))] -struct ShippmentArrivalForm { - shippment_id: i64, +struct ShipmentArrivalForm { + shipment_id: i64, } #[post("/materials/arrivals")] pub async fn post_material_arrival( - form: Form, + form: Form, pool: Data, ) -> impl Responder { let date = Scheduler::get_date() as i32; - match Shippment::arrived(form.shippment_id, date, &pool).await { + match Shipment::arrived(form.shipment_id, date, &pool).await { Err(e) => internal_server_error(e), Ok(_) => { - tracing::info!("Shippment {} arrived", form.shippment_id); + tracing::info!("Shippment {} arrived", form.shipment_id); HttpResponse::Created().finish() } } diff --git a/src/scheduler/resource_planning.rs b/src/scheduler/resource_planning.rs index c1ca4a5..8cbd86a 100644 --- a/src/scheduler/resource_planning.rs +++ b/src/scheduler/resource_planning.rs @@ -3,8 +3,7 @@ use std::collections::HashMap; use sqlx::PgPool; use crate::db_api::{ - MaterialShippment, RawMaterial, Shippment, Supplier, - UnderAllocatedShippment, + MaterialShippment, RawMaterial, Shipment, Supplier, UnderAllocatedShippment, }; use super::Scheduler; @@ -104,7 +103,7 @@ pub async fn resolve_material_needs( } struct PurchaseProcessingResults { - pub purchase_orders_by_due_date: HashMap, + pub purchase_orders_by_due_date: HashMap, pub altered_shippments_by_due_date: HashMap>, } @@ -239,7 +238,7 @@ async fn query_needed_data( let mut shippment_map = HashMap::new(); for day in net_req.keys() { let shippments = - Shippment::get_under_allocated(*day, variant, &mut conn).await?; + Shipment::get_under_allocated(*day, variant, &mut conn).await?; if !shippments.is_empty() { shippment_map.insert(*day, shippments); } diff --git a/src/startup.rs b/src/startup.rs index 95f3fc2..c7f2e67 100644 --- a/src/startup.rs +++ b/src/startup.rs @@ -108,7 +108,7 @@ impl App { .service(routes::get_production) .service(routes::post_transformation_completion) .service(routes::post_warehouse_action) - .service(routes::get_expected_shippments) + .service(routes::get_expected_shipments) .service(routes::post_material_arrival) .service(routes::get_deliveries) .app_data(Data::new(self.pool.clone()))