feat: add section Id

VirtoCommerce · Nov 26, 2024 · cc695a4 · cc695a4
1 parent dc05f46
commit cc695a4
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 20 deletions.
diff --git a/src/VirtoCommerce.XCart.Core/Commands/ChangeCartConfiguredItemCommand.cs b/src/VirtoCommerce.XCart.Core/Commands/ChangeCartConfiguredItemCommand.cs
@@ -0,0 +1,10 @@
+using VirtoCommerce.XCart.Core.Commands.BaseCommands;
+
+namespace VirtoCommerce.XCart.Core.Commands;
+
+public class ChangeCartConfiguredItemCommand : CartCommand
+{
+    public string LineItemId { get; set; }
+
+    public int? Quantity { get; set; }
+}
diff --git a/src/VirtoCommerce.XCart.Core/ConfiguredLineItemContainer.cs b/src/VirtoCommerce.XCart.Core/ConfiguredLineItemContainer.cs
@@ -20,9 +20,10 @@ public class ConfiguredLineItemContainer : ICloneable
         public IList<string> ProductsIncludeFields { get; set; }
 
         public CartProduct ConfigurableProduct { get; set; }
-        public IList<LineItem> Items { get; set; } = new List<LineItem>();
 
-        public LineItem AddItem(CartProduct cartProduct, int quantity)
+        private IList<SectionLineItem> _items { get; set; } = new List<SectionLineItem>();
+
+        public LineItem AddItem(CartProduct cartProduct, int quantity, string sectionId)
         {
             var lineItem = AbstractTypeFactory<LineItem>.TryCreateInstance();
             lineItem.ProductId = cartProduct.Id;
@@ -51,7 +52,11 @@ public LineItem AddItem(CartProduct cartProduct, int quantity)
                 lineItem.ExtendedPrice = lineItem.PlacedPrice * lineItem.Quantity;
             }
 
-            Items.Add(lineItem);
+            _items.Add(new SectionLineItem
+            {
+                Item = lineItem,
+                SectionId = sectionId,
+            });
 
             return lineItem;
         }
@@ -83,18 +88,19 @@ public ExpConfigurationLineItem CreateConfiguredLineItem()
             lineItem.VendorId = ConfigurableProduct.Product.Vendor;
 
             // create sub items
-            lineItem.ConfigurationItems = Items
+            lineItem.ConfigurationItems = _items
                 .Select(x =>
                 {
                     var subItem = AbstractTypeFactory<ConfigurationItem>.TryCreateInstance();
 
-                    subItem.ProductId = x.ProductId;
-                    subItem.Name = x.Name;
-                    subItem.Sku = x.Sku;
-                    subItem.ImageUrl = x.ImageUrl;
-                    subItem.Quantity = x.Quantity;
-                    subItem.CatalogId = x.CatalogId;
-                    subItem.CategoryId = x.CategoryId;
+                    subItem.SectionId = x.SectionId;
+                    subItem.ProductId = x.Item.ProductId;
+                    subItem.Name = x.Item.Name;
+                    subItem.Sku = x.Item.Sku;
+                    subItem.ImageUrl = x.Item.ImageUrl;
+                    subItem.Quantity = x.Item.Quantity;
+                    subItem.CatalogId = x.Item.CatalogId;
+                    subItem.CategoryId = x.Item.CategoryId;
 
                     return subItem;
                 })
@@ -119,8 +125,8 @@ public void UpdatePrice(LineItem lineItem)
         {
             var configurableProductPrice = ConfigurableProduct.Price ?? new Xapi.Core.Models.ProductPrice(Currency);
 
-            lineItem.ListPrice = Items.Sum(x => x.ListPrice * x.Quantity) + configurableProductPrice.ListPrice.Amount;
-            lineItem.SalePrice = Items.Sum(x => x.SalePrice * x.Quantity) + configurableProductPrice.SalePrice.Amount;
+            lineItem.ListPrice = _items.Select(x => x.Item).Sum(x => x.ListPrice * x.Quantity) + configurableProductPrice.ListPrice.Amount;
+            lineItem.SalePrice = _items.Select(x => x.Item).Sum(x => x.SalePrice * x.Quantity) + configurableProductPrice.SalePrice.Amount;
 
             lineItem.DiscountAmount = Math.Max(0, lineItem.ListPrice - lineItem.SalePrice);
             lineItem.PlacedPrice = lineItem.ListPrice - lineItem.DiscountAmount;
@@ -144,5 +150,11 @@ public object Clone()
         {
             return MemberwiseClone();
         }
+
+        private class SectionLineItem
+        {
+            public string SectionId { get; set; }
+            public LineItem Item { get; set; }
+        }
     }
 }
