.sqlx/query-e2f9f291a20aac77851774ba8cd37325143a4d98e0980632f097c5885cc71094.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "UPDATE\n                        cqrs_inventory_product_query\n                    SET\n                        version = $1,\n                        name = $2,\n                        description = $3,\n                        image = $4,\n                        category_id = $5,\n                        price_major = $6,\n                        price_minor = $7,\n                        price_currency = $8,\n                        sku_able = $9,\n                        quantity_minor_unit = $10,\n                        quantity_minor_number = $11,\n                        quantity_major_unit = $12,\n                        quantity_major_number = $13,\n                        deleted = $14;",
+  "query": "UPDATE\n                        cqrs_inventory_product_query\n                    SET\n                        version = $1,\n                        name = $2,\n                        description = $3,\n                        image = $4,\n                        product_id = $5,\n                        category_id = $6,\n                        price_major = $7,\n                        price_minor = $8,\n                        price_currency = $9,\n                        sku_able = $10,\n                        quantity_minor_unit = $11,\n                        quantity_minor_number = $12,\n                        quantity_major_unit = $13,\n                        quantity_major_number = $14,\n                        deleted = $15;",
   "describe": {
     "columns": [],
     "parameters": {
@@ -10,6 +10,7 @@
         "Text",
         "Text",
         "Uuid",
+        "Uuid",
         "Int4",
         "Int4",
         "Text",
@@ -23,5 +24,5 @@
     },
     "nullable": []
   },
-  "hash": "c358d3b79d35668b3475f29f5bf6767f7209a2443fd944420baf1e1cf5c51ccb"
+  "hash": "e2f9f291a20aac77851774ba8cd37325143a4d98e0980632f097c5885cc71094"
 }

src/inventory/adapters/output/db/postgres/category_name_exists_for_store.rs

