From 1c09b0eb5db415985bfefb52786dbe48d757665e Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Sat, 6 Sep 2025 18:31:40 +0200 Subject: feat: Provide basic barcode handling support --- crates/rocie-server/src/api/get.rs | 48 ------------- crates/rocie-server/src/api/get/mod.rs | 11 +++ crates/rocie-server/src/api/get/product.rs | 44 ++++++++++++ crates/rocie-server/src/api/get/unit.rs | 41 +++++++++++ crates/rocie-server/src/api/set.rs | 99 -------------------------- crates/rocie-server/src/api/set/mod.rs | 10 +++ crates/rocie-server/src/api/set/product.rs | 109 +++++++++++++++++++++++++++++ crates/rocie-server/src/api/set/unit.rs | 49 +++++++++++++ 8 files changed, 264 insertions(+), 147 deletions(-) delete mode 100644 crates/rocie-server/src/api/get.rs create mode 100644 crates/rocie-server/src/api/get/mod.rs create mode 100644 crates/rocie-server/src/api/get/product.rs create mode 100644 crates/rocie-server/src/api/get/unit.rs delete mode 100644 crates/rocie-server/src/api/set.rs create mode 100644 crates/rocie-server/src/api/set/mod.rs create mode 100644 crates/rocie-server/src/api/set/product.rs create mode 100644 crates/rocie-server/src/api/set/unit.rs (limited to 'crates/rocie-server/src/api') diff --git a/crates/rocie-server/src/api/get.rs b/crates/rocie-server/src/api/get.rs deleted file mode 100644 index 94015cf..0000000 --- a/crates/rocie-server/src/api/get.rs +++ /dev/null @@ -1,48 +0,0 @@ -use actix_web::{HttpResponse, Responder, Result, get, web}; - -use crate::{ - app::App, - storage::sql::product::{Product, ProductId}, -}; - -pub(crate) fn register_paths(cfg: &mut web::ServiceConfig) { - cfg.service(product_by_id).service(products); -} - -/// Get Product by id -#[utoipa::path( - responses( - (status = OK, description = "Product found from database", body = Product), - (status = NOT_FOUND, description = "Product not found in database"), - (status = INTERNAL_SERVER_ERROR, description = "Server encountered error", body = String) - ), - params( - ("id" = ProductId, description = "Product id" ), - ) -)] -#[get("/product/{id}")] -pub(crate) async fn product_by_id( - app: web::Data, - id: web::Path, -) -> Result { - let id = id.into_inner(); - - match Product::from_id(&app, id).await? { - Some(product) => Ok(HttpResponse::Ok().json(product)), - None => Ok(HttpResponse::NotFound().finish()), - } -} - -/// Return all registered products -#[utoipa::path( - responses( - (status = OK, description = "All products founds", body = Vec), - (status = INTERNAL_SERVER_ERROR, description = "Server encountered error", body = String) - ), -)] -#[get("/products/")] -pub(crate) async fn products(app: web::Data) -> Result { - let all = Product::get_all(&app).await?; - - Ok(HttpResponse::Ok().json(all)) -} diff --git a/crates/rocie-server/src/api/get/mod.rs b/crates/rocie-server/src/api/get/mod.rs new file mode 100644 index 0000000..ce39076 --- /dev/null +++ b/crates/rocie-server/src/api/get/mod.rs @@ -0,0 +1,11 @@ +use actix_web::web; + +pub(crate) mod product; +pub(crate) mod unit; + +pub(crate) fn register_paths(cfg: &mut web::ServiceConfig) { + cfg.service(product::product_by_id) + .service(product::products) + .service(unit::units) + .service(unit::unit_by_id); +} diff --git a/crates/rocie-server/src/api/get/product.rs b/crates/rocie-server/src/api/get/product.rs new file mode 100644 index 0000000..c496777 --- /dev/null +++ b/crates/rocie-server/src/api/get/product.rs @@ -0,0 +1,44 @@ +use actix_web::{HttpResponse, Responder, Result, get, web}; + +use crate::{ + app::App, + storage::sql::product::{Product, ProductId}, +}; + +/// Get Product by id +#[utoipa::path( + responses( + (status = OK, description = "Product found from database", body = Product), + (status = NOT_FOUND, description = "Product not found in database"), + (status = INTERNAL_SERVER_ERROR, description = "Server encountered error", body = String) + ), + params( + ("id" = ProductId, description = "Product id" ), + ) +)] +#[get("/product/{id}")] +pub(crate) async fn product_by_id( + app: web::Data, + id: web::Path, +) -> Result { + let id = id.into_inner(); + + match Product::from_id(&app, id).await? { + Some(product) => Ok(HttpResponse::Ok().json(product)), + None => Ok(HttpResponse::NotFound().finish()), + } +} + +/// Return all registered products +#[utoipa::path( + responses( + (status = OK, description = "All products founds", body = Vec), + (status = INTERNAL_SERVER_ERROR, description = "Server encountered error", body = String) + ), +)] +#[get("/products/")] +pub(crate) async fn products(app: web::Data) -> Result { + let all = Product::get_all(&app).await?; + + Ok(HttpResponse::Ok().json(all)) +} diff --git a/crates/rocie-server/src/api/get/unit.rs b/crates/rocie-server/src/api/get/unit.rs new file mode 100644 index 0000000..d006818 --- /dev/null +++ b/crates/rocie-server/src/api/get/unit.rs @@ -0,0 +1,41 @@ +use actix_web::{get, web, HttpResponse, Responder, Result}; + +use crate::{app::App, storage::sql::unit::{Unit, UnitId}}; + +/// Return all registered units +#[utoipa::path( + responses( + (status = OK, description = "All units founds", body = Vec), + (status = INTERNAL_SERVER_ERROR, description = "Server encountered error", body = String) + ), +)] +#[get("/units/")] +pub(crate) async fn units(app: web::Data) -> Result { + let all = Unit::get_all(&app).await?; + + Ok(HttpResponse::Ok().json(all)) +} + +/// Get Unit by id +#[utoipa::path( + responses( + (status = OK, description = "Unit found from database", body = Unit), + (status = NOT_FOUND, description = "Unit not found in database"), + (status = INTERNAL_SERVER_ERROR, description = "Server encountered error", body = String) + ), + params( + ("id" = UnitId, description = "Unit id" ), + ) +)] +#[get("/unit/{id}")] +pub(crate) async fn unit_by_id( + app: web::Data, + id: web::Path, +) -> Result { + let id = id.into_inner(); + + match Unit::from_id(&app, id).await? { + Some(product) => Ok(HttpResponse::Ok().json(product)), + None => Ok(HttpResponse::NotFound().finish()), + } +} diff --git a/crates/rocie-server/src/api/set.rs b/crates/rocie-server/src/api/set.rs deleted file mode 100644 index 0a6af1b..0000000 --- a/crates/rocie-server/src/api/set.rs +++ /dev/null @@ -1,99 +0,0 @@ -use actix_web::{HttpResponse, Responder, Result, post, web}; -use serde::Deserialize; -use utoipa::ToSchema; - -use crate::{ - app::App, - storage::sql::{ - insert::Operations, - product::{Barcode, Product, ProductId}, - }, -}; - -#[derive(Deserialize, ToSchema)] -struct ProductStub { - name: String, - description: Option, - parent: Option, -} - -pub(crate) fn register_paths(cfg: &mut web::ServiceConfig) { - cfg.service(register_product).service(associate_barcode); -} - -/// Register a product -#[utoipa::path( - responses( - ( - status = 200, - description = "Product successfully registered in database", - body = ProductId, - ), - ( - status = INTERNAL_SERVER_ERROR, - description = "Server encountered error", - body = String, - ) - ), - request_body = ProductStub, -)] -#[post("/product/new")] -pub(crate) async fn register_product( - app: web::Data, - product_stub: web::Json, -) -> Result { - let mut ops = Operations::new("register product"); - - let product = Product::register( - product_stub.name.clone(), - product_stub.description.clone(), - product_stub.parent, - &mut ops, - ); - - ops.apply(&app).await?; - - Ok(HttpResponse::Ok().json(product.id)) -} - -/// Associate a barcode with a product -#[utoipa::path( - responses( - ( - status = OK, - description = "Barcode successfully associated with product", - ), - ( - status = NOT_FOUND, - description = "Product id not found in database", - ), - ( - status = INTERNAL_SERVER_ERROR, - description = "Server encountered error", - body = String, - ) - ), - params ( - ("id" = ProductId, description = "The id of the product to associated the barcode with"), - ), - request_body = Barcode, -)] -#[post("/product/{id}/associate")] -pub(crate) async fn associate_barcode( - app: web::Data, - id: web::Path, - barcode: web::Json, -) -> Result { - let mut ops = Operations::new("associated barcode with product"); - - match Product::from_id(&app, id.into_inner()).await? { - Some(product) => { - product.associate_barcode(barcode.into_inner(), &mut ops); - - ops.apply(&app).await?; - - Ok(HttpResponse::Ok().finish()) - } - None => Ok(HttpResponse::NotFound().finish()), - } -} diff --git a/crates/rocie-server/src/api/set/mod.rs b/crates/rocie-server/src/api/set/mod.rs new file mode 100644 index 0000000..8a2a1df --- /dev/null +++ b/crates/rocie-server/src/api/set/mod.rs @@ -0,0 +1,10 @@ +use actix_web::web; + +pub(crate) mod product; +pub(crate) mod unit; + +pub(crate) fn register_paths(cfg: &mut web::ServiceConfig) { + cfg.service(product::register_product) + .service(product::associate_barcode) + .service(unit::register_unit); +} diff --git a/crates/rocie-server/src/api/set/product.rs b/crates/rocie-server/src/api/set/product.rs new file mode 100644 index 0000000..355f09a --- /dev/null +++ b/crates/rocie-server/src/api/set/product.rs @@ -0,0 +1,109 @@ +use actix_web::{HttpResponse, Responder, Result, post, web}; +use serde::Deserialize; +use utoipa::ToSchema; + +use crate::{ + app::App, + storage::sql::{ + insert::Operations, + product::{Barcode, Product, ProductId}, + unit::Unit, + }, +}; + +#[derive(Deserialize, ToSchema)] +struct ProductStub { + name: String, + description: Option, + parent: Option, +} + +/// Register a product +#[utoipa::path( + responses( + ( + status = 200, + description = "Product successfully registered in database", + body = ProductId, + ), + ( + status = INTERNAL_SERVER_ERROR, + description = "Server encountered error", + body = String, + ) + ), + request_body = ProductStub, +)] +#[post("/product/new")] +pub(crate) async fn register_product( + app: web::Data, + product_stub: web::Json, +) -> Result { + let mut ops = Operations::new("register product"); + + let product = Product::register( + product_stub.name.clone(), + product_stub.description.clone(), + product_stub.parent, + &mut ops, + ); + + ops.apply(&app).await?; + + Ok(HttpResponse::Ok().json(product.id)) +} + +/// Associate a barcode with a product +#[utoipa::path( + responses( + ( + status = OK, + description = "Barcode successfully associated with product", + ), + ( + status = NOT_FOUND, + description = "Product id not found in database", + ), + ( + status = FORBIDDEN, + description = "Unit used in request has not been registered yet", + body = String, + ), + ( + status = INTERNAL_SERVER_ERROR, + description = "Server encountered error", + body = String, + ) + ), + params ( + ("id" = ProductId, description = "The id of the product to associated the barcode with"), + ), + request_body = Barcode, +)] +#[post("/product/{id}/associate")] +pub(crate) async fn associate_barcode( + app: web::Data, + id: web::Path, + barcode: web::Json, +) -> Result { + let mut ops = Operations::new("associated barcode with product"); + + { + let units = Unit::get_all(&app).await?; + if !units.into_iter().any(|unit| unit.id == barcode.amount.unit) { + return Ok(HttpResponse::Forbidden() + .body("The used unit has not been registered; it cannot be used.\n")); + } + } + + match Product::from_id(&app, id.into_inner()).await? { + Some(product) => { + product.associate_barcode(barcode.into_inner(), &mut ops); + + ops.apply(&app).await?; + + Ok(HttpResponse::Ok().finish()) + } + None => Ok(HttpResponse::NotFound().finish()), + } +} diff --git a/crates/rocie-server/src/api/set/unit.rs b/crates/rocie-server/src/api/set/unit.rs new file mode 100644 index 0000000..4281e05 --- /dev/null +++ b/crates/rocie-server/src/api/set/unit.rs @@ -0,0 +1,49 @@ +use actix_web::{HttpResponse, Responder, Result, post, web}; +use serde::Deserialize; +use utoipa::ToSchema; + +use crate::{app::App, storage::sql::{insert::Operations, unit::{Unit, UnitId}}}; + +#[derive(Deserialize, ToSchema)] +struct UnitStub { + full_name_plural: String, + full_name_singular: String, + short_name: String, + description: Option, +} + +/// Register an Unit +#[utoipa::path( + responses( + ( + status = 200, + description = "Product successfully registered in database", + body = UnitId, + ), + ( + status = INTERNAL_SERVER_ERROR, + description = "Server encountered error", + body = String, + ) + ), + request_body = UnitStub, +)] +#[post("/unit/new")] +pub(crate) async fn register_unit( + app: web::Data, + unit: web::Json, +) -> Result { + let mut ops = Operations::new("register unit"); + + let unit = Unit::register( + unit.full_name_singular.clone(), + unit.full_name_plural.clone(), + unit.short_name.clone(), + unit.description.clone(), + &mut ops, + ); + + ops.apply(&app).await?; + + Ok(HttpResponse::Ok().json(unit.id)) +} -- cgit 1.4.1