Add product v2

crates/channels/src/stocks.rs

@@ -1,10 +1,7 @@
 pub static CLIENT_NAME: &str = "stocks";
 
 pub mod create_product {
-    use model::{
+    use model::v2::*;
-        Days, Price, ProductCategory, ProductLongDesc, ProductName, ProductShortDesc, Quantity,
-        QuantityUnit,
-    };
 
     #[derive(Debug, serde::Serialize, serde::Deserialize)]
     pub struct ProductInput {

crates/model/src/lib.rs

@@ -898,19 +898,95 @@ impl ProductCategory {
     }
 }
 
-#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub mod v2 {
-pub struct DetailedProduct {
+    pub use crate::{
-    pub id: ProductId,
+        Days, FileName, LocalPath, PhotoId, Price, ProductCategory, ProductId, ProductLongDesc,
-    pub name: ProductName,
+        ProductName, ProductPhotoId, ProductShortDesc, Quantity, QuantityUnit, RecordId, StockId,
-    pub short_description: ProductShortDesc,
+        UniqueName,
-    pub long_description: ProductLongDesc,
+    };
-    pub category: Option<ProductCategory>,
-    pub price: Price,
-    pub deliver_days_flag: Days,
 
-    pub stocks: Vec<Stock>,
+    #[cfg_attr(feature = "dummy", derive(fake::Dummy))]
+    #[cfg_attr(feature = "db", derive(sqlx::Type))]
+    #[cfg_attr(feature = "db", sqlx(transparent))]
+    #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, Deref, From)]
+    #[serde(transparent)]
+    pub struct ProductVariantId(RecordId);
 
-    pub photos: Vec<Photo>,
+    #[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
+    pub struct DetailedProduct {
+        pub id: ProductId,
+        pub name: ProductName,
+        pub short_description: ProductShortDesc,
+        pub long_description: ProductLongDesc,
+        pub category: Option<ProductCategory>,
+        pub price: Price,
+        pub deliver_days_flag: Days,
+
+        pub stocks: Vec<Stock>,
+
+        pub photos: Vec<Photo>,
+    }
+
+    #[cfg_attr(feature = "dummy", derive(fake::Dummy))]
+    #[cfg_attr(feature = "db", derive(sqlx::FromRow))]
+    #[derive(Debug, Hash, PartialEq, Eq, Serialize, Deserialize)]
+    pub struct Product {
+        pub id: ProductId,
+        pub name: ProductName,
+        pub category: Option<ProductCategory>,
+        pub deliver_days_flag: Days,
+    }
+
+    #[cfg_attr(feature = "dummy", derive(fake::Dummy))]
+    #[cfg_attr(feature = "db", derive(sqlx::FromRow))]
+    #[derive(Debug, Hash, PartialEq, Eq, Serialize, Deserialize)]
+    pub struct ProductVariant {
+        pub id: ProductVariantId,
+        pub name: ProductName,
+        pub short_description: ProductShortDesc,
+        pub long_description: ProductLongDesc,
+        pub price: Price,
+    }
+
+    #[cfg_attr(feature = "dummy", derive(fake::Dummy))]
+    #[cfg_attr(feature = "db", derive(sqlx::FromRow))]
+    #[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
+    pub struct Stock {
+        pub id: StockId,
+        pub product_variant_id: ProductVariantId,
+        pub quantity: Quantity,
+        pub quantity_unit: QuantityUnit,
+    }
+
+    #[cfg_attr(feature = "dummy", derive(fake::Dummy))]
+    #[cfg_attr(feature = "db", derive(sqlx::FromRow))]
+    #[derive(Debug, Hash, PartialEq, Eq, Serialize, Deserialize)]
+    pub struct Photo {
+        pub id: PhotoId,
+        pub local_path: LocalPath,
+        pub file_name: FileName,
+        pub unique_name: UniqueName,
+    }
+
+    #[cfg_attr(feature = "dummy", derive(fake::Dummy))]
+    #[cfg_attr(feature = "db", derive(sqlx::FromRow))]
+    #[derive(Debug, Hash, PartialEq, Eq, Serialize, Deserialize)]
+    pub struct ProductLinkedPhoto {
+        pub photo_id: PhotoId,
+        pub local_path: LocalPath,
+        pub file_name: FileName,
+        pub unique_name: UniqueName,
+        pub product_variant_id: ProductVariantId,
+    }
+
+    #[cfg_attr(feature = "dummy", derive(fake::Dummy))]
+    #[cfg_attr(feature = "db", derive(sqlx::FromRow))]
+    #[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
+    pub struct ProductPhoto {
+        pub id: ProductPhotoId,
+        pub product_variant_id: ProductVariantId,
+        pub photo_id: PhotoId,
+    }
 }
 
 #[cfg_attr(feature = "dummy", derive(fake::Dummy))]

crates/stock_manager/src/db/photos.rs

@@ -0,0 +1 @@
+use model::v2::*;

crates/stock_manager/src/db/product_photos.rs

@@ -0,0 +1 @@
+use model::v2::*;

crates/stock_manager/src/db/products.rs

@@ -0,0 +1 @@
+use model::v2::*;

crates/stock_manager/src/db/stocks.rs

@@ -0,0 +1 @@
+use model::v2::*;