Added unit to db and structs/types.

common/src/models/variant.rs

@@ -2,6 +2,7 @@ use log::{error, info};
 use serde::{Deserialize, Serialize};
 use sqlx::{Arguments, FromRow, PgPool, Row};
 use sqlx::postgres::{PgArguments, PgRow};
+use crate::models::unit::Unit;
 
 #[derive(Debug, Deserialize, Serialize, Clone, FromRow)]
 pub struct Variant {
@@ -11,6 +12,7 @@ pub struct Variant {
     pub name: Option<String>,
     pub description: Option<String>,
     pub ingredients: Option<String>,
+    pub unit: Unit,
 }
 
 fn from_postgres_row_small(row: PgRow) -> Variant {
@@ -21,6 +23,7 @@ fn from_postgres_row_small(row: PgRow) -> Variant {
         name: row.get(4),
         description: row.get(5),
         ingredients: row.get(6),
+        unit: row.get(7),
     }
 }
 
@@ -64,9 +67,10 @@ pub async fn insert_variant(article_id: i64, variant: &Variant, pool: PgPool) ->
     args.add(&variant.name);
     args.add(&variant.description);
     args.add(&variant.ingredients);
+    args.add(&variant.unit);
 
     let statement = format!(
-        "INSERT INTO {} (article_id, weight, ean, name, description, ingredients) VALUES ($1, $2, $3, $4, $5, $6) RETURNING *",
+        "INSERT INTO {} (article_id, weight, ean, name, description, ingredients, unit_id) VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING *",
         "variant",
     );
 
@@ -97,11 +101,12 @@ pub async fn update_variant(variant_id: i64, variant: &Variant, pool: PgPool) ->
     args.add(&variant.name);
     args.add(&variant.description);
     args.add(&variant.ingredients);
+    args.add(&variant.unit);
 
     info!("Variant: {:#?}", variant);
 
     let statement = format!(
-        "UPDATE {} SET weight = $2, ean = $3, name = $4, description = $5, ingredients = $6 WHERE id = $1 RETURNING *",
+        "UPDATE {} SET weight = $2, ean = $3, name = $4, description = $5, ingredients = $6, unit_id = $7 WHERE id = $1 RETURNING *",
         "variant",
     );