6 files changed, 125 insertions, 8 deletions
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.rs b/crates/rocie-server/src/api/get/product.rs
index 94015cf..c496777 100644
--- a/crates/rocie-server/src/api/get.rs
+++ b/crates/rocie-server/src/api/get/product.rs
@@ -5,10 +5,6 @@ use crate::{
     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(
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<Unit>),
+        (status = INTERNAL_SERVER_ERROR, description = "Server encountered error", body = String)
+    ),
+)]
+#[get("/units/")]
+pub(crate) async fn units(app: web::Data<App>) -> Result<impl Responder> {
+    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<App>,
+    id: web::Path<UnitId>,
+) -> Result<impl Responder> {
+    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/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.rs b/crates/rocie-server/src/api/set/product.rs
index 0a6af1b..355f09a 100644
--- a/crates/rocie-server/src/api/set.rs
+++ b/crates/rocie-server/src/api/set/product.rs
@@ -7,6 +7,7 @@ use crate::{
     storage::sql::{
         insert::Operations,
         product::{Barcode, Product, ProductId},
+        unit::Unit,
     },
 };
 
@@ -17,10 +18,6 @@ struct ProductStub {
     parent: Option<ProductId>,
 }
 
-pub(crate) fn register_paths(cfg: &mut web::ServiceConfig) {
-    cfg.service(register_product).service(associate_barcode);
-}
-
 /// Register a product
 #[utoipa::path(
     responses(
@@ -68,6 +65,11 @@ pub(crate) async fn register_product(
             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,
@@ -86,6 +88,14 @@ pub(crate) async fn associate_barcode(
 ) -> Result<impl Responder> {
     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);
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<String>,
+}
+
+/// 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<App>,
+    unit: web::Json<UnitStub>,
+) -> Result<impl Responder> {
+    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))
+}