VCST-2093: add section Id/changeCartConfiguredItem mutation/configurationItems query

src/VirtoCommerce.XCart.Core/CartAggregate.cs

@@ -203,6 +203,30 @@ public virtual async Task<CartAggregate> AddConfiguredItemAsync(NewCartItem newC
             return this;
         }
 
+        public virtual Task<CartAggregate> UpdateConfiguredItemAsync(string lineItemId, LineItem configuredItem)
+        {
+            ArgumentNullException.ThrowIfNull(lineItemId);
+            ArgumentNullException.ThrowIfNull(configuredItem);
+
+            EnsureCartExists();
+
+            var lineItem = Cart.Items.FirstOrDefault(x => x.Id == lineItemId && x.IsConfigured);
+
+            if (lineItem != null)
+            {
+                lineItem.Quantity = configuredItem.Quantity;
+                lineItem.ListPrice = configuredItem.ListPrice;
+                lineItem.SalePrice = configuredItem.SalePrice;
+                lineItem.DiscountAmount = configuredItem.DiscountAmount;
+                lineItem.PlacedPrice = configuredItem.PlacedPrice;
+                lineItem.ExtendedPrice = configuredItem.ExtendedPrice;
+
+                lineItem.ConfigurationItems = new List<ConfigurationItem>(configuredItem.ConfigurationItems);
+            }
+
+            return Task.FromResult(this);
+        }
+
         public virtual async Task<CartAggregate> AddItemAsync(NewCartItem newCartItem)
         {
             EnsureCartExists();

src/VirtoCommerce.XCart.Core/Commands/ChangeCartConfiguredItemCommand.cs

@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+using VirtoCommerce.XCart.Core.Commands.BaseCommands;
+using VirtoCommerce.XCart.Core.Models;
+
+namespace VirtoCommerce.XCart.Core.Commands;
+
+public class ChangeCartConfiguredItemCommand : CartCommand
+{
+    public string LineItemId { get; set; }
+
+    public int? Quantity { get; set; }
+
+    public IList<ProductConfigurationSection> ConfigurationSections { get; set; } = new List<ProductConfigurationSection>();
+}

src/VirtoCommerce.XCart.Core/Commands/CreateConfiguredLineItemCommand.cs

@@ -18,5 +18,7 @@ public class CreateConfiguredLineItemCommand : ICommand<ExpConfigurationLineItem
 
     public string ConfigurableProductId { get; set; }
 
+    public int Quantity { get; set; } = 1;
+
     public IList<ProductConfigurationSection> ConfigurationSections { get; set; } = [];
 }

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 List<SectionLineItem> _items { get; set; } = [];
+
+        public LineItem AddItem(CartProduct cartProduct, int quantity, string sectionId)
         {
             var lineItem = AbstractTypeFactory<LineItem>.TryCreateInstance();
             lineItem.ProductId = cartProduct.Id;
@@ -51,17 +52,21 @@ 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;
         }
 
-        public ExpConfigurationLineItem CreateConfiguredLineItem()
+        public ExpConfigurationLineItem CreateConfiguredLineItem(int quantity)
         {
             var lineItem = AbstractTypeFactory<LineItem>.TryCreateInstance();
 
             lineItem.IsConfigured = true;
-            lineItem.Quantity = 1;
+            lineItem.Quantity = quantity;
 
             lineItem.Discounts = [];
             lineItem.TaxDetails = [];
@@ -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 sealed class SectionLineItem
+        {
+            public string SectionId { get; set; }
+            public LineItem Item { get; set; }
+        }
     }
 }

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; }
     }

src/VirtoCommerce.XCart.Core/Models/ConfigurationItemsResponse.cs

@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+using VirtoCommerce.CartModule.Core.Model;
+
+namespace VirtoCommerce.XCart.Core.Models;
+
+public class ConfigurationItemsResponse
+{
+    public CartAggregate CartAggregate { get; set; }
+
+    public IList<ConfigurationItem> ConfigurationItems { get; set; } = [];
+}

src/VirtoCommerce.XCart.Core/Queries/GetConfigurationItemsQuery.cs

