VCST-1460: use current/default organization ID

src/VirtoCommerce.QuoteModule.ExperienceApi/Commands/CreateQuoteCommand.cs

@@ -1,6 +1,6 @@
 using GraphQL.Types;
-using VirtoCommerce.Xapi.Core.Infrastructure;
 using VirtoCommerce.QuoteModule.ExperienceApi.Aggregates;
+using VirtoCommerce.Xapi.Core.Infrastructure;
 
 namespace VirtoCommerce.QuoteModule.ExperienceApi.Commands;
 
@@ -10,6 +10,9 @@ public class CreateQuoteCommand : ICommand<QuoteAggregate>
     public string UserId { get; set; }
     public string CurrencyCode { get; set; }
     public string CultureName { get; set; }
+
+    // set by the builder
+    public string CurrentOrganizationId { get; set; }
 }
 
 public class CreateQuoteCommandType : InputObjectGraphType<CreateQuoteCommand>

src/VirtoCommerce.QuoteModule.ExperienceApi/Commands/CreateQuoteCommandBuilder.cs

@@ -2,10 +2,11 @@
 using GraphQL;
 using MediatR;
 using Microsoft.AspNetCore.Authorization;
-using VirtoCommerce.Xapi.Core.BaseQueries;
 using VirtoCommerce.QuoteModule.ExperienceApi.Aggregates;
 using VirtoCommerce.QuoteModule.ExperienceApi.Authorization;
 using VirtoCommerce.QuoteModule.ExperienceApi.Schemas;
+using VirtoCommerce.Xapi.Core.BaseQueries;
+using VirtoCommerce.Xapi.Core.Extensions;
 
 namespace VirtoCommerce.QuoteModule.ExperienceApi.Commands;
 
@@ -28,4 +29,16 @@ protected virtual Task CheckCanCreateQuote(IResolveFieldContext<object> context,
     {
         return Authorize(context, userId, new QuoteAuthorizationRequirement());
     }
+
+    protected override CreateQuoteCommand GetRequest(IResolveFieldContext<object> context)
+    {
+        var command = base.GetRequest(context);
+
+        if (command != null)
+        {
+            command.CurrentOrganizationId = context.GetCurrentOrganizationId();
+        }
+
+        return command;
+    }
 }

src/VirtoCommerce.QuoteModule.ExperienceApi/Commands/CreateQuoteCommandHandler.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using MediatR;
@@ -50,12 +49,12 @@ public async Task<QuoteAggregate> Handle(CreateQuoteCommand request, Cancellatio
 
         var contact = await GetContact(request.UserId);
         quote.CustomerName = contact?.Name;
-        quote.OrganizationId = contact?.Organizations?.FirstOrDefault();
+        quote.OrganizationId = request.CurrentOrganizationId ?? contact?.DefaultOrganizationId;
 
         var organization = await GetOrganization(quote.OrganizationId);
         quote.OrganizationName = organization?.Name;
 
-        await _quoteRequestService.SaveChangesAsync(new[] { quote });
+        await _quoteRequestService.SaveChangesAsync([quote]);
 
         return await _quoteAggregateRepository.GetById(quote.Id);
     }

src/VirtoCommerce.QuoteModule.ExperienceApi/VirtoCommerce.QuoteModule.ExperienceApi.csproj

@@ -13,8 +13,9 @@
     <PackageReference Include="VirtoCommerce.Xapi.Core" Version="3.900.0" />
     <PackageReference Include="VirtoCommerce.XCatalog.Core" Version="3.900.0" />
     <PackageReference Include="VirtoCommerce.XCart.Data" Version="3.900.0" />
+    <PackageReference Include="VirtoCommerce.CustomerModule.Core" Version="3.817.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.QuoteModule.Core\VirtoCommerce.QuoteModule.Core.csproj" />
   </ItemGroup>
-</Project>
+</Project>

src/VirtoCommerce.QuoteModule.Web/module.manifest

@@ -10,6 +10,7 @@
     <dependency id="VirtoCommerce.Cart" version="3.810.0" />
     <dependency id="VirtoCommerce.Catalog" version="3.800.0" />
     <dependency id="VirtoCommerce.Core" version="3.800.0" />
+    <dependency id="VirtoCommerce.Customer" version="3.817.0" />
     <dependency id="VirtoCommerce.Xapi" version="3.900.0" />
     <dependency id="VirtoCommerce.XCart" version="3.900.0" />
     <dependency id="VirtoCommerce.XCatalog" version="3.900.0" />
@@ -34,7 +35,7 @@
   <iconUrl>Modules/$(VirtoCommerce.Quote)/Content/logo.png</iconUrl>
   <requireLicenseAcceptance>false</requireLicenseAcceptance>
   <releaseNotes>First version.</releaseNotes>
-  <copyright>Copyright © 2011–2024 Virto Commerce. All rights reserved</copyright>
+  <copyright>Copyright © 2011–2025 Virto Commerce. All rights reserved</copyright>
   <tags>b2b quotes</tags>
   <assemblyFile>VirtoCommerce.QuoteModule.Web.dll</assemblyFile>
   <moduleType>VirtoCommerce.QuoteModule.Web.Module, VirtoCommerce.QuoteModule.Web</moduleType>