@@ -49,7 +49,7 @@ pub mod tests {
             VALUES ($1, $2, $3, $4, $5, $6);",
             1,
             c.name(),
-            c.description().as_ref().map(|s| s.as_str()),
+            c.description().as_ref().unwrap(),
             c.category_id(),
             c.store_id(),
             c.deleted().clone(),

src/inventory/adapters/output/db/postgres/product_view.rs

@@ -293,20 +293,22 @@ impl ViewRepository<ProductView, Product> for InventoryDBPostgresAdapter {
                         name = $2,
                         description = $3,
                         image = $4,
-                        category_id = $5,
-                        price_major = $6,
-                        price_minor = $7,
-                        price_currency = $8,
-                        sku_able = $9,
-                        quantity_minor_unit = $10,
-                        quantity_minor_number = $11,
-                        quantity_major_unit = $12,
-                        quantity_major_number = $13,
-                        deleted = $14;",
+                        product_id = $5,
+                        category_id = $6,
+                        price_major = $7,
+                        price_minor = $8,
+                        price_currency = $9,
+                        sku_able = $10,
+                        quantity_minor_unit = $11,
+                        quantity_minor_number = $12,
+                        quantity_major_unit = $13,
+                        quantity_major_number = $14,
+                        deleted = $15;",
                     version,
                     view.name,
                     view.description,
                     view.image,
+                    view.product_id,
                     view.category_id,
                     view.price_major,
                     view.price_minor,
@@ -347,157 +349,3 @@ impl Query<Product> for InventoryDBPostgresAdapter {
         self.update_view(view, view_context).await.unwrap();
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    use postgres_es::PostgresCqrs;
-
-    use crate::{
-        db::migrate::*,
-        inventory::{
-            application::{
-                port::output::full_text_search::add_product_to_store::*,
-                services::{
-                    add_product_service::*, update_product_service::*,
-                    MockInventoryServicesInterface,
-                },
-            },
-            domain::{
-                add_product_command::{tests::get_command, *},
-                category_aggregate::{Category, CategoryBuilder},
-                commands::*,
-                events::*,
-                product_aggregate::*,
-                store_aggregate::*,
-                update_product_command::{tests::get_command_with_product, *},
-            },
-        },
-        tests::bdd::*,
-        utils::{random_string::GenerateRandomStringInterface, uuid::tests::UUID},
-    };
-    use std::sync::Arc;
-
-    #[actix_rt::test]
-    async fn pg_query_inventory_product_view() {
-        let settings = crate::settings::tests::get_settings().await;
-        //let settings = crate::settings::Settings::new().unwrap();
-        settings.create_db().await;
-
-        let db = crate::db::sqlx_postgres::Postgres::init(&settings.database.url).await;
-        db.migrate().await;
-        let db = InventoryDBPostgresAdapter::new(db.pool.clone());
-
-        let store = Store::default();
-        crate::inventory::adapters::output::db::postgres::store_id_exists::tests::create_dummy_store_record(&store, &db).await;
-        let category = CategoryBuilder::default()
-            .name("fooooo_cat".into())
-            .description(None)
-            .store_id(*store.store_id())
-            .category_id(UUID)
-            .build()
-            .unwrap();
-        crate::inventory::adapters::output::db::postgres::category_name_exists_for_store::tests::create_dummy_category_record(&category, &db).await;
-
-        let queries: Vec<Box<dyn Query<Product>>> = vec![Box::new(db.clone())];
-
-        let mut mock_services = MockInventoryServicesInterface::new();
-
-        let db2 = Arc::new(db.clone());
-        mock_services
-            .expect_add_product()
-            .times(IS_CALLED_ONLY_ONCE.unwrap())
-            .returning(move || {
-                Arc::new(
-                    AddProductServiceBuilder::default()
-                        .db_product_name_exists_for_category(db2.clone())
-                        .db_product_id_exists(db2.clone())
-                        .db_get_category(db2.clone())
-                        .db_category_id_exists(db2.clone())
-                        .fts_add_product(mock_add_product_to_store_fts_port(IGNORE_CALL_COUNT))
-                        .build()
-                        .unwrap(),
-                )
-            });
-
-        let db2 = Arc::new(db.clone());
-        mock_services
-            .expect_update_product()
-            .times(IS_CALLED_ONLY_ONCE.unwrap())
-            .returning(move || {
-                Arc::new(
-                    UpdateProductServiceBuilder::default()
-                        .db_category_id_exists(db2.clone())
-                        .db_product_name_exists_for_category(db2.clone())
-                        .db_product_id_exists(db2.clone())
-                        .build()
-                        .unwrap(),
-                )
-            });
-
-        let (cqrs, product_query): (
-            Arc<PostgresCqrs<Product>>,
-            Arc<dyn ViewRepository<ProductView, Product>>,
-        ) = (
-            Arc::new(postgres_es::postgres_cqrs(
-                db.pool.clone(),
-                queries,
-                Arc::new(mock_services),
-            )),
-            Arc::new(db.clone()),
-        );
-
-        let rand = crate::utils::random_string::GenerateRandomString {};
-
-        let cmd = get_command();
-        cqrs.execute(
-            &cmd.product_id().to_string(),
-            InventoryCommand::AddProduct(cmd.clone()),
-        )
-        .await
-        .unwrap();
-
-        let product = product_query
-            .load(&(*cmd.product_id()).to_string())
-            .await
-            .unwrap()
-            .unwrap();
-        let product: Product = product.into();
-        assert_eq!(product.name(), cmd.name());
-        assert_eq!(product.description(), cmd.description());
-        assert_eq!(product.image(), cmd.image());
-        assert_eq!(product.product_id(), cmd.product_id());
-        assert_eq!(product.quantity(), cmd.quantity());
-        assert_eq!(product.sku_able(), cmd.sku_able());
-        assert_eq!(product.price(), cmd.price());
-        assert!(!store.deleted());
-
-        let update_product_cmd = get_command_with_product(product.clone());
-        cqrs.execute(
-            &cmd.product_id().to_string(),
-            InventoryCommand::UpdateProduct(update_product_cmd.clone()),
-        )
-        .await
-        .unwrap();
-        let product = product_query
-            .load(&(*cmd.product_id()).to_string())
-            .await
-            .unwrap()
-            .unwrap();
-        let product: Product = product.into();
-        assert_eq!(product.name(), update_product_cmd.name());
-        assert_eq!(product.description(), update_product_cmd.description());
-        assert_eq!(product.image(), update_product_cmd.image());
-        assert_eq!(
-            product.product_id(),
-            update_product_cmd.old_product().product_id()
-        );
-        assert_eq!(product.quantity(), update_product_cmd.quantity());
-        assert_eq!(product.sku_able(), update_product_cmd.sku_able());
-        assert_eq!(product.price(), update_product_cmd.price());
-        assert!(!store.deleted());
-
-        settings.drop_db().await;
-    }
-}

src/inventory/application/services/add_product_service.rs

@@ -23,6 +23,7 @@ use crate::inventory::{
         product_aggregate::*,
     },
 };
+use crate::utils::uuid::*;
 
 #[automock]
 #[async_trait::async_trait]
@@ -39,6 +40,7 @@ pub struct AddProductService {
     db_product_id_exists: ProductIDExistsDBPortObj,
     db_get_category: GetCategoryDBPortObj,
     fts_add_product: AddProductToStoreFTSPortObj,
+    get_uuid: GetUUIDInterfaceObj,
 }
 
 #[async_trait::async_trait]
@@ -52,12 +54,19 @@ impl AddProductUseCase for AddProductService {
             return Err(InventoryError::CategoryIDNotFound);
         }
 
-        if self
-            .db_product_id_exists
-            .product_id_exists(cmd.product_id())
-            .await?
-        {
-            return Err(InventoryError::DuplicateProductID);
+        let mut product_id = self.get_uuid.get_uuid();
+
+        loop {
+            if self
+                .db_product_id_exists
+                .product_id_exists(&product_id)
+                .await?
+            {
+                product_id = self.get_uuid.get_uuid();
+                continue;
+            } else {
+                break;
+            }
         }
 
         let product = ProductBuilder::default()
@@ -68,7 +77,7 @@ impl AddProductUseCase for AddProductService {
             .price(cmd.price().clone())
             .category_id(*cmd.category_id())
             .quantity(cmd.quantity().clone())
-            .product_id(*cmd.product_id())
+            .product_id(product_id)
             .build()
             .unwrap();
 
@@ -110,8 +119,8 @@ pub mod tests {
     use super::*;
 
     use crate::inventory::domain::add_product_command::tests::get_command;
-    use crate::tests::bdd::*;
     use crate::utils::uuid::tests::UUID;
+    use crate::{tests::bdd::*, utils::uuid::tests::mock_get_uuid};
 
     pub fn mock_add_product_service(
         times: Option<usize>,
@@ -156,6 +165,7 @@ pub mod tests {
             .db_get_category(mock_get_category_db_port(IS_CALLED_ONLY_ONCE))
             .db_category_id_exists(mock_category_id_exists_db_port_true(IS_CALLED_ONLY_ONCE))
             .fts_add_product(mock_add_product_to_store_fts_port(IS_CALLED_ONLY_ONCE))
+            .get_uuid(mock_get_uuid(IS_CALLED_ONLY_ONCE))
             .build()
             .unwrap();
 
@@ -180,6 +190,7 @@ pub mod tests {
                 mock_product_name_exists_for_category_db_port_true(IS_CALLED_ONLY_ONCE),
             )
             .db_category_id_exists(mock_category_id_exists_db_port_true(IS_CALLED_ONLY_ONCE))
+            .get_uuid(mock_get_uuid(IS_CALLED_ONLY_ONCE))
             .db_product_id_exists(mock_product_id_exists_db_port_false(IS_CALLED_ONLY_ONCE))
             .db_get_category(mock_get_category_db_port(IS_NEVER_CALLED))
             .fts_add_product(mock_add_product_to_store_fts_port(IS_NEVER_CALLED))
@@ -204,6 +215,7 @@ pub mod tests {
             .db_category_id_exists(mock_category_id_exists_db_port_false(IS_CALLED_ONLY_ONCE))
             .db_get_category(mock_get_category_db_port(IS_NEVER_CALLED))
             .fts_add_product(mock_add_product_to_store_fts_port(IS_NEVER_CALLED))
+            .get_uuid(mock_get_uuid(IS_NEVER_CALLED))
             .build()
             .unwrap();
 

src/inventory/application/services/errors.rs

@@ -21,7 +21,6 @@ pub enum InventoryError {
     DuplicateCustomizationID,
     DuplicateStoreID,
     DuplicateCategoryID,
-    DuplicateProductID,
     ProductIDNotFound,
     CategoryIDNotFound,
     CustomizationIDNotFound,
@@ -37,7 +36,10 @@ impl From<InventoryDBError> for InventoryError {
             InventoryDBError::DuplicateProductName => Self::DuplicateProductName,
             InventoryDBError::DuplicateCustomizationName => Self::DuplicateCustomizationName,
             InventoryDBError::DuplicateStoreID => Self::DuplicateStoreID,
-            InventoryDBError::DuplicateProductID => Self::DuplicateProductID,
+            InventoryDBError::DuplicateProductID => {
+                error!("DuplicateProductID");
+                Self::InternalError
+            }
             InventoryDBError::DuplicateCategoryID => Self::DuplicateCategoryID,
             InventoryDBError::DuplicateCustomizationID => Self::DuplicateCustomizationID,
             InventoryDBError::InternalError => Self::InternalError,

src/inventory/domain/add_product_command.rs

@@ -17,17 +17,24 @@ pub enum AddProductCommandError {
 }
 
 #[derive(
-    Clone, Builder, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters,
+    Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder,
 )]
-#[builder(build_fn(validate = "Self::validate"))]
-pub struct AddProductCommand {
-    #[builder(setter(custom))]
+pub struct UnvalidatedAddProductCommand {
+    name: String,
+    description: Option<String>,
+    image: Option<String>,
+    category_id: Uuid,
+    sku_able: bool,
+    quantity: Quantity,
+    price: Price,
+    adding_by: Uuid,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters)]
+pub struct AddProductCommand {
     name: String,
-    #[builder(setter(custom))]
     description: Option<String>,
-    #[builder(setter(custom))]
     image: Option<String>,
-    product_id: Uuid,
     category_id: Uuid,
     sku_able: bool,
     price: Price,
@@ -35,9 +42,9 @@ pub struct AddProductCommand {
     adding_by: Uuid,
 }
 
-impl AddProductCommandBuilder {
-    pub fn description(&mut self, description: Option<String>) -> &mut Self {
-        let description: Option<String> = if let Some(description) = description {
+impl UnvalidatedAddProductCommand {
+    pub fn validate(self) -> Result<AddProductCommand, AddProductCommandError> {
+        let description: Option<String> = if let Some(description) = self.description {
             let description = description.trim();
             if description.is_empty() {
                 None
@@ -47,12 +54,8 @@ impl AddProductCommandBuilder {
         } else {
             None
         };
-        self.description = Some(description);
-        self
-    }
 
-    pub fn image(&mut self, image: Option<String>) -> &mut Self {
-        let image: Option<String> = if let Some(image) = image {
+        let image: Option<String> = if let Some(image) = self.image {
             let image = image.trim();
             if image.is_empty() {
                 None
@@ -62,22 +65,22 @@ impl AddProductCommandBuilder {
         } else {
             None
         };
-        self.image = Some(image);
-        self
-    }
 
-    pub fn name(&mut self, name: String) -> &mut Self {
-        let name = name.trim().to_owned();
-        self.name = Some(name);
-        self
-    }
-
-    pub fn validate(&self) -> Result<(), String> {
-        if self.name.as_ref().unwrap().is_empty() {
-            return Err(AddProductCommandError::NameIsEmpty.to_string());
+        let name = self.name.trim().to_owned();
+        if name.is_empty() {
+            return Err(AddProductCommandError::NameIsEmpty);
         }
 
-        Ok(())
+        Ok(AddProductCommand {
+            name,
+            description,
+            image,
+            category_id: self.category_id,
+            sku_able: self.sku_able,
+            price: self.price,
+            quantity: self.quantity,
+            adding_by: self.adding_by,
+        })
     }
 }
 
@@ -90,7 +93,7 @@ pub mod tests {
     pub fn get_command() -> AddProductCommand {
         let name = "foo";
         let adding_by = UUID;
-        let category_id = UUID;
+        let category_id = Uuid::new_v4();
         let sku_able = false;
         let image = Some("image".to_string());
         let description = Some("description".to_string());
@@ -120,7 +123,7 @@ pub mod tests {
             .build()
             .unwrap();
 
-        AddProductCommandBuilder::default()
+        let cmd = UnvalidatedAddProductCommandBuilder::default()
             .name(name.into())
             .description(description.clone())
             .image(image.clone())
@@ -128,10 +131,11 @@ pub mod tests {
             .adding_by(adding_by)
             .quantity(quantity)
             .sku_able(sku_able)
-            .product_id(UUID)
             .price(price.clone())
             .build()
-            .unwrap()
+            .unwrap();
+
+        cmd.validate().unwrap()
     }
 
     #[test]
@@ -151,7 +155,7 @@ pub mod tests {
         let quantity = Quantity::default();
 
         // description = None
-        let cmd = AddProductCommandBuilder::default()
+        let cmd = UnvalidatedAddProductCommandBuilder::default()
             .name(name.into())
             .description(None)
             .image(None)
@@ -159,11 +163,12 @@ pub mod tests {
             .adding_by(adding_by)
             .quantity(quantity.clone())
             .sku_able(sku_able)
-            .product_id(UUID)
             .price(price.clone())
             .build()
             .unwrap();
 
+        let cmd = cmd.validate().unwrap();
+
         assert_eq!(cmd.name(), name);
         assert_eq!(cmd.description(), &None);
         assert_eq!(cmd.adding_by(), &adding_by);
@@ -191,19 +196,21 @@ pub mod tests {
 
         let quantity = Quantity::default();
 
-        let cmd = AddProductCommandBuilder::default()
+        let cmd = UnvalidatedAddProductCommandBuilder::default()
             .name(name.into())
             .description(description.clone())
             .image(image.clone())
             .category_id(category_id)
-            .adding_by(adding_by)
             .quantity(quantity.clone())
+            .adding_by(adding_by)
             .sku_able(sku_able)
-            .product_id(UUID)
             .price(price.clone())
+            //            .customizations(customizations.clone())
             .build()
             .unwrap();
 
+        let cmd = cmd.validate().unwrap();
+
         assert_eq!(cmd.name(), name);
         assert_eq!(cmd.description(), &description);
         assert_eq!(cmd.adding_by(), &adding_by);
@@ -231,8 +238,7 @@ pub mod tests {
 
         let quantity = Quantity::default();
 
-        // AddProductCommandError::NameIsEmpty
-        assert!(AddProductCommandBuilder::default()
+        let cmd = UnvalidatedAddProductCommandBuilder::default()
             .name("".into())
             .description(description.clone())
             .image(image.clone())
@@ -240,9 +246,11 @@ pub mod tests {
             .adding_by(adding_by)
             .quantity(quantity)
             .sku_able(sku_able)
-            .product_id(UUID)
             .price(price.clone())
             .build()
-            .is_err());
+            .unwrap();
+
+        // AddProductCommandError::NameIsEmpty
+        assert_eq!(cmd.validate(), Err(AddProductCommandError::NameIsEmpty))
     }
 }

src/inventory/domain/update_product_command.rs

@@ -95,62 +95,13 @@ pub mod tests {
     use crate::types::quantity::*;
     use crate::utils::uuid::tests::UUID;
 
-    pub fn get_command_with_product(product: Product) -> UpdateProductCommand {
-        let name = "foobaaar";
-        let adding_by = UUID;
-        let category_id = UUID;
-        let sku_able = false;
-        let image = Some("imageeee".to_string());
-        let description = Some("descriptionnnn".to_string());
-
-        let price = PriceBuilder::default()
-            .minor(0)
-            .major(100)
-            .currency(Currency::INR)
-            .build()
-            .unwrap();
-
-        let quantity = QuantityBuilder::default()
-            .minor(
-                QuantityPartBuilder::default()
-                    .number(0)
-                    .unit(QuantityUnit::DiscreteNumber)
-                    .build()
-                    .unwrap(),
-            )
-            .major(
-                QuantityPartBuilder::default()
-                    .number(1)
-                    .unit(QuantityUnit::DiscreteNumber)
-                    .build()
-                    .unwrap(),
-            )
-            .build()
-            .unwrap();
-
-        let cmd = UnvalidatedUpdateProductCommandBuilder::default()
-            .name(name.into())
-            .description(description.clone())
-            .image(image.clone())
-            .category_id(category_id.clone())
-            .adding_by(adding_by.clone())
-            .quantity(quantity)
-            .sku_able(sku_able)
-            .price(price.clone())
-            .old_product(product)
-            .build()
-            .unwrap();
-
-        cmd.validate().unwrap()
-    }
-
     pub fn get_command() -> UpdateProductCommand {
-        let name = "foobaaar";
+        let name = "foo";
         let adding_by = UUID;
-        let category_id = UUID;
+        let category_id = Uuid::new_v4();
         let sku_able = false;
-        let image = Some("imageeee".to_string());
-        let description = Some("descriptionnnn".to_string());
+        let image = Some("image".to_string());
+        let description = Some("description".to_string());
 
         let price = PriceBuilder::default()
             .minor(0)