@@ -0,0 +1,51 @@
+using System.Collections.Generic;
+using System.Linq;
+using GraphQL;
+using GraphQL.Types;
+using VirtoCommerce.Xapi.Core.BaseQueries;
+using VirtoCommerce.Xapi.Core.Extensions;
+using VirtoCommerce.XCart.Core.Models;
+
+namespace VirtoCommerce.XCart.Core.Queries;
+
+public class GetConfigurationItemsQuery : Query<ConfigurationItemsResponse>, ICartQuery
+{
+    public IList<string> IncludeFields { get; set; } = new List<string>();
+    public string StoreId { get; set; }
+    public string CartType { get; set; }
+    public string CartName { get; set; }
+    public string UserId { get; set; }
+    public string OrganizationId { get; set; }
+    public string CurrencyCode { get; set; }
+    public string CultureName { get; set; }
+
+    public string CartId { get; set; }
+    public string LineItemId { get; set; }
+
+    public override IEnumerable<QueryArgument> GetArguments()
+    {
+        yield return Argument<StringGraphType>(nameof(CartId));
+        yield return Argument<NonNullGraphType<StringGraphType>>(nameof(LineItemId));
+        yield return Argument<NonNullGraphType<StringGraphType>>(nameof(StoreId), description: "Store Id");
+        yield return Argument<NonNullGraphType<StringGraphType>>(nameof(CurrencyCode), description: "Currency code (\"USD\")");
+        yield return Argument<StringGraphType>(nameof(CartType), description: "Cart type");
+        yield return Argument<StringGraphType>(nameof(CartName), description: "Cart name");
+        yield return Argument<StringGraphType>(nameof(UserId), description: "User Id");
+        yield return Argument<StringGraphType>(nameof(CultureName), description: "Culture name (\"en-Us\")");
+    }
+
+    public override void Map(IResolveFieldContext context)
+    {
+        CartId = context.GetArgument<string>(nameof(CartId));
+        LineItemId = context.GetArgument<string>(nameof(LineItemId));
+        StoreId = context.GetArgument<string>(nameof(StoreId));
+        CartType = context.GetArgument<string>(nameof(CartType));
+        CartName = context.GetArgument<string>(nameof(CartName));
+        UserId = context.GetArgument<string>(nameof(UserId));
+        OrganizationId = context.GetCurrentOrganizationId();
+        CurrencyCode = context.GetArgument<string>(nameof(CurrencyCode));
+        CultureName = context.GetArgument<string>(nameof(CultureName));
+
+        IncludeFields = context.SubFields.Values.GetAllNodesPaths(context).ToArray();
+    }
+}

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");
         }
     }
 }

src/VirtoCommerce.XCart.Core/Schemas/ConfigurationItemsResponseType.cs

@@ -0,0 +1,16 @@
+using GraphQL.Types;
+using VirtoCommerce.Xapi.Core.Schemas;
+using VirtoCommerce.XCart.Core.Models;
+
+namespace VirtoCommerce.XCart.Core.Schemas;
+
+public class ConfigurationItemsResponseType : ExtendableGraphType<ConfigurationItemsResponse>
+{
+    public ConfigurationItemsResponseType()
+    {
+        ExtendableField<ListGraphType<CartConfigurationItemType>>(
+            "configurationItems",
+            "Configuration items for configurable product",
+            resolve: context => context.Source.ConfigurationItems ?? []);
+    }
+}

src/VirtoCommerce.XCart.Core/Schemas/InputChangeCartConfiguredItemType.cs

@@ -0,0 +1,14 @@
+using GraphQL.Types;
+
+namespace VirtoCommerce.XCart.Core.Schemas
+{
+    public class InputChangeCartConfiguredItemType : InputCartBaseType
+    {
+        public InputChangeCartConfiguredItemType()
+        {
+            Field<NonNullGraphType<StringGraphType>>("lineItemId", "Line item Id");
+            Field<IntGraphType>("quantity", "Quantity");
+            Field<ListGraphType<ConfigurationSectionInput>>("configurationSections");
+        }
+    }
+}

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" />

src/VirtoCommerce.XCart.Data/Commands/ChangeCartConfiguredItemCommandHandler.cs

@@ -0,0 +1,55 @@
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using MediatR;
+using VirtoCommerce.CartModule.Core.Model;
+using VirtoCommerce.XCart.Core;
+using VirtoCommerce.XCart.Core.Commands;
+using VirtoCommerce.XCart.Core.Commands.BaseCommands;
+using VirtoCommerce.XCart.Core.Services;
+
+namespace VirtoCommerce.XCart.Data.Commands;
+
+public class ChangeCartConfiguredItemCommandHandler : CartCommandHandler<ChangeCartConfiguredItemCommand>
+{
+    private readonly IMediator _mediator;
+
+    public ChangeCartConfiguredItemCommandHandler(ICartAggregateRepository cartAggregateRepository, IMediator mediator)
+        : base(cartAggregateRepository)
+    {
+        _mediator = mediator;
+    }
+
+    public override async Task<CartAggregate> Handle(ChangeCartConfiguredItemCommand request, CancellationToken cancellationToken)
+    {
+        var cartAggregate = await GetOrCreateCartFromCommandAsync(request);
+
+        var lineItem = GetConfiguredLineItem(request, cartAggregate);
+        if (lineItem != null)
+        {
+            var createConfigurableProductCommand = new CreateConfiguredLineItemCommand
+            {
+                StoreId = request.StoreId,
+                UserId = request.UserId,
+                OrganizationId = request.OrganizationId,
+                CultureName = request.CultureName,
+                CurrencyCode = request.CurrencyCode,
+                ConfigurableProductId = lineItem.ProductId,
+                ConfigurationSections = request.ConfigurationSections,
+                Quantity = request.Quantity ?? lineItem.Quantity,
+            };
+
+            var mediatorResult = await _mediator.Send(createConfigurableProductCommand, cancellationToken);
+            await cartAggregate.UpdateConfiguredItemAsync(lineItem.Id, mediatorResult.Item);
+
+            return await SaveCartAsync(cartAggregate);
+        }
+
+        return cartAggregate;
+    }
+
+    private static LineItem GetConfiguredLineItem(ChangeCartConfiguredItemCommand request, CartAggregate cartAggregate)
+    {
+        return cartAggregate.Cart.Items.FirstOrDefault(x => x.Id == request.LineItemId && x.IsConfigured);
+    }
+}

src/VirtoCommerce.XCart.Data/Commands/CreateConfiguredLineItemHandler.cs

@@ -47,18 +47,19 @@ 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();
+        var configuredItem = container.CreateConfiguredLineItem(request.Quantity);
 
         return configuredItem;
     }