diff --git a/src/VirtoCommerce.XCart.Core/ExpConfigurationLineItem.cs b/src/VirtoCommerce.XCart.Core/ExpConfigurationLineItem.cs
@@ -5,10 +5,16 @@ namespace VirtoCommerce.XCart.Core
 {
     public class ExpConfigurationLineItem
     {
+        public ExpConfigurationLineItem()
+        {
+
+        }
+
         public string StoreId { get; set; }
         public string UserId { get; set; }
         public string CultureName { get; set; }
 
+
         public LineItem Item { get; set; }
         public Currency Currency { get; set; }
     }

diff --git a/src/VirtoCommerce.XCart.Core/Schemas/CartConfigurationItemType.cs b/src/VirtoCommerce.XCart.Core/Schemas/CartConfigurationItemType.cs
@@ -1,4 +1,4 @@
-using VirtoCommerce.CartModule.Core.Model;
+using VirtoCommerce.CartModule.Core.Model;
 using VirtoCommerce.Xapi.Core.Schemas;
 
 namespace VirtoCommerce.XCart.Core.Schemas
@@ -9,6 +9,9 @@ public CartConfigurationItemType()
         {
             Field(x => x.Id, nullable: false).Description("Configuration item ID");
             Field(x => x.Name, nullable: true).Description("Configuration item name");
+            Field(x => x.SectionId, nullable: true).Description("Configuration item section ID");
+            Field(x => x.ProductId, nullable: true).Description("Configuration item product ID");
+            Field(x => x.Quantity, nullable: true).Description("Configuration item quantity");
         }
     }
 }
diff --git a/src/VirtoCommerce.XCart.Core/VirtoCommerce.XCart.Core.csproj b/src/VirtoCommerce.XCart.Core/VirtoCommerce.XCart.Core.csproj
@@ -12,7 +12,7 @@
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     <PackageReference Include="VirtoCommerce.Xapi.Core" Version="3.809.0" />
     <PackageReference Include="VirtoCommerce.XCatalog.Core" Version="3.817.0" />
-    <PackageReference Include="VirtoCommerce.CartModule.Core" Version="3.820.0" />
+    <PackageReference Include="VirtoCommerce.CartModule.Core" Version="3.821.0-alpha.712-vcst-2093" />
     <PackageReference Include="VirtoCommerce.PaymentModule.Core" Version="3.804.0" />
     <PackageReference Include="VirtoCommerce.ShippingModule.Core" Version="3.802.0" />
     <PackageReference Include="VirtoCommerce.InventoryModule.Core" Version="3.805.0" />

diff --git a/src/VirtoCommerce.XCart.Data/Commands/CreateConfiguredLineItemHandler.cs b/src/VirtoCommerce.XCart.Data/Commands/CreateConfiguredLineItemHandler.cs
@@ -47,15 +47,16 @@ public async Task<ExpConfigurationLineItem> Handle(CreateConfiguredLineItemComma
         productsRequest.LoadInventory = false;
         var products = await _cartProductService.GetCartProductsByIdsAsync(productsRequest);
 
-        foreach (var productOption in request.ConfigurationSections.Select(x => x.Value))
+        foreach (var section in request.ConfigurationSections)
         {
+            var productOption = section.Value;
             var selectedProduct = products.FirstOrDefault(x => x.Product.Id == productOption.ProductId);
             if (selectedProduct == null)
             {
                 throw new OperationCanceledException($"Product with id {productOption.ProductId} not found");
             }
 
-            _ = container.AddItem(selectedProduct, productOption.Quantity);
+            _ = container.AddItem(selectedProduct, productOption.Quantity, section.SectionId);
         }
 
         var configuredItem = container.CreateConfiguredLineItem();

diff --git a/src/VirtoCommerce.XCart.Data/Queries/GetProductConfigurationQueryHandler.cs b/src/VirtoCommerce.XCart.Data/Queries/GetProductConfigurationQueryHandler.cs
@@ -57,7 +57,7 @@ public async Task<ProductConfigurationQueryResponse> Handle(GetProductConfigurat
             {
                 if (productByIds.TryGetValue(option.ProductId, out var cartProduct))
                 {
-                    var item = container.AddItem(cartProduct, option.Quantity);
+                    var item = container.AddItem(cartProduct, option.Quantity, section.Id);
                     item.Id = option.Id;
 
                     var expConfigurationLineItem = new ExpConfigurationLineItem

diff --git a/src/VirtoCommerce.XCart.Data/Services/CartAggregateRepository.cs b/src/VirtoCommerce.XCart.Data/Services/CartAggregateRepository.cs
@@ -336,7 +336,7 @@ private async Task UpdateConfiguredLineItemPrice(CartAggregate aggregate)
                     var product = configProducts.FirstOrDefault(x => x.Product.Id == configurationItem.ProductId);
                     if (product != null)
                     {
-                        contaner.AddItem(product, configurationItem.Quantity);
+                        contaner.AddItem(product, configurationItem.Quantity, configurationItem.SectionId);
                     }
                 }
 

diff --git a/src/VirtoCommerce.XCart.Web/module.manifest b/src/VirtoCommerce.XCart.Web/module.manifest
@@ -6,7 +6,7 @@
 
   <platformVersion>3.867.0</platformVersion>
   <dependencies>
-    <dependency id="VirtoCommerce.Cart" version="3.820.0" />
+    <dependency id="VirtoCommerce.Cart" version="3.821.0" />
     <dependency id="VirtoCommerce.Inventory" version="3.805.0" />
     <dependency id="VirtoCommerce.Marketing" version="3.812.0" />
     <dependency id="VirtoCommerce.Payment" version="3.804.0" />