Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Separate DbProviders Logic into a Standalone Project
Krzysztof Pajakce6567e4e129
diff --git a/GrandNode.sln b/GrandNode.slnindex 4b428ccaa..bafa7f18f 100644--- a/GrandNode.sln+++ b/GrandNode.sln@@ -127,6 +127,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grand.Web.Common.Tests", "sEndProjectProject("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grand.Web.Vendor", "src\Web\Grand.Web.Vendor\Grand.Web.Vendor.csproj", "{061F07B8-067A-43E6-B0FF-250027EE705F}"EndProject+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grand.Data", "src\Core\Grand.Data\Grand.Data.csproj", "{1308D857-1D87-4973-A848-077F8BBD28DF}"+EndProjectGlobalGlobalSection(SolutionConfigurationPlatforms) = preSolutionDebug|Any CPU = Debug|Any CPU@@ -336,6 +338,10 @@ Global{061F07B8-067A-43E6-B0FF-250027EE705F}.Debug|Any CPU.Build.0 = Debug|Any CPU{061F07B8-067A-43E6-B0FF-250027EE705F}.Release|Any CPU.ActiveCfg = Release|Any CPU{061F07B8-067A-43E6-B0FF-250027EE705F}.Release|Any CPU.Build.0 = Release|Any CPU+ {1308D857-1D87-4973-A848-077F8BBD28DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU+ {1308D857-1D87-4973-A848-077F8BBD28DF}.Debug|Any CPU.Build.0 = Debug|Any CPU+ {1308D857-1D87-4973-A848-077F8BBD28DF}.Release|Any CPU.ActiveCfg = Release|Any CPU+ {1308D857-1D87-4973-A848-077F8BBD28DF}.Release|Any CPU.Build.0 = Release|Any CPUEndGlobalSectionGlobalSection(SolutionProperties) = preSolutionHideSolutionNode = FALSE@@ -391,6 +397,7 @@ Global{0B2B4B1B-EBF7-447F-9E5F-C55CE3247929} = {6360202A-F931-4BBD-ADBD-C9A628EE59F8}{6969D83E-567C-47A7-8E7F-7FE40940704E} = {6360202A-F931-4BBD-ADBD-C9A628EE59F8}{061F07B8-067A-43E6-B0FF-250027EE705F} = {38ECA068-176F-463C-A1D7-044341D4CACB}+ {1308D857-1D87-4973-A848-077F8BBD28DF} = {FA350BD6-C29D-40D9-BA47-FE5FBDFC84A0}EndGlobalSectionGlobalSection(ExtensibilityGlobals) = postSolutionSolutionGuid = {88B478F4-FD3B-4C24-9E84-4FAAF0254397}diff --git a/src/API/Grand.Api/Filters/AuthorizeApiAdminAttribute.cs b/src/API/Grand.Api/Filters/AuthorizeApiAdminAttribute.csindex 8bc8717f5..c7532bfc0 100644--- a/src/API/Grand.Api/Filters/AuthorizeApiAdminAttribute.cs+++ b/src/API/Grand.Api/Filters/AuthorizeApiAdminAttribute.cs@@ -1,6 +1,6 @@using Grand.Business.Core.Interfaces.Common.Security;using Grand.Business.Core.Utilities.Common.Security;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Security;using Microsoft.AspNetCore.Authentication.JwtBearer;using Microsoft.AspNetCore.Mvc;diff --git a/src/API/Grand.Api/Queries/Handlers/Common/GetGenericQueryHandler.cs b/src/API/Grand.Api/Queries/Handlers/Common/GetGenericQueryHandler.csindex 6cb466070..98c4d7233 100644--- a/src/API/Grand.Api/Queries/Handlers/Common/GetGenericQueryHandler.cs+++ b/src/API/Grand.Api/Queries/Handlers/Common/GetGenericQueryHandler.cs@@ -1,7 +1,7 @@using Grand.Api.Models;using Grand.Api.Queries.Models.Common;using Grand.Domain;-using Grand.Domain.Data;+using Grand.Data;using MediatR;namespace Grand.Api.Queries.Handlers.Commondiff --git a/src/API/Grand.Api/Queries/Handlers/Common/GetLayoutQueryHandler.cs b/src/API/Grand.Api/Queries/Handlers/Common/GetLayoutQueryHandler.csindex 7202c54d8..c5f77ff48 100644--- a/src/API/Grand.Api/Queries/Handlers/Common/GetLayoutQueryHandler.cs+++ b/src/API/Grand.Api/Queries/Handlers/Common/GetLayoutQueryHandler.cs@@ -1,6 +1,6 @@using Grand.Api.DTOs.Common;using Grand.Api.Queries.Models.Common;-using Grand.Domain.Data;+using Grand.Data;using MediatR;namespace Grand.Api.Queries.Handlers.Commondiff --git a/src/Business/Grand.Business.Authentication/Events/CustomerDeletedEventHandler.cs b/src/Business/Grand.Business.Authentication/Events/CustomerDeletedEventHandler.csindex cd55a4632..f9796b731 100644--- a/src/Business/Grand.Business.Authentication/Events/CustomerDeletedEventHandler.cs+++ b/src/Business/Grand.Business.Authentication/Events/CustomerDeletedEventHandler.cs@@ -1,6 +1,6 @@using Grand.Infrastructure.Events;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using MediatR;namespace Grand.Business.Authentication.Eventsdiff --git a/src/Business/Grand.Business.Authentication/Services/ExternalAuthenticationService.cs b/src/Business/Grand.Business.Authentication/Services/ExternalAuthenticationService.csindex 528edd3b4..b10e12227 100644--- a/src/Business/Grand.Business.Authentication/Services/ExternalAuthenticationService.cs+++ b/src/Business/Grand.Business.Authentication/Services/ExternalAuthenticationService.cs@@ -5,7 +5,7 @@ using Grand.Business.Core.Events.Customers;using Grand.Business.Core.Interfaces.Customers;using Grand.Business.Core.Utilities.Customers;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Stores;using Grand.Infrastructure;using Grand.Infrastructure.Extensions;diff --git a/src/Business/Grand.Business.Catalog/Commands/UpdateProductReviewTotalsCommandHandler.cs b/src/Business/Grand.Business.Catalog/Commands/UpdateProductReviewTotalsCommandHandler.csindex ef0408118..54d6bf3d9 100644--- a/src/Business/Grand.Business.Catalog/Commands/UpdateProductReviewTotalsCommandHandler.cs+++ b/src/Business/Grand.Business.Catalog/Commands/UpdateProductReviewTotalsCommandHandler.cs@@ -1,7 +1,7 @@using Grand.Business.Core.Commands.Catalog;using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;using MediatR;diff --git a/src/Business/Grand.Business.Catalog/Events/Handlers/BrandDeletedEventHandler.cs b/src/Business/Grand.Business.Catalog/Events/Handlers/BrandDeletedEventHandler.csindex e52f7aa32..1b306db3e 100644--- a/src/Business/Grand.Business.Catalog/Events/Handlers/BrandDeletedEventHandler.cs+++ b/src/Business/Grand.Business.Catalog/Events/Handlers/BrandDeletedEventHandler.cs@@ -1,5 +1,5 @@using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Events;using MediatR;diff --git a/src/Business/Grand.Business.Catalog/Events/Handlers/CategoryDeletedEventHandler.cs b/src/Business/Grand.Business.Catalog/Events/Handlers/CategoryDeletedEventHandler.csindex be09e1578..5b0c4b1e3 100644--- a/src/Business/Grand.Business.Catalog/Events/Handlers/CategoryDeletedEventHandler.cs+++ b/src/Business/Grand.Business.Catalog/Events/Handlers/CategoryDeletedEventHandler.cs@@ -1,5 +1,5 @@using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Seo;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;diff --git a/src/Business/Grand.Business.Catalog/Events/Handlers/CollectionDeletedEventHandler.cs b/src/Business/Grand.Business.Catalog/Events/Handlers/CollectionDeletedEventHandler.csindex 8c23b5d48..bf03f5ce7 100644--- a/src/Business/Grand.Business.Catalog/Events/Handlers/CollectionDeletedEventHandler.cs+++ b/src/Business/Grand.Business.Catalog/Events/Handlers/CollectionDeletedEventHandler.cs@@ -1,5 +1,5 @@using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Seo;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;diff --git a/src/Business/Grand.Business.Catalog/Events/Handlers/DeleteMeasureUnitOnProductEventHandler.cs b/src/Business/Grand.Business.Catalog/Events/Handlers/DeleteMeasureUnitOnProductEventHandler.csindex b9b291c7c..65a02b4b4 100644--- a/src/Business/Grand.Business.Catalog/Events/Handlers/DeleteMeasureUnitOnProductEventHandler.cs+++ b/src/Business/Grand.Business.Catalog/Events/Handlers/DeleteMeasureUnitOnProductEventHandler.cs@@ -1,5 +1,5 @@using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Directory;using Grand.Infrastructure.Events;using MediatR;diff --git a/src/Business/Grand.Business.Catalog/Events/Handlers/DeliveryDateDeletedEventHandler.cs b/src/Business/Grand.Business.Catalog/Events/Handlers/DeliveryDateDeletedEventHandler.csindex 8b971a06d..bdd57771c 100644--- a/src/Business/Grand.Business.Catalog/Events/Handlers/DeliveryDateDeletedEventHandler.cs+++ b/src/Business/Grand.Business.Catalog/Events/Handlers/DeliveryDateDeletedEventHandler.cs@@ -1,5 +1,5 @@using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Shipping;using Grand.Infrastructure.Events;using MediatR;diff --git a/src/Business/Grand.Business.Catalog/Events/Handlers/DiscountDeletedEventHandler.cs b/src/Business/Grand.Business.Catalog/Events/Handlers/DiscountDeletedEventHandler.csindex c14bc8691..49e3aaba4 100644--- a/src/Business/Grand.Business.Catalog/Events/Handlers/DiscountDeletedEventHandler.cs+++ b/src/Business/Grand.Business.Catalog/Events/Handlers/DiscountDeletedEventHandler.cs@@ -1,5 +1,5 @@using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Discounts;using Grand.Domain.Vendors;using Grand.Infrastructure.Caching;diff --git a/src/Business/Grand.Business.Catalog/Events/Handlers/ProductDeletedEventHandler.cs b/src/Business/Grand.Business.Catalog/Events/Handlers/ProductDeletedEventHandler.csindex 56062cd3d..b45942626 100644--- a/src/Business/Grand.Business.Catalog/Events/Handlers/ProductDeletedEventHandler.cs+++ b/src/Business/Grand.Business.Catalog/Events/Handlers/ProductDeletedEventHandler.cs@@ -2,7 +2,7 @@using Grand.Infrastructure.Events;using Grand.Domain.Catalog;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Seo;using MediatR;using Newtonsoft.Json;diff --git a/src/Business/Grand.Business.Catalog/Events/Handlers/TaxCategoryDeletedEventHandler.cs b/src/Business/Grand.Business.Catalog/Events/Handlers/TaxCategoryDeletedEventHandler.csindex 8478b1777..b7ab41236 100644--- a/src/Business/Grand.Business.Catalog/Events/Handlers/TaxCategoryDeletedEventHandler.cs+++ b/src/Business/Grand.Business.Catalog/Events/Handlers/TaxCategoryDeletedEventHandler.cs@@ -1,4 +1,4 @@-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Catalog;using Grand.Domain.Tax;using Grand.Infrastructure.Events;diff --git a/src/Business/Grand.Business.Catalog/Events/Handlers/UpdateProductOnCartEventHandler.cs b/src/Business/Grand.Business.Catalog/Events/Handlers/UpdateProductOnCartEventHandler.csindex f73a58310..fbe4e8a08 100644--- a/src/Business/Grand.Business.Catalog/Events/Handlers/UpdateProductOnCartEventHandler.cs+++ b/src/Business/Grand.Business.Catalog/Events/Handlers/UpdateProductOnCartEventHandler.cs@@ -1,6 +1,6 @@using Grand.Business.Core.Events.Catalog;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using MediatR;namespace Grand.Business.Catalog.Events.Handlersdiff --git a/src/Business/Grand.Business.Catalog/Events/Handlers/WarehouseDeletedEventHandler.cs b/src/Business/Grand.Business.Catalog/Events/Handlers/WarehouseDeletedEventHandler.csindex 3ad780d73..1655ac8a8 100644--- a/src/Business/Grand.Business.Catalog/Events/Handlers/WarehouseDeletedEventHandler.cs+++ b/src/Business/Grand.Business.Catalog/Events/Handlers/WarehouseDeletedEventHandler.cs@@ -1,4 +1,4 @@-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Catalog;using Grand.Domain.Shipping;using Grand.Infrastructure.Events;diff --git a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetPersonalizedProductsQueryHandler.cs b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetPersonalizedProductsQueryHandler.csindex f8f04336c..9e1d7458d 100644--- a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetPersonalizedProductsQueryHandler.cs+++ b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetPersonalizedProductsQueryHandler.cs@@ -4,7 +4,7 @@ using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;using Grand.Domain.Catalog;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using MediatR;namespace Grand.Business.Catalog.Queries.Handlersdiff --git a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetPriceByCustomerProductQueryHandler.cs b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetPriceByCustomerProductQueryHandler.csindex 0f2bed418..b9980780a 100644--- a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetPriceByCustomerProductQueryHandler.cs+++ b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetPriceByCustomerProductQueryHandler.cs@@ -2,7 +2,7 @@using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using MediatR;namespace Grand.Business.Catalog.Queries.Handlersdiff --git a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetProductArchByIdQueryHandler.cs b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetProductArchByIdQueryHandler.csindex c352130fb..abb30706a 100644--- a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetProductArchByIdQueryHandler.cs+++ b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetProductArchByIdQueryHandler.cs@@ -1,6 +1,6 @@using Grand.Business.Core.Queries.Catalog;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using MediatR;namespace Grand.Business.Catalog.Queries.Handlersdiff --git a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetRecommendedProductsQueryHandler.cs b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetRecommendedProductsQueryHandler.csindex d3a5b91ff..931061564 100644--- a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetRecommendedProductsQueryHandler.cs+++ b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetRecommendedProductsQueryHandler.cs@@ -2,7 +2,7 @@using Grand.Business.Core.Queries.Catalog;using Grand.Domain.Catalog;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;using MediatR;diff --git a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetSearchProductsQueryHandler.cs b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetSearchProductsQueryHandler.csindex f69d661e0..026bded7f 100644--- a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetSearchProductsQueryHandler.cs+++ b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetSearchProductsQueryHandler.cs@@ -3,7 +3,7 @@ using Grand.Business.Core.Queries.Catalog;using Grand.Domain;using Grand.Domain.Catalog;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Configuration;using MediatR;diff --git a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetSuggestedProductsQueryHandler.cs b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetSuggestedProductsQueryHandler.csindex e3244ca6b..85fc5e9b2 100644--- a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetSuggestedProductsQueryHandler.cs+++ b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetSuggestedProductsQueryHandler.cs@@ -4,7 +4,7 @@ using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;using Grand.Domain.Catalog;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using MediatR;namespace Grand.Business.Catalog.Queries.Handlersdiff --git a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetVendorByIdQueryHandler.cs b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetVendorByIdQueryHandler.csindex 5a3f446ff..b886cdb6a 100644--- a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetVendorByIdQueryHandler.cs+++ b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetVendorByIdQueryHandler.cs@@ -1,5 +1,5 @@using Grand.Business.Core.Queries.Catalog;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Vendors;using MediatR;diff --git a/src/Business/Grand.Business.Catalog/Services/Brands/BrandLayoutService.cs b/src/Business/Grand.Business.Catalog/Services/Brands/BrandLayoutService.csindex 4a2a4b858..d97750220 100644--- a/src/Business/Grand.Business.Catalog/Services/Brands/BrandLayoutService.cs+++ b/src/Business/Grand.Business.Catalog/Services/Brands/BrandLayoutService.cs@@ -1,6 +1,6 @@using Grand.Business.Core.Interfaces.Catalog.Brands;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;using Grand.Infrastructure.Extensions;diff --git a/src/Business/Grand.Business.Catalog/Services/Brands/BrandService.cs b/src/Business/Grand.Business.Catalog/Services/Brands/BrandService.csindex 6dbca7a77..c3d03ec19 100644--- a/src/Business/Grand.Business.Catalog/Services/Brands/BrandService.cs+++ b/src/Business/Grand.Business.Catalog/Services/Brands/BrandService.cs@@ -2,7 +2,7 @@ using Grand.Business.Core.Interfaces.Catalog.Brands;using Grand.Domain;using Grand.Domain.Catalog;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;diff --git a/src/Business/Grand.Business.Catalog/Services/Categories/CategoryLayoutService.cs b/src/Business/Grand.Business.Catalog/Services/Categories/CategoryLayoutService.csindex 64d52f042..1f42f5daf 100644--- a/src/Business/Grand.Business.Catalog/Services/Categories/CategoryLayoutService.cs+++ b/src/Business/Grand.Business.Catalog/Services/Categories/CategoryLayoutService.cs@@ -1,7 +1,7 @@using Grand.Business.Core.Interfaces.Catalog.Categories;using Grand.Infrastructure.Extensions;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using MediatR;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;diff --git a/src/Business/Grand.Business.Catalog/Services/Categories/CategoryService.cs b/src/Business/Grand.Business.Catalog/Services/Categories/CategoryService.csindex 95568c117..4c3d98531 100644--- a/src/Business/Grand.Business.Catalog/Services/Categories/CategoryService.cs+++ b/src/Business/Grand.Business.Catalog/Services/Categories/CategoryService.cs@@ -4,7 +4,7 @@ using Grand.Business.Core.Interfaces.Common.Security;using Grand.Domain;using Grand.Domain.Catalog;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;diff --git a/src/Business/Grand.Business.Catalog/Services/Categories/ProductCategoryService.cs b/src/Business/Grand.Business.Catalog/Services/Categories/ProductCategoryService.csindex 6bb39813b..03be306bb 100644--- a/src/Business/Grand.Business.Catalog/Services/Categories/ProductCategoryService.cs+++ b/src/Business/Grand.Business.Catalog/Services/Categories/ProductCategoryService.cs@@ -3,7 +3,7 @@ using Grand.Business.Core.Utilities.Catalog;using Grand.Domain;using Grand.Domain.Catalog;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;diff --git a/src/Business/Grand.Business.Catalog/Services/Collections/CollectionLayoutService.cs b/src/Business/Grand.Business.Catalog/Services/Collections/CollectionLayoutService.csindex 4e42eb006..e980c1397 100644--- a/src/Business/Grand.Business.Catalog/Services/Collections/CollectionLayoutService.cs+++ b/src/Business/Grand.Business.Catalog/Services/Collections/CollectionLayoutService.cs@@ -1,6 +1,6 @@using Grand.Business.Core.Interfaces.Catalog.Collections;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;using Grand.Infrastructure.Extensions;diff --git a/src/Business/Grand.Business.Catalog/Services/Collections/CollectionService.cs b/src/Business/Grand.Business.Catalog/Services/Collections/CollectionService.csindex c66e35ba9..0f7b9a333 100644--- a/src/Business/Grand.Business.Catalog/Services/Collections/CollectionService.cs+++ b/src/Business/Grand.Business.Catalog/Services/Collections/CollectionService.cs@@ -3,7 +3,7 @@ using Grand.Business.Core.Interfaces.Common.Security;using Grand.Domain;using Grand.Domain.Catalog;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;diff --git a/src/Business/Grand.Business.Catalog/Services/Collections/ProductCollectionService.cs b/src/Business/Grand.Business.Catalog/Services/Collections/ProductCollectionService.csindex d52396ecc..f9b1e0be9 100644--- a/src/Business/Grand.Business.Catalog/Services/Collections/ProductCollectionService.cs+++ b/src/Business/Grand.Business.Catalog/Services/Collections/ProductCollectionService.cs@@ -3,7 +3,7 @@ using Grand.Business.Core.Utilities.Catalog;using Grand.Domain;using Grand.Domain.Catalog;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;diff --git a/src/Business/Grand.Business.Catalog/Services/Directory/MeasureService.cs b/src/Business/Grand.Business.Catalog/Services/Directory/MeasureService.csindex a00828924..55ac020b5 100644--- a/src/Business/Grand.Business.Catalog/Services/Directory/MeasureService.cs+++ b/src/Business/Grand.Business.Catalog/Services/Directory/MeasureService.cs@@ -1,7 +1,7 @@using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;using Grand.Infrastructure.Extensions;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Directory;using Grand.SharedKernel;using MediatR;diff --git a/src/Business/Grand.Business.Catalog/Services/Directory/SearchTermService.cs b/src/Business/Grand.Business.Catalog/Services/Directory/SearchTermService.csindex 3523faeb2..1d10e8d60 100644--- a/src/Business/Grand.Business.Catalog/Services/Directory/SearchTermService.cs+++ b/src/Business/Grand.Business.Catalog/Services/Directory/SearchTermService.cs@@ -2,7 +2,7 @@ using Grand.Business.Core.Interfaces.Catalog.Directory;using Grand.Business.Core.Utilities.Catalog;using Grand.Domain;using Grand.Domain.Common;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Extensions;using MediatR;diff --git a/src/Business/Grand.Business.Catalog/Services/Discounts/DiscountService.cs b/src/Business/Grand.Business.Catalog/Services/Discounts/DiscountService.csindex ea580db6a..41380100e 100644--- a/src/Business/Grand.Business.Catalog/Services/Discounts/DiscountService.cs+++ b/src/Business/Grand.Business.Catalog/Services/Discounts/DiscountService.cs@@ -3,7 +3,7 @@ using Grand.Business.Core.Utilities.Catalog;using Grand.Domain;using Grand.Domain.Catalog;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Directory;using Grand.Domain.Discounts;using Grand.Domain.Orders;diff --git a/src/Business/Grand.Business.Catalog/Services/Products/AuctionService.cs b/src/Business/Grand.Business.Catalog/Services/Products/AuctionService.csindex 207c7a971..cf7de9e9d 100644--- a/src/Business/Grand.Business.Catalog/Services/Products/AuctionService.cs+++ b/src/Business/Grand.Business.Catalog/Services/Products/AuctionService.cs@@ -6,7 +6,7 @@ using Grand.Infrastructure.Extensions;using Grand.Domain;using Grand.Domain.Catalog;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Localization;using Grand.Domain.Stores;using MediatR;diff --git a/src/Business/Grand.Business.Catalog/Services/Products/CustomerGroupProductService.cs b/src/Business/Grand.Business.Catalog/Services/Products/CustomerGroupProductService.csindex 8f84351c6..918c564d9 100644--- a/src/Business/Grand.Business.Catalog/Services/Products/CustomerGroupProductService.cs+++ b/src/Business/Grand.Business.Catalog/Services/Products/CustomerGroupProductService.cs@@ -1,6 +1,6 @@using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;using Grand.Infrastructure.Extensions;diff --git a/src/Business/Grand.Business.Catalog/Services/Products/InventoryManageService.cs b/src/Business/Grand.Business.Catalog/Services/Products/InventoryManageService.csindex 26e5e296e..93dd27db9 100644--- a/src/Business/Grand.Business.Catalog/Services/Products/InventoryManageService.cs+++ b/src/Business/Grand.Business.Catalog/Services/Products/InventoryManageService.cs@@ -3,7 +3,7 @@ using Grand.Business.Core.Events.Catalog;using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Domain.Catalog;using Grand.Domain.Common;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Shipping;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;diff --git a/src/Business/Grand.Business.Catalog/Services/Products/OutOfStockSubscriptionService.cs b/src/Business/Grand.Business.Catalog/Services/Products/OutOfStockSubscriptionService.csindex b33afdfec..6424108c7 100644--- a/src/Business/Grand.Business.Catalog/Services/Products/OutOfStockSubscriptionService.cs+++ b/src/Business/Grand.Business.Catalog/Services/Products/OutOfStockSubscriptionService.cs@@ -4,7 +4,7 @@ using Grand.Infrastructure.Extensions;using Grand.Domain;using Grand.Domain.Catalog;using Grand.Domain.Common;-using Grand.Domain.Data;+using Grand.Data;using MediatR;namespace Grand.Business.Catalog.Services.Productsdiff --git a/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeService.cs b/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeService.csindex 45eb4f051..df79d9489 100644--- a/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeService.cs+++ b/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeService.cs@@ -4,7 +4,7 @@ using Grand.Infrastructure.Caching.Constants;using Grand.Infrastructure.Extensions;using Grand.Domain;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using MediatR;namespace Grand.Business.Catalog.Services.Productsdiff --git a/src/Business/Grand.Business.Catalog/Services/Products/ProductCourseService.cs b/src/Business/Grand.Business.Catalog/Services/Products/ProductCourseService.csindex 4f513fdda..979c0110e 100644--- a/src/Business/Grand.Business.Catalog/Services/Products/ProductCourseService.cs+++ b/src/Business/Grand.Business.Catalog/Services/Products/ProductCourseService.cs@@ -1,7 +1,7 @@using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Domain.Catalog;using Grand.Domain.Courses;-using Grand.Domain.Data;+using Grand.Data;namespace Grand.Business.Catalog.Services.Products{diff --git a/src/Business/Grand.Business.Catalog/Services/Products/ProductLayoutService.cs b/src/Business/Grand.Business.Catalog/Services/Products/ProductLayoutService.csindex bfa202ffe..b12737e44 100644--- a/src/Business/Grand.Business.Catalog/Services/Products/ProductLayoutService.cs+++ b/src/Business/Grand.Business.Catalog/Services/Products/ProductLayoutService.cs@@ -1,7 +1,7 @@using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Infrastructure.Extensions;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using MediatR;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;diff --git a/src/Business/Grand.Business.Catalog/Services/Products/ProductReservationService.cs b/src/Business/Grand.Business.Catalog/Services/Products/ProductReservationService.csindex 7e4e7e889..e77b7f0af 100644--- a/src/Business/Grand.Business.Catalog/Services/Products/ProductReservationService.cs+++ b/src/Business/Grand.Business.Catalog/Services/Products/ProductReservationService.cs@@ -2,7 +2,7 @@using Grand.Infrastructure.Extensions;using Grand.Domain;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using MediatR;namespace Grand.Business.Catalog.Services.Productsdiff --git a/src/Business/Grand.Business.Catalog/Services/Products/ProductReviewService.cs b/src/Business/Grand.Business.Catalog/Services/Products/ProductReviewService.csindex 8c8a0bfd8..334622cff 100644--- a/src/Business/Grand.Business.Catalog/Services/Products/ProductReviewService.cs+++ b/src/Business/Grand.Business.Catalog/Services/Products/ProductReviewService.cs@@ -2,7 +2,7 @@using Grand.Infrastructure.Extensions;using Grand.Domain;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using MediatR;namespace Grand.Business.Catalog.Services.Productsdiff --git a/src/Business/Grand.Business.Catalog/Services/Products/ProductService.cs b/src/Business/Grand.Business.Catalog/Services/Products/ProductService.csindex a2cddf3d7..d549d0cb0 100644--- a/src/Business/Grand.Business.Catalog/Services/Products/ProductService.cs+++ b/src/Business/Grand.Business.Catalog/Services/Products/ProductService.cs@@ -5,7 +5,7 @@ using Grand.Business.Core.Interfaces.Common.Security;using Grand.Domain;using Grand.Domain.Catalog;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Orders;using Grand.Infrastructure;using Grand.Infrastructure.Caching;diff --git a/src/Business/Grand.Business.Catalog/Services/Products/ProductTagService.cs b/src/Business/Grand.Business.Catalog/Services/Products/ProductTagService.csindex fa0714a50..9064f280d 100644--- a/src/Business/Grand.Business.Catalog/Services/Products/ProductTagService.cs+++ b/src/Business/Grand.Business.Catalog/Services/Products/ProductTagService.cs@@ -3,7 +3,7 @@ using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;using Grand.Infrastructure.Extensions;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using MediatR;namespace Grand.Business.Catalog.Services.Productsdiff --git a/src/Business/Grand.Business.Catalog/Services/Products/RecentlyViewedProductsService.cs b/src/Business/Grand.Business.Catalog/Services/Products/RecentlyViewedProductsService.csindex 8722ad443..c4dc4fa6a 100644--- a/src/Business/Grand.Business.Catalog/Services/Products/RecentlyViewedProductsService.cs+++ b/src/Business/Grand.Business.Catalog/Services/Products/RecentlyViewedProductsService.cs@@ -2,7 +2,7 @@ using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;namespace Grand.Business.Catalog.Services.Products{diff --git a/src/Business/Grand.Business.Catalog/Services/Products/SpecificationAttributeService.cs b/src/Business/Grand.Business.Catalog/Services/Products/SpecificationAttributeService.csindex c9703d072..e598eb5a1 100644--- a/src/Business/Grand.Business.Catalog/Services/Products/SpecificationAttributeService.cs+++ b/src/Business/Grand.Business.Catalog/Services/Products/SpecificationAttributeService.cs@@ -4,7 +4,7 @@ using Grand.Infrastructure.Caching.Constants;using Grand.Infrastructure.Extensions;using Grand.Domain;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using MediatR;namespace Grand.Business.Catalog.Services.Productsdiff --git a/src/Business/Grand.Business.Catalog/Services/Tax/TaxCategoryService.cs b/src/Business/Grand.Business.Catalog/Services/Tax/TaxCategoryService.csindex 9737d84cd..80ce87b76 100644--- a/src/Business/Grand.Business.Catalog/Services/Tax/TaxCategoryService.cs+++ b/src/Business/Grand.Business.Catalog/Services/Tax/TaxCategoryService.cs@@ -2,7 +2,7 @@ using Grand.Business.Core.Interfaces.Catalog.Tax;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;using Grand.Infrastructure.Extensions;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Tax;using MediatR;diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/MaxOrderNumberCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/MaxOrderNumberCommandHandler.csindex 8ed74f9b1..5044ff03c 100644--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/MaxOrderNumberCommandHandler.cs+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/MaxOrderNumberCommandHandler.cs@@ -1,4 +1,4 @@-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Orders;using Grand.Business.Core.Commands.Checkout.Orders;using MediatR;diff --git a/src/Business/Grand.Business.Checkout/Events/Orders/OrderDeletedEventHandler.cs b/src/Business/Grand.Business.Checkout/Events/Orders/OrderDeletedEventHandler.csindex 4a6010836..5ac922024 100644--- a/src/Business/Grand.Business.Checkout/Events/Orders/OrderDeletedEventHandler.cs+++ b/src/Business/Grand.Business.Checkout/Events/Orders/OrderDeletedEventHandler.cs@@ -1,6 +1,6 @@using Grand.Business.Core.Events.Checkout.Orders;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using MediatR;namespace Grand.Business.Checkout.Events.Ordersdiff --git a/src/Business/Grand.Business.Checkout/Events/Orders/OrderPlacedEventHandler.cs b/src/Business/Grand.Business.Checkout/Events/Orders/OrderPlacedEventHandler.csindex 4c5c188d3..94aa15dd1 100644--- a/src/Business/Grand.Business.Checkout/Events/Orders/OrderPlacedEventHandler.cs+++ b/src/Business/Grand.Business.Checkout/Events/Orders/OrderPlacedEventHandler.cs@@ -2,7 +2,7 @@using Grand.Business.Core.Interfaces.Checkout.Orders;using Grand.Business.Core.Interfaces.Customers;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Orders;using MediatR;diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetGiftVoucherQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetGiftVoucherQueryHandler.csindex cf83165b4..ba5f4d6a6 100644--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetGiftVoucherQueryHandler.cs+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetGiftVoucherQueryHandler.cs@@ -1,5 +1,5 @@using Grand.Business.Core.Queries.Checkout.Orders;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Orders;using MediatR;diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetMerchandiseReturnCountQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetMerchandiseReturnCountQueryHandler.csindex 790d95203..a86495cfa 100644--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetMerchandiseReturnCountQueryHandler.cs+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetMerchandiseReturnCountQueryHandler.cs@@ -1,5 +1,5 @@using Grand.Business.Core.Queries.Checkout.Orders;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Orders;using MediatR;diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetMerchandiseReturnQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetMerchandiseReturnQueryHandler.csindex dde990c62..bb4e3f6d8 100644--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetMerchandiseReturnQueryHandler.cs+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetMerchandiseReturnQueryHandler.cs@@ -1,5 +1,5 @@using Grand.Business.Core.Queries.Checkout.Orders;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Orders;using MediatR;diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetOrderQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetOrderQueryHandler.csindex 250653c38..77eb9ac24 100644--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetOrderQueryHandler.cs+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetOrderQueryHandler.cs@@ -1,5 +1,5 @@using Grand.Business.Core.Queries.Checkout.Orders;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Orders;using MediatR;diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetPaymentTransactionQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetPaymentTransactionQueryHandler.csindex 24cdfa86a..24b55b753 100644--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetPaymentTransactionQueryHandler.cs+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetPaymentTransactionQueryHandler.cs@@ -1,5 +1,5 @@using Grand.Business.Core.Queries.Checkout.Orders;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Payments;using MediatR;diff --git a/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeService.cs b/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeService.csindex 79fd26773..b37ac213b 100644--- a/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeService.cs+++ b/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeService.cs@@ -1,6 +1,6 @@using Grand.Business.Core.Interfaces.Checkout.CheckoutAttributes;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Orders;using Grand.Infrastructure;using Grand.Infrastructure.Caching;diff --git a/src/Business/Grand.Business.Checkout/Services/GiftVouchers/GiftVoucherService.cs b/src/Business/Grand.Business.Checkout/Services/GiftVouchers/GiftVoucherService.csindex 7cdf2a5c5..cc361cd2d 100644--- a/src/Business/Grand.Business.Checkout/Services/GiftVouchers/GiftVoucherService.cs+++ b/src/Business/Grand.Business.Checkout/Services/GiftVouchers/GiftVoucherService.cs@@ -2,7 +2,7 @@ using Grand.Business.Core.Interfaces.Checkout.GiftVouchers;using Grand.Business.Core.Queries.Checkout.Orders;using Grand.Infrastructure.Extensions;using Grand.Domain;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Orders;using MediatR;diff --git a/src/Business/Grand.Business.Checkout/Services/Orders/LoyaltyPointsService.cs b/src/Business/Grand.Business.Checkout/Services/Orders/LoyaltyPointsService.csindex d0310c6d3..2c00e34f5 100644--- a/src/Business/Grand.Business.Checkout/Services/Orders/LoyaltyPointsService.cs+++ b/src/Business/Grand.Business.Checkout/Services/Orders/LoyaltyPointsService.cs@@ -1,5 +1,5 @@using Grand.Business.Core.Interfaces.Checkout.Orders;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Orders;using Grand.Infrastructure.Extensions;using MediatR;diff --git a/src/Business/Grand.Business.Checkout/Services/Orders/MerchandiseReturnService.cs b/src/Business/Grand.Business.Checkout/Services/Orders/MerchandiseReturnService.csindex bcd1810ea..018fe9726 100644--- a/src/Business/Grand.Business.Checkout/Services/Orders/MerchandiseReturnService.cs+++ b/src/Business/Grand.Business.Checkout/Services/Orders/MerchandiseReturnService.cs@@ -1,7 +1,7 @@using Grand.Business.Core.Interfaces.Checkout.Orders;using Grand.Business.Core.Queries.Checkout.Orders;using Grand.Domain;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Orders;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;diff --git a/src/Business/Grand.Business.Checkout/Services/Orders/OrderService.cs b/src/Business/Grand.Business.Checkout/Services/Orders/OrderService.csindex 079fe54d0..fe9b065fa 100644--- a/src/Business/Grand.Business.Checkout/Services/Orders/OrderService.cs+++ b/src/Business/Grand.Business.Checkout/Services/Orders/OrderService.cs@@ -2,7 +2,7 @@ using Grand.Business.Core.Commands.Checkout.Orders;using Grand.Business.Core.Interfaces.Checkout.Orders;using Grand.Business.Core.Queries.Checkout.Orders;using Grand.Domain;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Orders;using Grand.Domain.Payments;using Grand.Domain.Shipping;diff --git a/src/Business/Grand.Business.Checkout/Services/Orders/OrderStatusService.cs b/src/Business/Grand.Business.Checkout/Services/Orders/OrderStatusService.csindex f1097560f..e25de76b7 100644--- a/src/Business/Grand.Business.Checkout/Services/Orders/OrderStatusService.cs+++ b/src/Business/Grand.Business.Checkout/Services/Orders/OrderStatusService.cs@@ -1,5 +1,5 @@using Grand.Business.Core.Interfaces.Checkout.Orders;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Orders;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;diff --git a/src/Business/Grand.Business.Checkout/Services/Orders/OrderTagService.cs b/src/Business/Grand.Business.Checkout/Services/Orders/OrderTagService.csindex 725298645..fb6999927 100644--- a/src/Business/Grand.Business.Checkout/Services/Orders/OrderTagService.cs+++ b/src/Business/Grand.Business.Checkout/Services/Orders/OrderTagService.cs@@ -2,7 +2,7 @@using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;using Grand.Infrastructure.Extensions;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Orders;using MediatR;diff --git a/src/Business/Grand.Business.Checkout/Services/Payments/PaymentTransactionService.cs b/src/Business/Grand.Business.Checkout/Services/Payments/PaymentTransactionService.csindex 6ee2c04c4..6c1bfad37 100644--- a/src/Business/Grand.Business.Checkout/Services/Payments/PaymentTransactionService.cs+++ b/src/Business/Grand.Business.Checkout/Services/Payments/PaymentTransactionService.cs@@ -1,7 +1,7 @@using Grand.Business.Core.Interfaces.Checkout.Payments;using Grand.Business.Core.Queries.Checkout.Orders;using Grand.Domain;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Payments;using Grand.Infrastructure.Extensions;using MediatR;diff --git a/src/Business/Grand.Business.Checkout/Services/Shipping/DeliveryDateService.cs b/src/Business/Grand.Business.Checkout/Services/Shipping/DeliveryDateService.csindex 10a038c2d..a5c5bba53 100644--- a/src/Business/Grand.Business.Checkout/Services/Shipping/DeliveryDateService.cs+++ b/src/Business/Grand.Business.Checkout/Services/Shipping/DeliveryDateService.cs@@ -2,7 +2,7 @@using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;using Grand.Infrastructure.Extensions;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Shipping;using MediatR;diff --git a/src/Business/Grand.Business.Checkout/Services/Shipping/PickupPointService.cs b/src/Business/Grand.Business.Checkout/Services/Shipping/PickupPointService.csindex 026c7c6f7..d4bfb3f3e 100644--- a/src/Business/Grand.Business.Checkout/Services/Shipping/PickupPointService.cs+++ b/src/Business/Grand.Business.Checkout/Services/Shipping/PickupPointService.cs@@ -2,7 +2,7 @@using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;using Grand.Infrastructure.Extensions;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Shipping;using MediatR;diff --git a/src/Business/Grand.Business.Checkout/Services/Shipping/ShipmentService.cs b/src/Business/Grand.Business.Checkout/Services/Shipping/ShipmentService.csindex f0c2b9c3b..6362af620 100644--- a/src/Business/Grand.Business.Checkout/Services/Shipping/ShipmentService.cs+++ b/src/Business/Grand.Business.Checkout/Services/Shipping/ShipmentService.cs@@ -1,6 +1,6 @@using Grand.Business.Core.Interfaces.Checkout.Shipping;using Grand.Domain;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Shipping;using Grand.Infrastructure.Extensions;using MediatR;diff --git a/src/Business/Grand.Business.Checkout/Services/Shipping/ShippingMethodService.cs b/src/Business/Grand.Business.Checkout/Services/Shipping/ShippingMethodService.csindex 4650be9ea..4bbbae133 100644--- a/src/Business/Grand.Business.Checkout/Services/Shipping/ShippingMethodService.cs+++ b/src/Business/Grand.Business.Checkout/Services/Shipping/ShippingMethodService.cs@@ -4,7 +4,7 @@ using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;using Grand.Infrastructure.Extensions;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Shipping;using MediatR;diff --git a/src/Business/Grand.Business.Checkout/Services/Shipping/WarehouseService.cs b/src/Business/Grand.Business.Checkout/Services/Shipping/WarehouseService.csindex fd30227e3..cafb374f8 100644--- a/src/Business/Grand.Business.Checkout/Services/Shipping/WarehouseService.cs+++ b/src/Business/Grand.Business.Checkout/Services/Shipping/WarehouseService.cs@@ -2,7 +2,7 @@using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;using Grand.Infrastructure.Extensions;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Shipping;using MediatR;diff --git a/src/Business/Grand.Business.Cms/Services/BlogService.cs b/src/Business/Grand.Business.Cms/Services/BlogService.csindex a646038da..aab60a19a 100644--- a/src/Business/Grand.Business.Cms/Services/BlogService.cs+++ b/src/Business/Grand.Business.Cms/Services/BlogService.cs@@ -1,7 +1,7 @@using Grand.Business.Core.Interfaces.Cms;using Grand.Domain;using Grand.Domain.Blogs;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Configuration;using Grand.Infrastructure.Extensions;using MediatR;diff --git a/src/Business/Grand.Business.Cms/Services/KnowledgebaseService.cs b/src/Business/Grand.Business.Cms/Services/KnowledgebaseService.csindex b38f05499..fd18cc55c 100644--- a/src/Business/Grand.Business.Cms/Services/KnowledgebaseService.cs+++ b/src/Business/Grand.Business.Cms/Services/KnowledgebaseService.cs@@ -1,7 +1,7 @@using Grand.Business.Core.Interfaces.Cms;using Grand.Domain;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Knowledgebase;using Grand.Infrastructure;using Grand.Infrastructure.Caching;diff --git a/src/Business/Grand.Business.Cms/Services/NewsService.cs b/src/Business/Grand.Business.Cms/Services/NewsService.csindex 042d07420..e9785b390 100644--- a/src/Business/Grand.Business.Cms/Services/NewsService.cs+++ b/src/Business/Grand.Business.Cms/Services/NewsService.cs@@ -1,7 +1,7 @@using Grand.Business.Core.Interfaces.Cms;using Grand.Domain;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.News;using Grand.Infrastructure;using Grand.Infrastructure.Configuration;diff --git a/src/Business/Grand.Business.Cms/Services/PageLayoutService.cs b/src/Business/Grand.Business.Cms/Services/PageLayoutService.csindex bb322a14e..62789401d 100644--- a/src/Business/Grand.Business.Cms/Services/PageLayoutService.cs+++ b/src/Business/Grand.Business.Cms/Services/PageLayoutService.cs@@ -1,5 +1,5 @@using Grand.Business.Core.Interfaces.Cms;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Pages;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;diff --git a/src/Business/Grand.Business.Cms/Services/PageService.cs b/src/Business/Grand.Business.Cms/Services/PageService.csindex 0a2dda6bb..aa234189d 100644--- a/src/Business/Grand.Business.Cms/Services/PageService.cs+++ b/src/Business/Grand.Business.Cms/Services/PageService.cs@@ -1,7 +1,7 @@using Grand.Business.Core.Interfaces.Cms;using Grand.Business.Core.Interfaces.Common.Security;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Pages;using Grand.Infrastructure;using Grand.Infrastructure.Caching;diff --git a/src/Business/Grand.Business.Cms/Services/RobotsTxtService.cs b/src/Business/Grand.Business.Cms/Services/RobotsTxtService.csindex cfadaba8c..9f41ff9b2 100644--- a/src/Business/Grand.Business.Cms/Services/RobotsTxtService.cs+++ b/src/Business/Grand.Business.Cms/Services/RobotsTxtService.cs@@ -1,6 +1,6 @@using Grand.Business.Core.Interfaces.Cms;using Grand.Domain.Common;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;using Grand.Infrastructure.Extensions;diff --git a/src/Business/Grand.Business.Common/Events/GroupDeletedEventHandler.cs b/src/Business/Grand.Business.Common/Events/GroupDeletedEventHandler.csindex 92daf379e..3b11f03bb 100644--- a/src/Business/Grand.Business.Common/Events/GroupDeletedEventHandler.cs+++ b/src/Business/Grand.Business.Common/Events/GroupDeletedEventHandler.cs@@ -1,6 +1,6 @@using Grand.Domain.Catalog;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;using Grand.Infrastructure.Events;diff --git a/src/Business/Grand.Business.Common/Services/Addresses/AddressAttributeService.cs b/src/Business/Grand.Business.Common/Services/Addresses/AddressAttributeService.csindex 450b64c43..51a55cd68 100644--- a/src/Business/Grand.Business.Common/Services/Addresses/AddressAttributeService.cs+++ b/src/Business/Grand.Business.Common/Services/Addresses/AddressAttributeService.cs@@ -3,7 +3,7 @@ using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;using Grand.Infrastructure.Extensions;using Grand.Domain.Common;-using Grand.Domain.Data;+using Grand.Data;using MediatR;namespace Grand.Business.Common.Services.Addressesdiff --git a/src/Business/Grand.Business.Common/Services/Configuration/SettingService.cs b/src/Business/Grand.Business.Common/Services/Configuration/SettingService.csindex 9b2cc36de..1b0f70431 100644--- a/src/Business/Grand.Business.Common/Services/Configuration/SettingService.cs+++ b/src/Business/Grand.Business.Common/Services/Configuration/SettingService.cs@@ -1,6 +1,6 @@using Grand.Business.Core.Interfaces.Common.Configuration;using Grand.Domain.Configuration;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;using System.Text.Json;diff --git a/src/Business/Grand.Business.Common/Services/Directory/CountryService.cs b/src/Business/Grand.Business.Common/Services/Directory/CountryService.csindex f06d5b208..de677e8c7 100644--- a/src/Business/Grand.Business.Common/Services/Directory/CountryService.cs+++ b/src/Business/Grand.Business.Common/Services/Directory/CountryService.cs@@ -1,6 +1,6 @@using Grand.Business.Core.Extensions;using Grand.Business.Core.Interfaces.Common.Directory;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Directory;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;diff --git a/src/Business/Grand.Business.Common/Services/Directory/CurrencyService.cs b/src/Business/Grand.Business.Common/Services/Directory/CurrencyService.csindex 13f89e431..3425d96a4 100644--- a/src/Business/Grand.Business.Common/Services/Directory/CurrencyService.cs+++ b/src/Business/Grand.Business.Common/Services/Directory/CurrencyService.cs@@ -1,6 +1,6 @@using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Core.Interfaces.Common.Security;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Directory;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;diff --git a/src/Business/Grand.Business.Common/Services/Directory/GroupService.cs b/src/Business/Grand.Business.Common/Services/Directory/GroupService.csindex 8de4022c1..08ffe2e33 100644--- a/src/Business/Grand.Business.Common/Services/Directory/GroupService.cs+++ b/src/Business/Grand.Business.Common/Services/Directory/GroupService.cs@@ -1,7 +1,7 @@using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Domain;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;using Grand.Infrastructure.Extensions;diff --git a/src/Business/Grand.Business.Common/Services/Directory/HistoryService.cs b/src/Business/Grand.Business.Common/Services/Directory/HistoryService.csindex 0b115c6fd..53ef245d0 100644--- a/src/Business/Grand.Business.Common/Services/Directory/HistoryService.cs+++ b/src/Business/Grand.Business.Common/Services/Directory/HistoryService.cs@@ -1,6 +1,6 @@using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Domain;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.History;namespace Grand.Business.Common.Services.Directorydiff --git a/src/Business/Grand.Business.Common/Services/Directory/UserFieldService.cs b/src/Business/Grand.Business.Common/Services/Directory/UserFieldService.csindex 07be52bac..622744df9 100644--- a/src/Business/Grand.Business.Common/Services/Directory/UserFieldService.cs+++ b/src/Business/Grand.Business.Common/Services/Directory/UserFieldService.cs@@ -1,7 +1,7 @@using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Domain;using Grand.Domain.Common;-using Grand.Domain.Data;+using Grand.Data;using Grand.SharedKernel.Extensions;namespace Grand.Business.Common.Services.Directorydiff --git a/src/Business/Grand.Business.Common/Services/Localization/LanguageService.cs b/src/Business/Grand.Business.Common/Services/Localization/LanguageService.csindex aa892b299..54cb4386d 100644--- a/src/Business/Grand.Business.Common/Services/Localization/LanguageService.cs+++ b/src/Business/Grand.Business.Common/Services/Localization/LanguageService.cs@@ -2,7 +2,7 @@ using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;using Grand.Infrastructure.Extensions;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Localization;using MediatR;diff --git a/src/Business/Grand.Business.Common/Services/Localization/TranslationService.cs b/src/Business/Grand.Business.Common/Services/Localization/TranslationService.csindex 1fb6284d8..21930550e 100644--- a/src/Business/Grand.Business.Common/Services/Localization/TranslationService.cs+++ b/src/Business/Grand.Business.Common/Services/Localization/TranslationService.cs@@ -1,6 +1,6 @@using Grand.Business.Common.Utilities;using Grand.Business.Core.Interfaces.Common.Localization;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Localization;using Grand.Infrastructure;using Grand.Infrastructure.Caching;diff --git a/src/Business/Grand.Business.Common/Services/Pdf/HtmlToPdfService.cs b/src/Business/Grand.Business.Common/Services/Pdf/HtmlToPdfService.csindex 0007f5347..6fa3a6aa3 100644--- a/src/Business/Grand.Business.Common/Services/Pdf/HtmlToPdfService.cs+++ b/src/Business/Grand.Business.Common/Services/Pdf/HtmlToPdfService.cs@@ -1,6 +1,6 @@using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Business.Core.Interfaces.Common.Pdf;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Media;using Grand.Domain.Orders;using Grand.Domain.Shipping;diff --git a/src/Business/Grand.Business.Common/Services/Security/PermissionService.cs b/src/Business/Grand.Business.Common/Services/Security/PermissionService.csindex 7479d1313..ec9e3e309 100644--- a/src/Business/Grand.Business.Common/Services/Security/PermissionService.cs+++ b/src/Business/Grand.Business.Common/Services/Security/PermissionService.cs@@ -3,7 +3,7 @@ using Grand.Infrastructure;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Permissions;using Grand.Business.Core.Interfaces.Common.Directory;diff --git a/src/Business/Grand.Business.Common/Services/Seo/SlugService.cs b/src/Business/Grand.Business.Common/Services/Seo/SlugService.csindex 8001edc7a..962fa9869 100644--- a/src/Business/Grand.Business.Common/Services/Seo/SlugService.cs+++ b/src/Business/Grand.Business.Common/Services/Seo/SlugService.cs@@ -1,6 +1,6 @@using Grand.Business.Core.Interfaces.Common.Seo;using Grand.Domain;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Seo;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;diff --git a/src/Business/Grand.Business.Common/Services/Stores/StoreService.cs b/src/Business/Grand.Business.Common/Services/Stores/StoreService.csindex a22774d5a..4147a37ab 100644--- a/src/Business/Grand.Business.Common/Services/Stores/StoreService.cs+++ b/src/Business/Grand.Business.Common/Services/Stores/StoreService.cs@@ -2,7 +2,7 @@ using Grand.Business.Core.Interfaces.Common.Stores;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;using Grand.Infrastructure.Extensions;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Stores;using MediatR;diff --git a/src/Business/Grand.Business.Customers/Queries/Handlers/GetCustomerQueryHandler.cs b/src/Business/Grand.Business.Customers/Queries/Handlers/GetCustomerQueryHandler.csindex 508df354f..0448be5a2 100644--- a/src/Business/Grand.Business.Customers/Queries/Handlers/GetCustomerQueryHandler.cs+++ b/src/Business/Grand.Business.Customers/Queries/Handlers/GetCustomerQueryHandler.cs@@ -1,6 +1,6 @@using Grand.Business.Core.Queries.Customers;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using MediatR;using System.Linq.Expressions;diff --git a/src/Business/Grand.Business.Customers/Services/AffiliateService.cs b/src/Business/Grand.Business.Customers/Services/AffiliateService.csindex 712085ced..0531b9cf4 100644--- a/src/Business/Grand.Business.Customers/Services/AffiliateService.cs+++ b/src/Business/Grand.Business.Customers/Services/AffiliateService.cs@@ -2,7 +2,7 @@ using Grand.Business.Core.Interfaces.Customers;using Grand.Infrastructure.Extensions;using Grand.Domain;using Grand.Domain.Affiliates;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Orders;using MediatR;diff --git a/src/Business/Grand.Business.Customers/Services/CustomerAttributeService.cs b/src/Business/Grand.Business.Customers/Services/CustomerAttributeService.csindex b155bc0df..f16c2c212 100644--- a/src/Business/Grand.Business.Customers/Services/CustomerAttributeService.cs+++ b/src/Business/Grand.Business.Customers/Services/CustomerAttributeService.cs@@ -3,7 +3,7 @@ using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;using Grand.Infrastructure.Extensions;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using MediatR;namespace Grand.Business.Customers.Servicesdiff --git a/src/Business/Grand.Business.Customers/Services/CustomerHistoryPasswordService.cs b/src/Business/Grand.Business.Customers/Services/CustomerHistoryPasswordService.csindex 80a0549ff..a01b0bad2 100644--- a/src/Business/Grand.Business.Customers/Services/CustomerHistoryPasswordService.cs+++ b/src/Business/Grand.Business.Customers/Services/CustomerHistoryPasswordService.cs@@ -1,6 +1,6 @@using Grand.Business.Core.Interfaces.Customers;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Extensions;using MediatR;diff --git a/src/Business/Grand.Business.Customers/Services/CustomerNoteService.cs b/src/Business/Grand.Business.Customers/Services/CustomerNoteService.csindex 290fd40cb..7d16b07f7 100644--- a/src/Business/Grand.Business.Customers/Services/CustomerNoteService.cs+++ b/src/Business/Grand.Business.Customers/Services/CustomerNoteService.cs@@ -1,6 +1,6 @@using Grand.Business.Core.Interfaces.Customers;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Extensions;using MediatR;diff --git a/src/Business/Grand.Business.Customers/Services/CustomerService.cs b/src/Business/Grand.Business.Customers/Services/CustomerService.csindex a90f166eb..a4aad1537 100644--- a/src/Business/Grand.Business.Customers/Services/CustomerService.cs+++ b/src/Business/Grand.Business.Customers/Services/CustomerService.cs@@ -4,7 +4,7 @@ using Grand.Business.Core.Queries.Customers;using Grand.Domain;using Grand.Domain.Common;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Orders;using Grand.Domain.Shipping;using Grand.Domain.Stores;diff --git a/src/Business/Grand.Business.Customers/Services/SalesEmployeeService.cs b/src/Business/Grand.Business.Customers/Services/SalesEmployeeService.csindex 10f77bed6..68150c874 100644--- a/src/Business/Grand.Business.Customers/Services/SalesEmployeeService.cs+++ b/src/Business/Grand.Business.Customers/Services/SalesEmployeeService.cs@@ -3,7 +3,7 @@ using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;using Grand.Infrastructure.Extensions;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using MediatR;namespace Grand.Business.Customers.Servicesdiff --git a/src/Business/Grand.Business.Customers/Services/UserApiService.cs b/src/Business/Grand.Business.Customers/Services/UserApiService.csindex 857e0cfe2..c365e2254 100644--- a/src/Business/Grand.Business.Customers/Services/UserApiService.cs+++ b/src/Business/Grand.Business.Customers/Services/UserApiService.cs@@ -2,7 +2,7 @@using Grand.Infrastructure.Extensions;using Grand.Domain;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using MediatR;namespace Grand.Business.Customers.Servicesdiff --git a/src/Business/Grand.Business.Customers/Services/VendorService.cs b/src/Business/Grand.Business.Customers/Services/VendorService.csindex 4e95dda4d..37b0456cb 100644--- a/src/Business/Grand.Business.Customers/Services/VendorService.cs+++ b/src/Business/Grand.Business.Customers/Services/VendorService.cs@@ -1,7 +1,7 @@using Grand.Business.Core.Interfaces.Customers;using Grand.Infrastructure.Extensions;using Grand.Domain;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Vendors;using MediatR;diff --git a/src/Business/Grand.Business.Marketing/Services/Campaigns/CampaignService.cs b/src/Business/Grand.Business.Marketing/Services/Campaigns/CampaignService.csindex 591d91a15..f1d7bf74e 100644--- a/src/Business/Grand.Business.Marketing/Services/Campaigns/CampaignService.cs+++ b/src/Business/Grand.Business.Marketing/Services/Campaigns/CampaignService.cs@@ -5,7 +5,7 @@ using Grand.Business.Core.Interfaces.Messages;using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;using Grand.Domain;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Messages;using Grand.Infrastructure;using Grand.Infrastructure.Extensions;diff --git a/src/Business/Grand.Business.Marketing/Services/Contacts/ContactAttributeService.cs b/src/Business/Grand.Business.Marketing/Services/Contacts/ContactAttributeService.csindex d62fb7508..d8e22cf18 100644--- a/src/Business/Grand.Business.Marketing/Services/Contacts/ContactAttributeService.cs+++ b/src/Business/Grand.Business.Marketing/Services/Contacts/ContactAttributeService.cs@@ -1,6 +1,6 @@using Grand.Business.Core.Interfaces.Marketing.Contacts;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Messages;using Grand.Infrastructure;using Grand.Infrastructure.Caching;diff --git a/src/Business/Grand.Business.Marketing/Services/Contacts/ContactUsService.cs b/src/Business/Grand.Business.Marketing/Services/Contacts/ContactUsService.csindex eed432e3a..0737ae77f 100644--- a/src/Business/Grand.Business.Marketing/Services/Contacts/ContactUsService.cs+++ b/src/Business/Grand.Business.Marketing/Services/Contacts/ContactUsService.cs@@ -1,7 +1,7 @@using Grand.Business.Core.Interfaces.Marketing.Contacts;using Grand.Infrastructure.Extensions;using Grand.Domain;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Messages;using MediatR;diff --git a/src/Business/Grand.Business.Marketing/Services/Courses/CourseActionService.cs b/src/Business/Grand.Business.Marketing/Services/Courses/CourseActionService.csindex ab69b6263..8a3067273 100644--- a/src/Business/Grand.Business.Marketing/Services/Courses/CourseActionService.cs+++ b/src/Business/Grand.Business.Marketing/Services/Courses/CourseActionService.cs@@ -1,7 +1,7 @@using Grand.Business.Core.Interfaces.Marketing.Courses;using Grand.Infrastructure.Extensions;using Grand.Domain.Courses;-using Grand.Domain.Data;+using Grand.Data;using MediatR;namespace Grand.Business.Marketing.Services.Coursesdiff --git a/src/Business/Grand.Business.Marketing/Services/Courses/CourseLessonService.cs b/src/Business/Grand.Business.Marketing/Services/Courses/CourseLessonService.csindex 45b27b246..293380c0f 100644--- a/src/Business/Grand.Business.Marketing/Services/Courses/CourseLessonService.cs+++ b/src/Business/Grand.Business.Marketing/Services/Courses/CourseLessonService.cs@@ -1,7 +1,7 @@using Grand.Business.Core.Interfaces.Marketing.Courses;using Grand.Infrastructure.Extensions;using Grand.Domain.Courses;-using Grand.Domain.Data;+using Grand.Data;using MediatR;namespace Grand.Business.Marketing.Services.Coursesdiff --git a/src/Business/Grand.Business.Marketing/Services/Courses/CourseLevelService.cs b/src/Business/Grand.Business.Marketing/Services/Courses/CourseLevelService.csindex 5b6dfe744..3edc41029 100644--- a/src/Business/Grand.Business.Marketing/Services/Courses/CourseLevelService.cs+++ b/src/Business/Grand.Business.Marketing/Services/Courses/CourseLevelService.cs@@ -1,7 +1,7 @@using Grand.Business.Core.Interfaces.Marketing.Courses;using Grand.Infrastructure.Extensions;using Grand.Domain.Courses;-using Grand.Domain.Data;+using Grand.Data;using MediatR;namespace Grand.Business.Marketing.Services.Coursesdiff --git a/src/Business/Grand.Business.Marketing/Services/Courses/CourseService.cs b/src/Business/Grand.Business.Marketing/Services/Courses/CourseService.csindex ec4981d96..83c4355d7 100644--- a/src/Business/Grand.Business.Marketing/Services/Courses/CourseService.cs+++ b/src/Business/Grand.Business.Marketing/Services/Courses/CourseService.cs@@ -2,7 +2,7 @@using Grand.Domain;using Grand.Domain.Courses;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Orders;using Grand.Infrastructure.Configuration;using Grand.Infrastructure.Extensions;diff --git a/src/Business/Grand.Business.Marketing/Services/Courses/CourseSubjectService.cs b/src/Business/Grand.Business.Marketing/Services/Courses/CourseSubjectService.csindex d9f3fd453..812b305c7 100644--- a/src/Business/Grand.Business.Marketing/Services/Courses/CourseSubjectService.cs+++ b/src/Business/Grand.Business.Marketing/Services/Courses/CourseSubjectService.cs@@ -1,7 +1,7 @@using Grand.Business.Core.Interfaces.Marketing.Courses;using Grand.Infrastructure.Extensions;using Grand.Domain.Courses;-using Grand.Domain.Data;+using Grand.Data;using MediatR;namespace Grand.Business.Marketing.Services.Coursesdiff --git a/src/Business/Grand.Business.Marketing/Services/Customers/CustomerCoordinatesService.cs b/src/Business/Grand.Business.Marketing/Services/Customers/CustomerCoordinatesService.csindex 3c4d04d3b..d4695b58e 100644--- a/src/Business/Grand.Business.Marketing/Services/Customers/CustomerCoordinatesService.cs+++ b/src/Business/Grand.Business.Marketing/Services/Customers/CustomerCoordinatesService.cs@@ -2,7 +2,7 @@using Grand.Business.Core.Events.Marketing;using Grand.Infrastructure;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using MediatR;namespace Grand.Business.Marketing.Services.Customersdiff --git a/src/Business/Grand.Business.Marketing/Services/Customers/CustomerProductService.cs b/src/Business/Grand.Business.Marketing/Services/Customers/CustomerProductService.csindex 1ca2bed0c..ade41bfed 100644--- a/src/Business/Grand.Business.Marketing/Services/Customers/CustomerProductService.cs+++ b/src/Business/Grand.Business.Marketing/Services/Customers/CustomerProductService.cs@@ -4,7 +4,7 @@ using Grand.Infrastructure.Caching.Constants;using Grand.Infrastructure.Extensions;using Grand.Domain;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using MediatR;namespace Grand.Business.Marketing.Services.Customersdiff --git a/src/Business/Grand.Business.Marketing/Services/Customers/CustomerTagService.cs b/src/Business/Grand.Business.Marketing/Services/Customers/CustomerTagService.csindex 178fee366..d3838fd44 100644--- a/src/Business/Grand.Business.Marketing/Services/Customers/CustomerTagService.cs+++ b/src/Business/Grand.Business.Marketing/Services/Customers/CustomerTagService.cs@@ -4,7 +4,7 @@ using Grand.Infrastructure.Caching.Constants;using Grand.Infrastructure.Extensions;using Grand.Domain;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using MediatR;namespace Grand.Business.Marketing.Services.Customersdiff --git a/src/Business/Grand.Business.Marketing/Services/Documents/DocumentService.cs b/src/Business/Grand.Business.Marketing/Services/Documents/DocumentService.csindex 82089636d..dd3fb40d6 100644--- a/src/Business/Grand.Business.Marketing/Services/Documents/DocumentService.cs+++ b/src/Business/Grand.Business.Marketing/Services/Documents/DocumentService.cs@@ -1,7 +1,7 @@using Grand.Business.Core.Interfaces.Marketing.Documents;using Grand.Infrastructure.Extensions;using Grand.Domain;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Documents;using MediatR;using Grand.Domain.Common;diff --git a/src/Business/Grand.Business.Marketing/Services/Documents/DocumentTypeService.cs b/src/Business/Grand.Business.Marketing/Services/Documents/DocumentTypeService.csindex 402c69e40..b138de552 100644--- a/src/Business/Grand.Business.Marketing/Services/Documents/DocumentTypeService.cs+++ b/src/Business/Grand.Business.Marketing/Services/Documents/DocumentTypeService.cs@@ -1,6 +1,6 @@using Grand.Business.Core.Interfaces.Marketing.Documents;using Grand.Infrastructure.Extensions;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Documents;using MediatR;diff --git a/src/Business/Grand.Business.Marketing/Services/Newsletters/NewsLetterSubscriptionService.cs b/src/Business/Grand.Business.Marketing/Services/Newsletters/NewsLetterSubscriptionService.csindex 75a995089..bf282afa5 100644--- a/src/Business/Grand.Business.Marketing/Services/Newsletters/NewsLetterSubscriptionService.cs+++ b/src/Business/Grand.Business.Marketing/Services/Newsletters/NewsLetterSubscriptionService.cs@@ -3,7 +3,7 @@ using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Core.Interfaces.Marketing.Newsletters;using Grand.Business.Marketing.Extensions;using Grand.Domain;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Messages;using Grand.Infrastructure.Extensions;using Grand.SharedKernel;diff --git a/src/Business/Grand.Business.Marketing/Services/Newsletters/NewsletterCategoryService.cs b/src/Business/Grand.Business.Marketing/Services/Newsletters/NewsletterCategoryService.csindex 34ffdc099..80011b8ef 100644--- a/src/Business/Grand.Business.Marketing/Services/Newsletters/NewsletterCategoryService.cs+++ b/src/Business/Grand.Business.Marketing/Services/Newsletters/NewsletterCategoryService.cs@@ -1,5 +1,5 @@using Grand.Business.Core.Interfaces.Marketing.Newsletters;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Messages;using Grand.Infrastructure.Extensions;using MediatR;diff --git a/src/Business/Grand.Business.Marketing/Services/PushNotifications/PushNotificationsService.cs b/src/Business/Grand.Business.Marketing/Services/PushNotifications/PushNotificationsService.csindex 5a4e48d38..977134f76 100644--- a/src/Business/Grand.Business.Marketing/Services/PushNotifications/PushNotificationsService.cs+++ b/src/Business/Grand.Business.Marketing/Services/PushNotifications/PushNotificationsService.cs@@ -1,7 +1,7 @@using Grand.Business.Core.Interfaces.Marketing.PushNotifications;using Grand.Business.Marketing.Utilities;using Grand.Domain;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.PushNotifications;using Grand.Infrastructure.Extensions;using MediatR;diff --git a/src/Business/Grand.Business.Messages/Commands/Handlers/Common/InsertContactUsCommandHandler.cs b/src/Business/Grand.Business.Messages/Commands/Handlers/Common/InsertContactUsCommandHandler.csindex 2f5095dcd..fb95a1ab1 100644--- a/src/Business/Grand.Business.Messages/Commands/Handlers/Common/InsertContactUsCommandHandler.cs+++ b/src/Business/Grand.Business.Messages/Commands/Handlers/Common/InsertContactUsCommandHandler.cs@@ -1,5 +1,5 @@using Grand.Business.Core.Commands.Messages.Common;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Messages;using MediatR;diff --git a/src/Business/Grand.Business.Messages/Queries/Handlers/GetBidsByProductIdQueryHandler.cs b/src/Business/Grand.Business.Messages/Queries/Handlers/GetBidsByProductIdQueryHandler.csindex c3d959568..918fc7120 100644--- a/src/Business/Grand.Business.Messages/Queries/Handlers/GetBidsByProductIdQueryHandler.cs+++ b/src/Business/Grand.Business.Messages/Queries/Handlers/GetBidsByProductIdQueryHandler.cs@@ -1,6 +1,6 @@using Grand.Business.Core.Queries.Messages;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using MediatR;namespace Grand.Business.Messages.Queries.Handlersdiff --git a/src/Business/Grand.Business.Messages/Queries/Handlers/GetCustomerByIdQueryHandler.cs b/src/Business/Grand.Business.Messages/Queries/Handlers/GetCustomerByIdQueryHandler.csindex 1fcc0173b..0fd95a4d3 100644--- a/src/Business/Grand.Business.Messages/Queries/Handlers/GetCustomerByIdQueryHandler.cs+++ b/src/Business/Grand.Business.Messages/Queries/Handlers/GetCustomerByIdQueryHandler.cs@@ -1,6 +1,6 @@using Grand.Business.Core.Queries.Messages;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using MediatR;namespace Grand.Business.Messages.Queries.Handlersdiff --git a/src/Business/Grand.Business.Messages/Queries/Handlers/GetProductByIdQueryHandler.cs b/src/Business/Grand.Business.Messages/Queries/Handlers/GetProductByIdQueryHandler.csindex 6db32d19f..b46247c56 100644--- a/src/Business/Grand.Business.Messages/Queries/Handlers/GetProductByIdQueryHandler.cs+++ b/src/Business/Grand.Business.Messages/Queries/Handlers/GetProductByIdQueryHandler.cs@@ -1,6 +1,6 @@using Grand.Business.Core.Queries.Messages;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using MediatR;namespace Grand.Business.Messages.Queries.Handlersdiff --git a/src/Business/Grand.Business.Messages/Queries/Handlers/GetVendorByIdQueryHandler.cs b/src/Business/Grand.Business.Messages/Queries/Handlers/GetVendorByIdQueryHandler.csindex 12cf89974..1905343e7 100644--- a/src/Business/Grand.Business.Messages/Queries/Handlers/GetVendorByIdQueryHandler.cs+++ b/src/Business/Grand.Business.Messages/Queries/Handlers/GetVendorByIdQueryHandler.cs@@ -1,5 +1,5 @@using Grand.Business.Core.Queries.Messages;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Vendors;using MediatR;diff --git a/src/Business/Grand.Business.Messages/Services/EmailAccountService.cs b/src/Business/Grand.Business.Messages/Services/EmailAccountService.csindex 3ba455427..2e44d614a 100644--- a/src/Business/Grand.Business.Messages/Services/EmailAccountService.cs+++ b/src/Business/Grand.Business.Messages/Services/EmailAccountService.cs@@ -2,7 +2,7 @@using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;using Grand.Infrastructure.Extensions;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Messages;using Grand.SharedKernel;using Grand.SharedKernel.Extensions;diff --git a/src/Business/Grand.Business.Messages/Services/MessageTemplateService.cs b/src/Business/Grand.Business.Messages/Services/MessageTemplateService.csindex 5a5989248..0139f81df 100644--- a/src/Business/Grand.Business.Messages/Services/MessageTemplateService.cs+++ b/src/Business/Grand.Business.Messages/Services/MessageTemplateService.cs@@ -1,6 +1,6 @@using Grand.Business.Core.Interfaces.Common.Security;using Grand.Business.Core.Interfaces.Messages;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Messages;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;diff --git a/src/Business/Grand.Business.Messages/Services/QueuedEmailService.cs b/src/Business/Grand.Business.Messages/Services/QueuedEmailService.csindex eea13ead2..232047c80 100644--- a/src/Business/Grand.Business.Messages/Services/QueuedEmailService.cs+++ b/src/Business/Grand.Business.Messages/Services/QueuedEmailService.cs@@ -1,7 +1,7 @@using Grand.Business.Core.Interfaces.Messages;using Grand.Infrastructure.Extensions;using Grand.Domain;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Messages;using MediatR;using Grand.Domain.Common;diff --git a/src/Business/Grand.Business.Storage/Services/AmazonPictureService.cs b/src/Business/Grand.Business.Storage/Services/AmazonPictureService.csindex 962ff17b1..306709ff2 100644--- a/src/Business/Grand.Business.Storage/Services/AmazonPictureService.cs+++ b/src/Business/Grand.Business.Storage/Services/AmazonPictureService.cs@@ -3,7 +3,7 @@ using Amazon.Runtime;using Amazon.S3;using Amazon.S3.Model;using Grand.Business.Core.Interfaces.Storage;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Media;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Configuration;diff --git a/src/Business/Grand.Business.Storage/Services/AzurePictureService.cs b/src/Business/Grand.Business.Storage/Services/AzurePictureService.csindex 26b3fd71e..e0dcf0a4f 100644--- a/src/Business/Grand.Business.Storage/Services/AzurePictureService.cs+++ b/src/Business/Grand.Business.Storage/Services/AzurePictureService.cs@@ -2,7 +2,7 @@using Azure.Storage.Blobs.Models;using Grand.Business.Core.Interfaces.Messages;using Grand.Business.Core.Interfaces.Storage;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Media;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Configuration;diff --git a/src/Business/Grand.Business.Storage/Services/DownloadService.cs b/src/Business/Grand.Business.Storage/Services/DownloadService.csindex 3ff67cf2f..c424b59bc 100644--- a/src/Business/Grand.Business.Storage/Services/DownloadService.cs+++ b/src/Business/Grand.Business.Storage/Services/DownloadService.cs@@ -1,5 +1,5 @@using Grand.Business.Core.Interfaces.Storage;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Media;using Grand.Infrastructure.Extensions;using MediatR;diff --git a/src/Business/Grand.Business.Storage/Services/PictureService.cs b/src/Business/Grand.Business.Storage/Services/PictureService.csindex 51bc3233f..6a0b9abee 100644--- a/src/Business/Grand.Business.Storage/Services/PictureService.cs+++ b/src/Business/Grand.Business.Storage/Services/PictureService.cs@@ -2,7 +2,7 @@using Grand.Business.Core.Interfaces.Storage;using Grand.Domain;using Grand.Domain.Common;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Media;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Catalog/SendNotificationsToSubscribersCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Catalog/SendNotificationsToSubscribersCommandHandler.csindex f07766457..7a467501f 100644--- a/src/Business/Grand.Business.System/Commands/Handlers/Catalog/SendNotificationsToSubscribersCommandHandler.cs+++ b/src/Business/Grand.Business.System/Commands/Handlers/Catalog/SendNotificationsToSubscribersCommandHandler.cs@@ -4,7 +4,7 @@ using Grand.Business.Core.Interfaces.Messages;using Grand.Domain.Catalog;using Grand.Domain.Common;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.SharedKernel.Extensions;using MediatR;diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Common/ClearMostViewedCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Common/ClearMostViewedCommandHandler.csindex 1e9896339..44ac3b706 100644--- a/src/Business/Grand.Business.System/Commands/Handlers/Common/ClearMostViewedCommandHandler.cs+++ b/src/Business/Grand.Business.System/Commands/Handlers/Common/ClearMostViewedCommandHandler.cs@@ -1,6 +1,6 @@using Grand.Business.Core.Commands.System.Common;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using MediatR;namespace Grand.Business.System.Commands.Handlers.Commondiff --git a/src/Business/Grand.Business.System/Services/Admin/AdminSiteMapService.cs b/src/Business/Grand.Business.System/Services/Admin/AdminSiteMapService.csindex caf85aeeb..6b8ea0eda 100644--- a/src/Business/Grand.Business.System/Services/Admin/AdminSiteMapService.cs+++ b/src/Business/Grand.Business.System/Services/Admin/AdminSiteMapService.cs@@ -1,7 +1,7 @@using Grand.Business.Core.Interfaces.System.Admin;using Grand.Infrastructure.Caching;using Grand.Domain.Admin;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Caching.Constants;using Grand.Infrastructure.Extensions;using MediatR;diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/ScheduleTaskService.cs b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/ScheduleTaskService.csindex 32066a02e..a934b77e5 100644--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/ScheduleTaskService.cs+++ b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/ScheduleTaskService.cs@@ -1,5 +1,5 @@using Grand.Business.Core.Interfaces.System.ScheduleTasks;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Tasks;namespace Grand.Business.System.Services.BackgroundServices.ScheduleTasksdiff --git a/src/Business/Grand.Business.System/Services/Installation/InstallationService.cs b/src/Business/Grand.Business.System/Services/Installation/InstallationService.csindex 043749192..7d29fbedb 100644--- a/src/Business/Grand.Business.System/Services/Installation/InstallationService.cs+++ b/src/Business/Grand.Business.System/Services/Installation/InstallationService.cs@@ -11,7 +11,7 @@ using Grand.Domain.Common;using Grand.Domain.Configuration;using Grand.Domain.Courses;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Directory;using Grand.Domain.Discounts;using Grand.Domain.Documents;diff --git a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationSystemPermission.cs b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationSystemPermission.csindex f87861262..71c9573fd 100644--- a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationSystemPermission.cs+++ b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationSystemPermission.cs@@ -1,7 +1,7 @@using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Core.Utilities.Common.Security;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Permissions;using Grand.Infrastructure.Migrations;using Microsoft.Extensions.DependencyInjection;diff --git a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateAdminSiteMap.cs b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateAdminSiteMap.csindex fd2f90a9e..2cae97f07 100644--- a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateAdminSiteMap.cs+++ b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateAdminSiteMap.cs@@ -1,5 +1,5 @@using Grand.Business.Core.Utilities.Common.Security;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Migrations;using Microsoft.Extensions.DependencyInjection;using Microsoft.Extensions.Logging;diff --git a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateLogoSettings.cs b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateLogoSettings.csindex 07bc77b72..5f3093c13 100644--- a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateLogoSettings.cs+++ b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateLogoSettings.cs@@ -1,6 +1,6 @@using Grand.Business.Core.Interfaces.Common.Configuration;using Grand.Business.Core.Interfaces.Storage;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Stores;using Grand.Infrastructure.Migrations;using Microsoft.AspNetCore.Hosting;diff --git a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateMediaSettings.cs b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateMediaSettings.csindex e9ad8ab55..bd081b6cf 100644--- a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateMediaSettings.cs+++ b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateMediaSettings.cs@@ -1,5 +1,5 @@using Grand.Business.Core.Interfaces.Common.Configuration;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Media;using Grand.Infrastructure.Migrations;using Microsoft.Extensions.DependencyInjection;diff --git a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateResourceString.cs b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateResourceString.csindex 7321fab25..a410aac39 100644--- a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateResourceString.cs+++ b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateResourceString.cs@@ -1,4 +1,4 @@-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Migrations;namespace Grand.Business.System.Services.Migrations._1._1diff --git a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateStore.cs b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateStore.csindex 3f1fafb33..93a42f4b0 100644--- a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateStore.cs+++ b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateStore.cs@@ -1,4 +1,4 @@-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Stores;using Grand.Infrastructure.Migrations;using Microsoft.Extensions.DependencyInjection;diff --git a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpgradeDbVersion_11.cs b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpgradeDbVersion_11.csindex 4afe32203..8b7935f84 100644--- a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpgradeDbVersion_11.cs+++ b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpgradeDbVersion_11.cs@@ -1,5 +1,5 @@using Grand.Domain.Common;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure;using Grand.Infrastructure.Migrations;using Microsoft.Extensions.DependencyInjection;diff --git a/src/Business/Grand.Business.System/Services/Migrations/2.0/MigrationUpdateResourceString.cs b/src/Business/Grand.Business.System/Services/Migrations/2.0/MigrationUpdateResourceString.csindex ffcf74c8f..b166ab417 100644--- a/src/Business/Grand.Business.System/Services/Migrations/2.0/MigrationUpdateResourceString.cs+++ b/src/Business/Grand.Business.System/Services/Migrations/2.0/MigrationUpdateResourceString.cs@@ -1,4 +1,4 @@-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Migrations;namespace Grand.Business.System.Services.Migrations._2._0diff --git a/src/Business/Grand.Business.System/Services/Migrations/2.0/MigrationUpgradeDbVersion_20.cs b/src/Business/Grand.Business.System/Services/Migrations/2.0/MigrationUpgradeDbVersion_20.csindex 9acfeda1f..fe50d24ef 100644--- a/src/Business/Grand.Business.System/Services/Migrations/2.0/MigrationUpgradeDbVersion_20.cs+++ b/src/Business/Grand.Business.System/Services/Migrations/2.0/MigrationUpgradeDbVersion_20.cs@@ -1,5 +1,5 @@using Grand.Domain.Common;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure;using Grand.Infrastructure.Migrations;using Microsoft.Extensions.DependencyInjection;diff --git a/src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationProductRating.cs b/src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationProductRating.csindex 2ed03265a..b81dca830 100644--- a/src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationProductRating.cs+++ b/src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationProductRating.cs@@ -1,5 +1,5 @@using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Migrations;using Microsoft.Extensions.DependencyInjection;using Microsoft.Extensions.Logging;diff --git a/src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationScheduleTasks.cs b/src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationScheduleTasks.csindex 1fbd3de9d..a1693e5d7 100644--- a/src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationScheduleTasks.cs+++ b/src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationScheduleTasks.cs@@ -1,4 +1,4 @@-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Tasks;using Grand.Infrastructure.Migrations;using Microsoft.Extensions.DependencyInjection;diff --git a/src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationSystemPermission.cs b/src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationSystemPermission.csindex c76441c73..d2449b601 100644--- a/src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationSystemPermission.cs+++ b/src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationSystemPermission.cs@@ -1,4 +1,4 @@-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Permissions;using Grand.Infrastructure.Migrations;using Microsoft.Extensions.DependencyInjection;diff --git a/src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationUpdateAdminSiteMap.cs b/src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationUpdateAdminSiteMap.csindex ae5778013..0da410323 100644--- a/src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationUpdateAdminSiteMap.cs+++ b/src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationUpdateAdminSiteMap.cs@@ -1,5 +1,5 @@using Grand.Business.Core.Utilities.Common.Security;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Migrations;using Microsoft.Extensions.DependencyInjection;using Microsoft.Extensions.Logging;diff --git a/src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationUpdateResourceString.cs b/src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationUpdateResourceString.csindex 521e47fd0..306ba7bef 100644--- a/src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationUpdateResourceString.cs+++ b/src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationUpdateResourceString.cs@@ -1,4 +1,4 @@-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Migrations;namespace Grand.Business.System.Services.Migrations._2._1diff --git a/src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationUpgradeDbVersion_21.cs b/src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationUpgradeDbVersion_21.csindex 2dfcc30dc..c7dfbb1a8 100644--- a/src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationUpgradeDbVersion_21.cs+++ b/src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationUpgradeDbVersion_21.cs@@ -1,5 +1,5 @@using Grand.Domain.Common;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure;using Grand.Infrastructure.Migrations;using Microsoft.Extensions.DependencyInjection;diff --git a/src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationAddLandingPage.cs b/src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationAddLandingPage.csindex 6afd59d90..0302f3c4d 100644--- a/src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationAddLandingPage.cs+++ b/src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationAddLandingPage.cs@@ -1,4 +1,4 @@-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Pages;using Grand.Infrastructure.Migrations;using Microsoft.Extensions.DependencyInjection;diff --git a/src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationScheduleTasks.cs b/src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationScheduleTasks.csindex 223e7db8a..10e9efa83 100644--- a/src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationScheduleTasks.cs+++ b/src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationScheduleTasks.cs@@ -1,4 +1,4 @@-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Tasks;using Grand.Infrastructure.Migrations;using Microsoft.Extensions.DependencyInjection;diff --git a/src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationSystemPermission.cs b/src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationSystemPermission.csindex a2eaa0865..ef79480c0 100644--- a/src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationSystemPermission.cs+++ b/src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationSystemPermission.cs@@ -1,7 +1,7 @@using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Core.Utilities.Common.Security;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Permissions;using Grand.Infrastructure.Migrations;using Microsoft.Extensions.DependencyInjection;diff --git a/src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationUpdateAdminSiteMap.cs b/src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationUpdateAdminSiteMap.csindex 7e03009a4..d3fe61543 100644--- a/src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationUpdateAdminSiteMap.cs+++ b/src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationUpdateAdminSiteMap.cs@@ -1,6 +1,6 @@using Grand.Business.Core.Utilities.Common.Security;using Grand.Domain.Admin;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Migrations;using Microsoft.Extensions.DependencyInjection;using Microsoft.Extensions.Logging;diff --git a/src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationUpdateResourceString.cs b/src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationUpdateResourceString.csindex 9ca37c54e..560ea45f6 100644--- a/src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationUpdateResourceString.cs+++ b/src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationUpdateResourceString.cs@@ -1,4 +1,4 @@-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Migrations;namespace Grand.Business.System.Services.Migrations._2._2diff --git a/src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationUpgradeDbVersion_22.cs b/src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationUpgradeDbVersion_22.csindex 7092a26e6..3825f2551 100644--- a/src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationUpgradeDbVersion_22.cs+++ b/src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationUpgradeDbVersion_22.cs@@ -1,5 +1,5 @@using Grand.Domain.Common;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure;using Grand.Infrastructure.Migrations;using Microsoft.Extensions.DependencyInjection;diff --git a/src/Business/Grand.Business.System/Services/Migrations/MigrationProcess.cs b/src/Business/Grand.Business.System/Services/Migrations/MigrationProcess.csindex f0e59e487..dbc4d063f 100644--- a/src/Business/Grand.Business.System/Services/Migrations/MigrationProcess.cs+++ b/src/Business/Grand.Business.System/Services/Migrations/MigrationProcess.cs@@ -1,4 +1,5 @@-using Grand.Domain.Data;+using Grand.Data;+using Grand.Domain;using Grand.Infrastructure.Migrations;using Microsoft.Extensions.Logging;diff --git a/src/Business/Grand.Business.System/Services/Migrations/MigrationUpdateResource.cs b/src/Business/Grand.Business.System/Services/Migrations/MigrationUpdateResource.csindex c1f445096..3da149fba 100644--- a/src/Business/Grand.Business.System/Services/Migrations/MigrationUpdateResource.cs+++ b/src/Business/Grand.Business.System/Services/Migrations/MigrationUpdateResource.cs@@ -1,5 +1,5 @@using Grand.Business.Core.Interfaces.Common.Localization;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Localization;using Grand.SharedKernel.Extensions;using Microsoft.Extensions.DependencyInjection;diff --git a/src/Business/Grand.Business.System/Services/Reports/CustomerReportService.cs b/src/Business/Grand.Business.System/Services/Reports/CustomerReportService.csindex 6f4e99543..f91ddd770 100644--- a/src/Business/Grand.Business.System/Services/Reports/CustomerReportService.cs+++ b/src/Business/Grand.Business.System/Services/Reports/CustomerReportService.cs@@ -3,7 +3,7 @@ using Grand.Business.Core.Interfaces.System.Reports;using Grand.Business.Core.Utilities.System;using Grand.Domain;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Orders;using Grand.Domain.Payments;using Grand.Domain.Shipping;diff --git a/src/Business/Grand.Business.System/Services/Reports/OrderReportService.cs b/src/Business/Grand.Business.System/Services/Reports/OrderReportService.csindex 159aca7b0..d878823f4 100644--- a/src/Business/Grand.Business.System/Services/Reports/OrderReportService.cs+++ b/src/Business/Grand.Business.System/Services/Reports/OrderReportService.cs@@ -3,7 +3,7 @@ using Grand.Business.Core.Interfaces.System.Reports;using Grand.Business.Core.Utilities.System;using Grand.Domain;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Orders;using Grand.Domain.Payments;using Grand.Domain.Shipping;diff --git a/src/Business/Grand.Business.System/Services/Reports/ProductsReportService.cs b/src/Business/Grand.Business.System/Services/Reports/ProductsReportService.csindex 14d8dde2b..584f9ae7d 100644--- a/src/Business/Grand.Business.System/Services/Reports/ProductsReportService.cs+++ b/src/Business/Grand.Business.System/Services/Reports/ProductsReportService.cs@@ -1,7 +1,7 @@using Grand.Business.Core.Interfaces.System.Reports;using Grand.Business.Core.Utilities.System;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;namespace Grand.Business.System.Services.Reports{diff --git a/src/Business/Grand.Business.System/Startup/StartupApplication.cs b/src/Business/Grand.Business.System/Startup/StartupApplication.csindex 697f2a4f3..28be141dd 100644--- a/src/Business/Grand.Business.System/Startup/StartupApplication.cs+++ b/src/Business/Grand.Business.System/Startup/StartupApplication.cs@@ -9,7 +9,7 @@ using Grand.Business.System.Services.Installation;using Grand.Business.System.Services.MachineNameProvider;using Grand.Business.System.Services.Migrations;using Grand.Business.System.Services.Reports;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure;using Grand.Infrastructure.Configuration;using Grand.Infrastructure.Migrations;diff --git a/src/Core/Grand.Domain/Data/DataSettings.cs b/src/Core/Grand.Data/DataSettings.cssimilarity index 87%rename from src/Core/Grand.Domain/Data/DataSettings.csrename to src/Core/Grand.Data/DataSettings.csindex 8add89e73..96159429d 100644--- a/src/Core/Grand.Domain/Data/DataSettings.cs+++ b/src/Core/Grand.Data/DataSettings.cs@@ -1,9 +1,9 @@-namespace Grand.Domain.Data+namespace Grand.Data{/// <summary>/// Data settings (connection string information)/// </summary>- public partial class DataSettings+ public class DataSettings{/// <summary>diff --git a/src/Core/Grand.Domain/Data/DataSettingsManager.cs b/src/Core/Grand.Data/DataSettingsManager.cssimilarity index 98%rename from src/Core/Grand.Domain/Data/DataSettingsManager.csrename to src/Core/Grand.Data/DataSettingsManager.csindex c8a62938e..67b9e2da0 100644--- a/src/Core/Grand.Domain/Data/DataSettingsManager.cs+++ b/src/Core/Grand.Data/DataSettingsManager.cs@@ -1,7 +1,7 @@using Grand.SharedKernel.Extensions;using System.Text.Json;-namespace Grand.Domain.Data+namespace Grand.Data{/// <summary>/// Manager of data settings (connection string)diff --git a/src/Core/Grand.Domain/Data/DbProvider.cs b/src/Core/Grand.Data/DbProvider.cssimilarity index 79%rename from src/Core/Grand.Domain/Data/DbProvider.csrename to src/Core/Grand.Data/DbProvider.csindex 8e478a455..5d97c41bf 100644--- a/src/Core/Grand.Domain/Data/DbProvider.cs+++ b/src/Core/Grand.Data/DbProvider.cs@@ -1,4 +1,4 @@-namespace Grand.Domain.Data+namespace Grand.Data{public enum DbProvider{diff --git a/src/Core/Grand.Domain/Data/ExpressionFieldDefinition.cs b/src/Core/Grand.Data/ExpressionFieldDefinition.cssimilarity index 93%rename from src/Core/Grand.Domain/Data/ExpressionFieldDefinition.csrename to src/Core/Grand.Data/ExpressionFieldDefinition.csindex 42359746b..185c29af2 100644--- a/src/Core/Grand.Domain/Data/ExpressionFieldDefinition.cs+++ b/src/Core/Grand.Data/ExpressionFieldDefinition.cs@@ -1,6 +1,6 @@using System.Linq.Expressions;-namespace Grand.Domain.Data+namespace Grand.Data{public class ExpressionFieldDefinition<TDocument, TField>{diff --git a/src/Core/Grand.Data/Grand.Data.csproj b/src/Core/Grand.Data/Grand.Data.csprojnew file mode 100644index 000000000..ea55d7d48--- /dev/null+++ b/src/Core/Grand.Data/Grand.Data.csproj@@ -0,0 +1,17 @@+<Project Sdk="Microsoft.NET.Sdk">+ <Import Project="..\..\Build\Grand.Common.props" />+ <ItemGroup>+ <PackageReference Include="LiteDB" Version="5.0.17" />+ <PackageReference Include="MongoDB.Bson" Version="2.23.0" />+ <PackageReference Include="MongoDB.Driver" Version="2.23.0" />+ <PackageReference Include="MongoDB.Driver.Core" Version="2.23.0" />+ <PackageReference Include="MongoDB.Driver.GridFS" Version="2.23.0" />+ <PackageReference Include="DotLiquid" Version="2.2.692" />+ </ItemGroup>++ <ItemGroup>+ <ProjectReference Include="..\Grand.Domain\Grand.Domain.csproj" />+ <ProjectReference Include="..\Grand.SharedKernel\Grand.SharedKernel.csproj" />+ </ItemGroup>++</Project>diff --git a/src/Core/Grand.Domain/Data/IAuditInfoProvider.cs b/src/Core/Grand.Data/IAuditInfoProvider.cssimilarity index 75%rename from src/Core/Grand.Domain/Data/IAuditInfoProvider.csrename to src/Core/Grand.Data/IAuditInfoProvider.csindex 69a5f2bdc..068197f1a 100644--- a/src/Core/Grand.Domain/Data/IAuditInfoProvider.cs+++ b/src/Core/Grand.Data/IAuditInfoProvider.cs@@ -1,4 +1,4 @@-namespace Grand.Domain.Data;+namespace Grand.Data;public interface IAuditInfoProvider{diff --git a/src/Core/Grand.Domain/Data/IDatabaseContext.cs b/src/Core/Grand.Data/IDatabaseContext.cssimilarity index 93%rename from src/Core/Grand.Domain/Data/IDatabaseContext.csrename to src/Core/Grand.Data/IDatabaseContext.csindex b62847284..aaef3bd14 100644--- a/src/Core/Grand.Domain/Data/IDatabaseContext.cs+++ b/src/Core/Grand.Data/IDatabaseContext.cs@@ -1,4 +1,6 @@-namespace Grand.Domain.Data+using Grand.Domain;++namespace Grand.Data{public interface IDatabaseContext{diff --git a/src/Core/Grand.Domain/Data/IRepository.cs b/src/Core/Grand.Data/IRepository.cssimilarity index 98%rename from src/Core/Grand.Domain/Data/IRepository.csrename to src/Core/Grand.Data/IRepository.csindex 41df15477..4552b3ba2 100644--- a/src/Core/Grand.Domain/Data/IRepository.cs+++ b/src/Core/Grand.Data/IRepository.cs@@ -1,6 +1,7 @@-using System.Linq.Expressions;+using Grand.Domain;+using System.Linq.Expressions;-namespace Grand.Domain.Data+namespace Grand.Data{/// <summary>/// Repositorydiff --git a/src/Core/Grand.Domain/Data/IStoreFilesContext.cs b/src/Core/Grand.Data/IStoreFilesContext.cssimilarity index 87%rename from src/Core/Grand.Domain/Data/IStoreFilesContext.csrename to src/Core/Grand.Data/IStoreFilesContext.csindex 136831e28..8fef878e9 100644--- a/src/Core/Grand.Domain/Data/IStoreFilesContext.cs+++ b/src/Core/Grand.Data/IStoreFilesContext.cs@@ -1,4 +1,4 @@-namespace Grand.Domain.Data+namespace Grand.Data{public interface IStoreFilesContext{diff --git a/src/Core/Grand.Domain/Data/LiteDb/LiteDBContext.cs b/src/Core/Grand.Data/LiteDb/LiteDBContext.cssimilarity index 95%rename from src/Core/Grand.Domain/Data/LiteDb/LiteDBContext.csrename to src/Core/Grand.Data/LiteDb/LiteDBContext.csindex 26c2118e8..ca0432752 100644--- a/src/Core/Grand.Domain/Data/LiteDb/LiteDBContext.cs+++ b/src/Core/Grand.Data/LiteDb/LiteDBContext.cs@@ -1,6 +1,7 @@-using LiteDB;+using Grand.Domain;+using LiteDB;-namespace Grand.Domain.Data.LiteDb+namespace Grand.Data.LiteDb{public class LiteDBContext : IDatabaseContext{@@ -31,7 +32,7 @@ namespace Grand.Domain.Data.LiteDbpublic async Task<bool> DatabaseExist(){- return await Task.FromResult(_database.CollectionExists(nameof(Common.GrandNodeVersion)));+ return await Task.FromResult(_database.CollectionExists(nameof(Grand.Domain.Common.GrandNodeVersion)));}public Task CreateTable(string name, string collation)diff --git a/src/Core/Grand.Domain/Data/LiteDb/LiteDBRepository.cs b/src/Core/Grand.Data/LiteDb/LiteDBRepository.cssimilarity index 99%rename from src/Core/Grand.Domain/Data/LiteDb/LiteDBRepository.csrename to src/Core/Grand.Data/LiteDb/LiteDBRepository.csindex ef17cff20..60db24849 100644--- a/src/Core/Grand.Domain/Data/LiteDb/LiteDBRepository.cs+++ b/src/Core/Grand.Data/LiteDb/LiteDBRepository.cs@@ -1,9 +1,10 @@+using Grand.Domain;using Grand.SharedKernel.Attributes;using LiteDB;using System.Linq.Expressions;using System.Reflection;-namespace Grand.Domain.Data.LiteDb+namespace Grand.Data.LiteDb{/// <summary>/// MongoDB repositorydiff --git a/src/Core/Grand.Domain/Data/LiteDb/LiteDBStartupBase.cs b/src/Core/Grand.Data/LiteDb/LiteDBStartupBase.cssimilarity index 91%rename from src/Core/Grand.Domain/Data/LiteDb/LiteDBStartupBase.csrename to src/Core/Grand.Data/LiteDb/LiteDBStartupBase.csindex d65b06dc5..06e93108c 100644--- a/src/Core/Grand.Domain/Data/LiteDb/LiteDBStartupBase.cs+++ b/src/Core/Grand.Data/LiteDb/LiteDBStartupBase.cs@@ -1,7 +1,7 @@using Grand.SharedKernel;using LiteDB;-namespace Grand.Domain.Data.LiteDb+namespace Grand.Data.LiteDb{public class LiteDBStartupBase : IStartupBase{diff --git a/src/Core/Grand.Domain/Data/LiteDb/LiteDBStoreFilesContext.cs b/src/Core/Grand.Data/LiteDb/LiteDBStoreFilesContext.cssimilarity index 94%rename from src/Core/Grand.Domain/Data/LiteDb/LiteDBStoreFilesContext.csrename to src/Core/Grand.Data/LiteDb/LiteDBStoreFilesContext.csindex 105067b17..49bb6d82a 100644--- a/src/Core/Grand.Domain/Data/LiteDb/LiteDBStoreFilesContext.cs+++ b/src/Core/Grand.Data/LiteDb/LiteDBStoreFilesContext.cs@@ -1,6 +1,7 @@-using LiteDB;+using Grand.Domain;+using LiteDB;-namespace Grand.Domain.Data.LiteDb+namespace Grand.Data.LiteDb{public class LiteDBStoreFilesContext : IStoreFilesContext{diff --git a/src/Core/Grand.Domain/Data/Mongo/BsonUtcDateTimeSerializer.cs b/src/Core/Grand.Data/Mongo/BsonUtcDateTimeSerializer.cssimilarity index 95%rename from src/Core/Grand.Domain/Data/Mongo/BsonUtcDateTimeSerializer.csrename to src/Core/Grand.Data/Mongo/BsonUtcDateTimeSerializer.csindex 8d1287ee7..8b08774a4 100644--- a/src/Core/Grand.Domain/Data/Mongo/BsonUtcDateTimeSerializer.cs+++ b/src/Core/Grand.Data/Mongo/BsonUtcDateTimeSerializer.cs@@ -1,7 +1,7 @@using MongoDB.Bson.Serialization;using MongoDB.Bson.Serialization.Serializers;-namespace Grand.Domain.Data.Mongo+namespace Grand.Data.Mongo{public class BsonUtcDateTimeSerializer : DateTimeSerializer{diff --git a/src/Core/Grand.Domain/Data/Mongo/MongoDBContext.cs b/src/Core/Grand.Data/Mongo/MongoDBContext.cssimilarity index 98%rename from src/Core/Grand.Domain/Data/Mongo/MongoDBContext.csrename to src/Core/Grand.Data/Mongo/MongoDBContext.csindex 521875f25..1a51df8b8 100644--- a/src/Core/Grand.Domain/Data/Mongo/MongoDBContext.cs+++ b/src/Core/Grand.Data/Mongo/MongoDBContext.cs@@ -1,7 +1,8 @@-using MongoDB.Bson;+using Grand.Domain;+using MongoDB.Bson;using MongoDB.Driver;-namespace Grand.Domain.Data.Mongo+namespace Grand.Data.Mongo{public class MongoDBContext : IDatabaseContext{diff --git a/src/Core/Grand.Domain/Data/Mongo/MongoDBStartupBase.cs b/src/Core/Grand.Data/Mongo/MongoDBStartupBase.cssimilarity index 91%rename from src/Core/Grand.Domain/Data/Mongo/MongoDBStartupBase.csrename to src/Core/Grand.Data/Mongo/MongoDBStartupBase.csindex 305a040fe..37d2997bc 100644--- a/src/Core/Grand.Domain/Data/Mongo/MongoDBStartupBase.cs+++ b/src/Core/Grand.Data/Mongo/MongoDBStartupBase.cs@@ -4,7 +4,7 @@ using MongoDB.Bson.Serialization.Conventions;using MongoDB.Bson.Serialization.Options;using MongoDB.Bson.Serialization.Serializers;-namespace Grand.Domain.Data.Mongo+namespace Grand.Data.Mongo{public class MongoDBStartupBase : IStartupBase{@@ -26,7 +26,7 @@ namespace Grand.Domain.Data.Mongo};ConventionRegistry.Register("ApplicationConventions", cp, t => true);- BsonClassMap.RegisterClassMap<Media.Download>(cm =>+ BsonClassMap.RegisterClassMap<Grand.Domain.Media.Download>(cm =>{cm.AutoMap();cm.UnmapMember(m => m.DownloadBinary);diff --git a/src/Core/Grand.Domain/Data/Mongo/MongoRepository.cs b/src/Core/Grand.Data/Mongo/MongoRepository.cssimilarity index 99%rename from src/Core/Grand.Domain/Data/Mongo/MongoRepository.csrename to src/Core/Grand.Data/Mongo/MongoRepository.csindex 418b93079..66ef75256 100644--- a/src/Core/Grand.Domain/Data/Mongo/MongoRepository.cs+++ b/src/Core/Grand.Data/Mongo/MongoRepository.cs@@ -1,9 +1,10 @@+using Grand.Domain;using MongoDB.Bson;using MongoDB.Driver;using System.Linq.Expressions;using System.Reflection;-namespace Grand.Domain.Data.Mongo+namespace Grand.Data.Mongo{/// <summary>/// MongoDB repositorydiff --git a/src/Core/Grand.Domain/Data/Mongo/MongoStoreFilesContext.cs b/src/Core/Grand.Data/Mongo/MongoStoreFilesContext.cssimilarity index 97%rename from src/Core/Grand.Domain/Data/Mongo/MongoStoreFilesContext.csrename to src/Core/Grand.Data/Mongo/MongoStoreFilesContext.csindex e462f605d..cdc529252 100644--- a/src/Core/Grand.Domain/Data/Mongo/MongoStoreFilesContext.cs+++ b/src/Core/Grand.Data/Mongo/MongoStoreFilesContext.cs@@ -1,7 +1,7 @@using MongoDB.Bson;using MongoDB.Driver;-namespace Grand.Domain.Data.Mongo+namespace Grand.Data.Mongo{public class MongoStoreFilesContext : IStoreFilesContext{diff --git a/src/Core/Grand.Domain/Data/OrderBuilder.cs b/src/Core/Grand.Data/OrderBuilder.cssimilarity index 97%rename from src/Core/Grand.Domain/Data/OrderBuilder.csrename to src/Core/Grand.Data/OrderBuilder.csindex afb4e4c0b..64344e510 100644--- a/src/Core/Grand.Domain/Data/OrderBuilder.cs+++ b/src/Core/Grand.Data/OrderBuilder.cs@@ -1,6 +1,6 @@using System.Linq.Expressions;-namespace Grand.Domain.Data+namespace Grand.Data{public class OrderBuilder<T>{diff --git a/src/Core/Grand.Domain/Data/UpdateBuilder.cs b/src/Core/Grand.Data/UpdateBuilder.cssimilarity index 97%rename from src/Core/Grand.Domain/Data/UpdateBuilder.csrename to src/Core/Grand.Data/UpdateBuilder.csindex 90820f431..3d8c9902e 100644--- a/src/Core/Grand.Domain/Data/UpdateBuilder.cs+++ b/src/Core/Grand.Data/UpdateBuilder.cs@@ -1,7 +1,7 @@using MongoDB.Driver;using System.Linq.Expressions;-namespace Grand.Domain.Data+namespace Grand.Data{public class UpdateBuilder<T>{diff --git a/src/Core/Grand.Domain/Grand.Domain.csproj b/src/Core/Grand.Domain/Grand.Domain.csprojindex 2fa65c05e..ea9a5e3a0 100644--- a/src/Core/Grand.Domain/Grand.Domain.csproj+++ b/src/Core/Grand.Domain/Grand.Domain.csproj@@ -1,11 +1,7 @@<Project Sdk="Microsoft.NET.Sdk"><Import Project="..\..\Build\Grand.Common.props" /><ItemGroup>- <PackageReference Include="LiteDB" Version="5.0.17" /><PackageReference Include="MongoDB.Bson" Version="2.23.0" />- <PackageReference Include="MongoDB.Driver" Version="2.23.0" />- <PackageReference Include="MongoDB.Driver.Core" Version="2.23.0" />- <PackageReference Include="MongoDB.Driver.GridFS" Version="2.23.0" /><PackageReference Include="DotLiquid" Version="2.2.692" /></ItemGroup>diff --git a/src/Core/Grand.Domain/Data/MigrationDb.cs b/src/Core/Grand.Domain/MigrationDb.cssimilarity index 94%rename from src/Core/Grand.Domain/Data/MigrationDb.csrename to src/Core/Grand.Domain/MigrationDb.csindex 60c659dcf..b35253734 100644--- a/src/Core/Grand.Domain/Data/MigrationDb.cs+++ b/src/Core/Grand.Domain/MigrationDb.cs@@ -1,4 +1,4 @@-namespace Grand.Domain.Data+namespace Grand.Domain{public class MigrationDb : BaseEntity{diff --git a/src/Core/Grand.Domain/ParentEntity.cs b/src/Core/Grand.Domain/ParentEntity.csindex 78e60cfd4..8b0661d96 100644--- a/src/Core/Grand.Domain/ParentEntity.cs+++ b/src/Core/Grand.Domain/ParentEntity.cs@@ -1,4 +1,3 @@-using Grand.Domain.Data;using Grand.SharedKernel.Attributes;namespace Grand.Domaindiff --git a/src/Core/Grand.Domain/Data/UniqueIdentifier.cs b/src/Core/Grand.Domain/UniqueIdentifier.cssimilarity index 84%rename from src/Core/Grand.Domain/Data/UniqueIdentifier.csrename to src/Core/Grand.Domain/UniqueIdentifier.csindex a0f2fe142..f9de46eef 100644--- a/src/Core/Grand.Domain/Data/UniqueIdentifier.cs+++ b/src/Core/Grand.Domain/UniqueIdentifier.cs@@ -1,6 +1,6 @@using MongoDB.Bson;-namespace Grand.Domain.Data+namespace Grand.Domain{public static class UniqueIdentifier{diff --git a/src/Core/Grand.Infrastructure/Grand.Infrastructure.csproj b/src/Core/Grand.Infrastructure/Grand.Infrastructure.csprojindex cedde646e..5d1ec0ea7 100644--- a/src/Core/Grand.Infrastructure/Grand.Infrastructure.csproj+++ b/src/Core/Grand.Infrastructure/Grand.Infrastructure.csproj@@ -21,6 +21,7 @@<PackageReference Include="FluentValidation" Version="11.8.1" /></ItemGroup><ItemGroup>+ <ProjectReference Include="..\Grand.Data\Grand.Data.csproj" /><ProjectReference Include="..\Grand.Domain\Grand.Domain.csproj" /></ItemGroup></Project>\ No newline at end of filediff --git a/src/Core/Grand.Infrastructure/Migrations/IMigration.cs b/src/Core/Grand.Infrastructure/Migrations/IMigration.csindex 1541b2403..2b5673eea 100644--- a/src/Core/Grand.Infrastructure/Migrations/IMigration.cs+++ b/src/Core/Grand.Infrastructure/Migrations/IMigration.cs@@ -1,4 +1,4 @@-using Grand.Domain.Data;+using Grand.Data;namespace Grand.Infrastructure.Migrations{diff --git a/src/Core/Grand.Infrastructure/Startup/AuditInfoProvider.cs b/src/Core/Grand.Infrastructure/Startup/AuditInfoProvider.csindex 37f77a411..1b8c8bb0e 100644--- a/src/Core/Grand.Infrastructure/Startup/AuditInfoProvider.cs+++ b/src/Core/Grand.Infrastructure/Startup/AuditInfoProvider.cs@@ -1,4 +1,4 @@-using Grand.Domain.Data;+using Grand.Data;using Microsoft.AspNetCore.Http;using System.Security.Claims;diff --git a/src/Core/Grand.Infrastructure/Startup/StartupApplication.cs b/src/Core/Grand.Infrastructure/Startup/StartupApplication.csindex 08e74a8dc..676780a62 100644--- a/src/Core/Grand.Infrastructure/Startup/StartupApplication.cs+++ b/src/Core/Grand.Infrastructure/Startup/StartupApplication.cs@@ -1,6 +1,6 @@-using Grand.Domain.Data;-using Grand.Domain.Data.LiteDb;-using Grand.Domain.Data.Mongo;+using Grand.Data;+using Grand.Data.LiteDb;+using Grand.Data.Mongo;using Grand.Infrastructure.Configuration;using LiteDB;using Microsoft.AspNetCore.Builder;diff --git a/src/Core/Grand.Infrastructure/StartupBase.cs b/src/Core/Grand.Infrastructure/StartupBase.csindex 941d6641e..ff4542451 100644--- a/src/Core/Grand.Infrastructure/StartupBase.cs+++ b/src/Core/Grand.Infrastructure/StartupBase.cs@@ -1,5 +1,5 @@using AutoMapper;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Caching.RabbitMq;using Grand.Infrastructure.Configuration;using Grand.Infrastructure.Extensions;diff --git a/src/Plugins/Authentication.Facebook/Authentication.Facebook.csproj b/src/Plugins/Authentication.Facebook/Authentication.Facebook.csprojindex b358b7602..83a6f76ec 100644--- a/src/Plugins/Authentication.Facebook/Authentication.Facebook.csproj+++ b/src/Plugins/Authentication.Facebook/Authentication.Facebook.csproj@@ -31,6 +31,9 @@</Target><ItemGroup>+ <ProjectReference Include="..\..\Core\Grand.Data\Grand.Data.csproj">+ <Private>false</Private>+ </ProjectReference><ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj"><Private>false</Private></ProjectReference>diff --git a/src/Plugins/Authentication.Google/Authentication.Google.csproj b/src/Plugins/Authentication.Google/Authentication.Google.csprojindex c7ca115b6..cbb2ba576 100644--- a/src/Plugins/Authentication.Google/Authentication.Google.csproj+++ b/src/Plugins/Authentication.Google/Authentication.Google.csproj@@ -30,7 +30,10 @@</Target><ItemGroup>- <ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">+ <ProjectReference Include="..\..\Core\Grand.Data\Grand.Data.csproj">+ <Private>false</Private>+ </ProjectReference>+ <ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj"><Private>false</Private></ProjectReference><ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">diff --git a/src/Plugins/DiscountRules.Standard/DiscountRules.Standard.csproj b/src/Plugins/DiscountRules.Standard/DiscountRules.Standard.csprojindex 94222a35f..7988f5ccb 100644--- a/src/Plugins/DiscountRules.Standard/DiscountRules.Standard.csproj+++ b/src/Plugins/DiscountRules.Standard/DiscountRules.Standard.csproj@@ -20,6 +20,9 @@</Target><ItemGroup>+ <ProjectReference Include="..\..\Core\Grand.Data\Grand.Data.csproj">+ <Private>false</Private>+ </ProjectReference><ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj"><Private>false</Private></ProjectReference>diff --git a/src/Plugins/ExchangeRate.McExchange/ExchangeRate.McExchange.csproj b/src/Plugins/ExchangeRate.McExchange/ExchangeRate.McExchange.csprojindex b06afa1d4..1fb251a79 100644--- a/src/Plugins/ExchangeRate.McExchange/ExchangeRate.McExchange.csproj+++ b/src/Plugins/ExchangeRate.McExchange/ExchangeRate.McExchange.csproj@@ -20,6 +20,9 @@<ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj"><Private>false</Private></ProjectReference>+ <ProjectReference Include="..\..\Core\Grand.Data\Grand.Data.csproj">+ <Private>false</Private>+ </ProjectReference><ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj"><Private>false</Private></ProjectReference>diff --git a/src/Plugins/Payments.BrainTree/Payments.BrainTree.csproj b/src/Plugins/Payments.BrainTree/Payments.BrainTree.csprojindex 93ed2b2ee..2249fdadb 100644--- a/src/Plugins/Payments.BrainTree/Payments.BrainTree.csproj+++ b/src/Plugins/Payments.BrainTree/Payments.BrainTree.csproj@@ -33,6 +33,9 @@</Target><ItemGroup>+ <ProjectReference Include="..\..\Core\Grand.Data\Grand.Data.csproj">+ <Private>false</Private>+ </ProjectReference><ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj"><Private>false</Private></ProjectReference>diff --git a/src/Plugins/Payments.CashOnDelivery/Payments.CashOnDelivery.csproj b/src/Plugins/Payments.CashOnDelivery/Payments.CashOnDelivery.csprojindex 4c9ea77c2..a8e7b5553 100644--- a/src/Plugins/Payments.CashOnDelivery/Payments.CashOnDelivery.csproj+++ b/src/Plugins/Payments.CashOnDelivery/Payments.CashOnDelivery.csproj@@ -20,6 +20,9 @@</PropertyGroup><ItemGroup>+ <ProjectReference Include="..\..\Core\Grand.Data\Grand.Data.csproj">+ <Private>false</Private>+ </ProjectReference><ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj"><Private>false</Private></ProjectReference>diff --git a/src/Plugins/Payments.PayPalStandard/Payments.PayPalStandard.csproj b/src/Plugins/Payments.PayPalStandard/Payments.PayPalStandard.csprojindex b1909f906..f0aefc380 100644--- a/src/Plugins/Payments.PayPalStandard/Payments.PayPalStandard.csproj+++ b/src/Plugins/Payments.PayPalStandard/Payments.PayPalStandard.csproj@@ -20,6 +20,9 @@</Target><ItemGroup>+ <ProjectReference Include="..\..\Core\Grand.Data\Grand.Data.csproj">+ <Private>false</Private>+ </ProjectReference><ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj"><Private>false</Private></ProjectReference>diff --git a/src/Plugins/Shipping.ByWeight/Services/ShippingByWeightService.cs b/src/Plugins/Shipping.ByWeight/Services/ShippingByWeightService.csindex 829c7f1ab..ea6328025 100644--- a/src/Plugins/Shipping.ByWeight/Services/ShippingByWeightService.cs+++ b/src/Plugins/Shipping.ByWeight/Services/ShippingByWeightService.cs@@ -1,5 +1,5 @@using Grand.Domain;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Caching;using Shipping.ByWeight.Domain;diff --git a/src/Plugins/Shipping.ByWeight/Shipping.ByWeight.csproj b/src/Plugins/Shipping.ByWeight/Shipping.ByWeight.csprojindex 3ff402ecd..212c15da0 100644--- a/src/Plugins/Shipping.ByWeight/Shipping.ByWeight.csproj+++ b/src/Plugins/Shipping.ByWeight/Shipping.ByWeight.csproj@@ -20,6 +20,9 @@</Target><ItemGroup>+ <ProjectReference Include="..\..\Core\Grand.Data\Grand.Data.csproj">+ <Private>false</Private>+ </ProjectReference><ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj"><Private>false</Private></ProjectReference>diff --git a/src/Plugins/Shipping.FixedRateShipping/Shipping.FixedRateShipping.csproj b/src/Plugins/Shipping.FixedRateShipping/Shipping.FixedRateShipping.csprojindex 2463f437f..1a7c7160c 100644--- a/src/Plugins/Shipping.FixedRateShipping/Shipping.FixedRateShipping.csproj+++ b/src/Plugins/Shipping.FixedRateShipping/Shipping.FixedRateShipping.csproj@@ -20,6 +20,9 @@</Target><ItemGroup>+ <ProjectReference Include="..\..\Core\Grand.Data\Grand.Data.csproj">+ <Private>false</Private>+ </ProjectReference><ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj"><Private>false</Private></ProjectReference>diff --git a/src/Plugins/Shipping.ShippingPoint/Services/ShippingPointService.cs b/src/Plugins/Shipping.ShippingPoint/Services/ShippingPointService.csindex 6d667c1a6..44c69f0a2 100644--- a/src/Plugins/Shipping.ShippingPoint/Services/ShippingPointService.cs+++ b/src/Plugins/Shipping.ShippingPoint/Services/ShippingPointService.cs@@ -1,5 +1,5 @@using Grand.Domain;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Caching;using Shipping.ShippingPoint.Domain;diff --git a/src/Plugins/Shipping.ShippingPoint/Shipping.ShippingPoint.csproj b/src/Plugins/Shipping.ShippingPoint/Shipping.ShippingPoint.csprojindex 6bc6b61eb..609b3fb16 100644--- a/src/Plugins/Shipping.ShippingPoint/Shipping.ShippingPoint.csproj+++ b/src/Plugins/Shipping.ShippingPoint/Shipping.ShippingPoint.csproj@@ -20,6 +20,9 @@</Target><ItemGroup>+ <ProjectReference Include="..\..\Core\Grand.Data\Grand.Data.csproj">+ <Private>false</Private>+ </ProjectReference><ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj"><Private>false</Private></ProjectReference>diff --git a/src/Plugins/Tax.CountryStateZip/Services/TaxRateService.cs b/src/Plugins/Tax.CountryStateZip/Services/TaxRateService.csindex 881d3628c..8311011a5 100644--- a/src/Plugins/Tax.CountryStateZip/Services/TaxRateService.cs+++ b/src/Plugins/Tax.CountryStateZip/Services/TaxRateService.cs@@ -1,5 +1,5 @@using Grand.Domain;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Extensions;using MediatR;diff --git a/src/Plugins/Tax.CountryStateZip/Tax.CountryStateZip.csproj b/src/Plugins/Tax.CountryStateZip/Tax.CountryStateZip.csprojindex dd15b7435..92f1ef79c 100644--- a/src/Plugins/Tax.CountryStateZip/Tax.CountryStateZip.csproj+++ b/src/Plugins/Tax.CountryStateZip/Tax.CountryStateZip.csproj@@ -20,6 +20,9 @@</Target><ItemGroup>+ <ProjectReference Include="..\..\Core\Grand.Data\Grand.Data.csproj">+ <Private>false</Private>+ </ProjectReference><ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj"><Private>false</Private></ProjectReference>diff --git a/src/Plugins/Tax.FixedRate/Tax.FixedRate.csproj b/src/Plugins/Tax.FixedRate/Tax.FixedRate.csprojindex 4e332d157..1f71c2e31 100644--- a/src/Plugins/Tax.FixedRate/Tax.FixedRate.csproj+++ b/src/Plugins/Tax.FixedRate/Tax.FixedRate.csproj@@ -20,6 +20,9 @@</Target><ItemGroup>+ <ProjectReference Include="..\..\Core\Grand.Data\Grand.Data.csproj">+ <Private>false</Private>+ </ProjectReference><ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj"><Private>false</Private></ProjectReference>diff --git a/src/Plugins/Widgets.FacebookPixel/Widgets.FacebookPixel.csproj b/src/Plugins/Widgets.FacebookPixel/Widgets.FacebookPixel.csprojindex 51f480c61..1c172b0e5 100644--- a/src/Plugins/Widgets.FacebookPixel/Widgets.FacebookPixel.csproj+++ b/src/Plugins/Widgets.FacebookPixel/Widgets.FacebookPixel.csproj@@ -20,6 +20,9 @@</Target><ItemGroup>+ <ProjectReference Include="..\..\Core\Grand.Data\Grand.Data.csproj">+ <Private>false</Private>+ </ProjectReference><ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj"><Private>false</Private></ProjectReference>diff --git a/src/Plugins/Widgets.GoogleAnalytics/Widgets.GoogleAnalytics.csproj b/src/Plugins/Widgets.GoogleAnalytics/Widgets.GoogleAnalytics.csprojindex 3410f9a8b..3ff30a827 100644--- a/src/Plugins/Widgets.GoogleAnalytics/Widgets.GoogleAnalytics.csproj+++ b/src/Plugins/Widgets.GoogleAnalytics/Widgets.GoogleAnalytics.csproj@@ -20,6 +20,9 @@</Target><ItemGroup>+ <ProjectReference Include="..\..\Core\Grand.Data\Grand.Data.csproj">+ <Private>false</Private>+ </ProjectReference><ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj"><Private>false</Private></ProjectReference>diff --git a/src/Plugins/Widgets.Slider/Services/SliderService.cs b/src/Plugins/Widgets.Slider/Services/SliderService.csindex 27e139819..da50ddc15 100644--- a/src/Plugins/Widgets.Slider/Services/SliderService.cs+++ b/src/Plugins/Widgets.Slider/Services/SliderService.cs@@ -1,5 +1,5 @@using Grand.Business.Core.Interfaces.Common.Security;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure;using Grand.Infrastructure.Caching;using Widgets.Slider.Domain;diff --git a/src/Plugins/Widgets.Slider/SliderWidgetPlugin.cs b/src/Plugins/Widgets.Slider/SliderWidgetPlugin.csindex d55c4c5d6..9b0e307ea 100644--- a/src/Plugins/Widgets.Slider/SliderWidgetPlugin.cs+++ b/src/Plugins/Widgets.Slider/SliderWidgetPlugin.cs@@ -1,7 +1,7 @@using Grand.Business.Core.Extensions;using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Business.Core.Interfaces.Storage;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Plugins;using Grand.SharedKernel.Extensions;using Widgets.Slider.Domain;diff --git a/src/Plugins/Widgets.Slider/Widgets.Slider.csproj b/src/Plugins/Widgets.Slider/Widgets.Slider.csprojindex 52557337a..e4573aa04 100644--- a/src/Plugins/Widgets.Slider/Widgets.Slider.csproj+++ b/src/Plugins/Widgets.Slider/Widgets.Slider.csproj@@ -20,6 +20,9 @@</Target><ItemGroup>+ <ProjectReference Include="..\..\Core\Grand.Data\Grand.Data.csproj">+ <Private>false</Private>+ </ProjectReference><ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj"><Private>false</Private></ProjectReference>diff --git a/src/Tests/Grand.Business.Authentication.Tests/Events/CustomerDeletedEventHandlerTests.cs b/src/Tests/Grand.Business.Authentication.Tests/Events/CustomerDeletedEventHandlerTests.csindex dca0bbeaa..cf3787e43 100644--- a/src/Tests/Grand.Business.Authentication.Tests/Events/CustomerDeletedEventHandlerTests.cs+++ b/src/Tests/Grand.Business.Authentication.Tests/Events/CustomerDeletedEventHandlerTests.cs@@ -1,7 +1,7 @@using Grand.Business.Authentication.Events;using Grand.Data.Tests.MongoDb;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Microsoft.VisualStudio.TestTools.UnitTesting;namespace Grand.Business.Authentication.Tests.Eventsdiff --git a/src/Tests/Grand.Business.Authentication.Tests/Services/ExternalAuthenticationServiceTests.cs b/src/Tests/Grand.Business.Authentication.Tests/Services/ExternalAuthenticationServiceTests.csindex 9591e8159..8cd155ea3 100644--- a/src/Tests/Grand.Business.Authentication.Tests/Services/ExternalAuthenticationServiceTests.cs+++ b/src/Tests/Grand.Business.Authentication.Tests/Services/ExternalAuthenticationServiceTests.cs@@ -4,7 +4,7 @@ using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Core.Interfaces.Customers;using Grand.Data.Tests.MongoDb;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure;using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/BrandDeletedEventHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/BrandDeletedEventHandlerTests.csindex 5d11aa226..5073ce575 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/BrandDeletedEventHandlerTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/BrandDeletedEventHandlerTests.cs@@ -1,7 +1,7 @@using Grand.Business.Catalog.Events.Handlers;using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using Microsoft.VisualStudio.TestTools.UnitTesting;namespace Grand.Business.Catalog.Tests.Events.Handlersdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/CategoryDeletedEventHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/CategoryDeletedEventHandlerTests.csindex 65b7456e7..5c5182731 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/CategoryDeletedEventHandlerTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/CategoryDeletedEventHandlerTests.cs@@ -1,7 +1,7 @@using Grand.Business.Catalog.Events.Handlers;using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Seo;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Configuration;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/CollectionDeletedEventHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/CollectionDeletedEventHandlerTests.csindex d2633d497..f7bfcfc1e 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/CollectionDeletedEventHandlerTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/CollectionDeletedEventHandlerTests.cs@@ -1,7 +1,7 @@using Grand.Business.Catalog.Events.Handlers;using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Seo;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Configuration;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/DeleteMeasureUnitOnProductEventHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/DeleteMeasureUnitOnProductEventHandlerTests.csindex 46dc98b44..e584b0794 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/DeleteMeasureUnitOnProductEventHandlerTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/DeleteMeasureUnitOnProductEventHandlerTests.cs@@ -1,7 +1,7 @@using Grand.Business.Catalog.Events.Handlers;using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Directory;using Microsoft.VisualStudio.TestTools.UnitTesting;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/DeliveryDateDeletedEventHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/DeliveryDateDeletedEventHandlerTests.csindex 2f73bd768..d40c2baba 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/DeliveryDateDeletedEventHandlerTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/DeliveryDateDeletedEventHandlerTests.cs@@ -1,7 +1,7 @@using Grand.Business.Catalog.Events.Handlers;using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Shipping;using Microsoft.VisualStudio.TestTools.UnitTesting;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/DiscountDeletedEventHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/DiscountDeletedEventHandlerTests.csindex 8c24aefd5..f9398a582 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/DiscountDeletedEventHandlerTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/DiscountDeletedEventHandlerTests.cs@@ -1,7 +1,7 @@using Grand.Business.Catalog.Events.Handlers;using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Discounts;using Grand.Domain.Vendors;using Grand.Infrastructure.Caching;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/ProductDeletedEventHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/ProductDeletedEventHandlerTests.csindex 66edc7fd9..39b34d2f7 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/ProductDeletedEventHandlerTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/ProductDeletedEventHandlerTests.cs@@ -3,7 +3,7 @@ using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Seo;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/TaxCategoryDeletedEventHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/TaxCategoryDeletedEventHandlerTests.csindex 5596f8b5d..a11fccaed 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/TaxCategoryDeletedEventHandlerTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/TaxCategoryDeletedEventHandlerTests.cs@@ -1,7 +1,7 @@using Grand.Business.Catalog.Events.Handlers;using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Tax;using Microsoft.VisualStudio.TestTools.UnitTesting;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/UpdateProductOnCartEventHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/UpdateProductOnCartEventHandlerTests.csindex c9a6eb2a2..bf40e49c9 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/UpdateProductOnCartEventHandlerTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/UpdateProductOnCartEventHandlerTests.cs@@ -2,7 +2,7 @@using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Microsoft.VisualStudio.TestTools.UnitTesting;namespace Grand.Business.Catalog.Tests.Events.Handlersdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/WarehouseDeletedEventHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/WarehouseDeletedEventHandlerTests.csindex 4e62e6f52..b53f474fd 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/WarehouseDeletedEventHandlerTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/WarehouseDeletedEventHandlerTests.cs@@ -1,7 +1,7 @@using Grand.Business.Catalog.Events.Handlers;using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Shipping;using Microsoft.VisualStudio.TestTools.UnitTesting;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Handlers/UpdateProductReviewTotalsCommandHandlerTest.cs b/src/Tests/Grand.Business.Catalog.Tests/Handlers/UpdateProductReviewTotalsCommandHandlerTest.csindex 9e3f2090b..a1b0ab69d 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Handlers/UpdateProductReviewTotalsCommandHandlerTest.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Handlers/UpdateProductReviewTotalsCommandHandlerTest.cs@@ -4,7 +4,7 @@ using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Data.Tests.MongoDb;using Grand.Domain;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Caching;using Grand.SharedKernel.Extensions;using Microsoft.VisualStudio.TestTools.UnitTesting;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetPersonalizedProductsQueryHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetPersonalizedProductsQueryHandlerTests.csindex a5f8a55bb..9ae7d3d2a 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetPersonalizedProductsQueryHandlerTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetPersonalizedProductsQueryHandlerTests.cs@@ -2,7 +2,7 @@using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Domain.Catalog;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Caching;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetPriceByCustomerProductQueryHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetPriceByCustomerProductQueryHandlerTests.csindex d21cfa177..15d0233c4 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetPriceByCustomerProductQueryHandlerTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetPriceByCustomerProductQueryHandlerTests.cs@@ -1,6 +1,6 @@using Grand.Business.Catalog.Queries.Handlers;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Caching;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetProductArchByIdQueryHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetProductArchByIdQueryHandlerTests.csindex bd7a04f91..227e6887c 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetProductArchByIdQueryHandlerTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetProductArchByIdQueryHandlerTests.cs@@ -1,6 +1,6 @@using Grand.Business.Catalog.Queries.Handlers;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetRecommendedProductsQueryHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetRecommendedProductsQueryHandlerTests.csindex 27e0f7123..d5d8cda9c 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetRecommendedProductsQueryHandlerTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetRecommendedProductsQueryHandlerTests.cs@@ -2,7 +2,7 @@using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Domain.Catalog;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Caching;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetSearchProductsQueryHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetSearchProductsQueryHandlerTests.csindex 081b88719..d7d84dc0a 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetSearchProductsQueryHandlerTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetSearchProductsQueryHandlerTests.cs@@ -2,7 +2,7 @@using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Configuration;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetSuggestedProductsQueryHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetSuggestedProductsQueryHandlerTests.csindex 08891d306..d4baef0c7 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetSuggestedProductsQueryHandlerTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetSuggestedProductsQueryHandlerTests.cs@@ -2,7 +2,7 @@using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Domain.Catalog;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Caching;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetVendorByIdQueryHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetVendorByIdQueryHandlerTests.csindex 17cdf30f9..fe5e87d76 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetVendorByIdQueryHandlerTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetVendorByIdQueryHandlerTests.cs@@ -1,6 +1,6 @@using Grand.Business.Catalog.Queries.Handlers;using Grand.Data.Tests.MongoDb;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Vendors;using Microsoft.VisualStudio.TestTools.UnitTesting;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Brands/BrandLayoutServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Brands/BrandLayoutServiceTests.csindex 34f106c9e..b50a2c1fb 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Brands/BrandLayoutServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Brands/BrandLayoutServiceTests.cs@@ -1,7 +1,7 @@using Grand.Business.Catalog.Services.Brands;using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Configuration;using Grand.Infrastructure.Tests.Caching;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Brands/BrandServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Brands/BrandServiceTests.csindex ea04f17f9..1aedd2713 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Brands/BrandServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Brands/BrandServiceTests.cs@@ -2,7 +2,7 @@using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Configuration;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryLayoutServiceDbTest.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryLayoutServiceDbTest.csindex 5f8b587b4..46569d8ea 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryLayoutServiceDbTest.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryLayoutServiceDbTest.cs@@ -1,7 +1,7 @@using Grand.Business.Catalog.Services.Categories;using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Configuration;using Grand.Infrastructure.Tests.Caching;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryLayoutServiceTest.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryLayoutServiceTest.csindex f601a8865..7515409ea 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryLayoutServiceTest.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryLayoutServiceTest.cs@@ -1,6 +1,6 @@using Grand.Business.Catalog.Services.Categories;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Events;using MediatR;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryServiceDbTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryServiceDbTests.csindex c14dcec77..3e6064d37 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryServiceDbTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryServiceDbTests.cs@@ -4,7 +4,7 @@ using Grand.Business.Core.Interfaces.Common.Security;using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Configuration;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryServiceTests.csindex 491d1228c..8a8662c07 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryServiceTests.cs@@ -2,8 +2,8 @@using Grand.Business.Core.Interfaces.Common.Security;using Grand.Domain.Catalog;using Grand.Domain.Customers;-using Grand.Domain.Data;-using Grand.Domain.Data.Mongo;+using Grand.Data;+using Grand.Data.Mongo;using Grand.Infrastructure;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Configuration;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/ProductCategoryServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/ProductCategoryServiceTests.csindex d7bb988a1..37610025d 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/ProductCategoryServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/ProductCategoryServiceTests.cs@@ -2,7 +2,7 @@using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Configuration;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Collections/CollectionLayoutServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Collections/CollectionLayoutServiceTests.csindex ab11096fc..7ea3e201c 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Collections/CollectionLayoutServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Collections/CollectionLayoutServiceTests.cs@@ -1,7 +1,7 @@using Grand.Business.Catalog.Services.Collections;using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Configuration;using Grand.Infrastructure.Tests.Caching;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Collections/CollectionServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Collections/CollectionServiceTests.csindex 2dccd514f..895d49f92 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Collections/CollectionServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Collections/CollectionServiceTests.cs@@ -2,7 +2,7 @@using Grand.Business.Core.Interfaces.Catalog.Collections;using Grand.Business.Core.Interfaces.Common.Security;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Configuration;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Collections/ProductCollectionServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Collections/ProductCollectionServiceTests.csindex 3e47cf22b..af8d8c6ab 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Collections/ProductCollectionServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Collections/ProductCollectionServiceTests.cs@@ -2,7 +2,7 @@using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Configuration;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Directory/MeasureServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Directory/MeasureServiceTests.csindex 1d76a7a29..94723cbe1 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Directory/MeasureServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Directory/MeasureServiceTests.cs@@ -1,5 +1,5 @@using Grand.Business.Catalog.Services.Directory;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Directory;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Events;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Directory/SearchTermServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Directory/SearchTermServiceTests.csindex e4b7049a8..a3cdc08e6 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Directory/SearchTermServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Directory/SearchTermServiceTests.cs@@ -1,6 +1,6 @@using Grand.Business.Catalog.Services.Directory;using Grand.Domain.Common;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Events;using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Discounts/DiscountServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Discounts/DiscountServiceTests.csindex f251f2a1f..cff7e5b67 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Discounts/DiscountServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Discounts/DiscountServiceTests.cs@@ -5,7 +5,7 @@ using Grand.Business.Core.Utilities.Catalog;using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Discounts;using Grand.Infrastructure;using Grand.Infrastructure.Caching;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/BrandImportDataObjectTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/BrandImportDataObjectTests.csindex 31aa0c14e..38dde4bbd 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/BrandImportDataObjectTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/BrandImportDataObjectTests.cs@@ -9,7 +9,7 @@ using Grand.Business.Core.Interfaces.Storage;using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Localization;using Grand.Infrastructure;using Grand.Infrastructure.Caching;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/CategoryImportDataObjectTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/CategoryImportDataObjectTests.csindex 70baee75e..f1c8e15fd 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/CategoryImportDataObjectTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/CategoryImportDataObjectTests.cs@@ -10,7 +10,7 @@ using Grand.Business.Core.Interfaces.Storage;using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Localization;using Grand.Infrastructure;using Grand.Infrastructure.Caching;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/CollectionImportDataObjectTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/CollectionImportDataObjectTests.csindex bdd9183fc..07b8d25f5 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/CollectionImportDataObjectTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/CollectionImportDataObjectTests.cs@@ -10,7 +10,7 @@ using Grand.Business.Core.Interfaces.Storage;using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Localization;using Grand.Infrastructure;using Grand.Infrastructure.Caching;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/ProductImportDataObjectTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/ProductImportDataObjectTests.csindex 48a73c7db..b8b4e5d73 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/ProductImportDataObjectTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/ProductImportDataObjectTests.cs@@ -16,7 +16,7 @@ using Grand.Business.Core.Interfaces.Storage;using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Localization;using Grand.Infrastructure;using Grand.Infrastructure.Caching;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Prices/PriceFormatterTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Prices/PriceFormatterTests.csindex 04d64e19a..728cb8c6c 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Prices/PriceFormatterTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Prices/PriceFormatterTests.cs@@ -4,8 +4,8 @@ using Grand.Business.Core.Interfaces.Catalog.Prices;using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Business.Core.Interfaces.Common.Security;-using Grand.Domain.Data;-using Grand.Domain.Data.Mongo;+using Grand.Data;+using Grand.Data.Mongo;using Grand.Domain.Directory;using Grand.Domain.Localization;using Grand.Domain.Tax;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Prices/PriceServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Prices/PriceServiceTests.csindex 863477533..c9d7edf58 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Prices/PriceServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Prices/PriceServiceTests.cs@@ -12,8 +12,8 @@ using Grand.Business.Core.Utilities.Catalog;using Grand.Domain.Catalog;using Grand.Domain.Common;using Grand.Domain.Customers;-using Grand.Domain.Data;-using Grand.Domain.Data.Mongo;+using Grand.Data;+using Grand.Data.Mongo;using Grand.Domain.Directory;using Grand.Domain.Discounts;using Grand.Domain.Orders;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/AuctionServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/AuctionServiceTests.csindex 7649ead07..fa3ee2e08 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/AuctionServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/AuctionServiceTests.cs@@ -2,7 +2,7 @@using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Configuration;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/CustomerGroupProductServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/CustomerGroupProductServiceTests.csindex ed4e9c44e..5401b415f 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/CustomerGroupProductServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/CustomerGroupProductServiceTests.cs@@ -1,6 +1,6 @@using Grand.Business.Catalog.Services.Products;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Events;using MediatR;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/InventoryManageServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/InventoryManageServiceTests.csindex 2f36f9375..df6aeb468 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/InventoryManageServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/InventoryManageServiceTests.cs@@ -3,7 +3,7 @@ using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Shipping;using Grand.Infrastructure;using Grand.Infrastructure.Caching;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/OutOfStockSubscriptionServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/OutOfStockSubscriptionServiceTests.csindex 5b9ff8a97..477ff7426 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/OutOfStockSubscriptionServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/OutOfStockSubscriptionServiceTests.cs@@ -3,7 +3,7 @@ using Grand.Business.Core.Commands.Catalog;using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Common;-using Grand.Domain.Data;+using Grand.Data;using Grand.SharedKernel.Extensions;using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductAttributeServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductAttributeServiceTests.csindex e3bc85654..d587869eb 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductAttributeServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductAttributeServiceTests.cs@@ -1,7 +1,7 @@using Grand.Business.Catalog.Services.Products;using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Configuration;using Grand.Infrastructure.Tests.Caching;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductCourseServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductCourseServiceTests.csindex 19d21c6b6..78e9e8005 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductCourseServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductCourseServiceTests.cs@@ -2,7 +2,7 @@using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Courses;-using Grand.Domain.Data;+using Grand.Data;using Microsoft.VisualStudio.TestTools.UnitTesting;namespace Grand.Business.Catalog.Tests.Services.Productsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductLayoutServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductLayoutServiceTests.csindex 92880552c..e0f7a3718 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductLayoutServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductLayoutServiceTests.cs@@ -1,7 +1,7 @@using Grand.Business.Catalog.Services.Products;using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Configuration;using Grand.Infrastructure.Tests.Caching;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductReservationServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductReservationServiceTests.csindex 6fcb97d7d..9c590312f 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductReservationServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductReservationServiceTests.cs@@ -1,7 +1,7 @@using Grand.Business.Catalog.Services.Products;using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductReviewServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductReviewServiceTests.csindex a066bea13..fe0acf01b 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductReviewServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductReviewServiceTests.cs@@ -1,7 +1,7 @@using Grand.Business.Catalog.Services.Products;using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductServiceTests.csindex 97371beb3..2c441d8cd 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductServiceTests.cs@@ -5,7 +5,7 @@ using Grand.Business.Core.Queries.Catalog;using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Orders;using Grand.Infrastructure;using Grand.Infrastructure.Caching;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductTagServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductTagServiceTests.csindex 6c8294b8b..da06d9d42 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductTagServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductTagServiceTests.cs@@ -1,7 +1,7 @@using Grand.Business.Catalog.Services.Products;using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Configuration;using Grand.Infrastructure.Tests.Caching;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/RecentlyViewedProductsServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/RecentlyViewedProductsServiceTests.csindex 70f5375ab..5f89dbdf5 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/RecentlyViewedProductsServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/RecentlyViewedProductsServiceTests.cs@@ -2,7 +2,7 @@using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Configuration;using Grand.Infrastructure.Tests.Caching;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/SpecificationAttributeServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/SpecificationAttributeServiceTests.csindex f63229ecf..bfb1236b9 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/SpecificationAttributeServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/SpecificationAttributeServiceTests.cs@@ -2,7 +2,7 @@using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Configuration;using Grand.Infrastructure.Tests.Caching;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Tax/TaxCategoryServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Tax/TaxCategoryServiceTests.csindex 5e893404a..d980eac6c 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Tax/TaxCategoryServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Tax/TaxCategoryServiceTests.cs@@ -1,6 +1,6 @@using Grand.Business.Catalog.Services.Tax;using Grand.Data.Tests.MongoDb;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Tax;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Configuration;diff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/MaxOrderNumberCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/MaxOrderNumberCommandHandlerTests.csindex 592138f80..24e7d2038 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/MaxOrderNumberCommandHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/MaxOrderNumberCommandHandlerTests.cs@@ -1,6 +1,6 @@using Grand.Business.Checkout.Commands.Handlers.Orders;using Grand.Data.Tests.MongoDb;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Orders;using Microsoft.VisualStudio.TestTools.UnitTesting;diff --git a/src/Tests/Grand.Business.Checkout.Tests/Events/Orders/OrderDeletedEventHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Events/Orders/OrderDeletedEventHandlerTests.csindex a88479910..f1a9f8b40 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Events/Orders/OrderDeletedEventHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Events/Orders/OrderDeletedEventHandlerTests.cs@@ -1,7 +1,7 @@using Grand.Business.Checkout.Events.Orders;using Grand.Business.Core.Events.Checkout.Orders;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;diff --git a/src/Tests/Grand.Business.Checkout.Tests/Events/Orders/OrderPlacedEventHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Events/Orders/OrderPlacedEventHandlerTests.csindex bada30f1c..db5f7a044 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Events/Orders/OrderPlacedEventHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Events/Orders/OrderPlacedEventHandlerTests.cs@@ -3,7 +3,7 @@ using Grand.Business.Core.Events.Checkout.Orders;using Grand.Business.Core.Interfaces.Checkout.Orders;using Grand.Business.Core.Interfaces.Customers;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Orders;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeParserTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeParserTests.csindex af06e7b6b..d45ddf064 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeParserTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeParserTests.cs@@ -2,8 +2,8 @@using Grand.Business.Checkout.Services.CheckoutAttributes;using Grand.Domain.Catalog;using Grand.Domain.Common;-using Grand.Domain.Data;-using Grand.Domain.Data.Mongo;+using Grand.Data;+using Grand.Data.Mongo;using Grand.Domain.Localization;using Grand.Domain.Orders;using Grand.Infrastructure;diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeServiceTests.csindex d29ab6da8..3b7af3ed3 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeServiceTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeServiceTests.cs@@ -1,6 +1,6 @@using Grand.Business.Core.Interfaces.Checkout.CheckoutAttributes;using Grand.Business.Checkout.Services.CheckoutAttributes;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Orders;using Grand.Infrastructure;using Grand.Infrastructure.Caching;diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/GiftVouchers/GiftVoucherServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/GiftVouchers/GiftVoucherServiceTests.csindex 0cc4af904..7d4adf6fc 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Services/GiftVouchers/GiftVoucherServiceTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/GiftVouchers/GiftVoucherServiceTests.cs@@ -1,6 +1,6 @@using Grand.Business.Core.Interfaces.Checkout.GiftVouchers;using Grand.Business.Checkout.Services.GiftVouchers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Orders;using Grand.Infrastructure.Events;using MediatR;diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/LoyaltyPointsServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/LoyaltyPointsServiceTests.csindex e1f2bcc14..3aa66cd1d 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/LoyaltyPointsServiceTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/LoyaltyPointsServiceTests.cs@@ -1,6 +1,6 @@using Grand.Business.Checkout.Services.Orders;using Grand.Data.Tests.MongoDb;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Orders;using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/MerchandiseReturnServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/MerchandiseReturnServiceTests.csindex 923be536e..3dde512aa 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/MerchandiseReturnServiceTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/MerchandiseReturnServiceTests.cs@@ -1,7 +1,7 @@using Grand.Business.Checkout.Services.Orders;using Grand.Business.Core.Queries.Checkout.Orders;using Grand.Data.Tests.MongoDb;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Orders;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Configuration;diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderServiceTests.csindex 3416e998a..38a6e42a1 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderServiceTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderServiceTests.cs@@ -1,5 +1,5 @@using Grand.Business.Checkout.Services.Orders;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Orders;using Grand.Infrastructure.Events;using MediatR;diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderStatusServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderStatusServiceTests.csindex 11bdf6f0b..df6eda8cf 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderStatusServiceTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderStatusServiceTests.cs@@ -1,5 +1,5 @@using Grand.Business.Checkout.Services.Orders;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Orders;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Events;diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderTagServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderTagServiceTests.csindex cf69c7e65..8b1f30b07 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderTagServiceTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderTagServiceTests.cs@@ -1,6 +1,6 @@using Grand.Business.Checkout.Services.Orders;using Grand.Data.Tests.MongoDb;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Orders;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Configuration;diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Payments/PaymentTransactionServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Payments/PaymentTransactionServiceTests.csindex 14bf188ce..7bd24d5f1 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Payments/PaymentTransactionServiceTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Payments/PaymentTransactionServiceTests.cs@@ -1,5 +1,5 @@using Grand.Business.Checkout.Services.Payments;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Payments;using Grand.Infrastructure.Events;using MediatR;diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/DeliveryDateServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/DeliveryDateServiceTests.csindex ece9ba608..778598226 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/DeliveryDateServiceTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/DeliveryDateServiceTests.cs@@ -1,6 +1,6 @@using Grand.Business.Core.Interfaces.Checkout.Shipping;using Grand.Business.Checkout.Services.Shipping;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Shipping;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Events;diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/PickupPointServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/PickupPointServiceTests.csindex d2660eb56..eac35ae6e 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/PickupPointServiceTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/PickupPointServiceTests.cs@@ -1,6 +1,6 @@using Grand.Business.Core.Interfaces.Checkout.Shipping;using Grand.Business.Checkout.Services.Shipping;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Shipping;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Events;diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShipmentServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShipmentServiceTests.csindex 45a10bea6..99e76e323 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShipmentServiceTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShipmentServiceTests.cs@@ -1,6 +1,6 @@using Grand.Business.Checkout.Services.Shipping;using Grand.Business.Core.Interfaces.Checkout.Shipping;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Shipping;using Grand.Infrastructure.Events;using MediatR;diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShippingMethodServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShippingMethodServiceTests.csindex 6ed62e6b7..ce5b6eb49 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShippingMethodServiceTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShippingMethodServiceTests.cs@@ -1,6 +1,6 @@using Grand.Business.Core.Interfaces.Checkout.Shipping;using Grand.Business.Checkout.Services.Shipping;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Shipping;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Events;diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/WarehouseServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/WarehouseServiceTests.csindex 13069caec..d25393b98 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/WarehouseServiceTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/WarehouseServiceTests.cs@@ -1,6 +1,6 @@using Grand.Business.Core.Interfaces.Checkout.Shipping;using Grand.Business.Checkout.Services.Shipping;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Shipping;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Events;diff --git a/src/Tests/Grand.Business.Cms.Tests/Services/BlogServiceTests.cs b/src/Tests/Grand.Business.Cms.Tests/Services/BlogServiceTests.csindex 3cc628058..add76b22c 100644--- a/src/Tests/Grand.Business.Cms.Tests/Services/BlogServiceTests.cs+++ b/src/Tests/Grand.Business.Cms.Tests/Services/BlogServiceTests.cs@@ -1,7 +1,7 @@using Grand.Business.Cms.Services;using Grand.Domain.Blogs;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Configuration;using Grand.Infrastructure.Events;using MediatR;diff --git a/src/Tests/Grand.Business.Cms.Tests/Services/KnowledgebaseServiceTests.cs b/src/Tests/Grand.Business.Cms.Tests/Services/KnowledgebaseServiceTests.csindex 7df40188b..fbc52d0da 100644--- a/src/Tests/Grand.Business.Cms.Tests/Services/KnowledgebaseServiceTests.cs+++ b/src/Tests/Grand.Business.Cms.Tests/Services/KnowledgebaseServiceTests.cs@@ -1,7 +1,7 @@using Grand.Business.Cms.Services;using Grand.Data.Tests.MongoDb;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Knowledgebase;using Grand.Infrastructure;using Grand.Infrastructure.Caching;diff --git a/src/Tests/Grand.Business.Cms.Tests/Services/NewsServiceTests.cs b/src/Tests/Grand.Business.Cms.Tests/Services/NewsServiceTests.csindex 692f275a0..6fbae83c3 100644--- a/src/Tests/Grand.Business.Cms.Tests/Services/NewsServiceTests.cs+++ b/src/Tests/Grand.Business.Cms.Tests/Services/NewsServiceTests.cs@@ -1,7 +1,7 @@using Grand.Business.Cms.Services;using Grand.Data.Tests.MongoDb;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.News;using Grand.Infrastructure;using Grand.Infrastructure.Configuration;diff --git a/src/Tests/Grand.Business.Cms.Tests/Services/PageLayoutServiceTests.cs b/src/Tests/Grand.Business.Cms.Tests/Services/PageLayoutServiceTests.csindex 90fff406b..e4755c642 100644--- a/src/Tests/Grand.Business.Cms.Tests/Services/PageLayoutServiceTests.cs+++ b/src/Tests/Grand.Business.Cms.Tests/Services/PageLayoutServiceTests.cs@@ -1,7 +1,7 @@using Grand.Business.Cms.Services;using Grand.Data.Tests.MongoDb;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Pages;using Grand.Infrastructure;using Grand.Infrastructure.Caching;diff --git a/src/Tests/Grand.Business.Cms.Tests/Services/PageServiceTests.cs b/src/Tests/Grand.Business.Cms.Tests/Services/PageServiceTests.csindex eca4302a1..2638c7199 100644--- a/src/Tests/Grand.Business.Cms.Tests/Services/PageServiceTests.cs+++ b/src/Tests/Grand.Business.Cms.Tests/Services/PageServiceTests.cs@@ -3,7 +3,7 @@ using Grand.Business.Common.Services.Security;using Grand.Business.Core.Interfaces.Common.Security;using Grand.Data.Tests.MongoDb;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Pages;using Grand.Infrastructure;using Grand.Infrastructure.Caching;diff --git a/src/Tests/Grand.Business.Cms.Tests/Services/RobotsTxtServiceTests.cs b/src/Tests/Grand.Business.Cms.Tests/Services/RobotsTxtServiceTests.csindex 29362bbe6..1a5e22593 100644--- a/src/Tests/Grand.Business.Cms.Tests/Services/RobotsTxtServiceTests.cs+++ b/src/Tests/Grand.Business.Cms.Tests/Services/RobotsTxtServiceTests.cs@@ -2,7 +2,7 @@using Grand.Data.Tests.MongoDb;using Grand.Domain.Common;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Configuration;diff --git a/src/Tests/Grand.Business.Common.Tests/Events/GroupDeletedEventHandlerTests.cs b/src/Tests/Grand.Business.Common.Tests/Events/GroupDeletedEventHandlerTests.csindex 6dd73ce83..280eae2d6 100644--- a/src/Tests/Grand.Business.Common.Tests/Events/GroupDeletedEventHandlerTests.cs+++ b/src/Tests/Grand.Business.Common.Tests/Events/GroupDeletedEventHandlerTests.cs@@ -2,7 +2,7 @@using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Configuration;using Grand.Infrastructure.Tests.Caching;diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Addresses/AddressAttributeServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Addresses/AddressAttributeServiceTests.csindex efc34ebcb..01c488034 100644--- a/src/Tests/Grand.Business.Common.Tests/Services/Addresses/AddressAttributeServiceTests.cs+++ b/src/Tests/Grand.Business.Common.Tests/Services/Addresses/AddressAttributeServiceTests.cs@@ -1,7 +1,7 @@using Grand.Business.Common.Services.Addresses;using Grand.Domain.Common;-using Grand.Domain.Data;-using Grand.Domain.Data.Mongo;+using Grand.Data;+using Grand.Data.Mongo;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Events;using Grand.SharedKernel.Extensions;diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Configuration/SettingServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Configuration/SettingServiceTests.csindex 0d03db096..9217dd473 100644--- a/src/Tests/Grand.Business.Common.Tests/Services/Configuration/SettingServiceTests.cs+++ b/src/Tests/Grand.Business.Common.Tests/Services/Configuration/SettingServiceTests.cs@@ -1,6 +1,6 @@using Grand.Business.Common.Services.Configuration;using Grand.Domain.Configuration;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Caching;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Directory/CountryServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Directory/CountryServiceTests.csindex 723db9706..d516192f4 100644--- a/src/Tests/Grand.Business.Common.Tests/Services/Directory/CountryServiceTests.cs+++ b/src/Tests/Grand.Business.Common.Tests/Services/Directory/CountryServiceTests.cs@@ -1,6 +1,6 @@using Grand.Business.Common.Services.Directory;using Grand.Data.Tests.MongoDb;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Directory;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Configuration;diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Directory/CurrencyServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Directory/CurrencyServiceTests.csindex eb1314228..28992ff55 100644--- a/src/Tests/Grand.Business.Common.Tests/Services/Directory/CurrencyServiceTests.cs+++ b/src/Tests/Grand.Business.Common.Tests/Services/Directory/CurrencyServiceTests.cs@@ -1,8 +1,8 @@using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Core.Interfaces.Common.Security;using Grand.Business.Common.Services.Directory;-using Grand.Domain.Data;-using Grand.Domain.Data.Mongo;+using Grand.Data;+using Grand.Data.Mongo;using Grand.Domain.Directory;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Events;diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Directory/GroupServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Directory/GroupServiceTests.csindex 28ccd0d4a..eabb0fcd6 100644--- a/src/Tests/Grand.Business.Common.Tests/Services/Directory/GroupServiceTests.cs+++ b/src/Tests/Grand.Business.Common.Tests/Services/Directory/GroupServiceTests.cs@@ -1,7 +1,7 @@using Grand.Business.Common.Services.Directory;using Grand.Data.Tests.MongoDb;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Configuration;using Grand.Infrastructure.Tests.Caching;diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Directory/HistoryServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Directory/HistoryServiceTests.csindex 619a882de..dccbd042b 100644--- a/src/Tests/Grand.Business.Common.Tests/Services/Directory/HistoryServiceTests.cs+++ b/src/Tests/Grand.Business.Common.Tests/Services/Directory/HistoryServiceTests.cs@@ -1,7 +1,7 @@using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Common.Services.Directory;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.History;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Directory/UserFieldServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Directory/UserFieldServiceTests.csindex ea26baf99..8e5336a84 100644--- a/src/Tests/Grand.Business.Common.Tests/Services/Directory/UserFieldServiceTests.cs+++ b/src/Tests/Grand.Business.Common.Tests/Services/Directory/UserFieldServiceTests.cs@@ -2,7 +2,7 @@using Grand.Data.Tests.MongoDb;using Grand.Domain.Common;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Microsoft.VisualStudio.TestTools.UnitTesting;using MongoDB.Bson.Serialization.Conventions;diff --git a/src/Tests/Grand.Business.Common.Tests/Services/ExportImport/CountryImportDataObjectTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/ExportImport/CountryImportDataObjectTests.csindex b8aebecb2..b7d858f16 100644--- a/src/Tests/Grand.Business.Common.Tests/Services/ExportImport/CountryImportDataObjectTests.cs+++ b/src/Tests/Grand.Business.Common.Tests/Services/ExportImport/CountryImportDataObjectTests.cs@@ -3,7 +3,7 @@ using Grand.Business.Common.Services.ExportImport;using Grand.Business.Core.Dto;using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Data.Tests.MongoDb;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Directory;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Configuration;diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Localization/LanguageServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Localization/LanguageServiceTests.csindex a1835c375..867c441ee 100644--- a/src/Tests/Grand.Business.Common.Tests/Services/Localization/LanguageServiceTests.cs+++ b/src/Tests/Grand.Business.Common.Tests/Services/Localization/LanguageServiceTests.cs@@ -1,6 +1,6 @@using Grand.Business.Common.Services.Localization;using Grand.Data.Tests.MongoDb;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Localization;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Configuration;diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Localization/TranslationServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Localization/TranslationServiceTests.csindex dd0fc62a9..5ed519f97 100644--- a/src/Tests/Grand.Business.Common.Tests/Services/Localization/TranslationServiceTests.cs+++ b/src/Tests/Grand.Business.Common.Tests/Services/Localization/TranslationServiceTests.cs@@ -1,7 +1,7 @@using Grand.Business.Common.Services.Localization;using Grand.Data.Tests.MongoDb;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Localization;using Grand.Infrastructure;using Grand.Infrastructure.Caching;diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Security/PermissionServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Security/PermissionServiceTests.csindex b972faad4..18d2444f8 100644--- a/src/Tests/Grand.Business.Common.Tests/Services/Security/PermissionServiceTests.cs+++ b/src/Tests/Grand.Business.Common.Tests/Services/Security/PermissionServiceTests.cs@@ -1,7 +1,7 @@using Grand.Business.Common.Services.Security;using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Permissions;using Grand.Infrastructure;using Grand.Infrastructure.Caching;diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Seo/SlugServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Seo/SlugServiceTests.csindex da4ff200b..84d9f1585 100644--- a/src/Tests/Grand.Business.Common.Tests/Services/Seo/SlugServiceTests.cs+++ b/src/Tests/Grand.Business.Common.Tests/Services/Seo/SlugServiceTests.cs@@ -1,7 +1,7 @@using Grand.Business.Common.Services.Seo;using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Seo;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Configuration;diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Stores/StoreServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Stores/StoreServiceTests.csindex 8a5d05813..7135fd14f 100644--- a/src/Tests/Grand.Business.Common.Tests/Services/Stores/StoreServiceTests.cs+++ b/src/Tests/Grand.Business.Common.Tests/Services/Stores/StoreServiceTests.cs@@ -1,5 +1,5 @@using Grand.Business.Common.Services.Stores;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Stores;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Events;diff --git a/src/Tests/Grand.Business.Customers.Tests/Services/AffiliateServiceTests.cs b/src/Tests/Grand.Business.Customers.Tests/Services/AffiliateServiceTests.csindex f40df7798..dcab6ef9c 100644--- a/src/Tests/Grand.Business.Customers.Tests/Services/AffiliateServiceTests.cs+++ b/src/Tests/Grand.Business.Customers.Tests/Services/AffiliateServiceTests.cs@@ -1,7 +1,7 @@using Grand.Business.Core.Interfaces.Customers;using Grand.Business.Customers.Services;using Grand.Domain.Affiliates;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Orders;using Grand.Infrastructure.Events;using MediatR;diff --git a/src/Tests/Grand.Business.Customers.Tests/Services/CustomerAttributeServiceTests.cs b/src/Tests/Grand.Business.Customers.Tests/Services/CustomerAttributeServiceTests.csindex dff65e452..c2b5c3481 100644--- a/src/Tests/Grand.Business.Customers.Tests/Services/CustomerAttributeServiceTests.cs+++ b/src/Tests/Grand.Business.Customers.Tests/Services/CustomerAttributeServiceTests.cs@@ -1,6 +1,6 @@using Grand.Business.Customers.Services;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Events;using MediatR;diff --git a/src/Tests/Grand.Business.Customers.Tests/Services/CustomerHistoryPasswordServiceTests.cs b/src/Tests/Grand.Business.Customers.Tests/Services/CustomerHistoryPasswordServiceTests.csindex 0c759e275..22b1081c3 100644--- a/src/Tests/Grand.Business.Customers.Tests/Services/CustomerHistoryPasswordServiceTests.cs+++ b/src/Tests/Grand.Business.Customers.Tests/Services/CustomerHistoryPasswordServiceTests.cs@@ -1,7 +1,7 @@using Grand.Business.Customers.Services;using Grand.Data.Tests.MongoDb;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;diff --git a/src/Tests/Grand.Business.Customers.Tests/Services/CustomerNoteServiceTests.cs b/src/Tests/Grand.Business.Customers.Tests/Services/CustomerNoteServiceTests.csindex bb66f471c..010381053 100644--- a/src/Tests/Grand.Business.Customers.Tests/Services/CustomerNoteServiceTests.cs+++ b/src/Tests/Grand.Business.Customers.Tests/Services/CustomerNoteServiceTests.cs@@ -1,6 +1,6 @@using Grand.Business.Customers.Services;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Events;using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;diff --git a/src/Tests/Grand.Business.Customers.Tests/Services/CustomerServiceTests.cs b/src/Tests/Grand.Business.Customers.Tests/Services/CustomerServiceTests.csindex 1e299e85d..363238094 100644--- a/src/Tests/Grand.Business.Customers.Tests/Services/CustomerServiceTests.cs+++ b/src/Tests/Grand.Business.Customers.Tests/Services/CustomerServiceTests.cs@@ -5,7 +5,7 @@ using Grand.Business.Customers.Services;using Grand.Data.Tests.MongoDb;using Grand.Domain.Common;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Orders;using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;diff --git a/src/Tests/Grand.Business.Customers.Tests/Services/SalesEmployeeServiceTests.cs b/src/Tests/Grand.Business.Customers.Tests/Services/SalesEmployeeServiceTests.csindex 3e3acfc3f..c44385d68 100644--- a/src/Tests/Grand.Business.Customers.Tests/Services/SalesEmployeeServiceTests.cs+++ b/src/Tests/Grand.Business.Customers.Tests/Services/SalesEmployeeServiceTests.cs@@ -1,7 +1,7 @@using Grand.Business.Customers.Services;using Grand.Data.Tests.MongoDb;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Configuration;using Grand.Infrastructure.Tests.Caching;diff --git a/src/Tests/Grand.Business.Customers.Tests/Services/UserApiServiceTests.cs b/src/Tests/Grand.Business.Customers.Tests/Services/UserApiServiceTests.csindex 9d7934894..4418618ad 100644--- a/src/Tests/Grand.Business.Customers.Tests/Services/UserApiServiceTests.cs+++ b/src/Tests/Grand.Business.Customers.Tests/Services/UserApiServiceTests.cs@@ -1,6 +1,6 @@using Grand.Business.Customers.Services;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Events;using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;diff --git a/src/Tests/Grand.Business.Customers.Tests/Services/VendorServiceTests.cs b/src/Tests/Grand.Business.Customers.Tests/Services/VendorServiceTests.csindex b798b4266..b881cfab3 100644--- a/src/Tests/Grand.Business.Customers.Tests/Services/VendorServiceTests.cs+++ b/src/Tests/Grand.Business.Customers.Tests/Services/VendorServiceTests.cs@@ -1,5 +1,5 @@using Grand.Business.Customers.Services;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Vendors;using Grand.Infrastructure.Events;using MediatR;diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Campaigns/CampaignServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Campaigns/CampaignServiceTests.csindex 6d5ce413f..ba43fcfed 100644--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Campaigns/CampaignServiceTests.cs+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Campaigns/CampaignServiceTests.cs@@ -4,7 +4,7 @@ using Grand.Business.Core.Interfaces.Messages;using Grand.Business.Marketing.Services.Campaigns;using Grand.Data.Tests.MongoDb;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Localization;using Grand.Domain.Messages;using Grand.Infrastructure;diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Contacts/ContactAttributeServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Contacts/ContactAttributeServiceTests.csindex 31a350e33..a51c61b7c 100644--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Contacts/ContactAttributeServiceTests.cs+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Contacts/ContactAttributeServiceTests.cs@@ -1,7 +1,7 @@using Grand.Business.Marketing.Services.Contacts;using Grand.Data.Tests.MongoDb;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Messages;using Grand.Infrastructure;using Grand.Infrastructure.Caching;diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Contacts/ContactUsServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Contacts/ContactUsServiceTests.csindex 82a39ddbb..351b13e4e 100644--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Contacts/ContactUsServiceTests.cs+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Contacts/ContactUsServiceTests.cs@@ -1,6 +1,6 @@using Grand.Business.Marketing.Services.Contacts;using Grand.Data.Tests.MongoDb;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Messages;using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseActionServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseActionServiceTests.csindex 009100afc..4083ee0ee 100644--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseActionServiceTests.cs+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseActionServiceTests.cs@@ -1,6 +1,6 @@using Grand.Business.Marketing.Services.Courses;using Grand.Domain.Courses;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Events;using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseLessonServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseLessonServiceTests.csindex 1d553782d..24a06a7ca 100644--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseLessonServiceTests.cs+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseLessonServiceTests.cs@@ -1,7 +1,7 @@using Grand.Business.Marketing.Services.Courses;using Grand.Data.Tests.MongoDb;using Grand.Domain.Courses;-using Grand.Domain.Data;+using Grand.Data;using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseLevelServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseLevelServiceTests.csindex 3db344d06..c00bc0346 100644--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseLevelServiceTests.cs+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseLevelServiceTests.cs@@ -1,7 +1,7 @@using Grand.Business.Marketing.Services.Courses;using Grand.Data.Tests.MongoDb;using Grand.Domain.Courses;-using Grand.Domain.Data;+using Grand.Data;using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseSubjectServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseSubjectServiceTests.csindex 663814aa8..d19292cc1 100644--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseSubjectServiceTests.cs+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseSubjectServiceTests.cs@@ -1,7 +1,7 @@using Grand.Business.Marketing.Services.Courses;using Grand.Data.Tests.MongoDb;using Grand.Domain.Courses;-using Grand.Domain.Data;+using Grand.Data;using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CoursesServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CoursesServiceTests.csindex 5d932547e..e2312b113 100644--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CoursesServiceTests.cs+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CoursesServiceTests.cs@@ -1,7 +1,7 @@using Grand.Business.Marketing.Services.Courses;using Grand.Domain.Catalog;using Grand.Domain.Courses;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Orders;using Grand.Infrastructure.Configuration;using Grand.Infrastructure.Events;diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Customers/CustomerCoordinatesServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Customers/CustomerCoordinatesServiceTests.csindex cef943ffa..8835cbef2 100644--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Customers/CustomerCoordinatesServiceTests.cs+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Customers/CustomerCoordinatesServiceTests.cs@@ -2,7 +2,7 @@using Grand.Business.Marketing.Services.Customers;using Grand.Data.Tests.MongoDb;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure;using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Customers/CustomerProductServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Customers/CustomerProductServiceTests.csindex e8591eaaa..51ba92b13 100644--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Customers/CustomerProductServiceTests.cs+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Customers/CustomerProductServiceTests.cs@@ -1,7 +1,7 @@using Grand.Business.Marketing.Services.Customers;using Grand.Data.Tests.MongoDb;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Configuration;using Grand.Infrastructure.Tests.Caching;diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Customers/CustomerTagServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Customers/CustomerTagServiceTests.csindex eeffc8e0b..a5ff915d7 100644--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Customers/CustomerTagServiceTests.cs+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Customers/CustomerTagServiceTests.cs@@ -1,7 +1,7 @@using Grand.Business.Marketing.Services.Customers;using Grand.Data.Tests.MongoDb;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Configuration;using Grand.Infrastructure.Tests.Caching;diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Documents/DocumentServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Documents/DocumentServiceTests.csindex 8e06a7893..e7ed261b8 100644--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Documents/DocumentServiceTests.cs+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Documents/DocumentServiceTests.cs@@ -1,5 +1,5 @@using Grand.Business.Marketing.Services.Documents;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Documents;using Grand.Infrastructure.Events;using MediatR;diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Documents/DocumentTypeServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Documents/DocumentTypeServiceTests.csindex 35767f2e6..1396277b0 100644--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Documents/DocumentTypeServiceTests.cs+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Documents/DocumentTypeServiceTests.cs@@ -1,6 +1,6 @@using Grand.Business.Marketing.Services.Documents;-using Grand.Domain.Data;-using Grand.Domain.Data.Mongo;+using Grand.Data;+using Grand.Data.Mongo;using Grand.Domain.Documents;using Grand.Infrastructure.Events;using Grand.SharedKernel.Extensions;diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Newsletters/NewsLetterSubscriptionServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Newsletters/NewsLetterSubscriptionServiceTests.csindex ee68494dd..ca671c44b 100644--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Newsletters/NewsLetterSubscriptionServiceTests.cs+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Newsletters/NewsLetterSubscriptionServiceTests.cs@@ -3,7 +3,7 @@ using Grand.Business.Core.Events.Marketing;using Grand.Business.Core.Interfaces.Marketing.Newsletters;using Grand.Business.Marketing.Services.Newsletters;using Grand.Domain;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Messages;using Grand.Infrastructure.Events;using Grand.SharedKernel;diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Newsletters/NewsletterCategoryServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Newsletters/NewsletterCategoryServiceTests.csindex 4c419e84e..a7f62e046 100644--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Newsletters/NewsletterCategoryServiceTests.cs+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Newsletters/NewsletterCategoryServiceTests.cs@@ -1,5 +1,5 @@using Grand.Business.Marketing.Services.Newsletters;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Messages;using Grand.Infrastructure.Events;using MediatR;diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/PushNotifications/PushNotificationsServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/PushNotifications/PushNotificationsServiceTests.csindex f592ea3f8..8f0168328 100644--- a/src/Tests/Grand.Business.Marketing.Tests/Services/PushNotifications/PushNotificationsServiceTests.cs+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/PushNotifications/PushNotificationsServiceTests.cs@@ -1,7 +1,7 @@using Grand.Business.Marketing.Services.PushNotifications;using Grand.Business.Marketing.Utilities;using Grand.Data.Tests.MongoDb;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.PushNotifications;using MediatR;using Microsoft.Extensions.Logging;diff --git a/src/Tests/Grand.Business.Messages.Tests/Commands/InsertContactUsCommandHandlerTests.cs b/src/Tests/Grand.Business.Messages.Tests/Commands/InsertContactUsCommandHandlerTests.csindex c446384a0..495dfb49d 100644--- a/src/Tests/Grand.Business.Messages.Tests/Commands/InsertContactUsCommandHandlerTests.cs+++ b/src/Tests/Grand.Business.Messages.Tests/Commands/InsertContactUsCommandHandlerTests.cs@@ -1,7 +1,7 @@using Grand.Business.Core.Commands.Messages.Common;using Grand.Business.Messages.Commands.Handlers.Common;using Grand.Domain.Common;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Messages;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;diff --git a/src/Tests/Grand.Business.Messages.Tests/Queries/Handlers/GetVendorByIdQueryHandlerTests.cs b/src/Tests/Grand.Business.Messages.Tests/Queries/Handlers/GetVendorByIdQueryHandlerTests.csindex 8a74ccd0e..db765a558 100644--- a/src/Tests/Grand.Business.Messages.Tests/Queries/Handlers/GetVendorByIdQueryHandlerTests.cs+++ b/src/Tests/Grand.Business.Messages.Tests/Queries/Handlers/GetVendorByIdQueryHandlerTests.cs@@ -1,6 +1,6 @@using Grand.Business.Messages.Queries.Handlers;using Grand.Data.Tests.MongoDb;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Vendors;using Microsoft.VisualStudio.TestTools.UnitTesting;diff --git a/src/Tests/Grand.Business.Messages.Tests/Services/EmailAccountServiceTests.cs b/src/Tests/Grand.Business.Messages.Tests/Services/EmailAccountServiceTests.csindex 6b463c8ea..822fddc32 100644--- a/src/Tests/Grand.Business.Messages.Tests/Services/EmailAccountServiceTests.cs+++ b/src/Tests/Grand.Business.Messages.Tests/Services/EmailAccountServiceTests.cs@@ -1,5 +1,5 @@using Grand.Business.Messages.Services;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Messages;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Events;diff --git a/src/Tests/Grand.Business.Messages.Tests/Services/MessageTemplateServiceTests.cs b/src/Tests/Grand.Business.Messages.Tests/Services/MessageTemplateServiceTests.csindex 5727b9708..b28c86dac 100644--- a/src/Tests/Grand.Business.Messages.Tests/Services/MessageTemplateServiceTests.cs+++ b/src/Tests/Grand.Business.Messages.Tests/Services/MessageTemplateServiceTests.cs@@ -1,7 +1,7 @@using Grand.Business.Core.Interfaces.Common.Security;using Grand.Business.Messages.Services;using Grand.Domain.Catalog;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Messages;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Configuration;diff --git a/src/Tests/Grand.Business.Messages.Tests/Services/QueuedEmailServiceTests.cs b/src/Tests/Grand.Business.Messages.Tests/Services/QueuedEmailServiceTests.csindex 75594901a..5e8923978 100644--- a/src/Tests/Grand.Business.Messages.Tests/Services/QueuedEmailServiceTests.cs+++ b/src/Tests/Grand.Business.Messages.Tests/Services/QueuedEmailServiceTests.cs@@ -1,5 +1,5 @@using Grand.Business.Messages.Services;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Messages;using Grand.Infrastructure.Events;using MediatR;diff --git a/src/Tests/Grand.Business.Storage.Tests/Services/DownloadServiceTests.cs b/src/Tests/Grand.Business.Storage.Tests/Services/DownloadServiceTests.csindex 0f332600e..74827eb08 100644--- a/src/Tests/Grand.Business.Storage.Tests/Services/DownloadServiceTests.cs+++ b/src/Tests/Grand.Business.Storage.Tests/Services/DownloadServiceTests.cs@@ -1,5 +1,5 @@using Grand.Business.Storage.Services;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Media;using Grand.Infrastructure.Events;using MediatR;diff --git a/src/Tests/Grand.Business.Storage.Tests/Services/PictureServiceTests.cs b/src/Tests/Grand.Business.Storage.Tests/Services/PictureServiceTests.csindex c56a7fecf..1aceb7fe1 100644--- a/src/Tests/Grand.Business.Storage.Tests/Services/PictureServiceTests.cs+++ b/src/Tests/Grand.Business.Storage.Tests/Services/PictureServiceTests.cs@@ -1,6 +1,6 @@using Grand.Business.Core.Interfaces.Storage;using Grand.Business.Storage.Services;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Media;using Grand.Infrastructure;using Grand.Infrastructure.Caching;diff --git a/src/Tests/Grand.Business.System.Tests/Services/Admin/AdminSiteMapServiceTests.cs b/src/Tests/Grand.Business.System.Tests/Services/Admin/AdminSiteMapServiceTests.csindex d1d274416..9ca81bbe6 100644--- a/src/Tests/Grand.Business.System.Tests/Services/Admin/AdminSiteMapServiceTests.cs+++ b/src/Tests/Grand.Business.System.Tests/Services/Admin/AdminSiteMapServiceTests.cs@@ -1,6 +1,6 @@using Grand.Business.System.Services.Admin;using Grand.Domain.Admin;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Caching;using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;diff --git a/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationProcessTest.cs b/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationProcessTest.csindex 7e041e4a1..2400192ac 100644--- a/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationProcessTest.cs+++ b/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationProcessTest.cs@@ -1,5 +1,6 @@using Grand.Business.System.Services.Migrations;-using Grand.Domain.Data;+using Grand.Data;+using Grand.Domain;using Microsoft.Extensions.Logging;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;diff --git a/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationUpgrade_Test.cs b/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationUpgrade_Test.csindex b3b0f0d72..c75e4ca1c 100644--- a/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationUpgrade_Test.cs+++ b/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationUpgrade_Test.cs@@ -1,4 +1,4 @@-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Migrations;namespace Grand.Business.System.Tests.Services.Migrationsdiff --git a/src/Tests/Grand.Data.Tests/AuditInfoProvider.cs b/src/Tests/Grand.Data.Tests/AuditInfoProvider.csindex 1d27851c9..a108eb808 100644--- a/src/Tests/Grand.Data.Tests/AuditInfoProvider.cs+++ b/src/Tests/Grand.Data.Tests/AuditInfoProvider.cs@@ -1,4 +1,4 @@-using Grand.Domain.Data;+using Grand.Data;namespace Grand.Data.Tests;diff --git a/src/Tests/Grand.Data.Tests/LiteDb/LiteDbRepositoryMock.cs b/src/Tests/Grand.Data.Tests/LiteDb/LiteDbRepositoryMock.csindex 6ae9cfdfa..ef058628a 100644--- a/src/Tests/Grand.Data.Tests/LiteDb/LiteDbRepositoryMock.cs+++ b/src/Tests/Grand.Data.Tests/LiteDb/LiteDbRepositoryMock.cs@@ -1,6 +1,6 @@using Grand.Domain;-using Grand.Domain.Data;-using Grand.Domain.Data.LiteDb;+using Grand.Data;+using Grand.Data.LiteDb;using LiteDB;namespace Grand.Data.Tests.LiteDbdiff --git a/src/Tests/Grand.Data.Tests/LiteDb/LiteDbRepositoryTests.cs b/src/Tests/Grand.Data.Tests/LiteDb/LiteDbRepositoryTests.csindex 2c25c36df..8e79d9743 100644--- a/src/Tests/Grand.Data.Tests/LiteDb/LiteDbRepositoryTests.cs+++ b/src/Tests/Grand.Data.Tests/LiteDb/LiteDbRepositoryTests.cs@@ -1,4 +1,4 @@-using Grand.Domain.Data;+using Grand.Data;using Grand.SharedKernel.Extensions;using Microsoft.VisualStudio.TestTools.UnitTesting;diff --git a/src/Tests/Grand.Data.Tests/MongoDb/MongoDBRepositoryTest.cs b/src/Tests/Grand.Data.Tests/MongoDb/MongoDBRepositoryTest.csindex 2158d34e6..82a296c27 100644--- a/src/Tests/Grand.Data.Tests/MongoDb/MongoDBRepositoryTest.cs+++ b/src/Tests/Grand.Data.Tests/MongoDb/MongoDBRepositoryTest.cs@@ -1,6 +1,6 @@using Grand.Domain;-using Grand.Domain.Data;-using Grand.Domain.Data.Mongo;+using Grand.Data;+using Grand.Data.Mongo;using MongoDB.Bson.Serialization.Conventions;namespace Grand.Data.Tests.MongoDbdiff --git a/src/Tests/Grand.Data.Tests/MongoDb/MongoRepositoryTests.cs b/src/Tests/Grand.Data.Tests/MongoDb/MongoRepositoryTests.csindex 6eda51c74..708180621 100644--- a/src/Tests/Grand.Data.Tests/MongoDb/MongoRepositoryTests.cs+++ b/src/Tests/Grand.Data.Tests/MongoDb/MongoRepositoryTests.cs@@ -1,4 +1,4 @@-using Grand.Domain.Data;+using Grand.Data;using Grand.SharedKernel.Extensions;using Microsoft.VisualStudio.TestTools.UnitTesting;diff --git a/src/Tests/Grand.Domain.Tests/Data/DataSettingsManagerTests.cs b/src/Tests/Grand.Domain.Tests/Data/DataSettingsManagerTests.csindex 34d8e9a0e..9f02186d8 100644--- a/src/Tests/Grand.Domain.Tests/Data/DataSettingsManagerTests.cs+++ b/src/Tests/Grand.Domain.Tests/Data/DataSettingsManagerTests.cs@@ -1,4 +1,4 @@-using Grand.Domain.Data;+using Grand.Data;using Grand.SharedKernel.Extensions;using Microsoft.VisualStudio.TestTools.UnitTesting;diff --git a/src/Tests/Grand.Domain.Tests/Grand.Domain.Tests.csproj b/src/Tests/Grand.Domain.Tests/Grand.Domain.Tests.csprojindex 97e5510ab..c00bee4c8 100644--- a/src/Tests/Grand.Domain.Tests/Grand.Domain.Tests.csproj+++ b/src/Tests/Grand.Domain.Tests/Grand.Domain.Tests.csproj@@ -17,6 +17,7 @@</ItemGroup><ItemGroup>+ <ProjectReference Include="..\..\Core\Grand.Data\Grand.Data.csproj" /><ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj" /><ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj" /></ItemGroup>diff --git a/src/Tests/Grand.Infrastructure.Tests/MigrationTest.cs b/src/Tests/Grand.Infrastructure.Tests/MigrationTest.csindex 1eca062c1..2bd42af32 100644--- a/src/Tests/Grand.Infrastructure.Tests/MigrationTest.cs+++ b/src/Tests/Grand.Infrastructure.Tests/MigrationTest.cs@@ -1,4 +1,4 @@-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Migrations;namespace Grand.Infrastructure.Testsdiff --git a/src/Tests/Grand.Web.Common.Tests/AuthorizeMenuAttributeTests.cs b/src/Tests/Grand.Web.Common.Tests/AuthorizeMenuAttributeTests.csindex 52965354b..de48a5a37 100644--- a/src/Tests/Grand.Web.Common.Tests/AuthorizeMenuAttributeTests.cs+++ b/src/Tests/Grand.Web.Common.Tests/AuthorizeMenuAttributeTests.cs@@ -2,7 +2,7 @@using Grand.Business.Core.Interfaces.System.Admin;using Grand.Domain.Admin;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure;using Grand.Infrastructure.Configuration;using Grand.SharedKernel.Extensions;diff --git a/src/Web/Grand.Web.Common/Filters/AffiliateAttribute.cs b/src/Web/Grand.Web.Common/Filters/AffiliateAttribute.csindex ab484e211..0c5c76e26 100644--- a/src/Web/Grand.Web.Common/Filters/AffiliateAttribute.cs+++ b/src/Web/Grand.Web.Common/Filters/AffiliateAttribute.cs@@ -1,6 +1,6 @@using Grand.Business.Core.Interfaces.Customers;using Grand.Domain.Affiliates;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure;using Microsoft.AspNetCore.Mvc;using Microsoft.AspNetCore.Mvc.Filters;diff --git a/src/Web/Grand.Web.Common/Filters/AuthorizeAdminAttribute.cs b/src/Web/Grand.Web.Common/Filters/AuthorizeAdminAttribute.csindex 6d0d1ce7a..673cbec7f 100644--- a/src/Web/Grand.Web.Common/Filters/AuthorizeAdminAttribute.cs+++ b/src/Web/Grand.Web.Common/Filters/AuthorizeAdminAttribute.cs@@ -1,7 +1,7 @@using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Core.Interfaces.Common.Security;using Grand.Business.Core.Utilities.Common.Security;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Security;using Grand.Infrastructure;using Microsoft.AspNetCore.Mvc;diff --git a/src/Web/Grand.Web.Common/Filters/AuthorizeMenuAttribute.cs b/src/Web/Grand.Web.Common/Filters/AuthorizeMenuAttribute.csindex a439e6ade..9f94b8cd8 100644--- a/src/Web/Grand.Web.Common/Filters/AuthorizeMenuAttribute.cs+++ b/src/Web/Grand.Web.Common/Filters/AuthorizeMenuAttribute.cs@@ -1,7 +1,7 @@using Grand.Business.Core.Interfaces.Common.Security;using Grand.Business.Core.Interfaces.System.Admin;using Grand.Domain.Admin;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure;using Grand.Infrastructure.Configuration;using Grand.SharedKernel.Extensions;diff --git a/src/Web/Grand.Web.Common/Filters/AuthorizeVendorAttribute.cs b/src/Web/Grand.Web.Common/Filters/AuthorizeVendorAttribute.csindex 09aef7ca4..e291be90f 100644--- a/src/Web/Grand.Web.Common/Filters/AuthorizeVendorAttribute.cs+++ b/src/Web/Grand.Web.Common/Filters/AuthorizeVendorAttribute.cs@@ -1,7 +1,7 @@using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Core.Interfaces.Common.Security;using Grand.Business.Core.Utilities.Common.Security;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure;using Microsoft.AspNetCore.Mvc;using Microsoft.AspNetCore.Mvc.Filters;diff --git a/src/Web/Grand.Web.Common/Filters/ClosedStoreAttribute.cs b/src/Web/Grand.Web.Common/Filters/ClosedStoreAttribute.csindex f05003833..6eeb39ac7 100644--- a/src/Web/Grand.Web.Common/Filters/ClosedStoreAttribute.cs+++ b/src/Web/Grand.Web.Common/Filters/ClosedStoreAttribute.cs@@ -1,7 +1,7 @@using Grand.Business.Core.Interfaces.Cms;using Grand.Business.Core.Interfaces.Common.Security;using Grand.Business.Core.Utilities.Common.Security;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Stores;using Grand.Infrastructure;using Microsoft.AspNetCore.Mvc;diff --git a/src/Web/Grand.Web.Common/Filters/CustomerActivityAttribute.cs b/src/Web/Grand.Web.Common/Filters/CustomerActivityAttribute.csindex a1c5bde71..c890a69f6 100644--- a/src/Web/Grand.Web.Common/Filters/CustomerActivityAttribute.cs+++ b/src/Web/Grand.Web.Common/Filters/CustomerActivityAttribute.cs@@ -3,7 +3,7 @@ using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Core.Interfaces.Customers;using Grand.Domain.Common;using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure;using Microsoft.AspNetCore.Http;using Microsoft.AspNetCore.Http.Extensions;diff --git a/src/Web/Grand.Web.Common/Filters/DenySystemAccountAttribute.cs b/src/Web/Grand.Web.Common/Filters/DenySystemAccountAttribute.csindex 9a682119a..26433845c 100644--- a/src/Web/Grand.Web.Common/Filters/DenySystemAccountAttribute.cs+++ b/src/Web/Grand.Web.Common/Filters/DenySystemAccountAttribute.cs@@ -1,5 +1,5 @@using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure;using Microsoft.AspNetCore.Mvc;using Microsoft.AspNetCore.Mvc.Filters;diff --git a/src/Web/Grand.Web.Common/Filters/LanguageAttribute.cs b/src/Web/Grand.Web.Common/Filters/LanguageAttribute.csindex f8fac02da..87c8363a8 100644--- a/src/Web/Grand.Web.Common/Filters/LanguageAttribute.cs+++ b/src/Web/Grand.Web.Common/Filters/LanguageAttribute.cs@@ -1,5 +1,5 @@using Grand.Business.Core.Interfaces.Common.Localization;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Localization;using Grand.Infrastructure;using Grand.Infrastructure.Configuration;diff --git a/src/Web/Grand.Web.Common/Filters/PasswordExpiredAttribute.cs b/src/Web/Grand.Web.Common/Filters/PasswordExpiredAttribute.csindex d62f73b69..44a490245 100644--- a/src/Web/Grand.Web.Common/Filters/PasswordExpiredAttribute.cs+++ b/src/Web/Grand.Web.Common/Filters/PasswordExpiredAttribute.cs@@ -1,5 +1,5 @@using Grand.Business.Core.Queries.Customers;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure;using MediatR;using Microsoft.AspNetCore.Mvc;diff --git a/src/Web/Grand.Web.Common/Filters/PublicStoreAttribute.cs b/src/Web/Grand.Web.Common/Filters/PublicStoreAttribute.csindex 8c886d9fb..35eff47ea 100644--- a/src/Web/Grand.Web.Common/Filters/PublicStoreAttribute.cs+++ b/src/Web/Grand.Web.Common/Filters/PublicStoreAttribute.cs@@ -1,6 +1,6 @@using Grand.Business.Core.Interfaces.Common.Security;using Grand.Business.Core.Utilities.Common.Security;-using Grand.Domain.Data;+using Grand.Data;using Grand.Domain.Stores;using Microsoft.AspNetCore.Mvc;using Microsoft.AspNetCore.Mvc.Filters;diff --git a/src/Web/Grand.Web.Common/Infrastructure/ApplicationBuilderExtensions.cs b/src/Web/Grand.Web.Common/Infrastructure/ApplicationBuilderExtensions.csindex e36264f30..136da08fd 100644--- a/src/Web/Grand.Web.Common/Infrastructure/ApplicationBuilderExtensions.cs+++ b/src/Web/Grand.Web.Common/Infrastructure/ApplicationBuilderExtensions.cs@@ -1,5 +1,5 @@using Grand.Domain.Common;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Configuration;using Grand.Infrastructure.Endpoints;using Grand.Infrastructure.Plugins;diff --git a/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.cs b/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.csindex d268ff7f4..0b8d147d7 100644--- a/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.cs+++ b/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.cs@@ -6,7 +6,7 @@ using Grand.Business.Core.Interfaces.Common.Security;using Grand.Business.Core.Utilities.Authentication;using Grand.Business.Core.Utilities.Common.Security;using Grand.Domain.Configuration;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure;using Grand.Infrastructure.Configuration;using Grand.Infrastructure.Plugins;diff --git a/src/Web/Grand.Web.Common/Middleware/DbVersionCheckMiddleware.cs b/src/Web/Grand.Web.Common/Middleware/DbVersionCheckMiddleware.csindex f3131b3a2..c6d9d5e48 100644--- a/src/Web/Grand.Web.Common/Middleware/DbVersionCheckMiddleware.cs+++ b/src/Web/Grand.Web.Common/Middleware/DbVersionCheckMiddleware.cs@@ -1,5 +1,5 @@using Grand.Domain.Common;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;diff --git a/src/Web/Grand.Web.Common/Middleware/InstallUrlMiddleware.cs b/src/Web/Grand.Web.Common/Middleware/InstallUrlMiddleware.csindex 51a41cc24..71d443aed 100644--- a/src/Web/Grand.Web.Common/Middleware/InstallUrlMiddleware.cs+++ b/src/Web/Grand.Web.Common/Middleware/InstallUrlMiddleware.cs@@ -1,4 +1,4 @@-using Grand.Domain.Data;+using Grand.Data;using Microsoft.AspNetCore.Http;using Microsoft.AspNetCore.Http.Extensions;diff --git a/src/Web/Grand.Web.Common/Startup/AuthenticationStartup.cs b/src/Web/Grand.Web.Common/Startup/AuthenticationStartup.csindex 789739430..970f8fefb 100644--- a/src/Web/Grand.Web.Common/Startup/AuthenticationStartup.cs+++ b/src/Web/Grand.Web.Common/Startup/AuthenticationStartup.cs@@ -1,4 +1,4 @@-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure;using Grand.Infrastructure.Configuration;using Grand.Web.Common.Infrastructure;diff --git a/src/Web/Grand.Web.Common/Startup/DbCheckStartup.cs b/src/Web/Grand.Web.Common/Startup/DbCheckStartup.csindex 1b1fd0763..09ee53835 100644--- a/src/Web/Grand.Web.Common/Startup/DbCheckStartup.cs+++ b/src/Web/Grand.Web.Common/Startup/DbCheckStartup.cs@@ -1,4 +1,4 @@-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure;using Grand.Infrastructure.Configuration;using Grand.Web.Common.Middleware;diff --git a/src/Web/Grand.Web.Common/Startup/ForwardedHeadersStartup.cs b/src/Web/Grand.Web.Common/Startup/ForwardedHeadersStartup.csindex 9306bc8c7..a833cfa45 100644--- a/src/Web/Grand.Web.Common/Startup/ForwardedHeadersStartup.cs+++ b/src/Web/Grand.Web.Common/Startup/ForwardedHeadersStartup.cs@@ -1,4 +1,4 @@-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure;using Grand.Infrastructure.Configuration;using Grand.Web.Common.Infrastructure;diff --git a/src/Web/Grand.Web.Common/Startup/HostFilteringStartup.cs b/src/Web/Grand.Web.Common/Startup/HostFilteringStartup.csindex 2d5387d86..d6d5d513d 100644--- a/src/Web/Grand.Web.Common/Startup/HostFilteringStartup.cs+++ b/src/Web/Grand.Web.Common/Startup/HostFilteringStartup.cs@@ -1,4 +1,4 @@-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure;using Grand.Infrastructure.Configuration;using Microsoft.AspNetCore.Builder;diff --git a/src/Web/Grand.Web.Common/Startup/LoggerStartup.cs b/src/Web/Grand.Web.Common/Startup/LoggerStartup.csindex 2d2879335..eb8da16cc 100644--- a/src/Web/Grand.Web.Common/Startup/LoggerStartup.cs+++ b/src/Web/Grand.Web.Common/Startup/LoggerStartup.cs@@ -1,4 +1,4 @@-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure;using Grand.Infrastructure.Configuration;using Grand.Web.Common.Middleware;diff --git a/src/Web/Grand.Web.Common/Startup/MigrationApplicationStartup.cs b/src/Web/Grand.Web.Common/Startup/MigrationApplicationStartup.csindex 65417396e..590c6b4ad 100644--- a/src/Web/Grand.Web.Common/Startup/MigrationApplicationStartup.cs+++ b/src/Web/Grand.Web.Common/Startup/MigrationApplicationStartup.cs@@ -1,4 +1,4 @@-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure;using Grand.Infrastructure.Configuration;using Grand.Infrastructure.Migrations;diff --git a/src/Web/Grand.Web.Common/Startup/StartupApplication.cs b/src/Web/Grand.Web.Common/Startup/StartupApplication.csindex 704082169..6a152cd61 100644--- a/src/Web/Grand.Web.Common/Startup/StartupApplication.cs+++ b/src/Web/Grand.Web.Common/Startup/StartupApplication.cs@@ -1,5 +1,5 @@using Grand.Business.Core.Interfaces.Common.Pdf;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Message;diff --git a/src/Web/Grand.Web.Common/Startup/TaskHandler.cs b/src/Web/Grand.Web.Common/Startup/TaskHandler.csindex 864f55b79..b3d934d94 100644--- a/src/Web/Grand.Web.Common/Startup/TaskHandler.cs+++ b/src/Web/Grand.Web.Common/Startup/TaskHandler.cs@@ -1,5 +1,5 @@using Grand.Business.Core.Interfaces.System.ScheduleTasks;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Configuration;using Grand.Infrastructure.Plugins;using Grand.Infrastructure.TypeSearch;diff --git a/src/Web/Grand.Web.Vendor/Startup/StartupApplication.cs b/src/Web/Grand.Web.Vendor/Startup/StartupApplication.csindex 2e2cec587..820598f46 100644--- a/src/Web/Grand.Web.Vendor/Startup/StartupApplication.cs+++ b/src/Web/Grand.Web.Vendor/Startup/StartupApplication.cs@@ -1,4 +1,4 @@-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure;using Grand.Web.Vendor.Infrastructure;using Grand.Web.Vendor.Interfaces;diff --git a/src/Web/Grand.Web/Controllers/InstallController.cs b/src/Web/Grand.Web/Controllers/InstallController.csindex 08abd4b40..9b546e412 100644--- a/src/Web/Grand.Web/Controllers/InstallController.cs+++ b/src/Web/Grand.Web/Controllers/InstallController.cs@@ -1,7 +1,7 @@using Grand.Business.Core.Commands.System.Security;using Grand.Business.Core.Interfaces.Common.Security;using Grand.Business.Core.Interfaces.System.Installation;-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Configuration;using Grand.Infrastructure.Migrations;diff --git a/src/Web/Grand.Web/Endpoints/EndpointProvider.cs b/src/Web/Grand.Web/Endpoints/EndpointProvider.csindex fc0700d15..150002151 100644--- a/src/Web/Grand.Web/Endpoints/EndpointProvider.cs+++ b/src/Web/Grand.Web/Endpoints/EndpointProvider.cs@@ -1,4 +1,4 @@-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Configuration;using Grand.Infrastructure.Endpoints;using Microsoft.AspNetCore.Builder;diff --git a/src/Web/Grand.Web/Endpoints/SlugEndpointProvider.cs b/src/Web/Grand.Web/Endpoints/SlugEndpointProvider.csindex 42f3c7511..6282b0fe3 100644--- a/src/Web/Grand.Web/Endpoints/SlugEndpointProvider.cs+++ b/src/Web/Grand.Web/Endpoints/SlugEndpointProvider.cs@@ -1,4 +1,4 @@-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Configuration;using Grand.Infrastructure.Endpoints;using Grand.Web.Common.Routing;diff --git a/src/Web/Grand.Web/Models/Install/InstallModel.cs b/src/Web/Grand.Web/Models/Install/InstallModel.csindex f80da5bb6..e2e06a470 100644--- a/src/Web/Grand.Web/Models/Install/InstallModel.cs+++ b/src/Web/Grand.Web/Models/Install/InstallModel.cs@@ -1,4 +1,4 @@-using Grand.Domain.Data;+using Grand.Data;using Grand.Infrastructure.Models;using Microsoft.AspNetCore.Mvc.Rendering;using System.ComponentModel.DataAnnotations;