From e536cb326a67fffd511ead4a87655ca5ef98bf29 Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Tue, 23 Sep 2025 17:16:23 +0200 Subject: feat(crates/rocies-server): Don't make the newtype wrappers transparent in the openapi spec This makes using the generated code significantly easier and type safer. --- crates/rocie-server/src/api/get/inventory.rs | 6 +++--- crates/rocie-server/src/api/get/product.rs | 6 +++--- crates/rocie-server/src/api/get/unit.rs | 6 +++--- crates/rocie-server/src/api/set/barcode.rs | 10 +++++----- crates/rocie-server/src/api/set/product.rs | 6 +++--- 5 files changed, 17 insertions(+), 17 deletions(-) (limited to 'crates/rocie-server/src/api') diff --git a/crates/rocie-server/src/api/get/inventory.rs b/crates/rocie-server/src/api/get/inventory.rs index 3011430..d1ca436 100644 --- a/crates/rocie-server/src/api/get/inventory.rs +++ b/crates/rocie-server/src/api/get/inventory.rs @@ -2,7 +2,7 @@ use actix_web::{HttpResponse, Responder, Result, get, web}; use crate::{ app::App, - storage::sql::{product::ProductId, product_amount::ProductAmount}, + storage::sql::{product::{ProductId, ProductIdStub}, product_amount::ProductAmount}, }; /// Get the amount of an product @@ -33,11 +33,11 @@ use crate::{ #[get("/inventory/{id}")] pub(crate) async fn amount_by_id( app: web::Data, - id: web::Path, + id: web::Path, ) -> Result { let id = id.into_inner(); - match ProductAmount::from_id(&app, id).await? { + match ProductAmount::from_id(&app, id.into()).await? { Some(product) => Ok(HttpResponse::Ok().json(product)), None => Ok(HttpResponse::NotFound().finish()), } diff --git a/crates/rocie-server/src/api/get/product.rs b/crates/rocie-server/src/api/get/product.rs index c496777..90cb8c8 100644 --- a/crates/rocie-server/src/api/get/product.rs +++ b/crates/rocie-server/src/api/get/product.rs @@ -2,7 +2,7 @@ use actix_web::{HttpResponse, Responder, Result, get, web}; use crate::{ app::App, - storage::sql::product::{Product, ProductId}, + storage::sql::product::{Product, ProductId, ProductIdStub}, }; /// Get Product by id @@ -19,11 +19,11 @@ use crate::{ #[get("/product/{id}")] pub(crate) async fn product_by_id( app: web::Data, - id: web::Path, + id: web::Path, ) -> Result { let id = id.into_inner(); - match Product::from_id(&app, id).await? { + match Product::from_id(&app, id.into()).await? { Some(product) => Ok(HttpResponse::Ok().json(product)), None => Ok(HttpResponse::NotFound().finish()), } diff --git a/crates/rocie-server/src/api/get/unit.rs b/crates/rocie-server/src/api/get/unit.rs index d006818..4854ea3 100644 --- a/crates/rocie-server/src/api/get/unit.rs +++ b/crates/rocie-server/src/api/get/unit.rs @@ -1,6 +1,6 @@ use actix_web::{get, web, HttpResponse, Responder, Result}; -use crate::{app::App, storage::sql::unit::{Unit, UnitId}}; +use crate::{app::App, storage::sql::unit::{Unit, UnitId, UnitIdStub}}; /// Return all registered units #[utoipa::path( @@ -30,11 +30,11 @@ pub(crate) async fn units(app: web::Data) -> Result { #[get("/unit/{id}")] pub(crate) async fn unit_by_id( app: web::Data, - id: web::Path, + id: web::Path, ) -> Result { let id = id.into_inner(); - match Unit::from_id(&app, id).await? { + match Unit::from_id(&app, id.into()).await? { Some(product) => Ok(HttpResponse::Ok().json(product)), None => Ok(HttpResponse::NotFound().finish()), } diff --git a/crates/rocie-server/src/api/set/barcode.rs b/crates/rocie-server/src/api/set/barcode.rs index a89bf4f..60b1650 100644 --- a/crates/rocie-server/src/api/set/barcode.rs +++ b/crates/rocie-server/src/api/set/barcode.rs @@ -4,7 +4,7 @@ use log::debug; use crate::{ app::App, storage::sql::{ - barcode::{Barcode, BarcodeId, UnitAmount}, + barcode::{Barcode, BarcodeId, BarcodeIdStub, UnitAmount}, insert::Operations, }, }; @@ -33,11 +33,11 @@ use crate::{ #[post("/barcode/{id}/buy")] pub(crate) async fn buy_barcode( app: web::Data, - barcode_id: web::Path, + barcode_id: web::Path, ) -> Result { let mut ops = Operations::new("buy barcode unit"); - let barcode = Barcode::from_id(&app, barcode_id.into_inner()).await?; + let barcode = Barcode::from_id(&app, barcode_id.into_inner().into()).await?; match barcode { Some(barcode) => { @@ -76,12 +76,12 @@ pub(crate) async fn buy_barcode( #[post("/barcode/{id}/consume")] pub(crate) async fn consume_barcode( app: web::Data, - barcode_id: web::Path, + barcode_id: web::Path, unit_amount: web::Json, ) -> Result { let mut ops = Operations::new("consume barcode unit"); - let barcode = Barcode::from_id(&app, barcode_id.into_inner()).await?; + let barcode = Barcode::from_id(&app, barcode_id.into_inner().into()).await?; debug!("Starting consume for barcode: {barcode:?}"); match barcode { diff --git a/crates/rocie-server/src/api/set/product.rs b/crates/rocie-server/src/api/set/product.rs index 19024c7..d347ee7 100644 --- a/crates/rocie-server/src/api/set/product.rs +++ b/crates/rocie-server/src/api/set/product.rs @@ -7,7 +7,7 @@ use crate::{ storage::sql::{ barcode::Barcode, insert::Operations, - product::{Product, ProductId}, + product::{Product, ProductId, ProductIdStub}, unit::Unit, }, }; @@ -84,7 +84,7 @@ pub(crate) async fn register_product( #[post("/product/{id}/associate")] pub(crate) async fn associate_barcode( app: web::Data, - id: web::Path, + id: web::Path, barcode: web::Json, ) -> Result { let mut ops = Operations::new("associated barcode with product"); @@ -97,7 +97,7 @@ pub(crate) async fn associate_barcode( } } - match Product::from_id(&app, id.into_inner()).await? { + match Product::from_id(&app, id.into_inner().into()).await? { Some(product) => { product.associate_barcode(barcode.into_inner(), &mut ops); -- cgit 1.4.1