Skip to content

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.

Move Grand.Api to Grand.Module.Api (#523)

Krzysztof Pajak9288c1c7de00
diff --git a/GrandNode.sln b/GrandNode.sln
index ddbeb9275..9f2684668 100644
--- a/GrandNode.sln
+++ b/GrandNode.sln
@@ -77,10 +77,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grand.Business.Authenticati
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grand.Business.Catalog.Tests", "src\Tests\Grand.Business.Catalog.Tests\Grand.Business.Catalog.Tests.csproj", "{CC40A0A2-BD47-49B9-A1E1-6E1819117EB1}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "API", "API", "{FFCB0026-FA9B-434F-BB7A-57997C968070}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grand.Api", "src\API\Grand.Api\Grand.Api.csproj", "{EAB65B15-BD78-4ABA-B759-BA5D94223499}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grand.Business.Cms.Tests", "src\Tests\Grand.Business.Cms.Tests\Grand.Business.Cms.Tests.csproj", "{B023CB66-17B2-4B82-B9C1-09E6716131C4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grand.Business.Customers.Tests", "src\Tests\Grand.Business.Customers.Tests\Grand.Business.Customers.Tests.csproj", "{9D142307-0C53-490B-AFAB-C634FDF57A64}"
@@ -141,6 +137,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grand.Module.Installer", "s
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grand.Module.Migration", "src\Modules\Grand.Module.Migration\Grand.Module.Migration.csproj", "{75F9D855-026B-4BCB-90CE-3800F02FA0A7}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grand.Module.Api", "src\Modules\Grand.Module.Api\Grand.Module.Api.csproj", "{E0B26803-010B-4198-8016-002242076B61}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -275,10 +273,6 @@ Global
{CC40A0A2-BD47-49B9-A1E1-6E1819117EB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CC40A0A2-BD47-49B9-A1E1-6E1819117EB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CC40A0A2-BD47-49B9-A1E1-6E1819117EB1}.Release|Any CPU.Build.0 = Release|Any CPU
- {EAB65B15-BD78-4ABA-B759-BA5D94223499}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {EAB65B15-BD78-4ABA-B759-BA5D94223499}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {EAB65B15-BD78-4ABA-B759-BA5D94223499}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {EAB65B15-BD78-4ABA-B759-BA5D94223499}.Release|Any CPU.Build.0 = Release|Any CPU
{B023CB66-17B2-4B82-B9C1-09E6716131C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B023CB66-17B2-4B82-B9C1-09E6716131C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B023CB66-17B2-4B82-B9C1-09E6716131C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -370,6 +364,10 @@ Global
{75F9D855-026B-4BCB-90CE-3800F02FA0A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{75F9D855-026B-4BCB-90CE-3800F02FA0A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{75F9D855-026B-4BCB-90CE-3800F02FA0A7}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E0B26803-010B-4198-8016-002242076B61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E0B26803-010B-4198-8016-002242076B61}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E0B26803-010B-4198-8016-002242076B61}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E0B26803-010B-4198-8016-002242076B61}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -407,7 +405,6 @@ Global
{56643517-D513-4A7E-A245-018DC9E2B451} = {38ECA068-176F-463C-A1D7-044341D4CACB}
{E78BA3F9-119E-4F7E-893F-3972B22F5096} = {6360202A-F931-4BBD-ADBD-C9A628EE59F8}
{CC40A0A2-BD47-49B9-A1E1-6E1819117EB1} = {6360202A-F931-4BBD-ADBD-C9A628EE59F8}
- {EAB65B15-BD78-4ABA-B759-BA5D94223499} = {FFCB0026-FA9B-434F-BB7A-57997C968070}
{B023CB66-17B2-4B82-B9C1-09E6716131C4} = {6360202A-F931-4BBD-ADBD-C9A628EE59F8}
{9D142307-0C53-490B-AFAB-C634FDF57A64} = {6360202A-F931-4BBD-ADBD-C9A628EE59F8}
{DA207F2A-1F21-4B78-8441-236B1A9EA728} = {6360202A-F931-4BBD-ADBD-C9A628EE59F8}
@@ -431,6 +428,7 @@ Global
{8AD9B827-7FB6-4581-85BB-82D7F298DE1A} = {F6F48227-B3C5-4A51-B33F-FF9AD96352DB}
{62460E0C-D4D1-4606-9716-965267B77BA3} = {583FFBBD-421C-4FB7-BBDA-F9CAF35A354A}
{75F9D855-026B-4BCB-90CE-3800F02FA0A7} = {583FFBBD-421C-4FB7-BBDA-F9CAF35A354A}
+ {E0B26803-010B-4198-8016-002242076B61} = {583FFBBD-421C-4FB7-BBDA-F9CAF35A354A}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {88B478F4-FD3B-4C24-9E84-4FAAF0254397}
diff --git a/src/API/Grand.Api/Grand.Api.csproj b/src/API/Grand.Api/Grand.Api.csproj
deleted file mode 100644
index 4bef40c8b..000000000
--- a/src/API/Grand.Api/Grand.Api.csproj
+++ /dev/null
@@ -1,17 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
- <Import Project="..\..\Build\Grand.Common.props" />
- <ItemGroup>
- <ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj" />
- <ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj" />
- <ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj" />
- </ItemGroup>
- <ItemGroup>
- <PackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="8.0.10" />
- <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.10" />
- <PackageReference Include="Microsoft.AspNetCore.OData" Version="9.0.0" />
- <PackageReference Include="MongoDB.AspNetCore.OData" Version="1.0.1" />
- <PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />
- <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.9.0" />
- </ItemGroup>
-
-</Project>
diff --git a/src/Core/Grand.Infrastructure/Modules/ModuleLoader.cs b/src/Core/Grand.Infrastructure/Modules/ModuleLoader.cs
index 22458a050..0296c0583 100644
--- a/src/Core/Grand.Infrastructure/Modules/ModuleLoader.cs
+++ b/src/Core/Grand.Infrastructure/Modules/ModuleLoader.cs
@@ -4,54 +4,100 @@ using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using System.Reflection;
+using System.Runtime.CompilerServices;
using System.Runtime.Loader;
namespace Grand.Infrastructure.Modules;
public static class ModuleLoader
{
+ private const string MODULE_SECTION_PATH = "FeatureFlags:Modules";
+ private const string MODULES_DIRECTORY = "Modules";
+ private const string LOGGER_NAME = "ModuleManager";
+
+ [MethodImpl(MethodImplOptions.NoInlining)]
public static void LoadModules(IMvcCoreBuilder mvcCoreBuilder, IConfiguration configuration, IWebHostEnvironment hostingEnvironment)
{
- var modulesSection = configuration.GetSection("FeatureFlags:Modules");
+ var modulesSection = configuration.GetSection(MODULE_SECTION_PATH);
if (!modulesSection.Exists())
{
return;
}
- var logger = mvcCoreBuilder.Services.BuildServiceProvider().GetService<ILoggerFactory>().CreateLogger("ModuleManager");
-
+ var logger = CreateLogger(mvcCoreBuilder.Services);
var modules = modulesSection.Get<Dictionary<string, bool>>();
- foreach (var module in modules)
+ foreach (var (moduleName, isEnabled) in modules)
+ {
+ if (!isEnabled)
+ {
+ logger.LogInformation("Module '{ModuleName}' is disabled.", moduleName);
+ continue;
+ }
+
+ LoadModule(moduleName, hostingEnvironment, mvcCoreBuilder, logger);
+ }
+ }
+
+ private static void LoadModule(string moduleName, IWebHostEnvironment hostingEnvironment,
+ IMvcCoreBuilder mvcCoreBuilder, ILogger logger)
+ {
+ var modulePath = GetModulePath(hostingEnvironment, moduleName);
+ var moduleFile = Path.Combine(modulePath, $"{moduleName}.dll");
+
+ if (!File.Exists(moduleFile))
+ {
+ logger.LogWarning("Module '{ModuleName}' does not exist at path: {ModulePath}",
+ moduleName, moduleFile);
+ return;
+ }
+
+ try
+ {
+ var assemblyLoadContext = new ModuleLoadContext();
+ LoadModuleDependencies(modulePath, assemblyLoadContext, mvcCoreBuilder, logger);
+ logger.LogInformation("Module '{ModuleName}' has been successfully loaded.", moduleName);
+ }
+ catch (Exception ex)
+ {
+ logger.LogError(ex, "Failed to load module '{ModuleName}'. Error: {Error}",
+ moduleName, ex.Message);
+ }
+ }
+ private static void LoadModuleDependencies(string modulePath, ModuleLoadContext assemblyLoadContext,
+ IMvcCoreBuilder mvcCoreBuilder, ILogger logger)
+ {
+ var loadedAssemblies = AppDomain.CurrentDomain.GetAssemblies()
+ .Select(a => a.Location)
+ .ToHashSet();
+
+ foreach (var dependencyDll in Directory.GetFiles(modulePath, "*.dll"))
{
- if (module.Value)
+ if (loadedAssemblies.Contains(dependencyDll))
+ continue;
+
+ try
{
- var moduleName = module.Key;
- var modulePath = Path.Combine(hostingEnvironment.ContentRootPath, "Modules", $"{moduleName}.dll");
- if (File.Exists(modulePath))
- {
- try
- {
- var assembly = AssemblyLoadContext.Default.LoadFromAssemblyPath(modulePath);
- AddApplicationPart(mvcCoreBuilder, assembly);
- logger.LogInformation($"Module '{moduleName}' has been successfully loaded.");
- }
- catch (Exception ex)
- {
- logger.LogError($"Error loading module '{moduleName}': {ex.Message}");
- }
- }
- else
- {
- logger.LogWarning($"Module '{moduleName}' does not exist in the application directory.");
- }
+ var assembly = assemblyLoadContext.LoadFromAssemblyPath(dependencyDll);
+ AddApplicationPart(mvcCoreBuilder, assembly);
+ logger.LogDebug("Successfully loaded dependency: {Dependency}", dependencyDll);
}
- else
+ catch (Exception ex)
{
- logger.LogInformation($"Module '{module.Key}' is disabled.");
+ logger.LogWarning(ex, "Failed to load dependency: {Dependency}", dependencyDll);
}
}
}
+
+ private static string GetModulePath(IWebHostEnvironment hostingEnvironment, string moduleName)
+ => Path.Combine(hostingEnvironment.ContentRootPath, MODULES_DIRECTORY, moduleName);
+
+ private static ILogger CreateLogger(IServiceCollection services)
+ => services.BuildServiceProvider()
+ .GetService<ILoggerFactory>()
+ ?.CreateLogger(LOGGER_NAME)
+ ?? throw new InvalidOperationException("Logger factory not found in services.");
+
private static void AddApplicationPart(IMvcCoreBuilder mvcCoreBuilder, Assembly assembly)
{
mvcCoreBuilder.AddApplicationPart(assembly);
@@ -64,4 +110,12 @@ public static class ModuleLoader
mvcCoreBuilder.PartManager.ApplicationParts.Add(part);
}
}
-}
+
+ private class ModuleLoadContext : AssemblyLoadContext
+ {
+ public ModuleLoadContext() : base(isCollectible: true)
+ {
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Core/Grand.Infrastructure/TypeSearch/ITypeSearcher.cs b/src/Core/Grand.Infrastructure/TypeSearch/ITypeSearcher.cs
index 7f396558f..1fbfde179 100644
--- a/src/Core/Grand.Infrastructure/TypeSearch/ITypeSearcher.cs
+++ b/src/Core/Grand.Infrastructure/TypeSearch/ITypeSearcher.cs
@@ -8,11 +8,7 @@ namespace Grand.Infrastructure.TypeSearch;
public interface ITypeSearcher
{
IList<Assembly> GetAssemblies();
-
- IEnumerable<Type> ClassesOfType(Type assignTypeFrom, bool onlyConcreteClasses = true);
-
- IEnumerable<Type> ClassesOfType(Type assignTypeFrom, IEnumerable<Assembly> assemblies,
- bool onlyConcreteClasses = true);
-
- IEnumerable<Type> ClassesOfType<T>(bool onlyConcreteClasses = true);
+ IEnumerable<Type> ClassesOfType<T>();
+ IEnumerable<Type> ClassesOfType(Type assignTypeFrom);
+ IEnumerable<Type> ClassesOfType(Type assignTypeFrom, IEnumerable<Assembly> assemblies);
}
\ No newline at end of file
diff --git a/src/Core/Grand.Infrastructure/TypeSearch/TypeSearcher.cs b/src/Core/Grand.Infrastructure/TypeSearch/TypeSearcher.cs
index ef1292018..1c3806df0 100644
--- a/src/Core/Grand.Infrastructure/TypeSearch/TypeSearcher.cs
+++ b/src/Core/Grand.Infrastructure/TypeSearch/TypeSearcher.cs
@@ -45,54 +45,42 @@ public class TypeSearcher : ITypeSearcher
#region Methods
- public IEnumerable<Type> ClassesOfType<T>(bool onlyConcreteClasses = true)
+ public IEnumerable<Type> ClassesOfType<T>()
{
- return ClassesOfType(typeof(T), onlyConcreteClasses);
+ return ClassesOfType(typeof(T));
}
- public IEnumerable<Type> ClassesOfType(Type assignTypeFrom, bool onlyConcreteClasses = true)
+ public IEnumerable<Type> ClassesOfType(Type assignTypeFrom)
{
- return ClassesOfType(assignTypeFrom, GetAssemblies(), onlyConcreteClasses);
+ return ClassesOfType(assignTypeFrom, GetAssemblies());
}
- public IEnumerable<Type> ClassesOfType(Type assignTypeFrom, IEnumerable<Assembly> assemblies,
- bool onlyConcreteClasses = true)
+ public IEnumerable<Type> ClassesOfType(Type assignTypeFrom, IEnumerable<Assembly> assemblies)
{
var result = new List<Type>();
try
{
- foreach (var a in assemblies)
+ foreach (var assembly in assemblies)
{
- var types = a.GetTypes();
- foreach (var t in types)
- {
- if (!assignTypeFrom.IsAssignableFrom(t) && (!assignTypeFrom.IsGenericTypeDefinition ||
- !DoesTypeImplementOpenGeneric(t, assignTypeFrom)))
- continue;
-
- if (t.IsInterface)
- continue;
-
- if (onlyConcreteClasses)
- {
- if (t.IsClass && !t.IsAbstract) result.Add(t);
- }
- else
- {
- result.Add(t);
- }
- }
+ var types = assembly.GetTypes()
+ .Where(type =>
+ (assignTypeFrom.IsAssignableFrom(type) ||
+ (assignTypeFrom.IsGenericTypeDefinition && DoesTypeImplementOpenGeneric(type, assignTypeFrom))) &&
+ !type.IsInterface &&
+ type.IsClass &&
+ !type.IsAbstract);
+
+ result.AddRange(types);
}
}
catch (ReflectionTypeLoadException ex)
{
- var msg = ex.LoaderExceptions.Aggregate(string.Empty,
- (current, e) => current + e!.Message + Environment.NewLine);
+ var errorMessage = ex.LoaderExceptions
+ .Aggregate(string.Empty, (current, e) => current + e!.Message + Environment.NewLine);
- var fail = new Exception(msg, ex);
- Debug.WriteLine(fail.Message, fail);
-
- throw fail;
+ var exception = new Exception(errorMessage, ex);
+ Debug.WriteLine(exception.Message, exception);
+ throw exception;
}
return result;
diff --git a/src/API/Grand.Api/ApiExplorer/ApiParameterContext.cs b/src/Modules/Grand.Module.Api/ApiExplorer/ApiParameterContext.cs
similarity index 95%
rename from src/API/Grand.Api/ApiExplorer/ApiParameterContext.cs
rename to src/Modules/Grand.Module.Api/ApiExplorer/ApiParameterContext.cs
index bcd7f8a5d..1f04a920d 100644
--- a/src/API/Grand.Api/ApiExplorer/ApiParameterContext.cs
+++ b/src/Modules/Grand.Module.Api/ApiExplorer/ApiParameterContext.cs
@@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Mvc.Controllers;
using Microsoft.AspNetCore.Mvc.ModelBinding;
using Microsoft.AspNetCore.Routing.Template;
-namespace Grand.Api.ApiExplorer;
+namespace Grand.Module.Api.ApiExplorer;
public class ApiParameterContext
{
diff --git a/src/API/Grand.Api/ApiExplorer/ApiResponseTypeProvider.cs b/src/Modules/Grand.Module.Api/ApiExplorer/ApiResponseTypeProvider.cs
similarity index 99%
rename from src/API/Grand.Api/ApiExplorer/ApiResponseTypeProvider.cs
rename to src/Modules/Grand.Module.Api/ApiExplorer/ApiResponseTypeProvider.cs
index e1966754c..07b44d8d3 100644
--- a/src/API/Grand.Api/ApiExplorer/ApiResponseTypeProvider.cs
+++ b/src/Modules/Grand.Module.Api/ApiExplorer/ApiResponseTypeProvider.cs
@@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Mvc.Formatters;
using Microsoft.AspNetCore.Mvc.Infrastructure;
using Microsoft.AspNetCore.Mvc.ModelBinding;
-namespace Grand.Api.ApiExplorer;
+namespace Grand.Module.Api.ApiExplorer;
public class ApiResponseTypeProvider
{
diff --git a/src/API/Grand.Api/ApiExplorer/MetadataApiDescriptionProvider.cs b/src/Modules/Grand.Module.Api/ApiExplorer/MetadataApiDescriptionProvider.cs
similarity index 99%
rename from src/API/Grand.Api/ApiExplorer/MetadataApiDescriptionProvider.cs
rename to src/Modules/Grand.Module.Api/ApiExplorer/MetadataApiDescriptionProvider.cs
index a77ca77f3..01531d850 100644
--- a/src/API/Grand.Api/ApiExplorer/MetadataApiDescriptionProvider.cs
+++ b/src/Modules/Grand.Module.Api/ApiExplorer/MetadataApiDescriptionProvider.cs
@@ -19,7 +19,7 @@ using Microsoft.Extensions.Options;
using System.Reflection;
using ApiControllerAttribute = Grand.SharedKernel.Attributes.ApiControllerAttribute;
-namespace Grand.Api.ApiExplorer;
+namespace Grand.Module.Api.ApiExplorer;
public class MetadataApiDescriptionProvider : IApiDescriptionProvider
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddBrandCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddBrandCommandHandler.cs
similarity index 86%
rename from src/API/Grand.Api/Commands/Handlers/Catalog/AddBrandCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddBrandCommandHandler.cs
index f69fc2616..5d0a109a2 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddBrandCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddBrandCommandHandler.cs
@@ -1,12 +1,12 @@
-using Grand.Api.Commands.Models.Catalog;
-using Grand.Api.DTOs.Catalog;
-using Grand.Api.Extensions;
+using Grand.Module.Api.Commands.Models.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
+using Grand.Module.Api.Extensions;
using Grand.Business.Core.Interfaces.Catalog.Brands;
using Grand.Business.Core.Interfaces.Common.Seo;
using Grand.Domain.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Catalog;
+namespace Grand.Module.Api.Commands.Handlers.Catalog;
public class AddBrandCommandHandler : IRequestHandler<AddBrandCommand, BrandDto>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddCategoryCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddCategoryCommandHandler.cs
similarity index 87%
rename from src/API/Grand.Api/Commands/Handlers/Catalog/AddCategoryCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddCategoryCommandHandler.cs
index c731d22bf..449a2f2c4 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddCategoryCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddCategoryCommandHandler.cs
@@ -1,12 +1,12 @@
-using Grand.Api.Commands.Models.Catalog;
-using Grand.Api.DTOs.Catalog;
-using Grand.Api.Extensions;
+using Grand.Module.Api.Commands.Models.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
+using Grand.Module.Api.Extensions;
using Grand.Business.Core.Interfaces.Catalog.Categories;
using Grand.Business.Core.Interfaces.Common.Seo;
using Grand.Domain.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Catalog;
+namespace Grand.Module.Api.Commands.Handlers.Catalog;
public class AddCategoryCommandHandler : IRequestHandler<AddCategoryCommand, CategoryDto>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddCollectionCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddCollectionCommandHandler.cs
similarity index 87%
rename from src/API/Grand.Api/Commands/Handlers/Catalog/AddCollectionCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddCollectionCommandHandler.cs
index a7e9d06d4..0cfa0d441 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddCollectionCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddCollectionCommandHandler.cs
@@ -1,12 +1,12 @@
-using Grand.Api.Commands.Models.Catalog;
-using Grand.Api.DTOs.Catalog;
-using Grand.Api.Extensions;
+using Grand.Module.Api.Commands.Models.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
+using Grand.Module.Api.Extensions;
using Grand.Business.Core.Interfaces.Catalog.Collections;
using Grand.Business.Core.Interfaces.Common.Seo;
using Grand.Domain.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Catalog;
+namespace Grand.Module.Api.Commands.Handlers.Catalog;
public class AddCollectionCommandHandler : IRequestHandler<AddCollectionCommand, CollectionDto>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductAttributeCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductAttributeCommandHandler.cs
similarity index 86%
rename from src/API/Grand.Api/Commands/Handlers/Catalog/AddProductAttributeCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductAttributeCommandHandler.cs
index 617709e44..8a4bd9eba 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductAttributeCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductAttributeCommandHandler.cs
@@ -1,12 +1,12 @@
-using Grand.Api.Commands.Models.Catalog;
-using Grand.Api.DTOs.Catalog;
-using Grand.Api.Extensions;
+using Grand.Module.Api.Commands.Models.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
+using Grand.Module.Api.Extensions;
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Catalog;
+namespace Grand.Module.Api.Commands.Handlers.Catalog;
public class AddProductAttributeCommandHandler : IRequestHandler<AddProductAttributeCommand, ProductAttributeDto>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductAttributeMappingCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductAttributeMappingCommandHandler.cs
similarity index 83%
rename from src/API/Grand.Api/Commands/Handlers/Catalog/AddProductAttributeMappingCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductAttributeMappingCommandHandler.cs
index d87d52b12..8bb9d2024 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductAttributeMappingCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductAttributeMappingCommandHandler.cs
@@ -1,10 +1,10 @@
-using Grand.Api.Commands.Models.Catalog;
-using Grand.Api.DTOs.Catalog;
-using Grand.Api.Extensions;
+using Grand.Module.Api.Commands.Models.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
+using Grand.Module.Api.Extensions;
using Grand.Business.Core.Interfaces.Catalog.Products;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Catalog;
+namespace Grand.Module.Api.Commands.Handlers.Catalog;
public class
AddProductAttributeMappingCommandHandler : IRequestHandler<AddProductAttributeMappingCommand,
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCategoryCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductCategoryCommandHandler.cs
similarity index 88%
rename from src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCategoryCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductCategoryCommandHandler.cs
index 3017ab942..e406fb699 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCategoryCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductCategoryCommandHandler.cs
@@ -1,9 +1,9 @@
-using Grand.Api.Commands.Models.Catalog;
+using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Categories;
using Grand.Domain.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Catalog;
+namespace Grand.Module.Api.Commands.Handlers.Catalog;
public class AddProductCategoryCommandHandler : IRequestHandler<AddProductCategoryCommand, bool>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCollectionCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductCollectionCommandHandler.cs
similarity index 89%
rename from src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCollectionCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductCollectionCommandHandler.cs
index d82d29abe..1f7e44d94 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCollectionCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductCollectionCommandHandler.cs
@@ -1,9 +1,9 @@
-using Grand.Api.Commands.Models.Catalog;
+using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Collections;
using Grand.Domain.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Catalog;
+namespace Grand.Module.Api.Commands.Handlers.Catalog;
public class AddProductCollectionCommandHandler : IRequestHandler<AddProductCollectionCommand, bool>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductCommandHandler.cs
similarity index 88%
rename from src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductCommandHandler.cs
index 228977de5..5c54ce738 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductCommandHandler.cs
@@ -1,6 +1,6 @@
-using Grand.Api.Commands.Models.Catalog;
-using Grand.Api.DTOs.Catalog;
-using Grand.Api.Extensions;
+using Grand.Module.Api.Commands.Models.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
+using Grand.Module.Api.Extensions;
using Grand.Business.Core.Extensions;
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Business.Core.Interfaces.Common.Localization;
@@ -10,7 +10,7 @@ using Grand.Domain.Seo;
using Grand.Infrastructure;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Catalog;
+namespace Grand.Module.Api.Commands.Handlers.Catalog;
public class AddProductCommandHandler : IRequestHandler<AddProductCommand, ProductDto>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductPictureCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductPictureCommandHandler.cs
similarity index 92%
rename from src/API/Grand.Api/Commands/Handlers/Catalog/AddProductPictureCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductPictureCommandHandler.cs
index 2f4b76f38..1140e5fe0 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductPictureCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductPictureCommandHandler.cs
@@ -1,10 +1,10 @@
-using Grand.Api.Commands.Models.Catalog;
+using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Catalog;
+namespace Grand.Module.Api.Commands.Handlers.Catalog;
public class AddProductPictureCommandHandler : IRequestHandler<AddProductPictureCommand, bool>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductSpecificationCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductSpecificationCommandHandler.cs
similarity index 93%
rename from src/API/Grand.Api/Commands/Handlers/Catalog/AddProductSpecificationCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductSpecificationCommandHandler.cs
index a1b96ce87..8793f3643 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductSpecificationCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductSpecificationCommandHandler.cs
@@ -1,9 +1,9 @@
-using Grand.Api.Commands.Models.Catalog;
+using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Domain.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Catalog;
+namespace Grand.Module.Api.Commands.Handlers.Catalog;
public class AddProductSpecificationCommandHandler : IRequestHandler<AddProductSpecificationCommand, bool>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductTierPriceCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductTierPriceCommandHandler.cs
similarity index 81%
rename from src/API/Grand.Api/Commands/Handlers/Catalog/AddProductTierPriceCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductTierPriceCommandHandler.cs
index 3c5da8ebb..43dc331ef 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductTierPriceCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductTierPriceCommandHandler.cs
@@ -1,9 +1,9 @@
-using Grand.Api.Commands.Models.Catalog;
-using Grand.Api.Extensions;
+using Grand.Module.Api.Commands.Models.Catalog;
+using Grand.Module.Api.Extensions;
using Grand.Business.Core.Interfaces.Catalog.Products;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Catalog;
+namespace Grand.Module.Api.Commands.Handlers.Catalog;
public class AddProductTierPriceCommandHandler : IRequestHandler<AddProductTierPriceCommand, bool>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddSpecificationAttributeCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddSpecificationAttributeCommandHandler.cs
similarity index 87%
rename from src/API/Grand.Api/Commands/Handlers/Catalog/AddSpecificationAttributeCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddSpecificationAttributeCommandHandler.cs
index f10a24d97..2b6a264e0 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddSpecificationAttributeCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddSpecificationAttributeCommandHandler.cs
@@ -1,12 +1,12 @@
-using Grand.Api.Commands.Models.Catalog;
-using Grand.Api.DTOs.Catalog;
-using Grand.Api.Extensions;
+using Grand.Module.Api.Commands.Models.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
+using Grand.Module.Api.Extensions;
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Catalog;
+namespace Grand.Module.Api.Commands.Handlers.Catalog;
public class
AddSpecificationAttributeCommandHandler : IRequestHandler<AddSpecificationAttributeCommand,
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteBrandCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteBrandCommandHandler.cs
similarity index 90%
rename from src/API/Grand.Api/Commands/Handlers/Catalog/DeleteBrandCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteBrandCommandHandler.cs
index 26ff293db..8ecba5bd2 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteBrandCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteBrandCommandHandler.cs
@@ -1,10 +1,10 @@
-using Grand.Api.Commands.Models.Catalog;
+using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Brands;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Catalog;
+namespace Grand.Module.Api.Commands.Handlers.Catalog;
public class DeleteBrandCommandHandler : IRequestHandler<DeleteBrandCommand, bool>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteCategoryCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteCategoryCommandHandler.cs
similarity index 90%
rename from src/API/Grand.Api/Commands/Handlers/Catalog/DeleteCategoryCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteCategoryCommandHandler.cs
index 295caca09..fed6ab6ab 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteCategoryCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteCategoryCommandHandler.cs
@@ -1,10 +1,10 @@
-using Grand.Api.Commands.Models.Catalog;
+using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Categories;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Catalog;
+namespace Grand.Module.Api.Commands.Handlers.Catalog;
public class DeleteCategoryCommandHandler : IRequestHandler<DeleteCategoryCommand, bool>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteCollectionCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteCollectionCommandHandler.cs
similarity index 90%
rename from src/API/Grand.Api/Commands/Handlers/Catalog/DeleteCollectionCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteCollectionCommandHandler.cs
index 622738863..0022476df 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteCollectionCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteCollectionCommandHandler.cs
@@ -1,10 +1,10 @@
-using Grand.Api.Commands.Models.Catalog;
+using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Collections;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Catalog;
+namespace Grand.Module.Api.Commands.Handlers.Catalog;
public class DeleteCollectionCommandHandler : IRequestHandler<DeleteCollectionCommand, bool>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductAttributeCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductAttributeCommandHandler.cs
similarity index 91%
rename from src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductAttributeCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductAttributeCommandHandler.cs
index 3d7c483d7..00964f172 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductAttributeCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductAttributeCommandHandler.cs
@@ -1,10 +1,10 @@
-using Grand.Api.Commands.Models.Catalog;
+using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Catalog;
+namespace Grand.Module.Api.Commands.Handlers.Catalog;
public class DeleteProductAttributeCommandHandler : IRequestHandler<DeleteProductAttributeCommand, bool>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductAttributeMappingCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductAttributeMappingCommandHandler.cs
similarity index 85%
rename from src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductAttributeMappingCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductAttributeMappingCommandHandler.cs
index 912b4c2c0..6cec095f1 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductAttributeMappingCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductAttributeMappingCommandHandler.cs
@@ -1,9 +1,9 @@
-using Grand.Api.Commands.Models.Catalog;
-using Grand.Api.Extensions;
+using Grand.Module.Api.Commands.Models.Catalog;
+using Grand.Module.Api.Extensions;
using Grand.Business.Core.Interfaces.Catalog.Products;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Catalog;
+namespace Grand.Module.Api.Commands.Handlers.Catalog;
public class DeleteProductAttributeMappingCommandHandler : IRequestHandler<DeleteProductAttributeMappingCommand, bool>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductCategoryCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductCategoryCommandHandler.cs
similarity index 91%
rename from src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductCategoryCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductCategoryCommandHandler.cs
index b9e2df402..33b644709 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductCategoryCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductCategoryCommandHandler.cs
@@ -1,9 +1,9 @@
-using Grand.Api.Commands.Models.Catalog;
+using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Categories;
using Grand.Business.Core.Interfaces.Catalog.Products;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Catalog;
+namespace Grand.Module.Api.Commands.Handlers.Catalog;
public class DeleteProductCategoryCommandHandler : IRequestHandler<DeleteProductCategoryCommand, bool>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductCollectionCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductCollectionCommandHandler.cs
similarity index 91%
rename from src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductCollectionCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductCollectionCommandHandler.cs
index 831814afe..6e6508aad 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductCollectionCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductCollectionCommandHandler.cs
@@ -1,9 +1,9 @@
-using Grand.Api.Commands.Models.Catalog;
+using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Collections;
using Grand.Business.Core.Interfaces.Catalog.Products;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Catalog;
+namespace Grand.Module.Api.Commands.Handlers.Catalog;
public class DeleteProductCollectionCommandHandler : IRequestHandler<DeleteProductCollectionCommand, bool>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductCommandHandler.cs
similarity index 90%
rename from src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductCommandHandler.cs
index 1b6ea65fb..190aece43 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductCommandHandler.cs
@@ -1,10 +1,10 @@
-using Grand.Api.Commands.Models.Catalog;
+using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Catalog;
+namespace Grand.Module.Api.Commands.Handlers.Catalog;
public class DeleteProductCommandHandler : IRequestHandler<DeleteProductCommand, bool>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductPictureCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductPictureCommandHandler.cs
similarity index 89%
rename from src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductPictureCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductPictureCommandHandler.cs
index 09d5c2200..76d5d16cb 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductPictureCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductPictureCommandHandler.cs
@@ -1,8 +1,8 @@
-using Grand.Api.Commands.Models.Catalog;
+using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Products;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Catalog;
+namespace Grand.Module.Api.Commands.Handlers.Catalog;
public class DeleteProductPictureCommandHandler : IRequestHandler<DeleteProductPictureCommand, bool>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductSpecificationCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductSpecificationCommandHandler.cs
similarity index 90%
rename from src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductSpecificationCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductSpecificationCommandHandler.cs
index 71066ce64..31147a698 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductSpecificationCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductSpecificationCommandHandler.cs
@@ -1,8 +1,8 @@
-using Grand.Api.Commands.Models.Catalog;
+using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Products;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Catalog;
+namespace Grand.Module.Api.Commands.Handlers.Catalog;
public class DeleteProductSpecificationCommandHandler : IRequestHandler<DeleteProductSpecificationCommand, bool>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductTierPriceCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductTierPriceCommandHandler.cs
similarity index 87%
rename from src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductTierPriceCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductTierPriceCommandHandler.cs
index 3b596f8e4..db0539864 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductTierPriceCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductTierPriceCommandHandler.cs
@@ -1,8 +1,8 @@
-using Grand.Api.Commands.Models.Catalog;
+using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Products;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Catalog;
+namespace Grand.Module.Api.Commands.Handlers.Catalog;
public class DeleteProductTierPriceCommandHandler : IRequestHandler<DeleteProductTierPriceCommand, bool>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteSpecificationAttributeCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteSpecificationAttributeCommandHandler.cs
similarity index 92%
rename from src/API/Grand.Api/Commands/Handlers/Catalog/DeleteSpecificationAttributeCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteSpecificationAttributeCommandHandler.cs
index 95bc422bd..8d202aca5 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteSpecificationAttributeCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteSpecificationAttributeCommandHandler.cs
@@ -1,10 +1,10 @@
-using Grand.Api.Commands.Models.Catalog;
+using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Catalog;
+namespace Grand.Module.Api.Commands.Handlers.Catalog;
public class DeleteSpecificationAttributeCommandHandler : IRequestHandler<DeleteSpecificationAttributeCommand, bool>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateBrandCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateBrandCommandHandler.cs
similarity index 92%
rename from src/API/Grand.Api/Commands/Handlers/Catalog/UpdateBrandCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateBrandCommandHandler.cs
index 8f12f761a..977a93820 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateBrandCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateBrandCommandHandler.cs
@@ -1,12 +1,12 @@
-using Grand.Api.Commands.Models.Catalog;
-using Grand.Api.DTOs.Catalog;
-using Grand.Api.Extensions;
+using Grand.Module.Api.Commands.Models.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
+using Grand.Module.Api.Extensions;
using Grand.Business.Core.Interfaces.Catalog.Brands;
using Grand.Business.Core.Interfaces.Common.Seo;
using Grand.Business.Core.Interfaces.Storage;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Catalog;
+namespace Grand.Module.Api.Commands.Handlers.Catalog;
public class UpdateBrandCommandHandler : IRequestHandler<UpdateBrandCommand, BrandDto>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateCategoryCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateCategoryCommandHandler.cs
similarity index 92%
rename from src/API/Grand.Api/Commands/Handlers/Catalog/UpdateCategoryCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateCategoryCommandHandler.cs
index 9dddab562..e146903c9 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateCategoryCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateCategoryCommandHandler.cs
@@ -1,12 +1,12 @@
-using Grand.Api.Commands.Models.Catalog;
-using Grand.Api.DTOs.Catalog;
-using Grand.Api.Extensions;
+using Grand.Module.Api.Commands.Models.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
+using Grand.Module.Api.Extensions;
using Grand.Business.Core.Interfaces.Catalog.Categories;
using Grand.Business.Core.Interfaces.Common.Seo;
using Grand.Business.Core.Interfaces.Storage;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Catalog;
+namespace Grand.Module.Api.Commands.Handlers.Catalog;
public class UpdateCategoryCommandHandler : IRequestHandler<UpdateCategoryCommand, CategoryDto>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateCollectionCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateCollectionCommandHandler.cs
similarity index 92%
rename from src/API/Grand.Api/Commands/Handlers/Catalog/UpdateCollectionCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateCollectionCommandHandler.cs
index c39e52ec8..e4b5cb81b 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateCollectionCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateCollectionCommandHandler.cs
@@ -1,12 +1,12 @@
-using Grand.Api.Commands.Models.Catalog;
-using Grand.Api.DTOs.Catalog;
-using Grand.Api.Extensions;
+using Grand.Module.Api.Commands.Models.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
+using Grand.Module.Api.Extensions;
using Grand.Business.Core.Interfaces.Catalog.Collections;
using Grand.Business.Core.Interfaces.Common.Seo;
using Grand.Business.Core.Interfaces.Storage;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Catalog;
+namespace Grand.Module.Api.Commands.Handlers.Catalog;
public class UpdateCollectionCommandHandler : IRequestHandler<UpdateCollectionCommand, CollectionDto>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductAttributeCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductAttributeCommandHandler.cs
similarity index 87%
rename from src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductAttributeCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductAttributeCommandHandler.cs
index 5b84d4fff..7f956abdf 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductAttributeCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductAttributeCommandHandler.cs
@@ -1,12 +1,12 @@
-using Grand.Api.Commands.Models.Catalog;
-using Grand.Api.DTOs.Catalog;
-using Grand.Api.Extensions;
+using Grand.Module.Api.Commands.Models.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
+using Grand.Module.Api.Extensions;
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Catalog;
+namespace Grand.Module.Api.Commands.Handlers.Catalog;
public class UpdateProductAttributeCommandHandler : IRequestHandler<UpdateProductAttributeCommand, ProductAttributeDto>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductAttributeMappingCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductAttributeMappingCommandHandler.cs
similarity index 83%
rename from src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductAttributeMappingCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductAttributeMappingCommandHandler.cs
index cc290997c..5002b92a1 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductAttributeMappingCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductAttributeMappingCommandHandler.cs
@@ -1,10 +1,10 @@
-using Grand.Api.Commands.Models.Catalog;
-using Grand.Api.DTOs.Catalog;
-using Grand.Api.Extensions;
+using Grand.Module.Api.Commands.Models.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
+using Grand.Module.Api.Extensions;
using Grand.Business.Core.Interfaces.Catalog.Products;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Catalog;
+namespace Grand.Module.Api.Commands.Handlers.Catalog;
public class
UpdateProductAttributeMappingCommandHandler : IRequestHandler<UpdateProductAttributeMappingCommand,
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCategoryCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductCategoryCommandHandler.cs
similarity index 92%
rename from src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCategoryCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductCategoryCommandHandler.cs
index bd66fac22..485d51756 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCategoryCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductCategoryCommandHandler.cs
@@ -1,9 +1,9 @@
-using Grand.Api.Commands.Models.Catalog;
+using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Categories;
using Grand.Business.Core.Interfaces.Catalog.Products;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Catalog;
+namespace Grand.Module.Api.Commands.Handlers.Catalog;
public class UpdateProductCategoryCommandHandler : IRequestHandler<UpdateProductCategoryCommand, bool>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCollectionCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductCollectionCommandHandler.cs
similarity index 92%
rename from src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCollectionCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductCollectionCommandHandler.cs
index 6de3cc425..7e7db843e 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCollectionCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductCollectionCommandHandler.cs
@@ -1,9 +1,9 @@
-using Grand.Api.Commands.Models.Catalog;
+using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Collections;
using Grand.Business.Core.Interfaces.Catalog.Products;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Catalog;
+namespace Grand.Module.Api.Commands.Handlers.Catalog;
public class UpdateProductCollectionCommandHandler : IRequestHandler<UpdateProductCollectionCommand, bool>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductCommandHandler.cs
similarity index 94%
rename from src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductCommandHandler.cs
index b10528d80..ee2ea8d66 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductCommandHandler.cs
@@ -1,13 +1,13 @@
-using Grand.Api.Commands.Models.Catalog;
-using Grand.Api.DTOs.Catalog;
-using Grand.Api.Extensions;
+using Grand.Module.Api.Commands.Models.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
+using Grand.Module.Api.Extensions;
using Grand.Business.Core.Events.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Business.Core.Interfaces.Common.Seo;
using Grand.Domain.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Catalog;
+namespace Grand.Module.Api.Commands.Handlers.Catalog;
public class UpdateProductCommandHandler : IRequestHandler<UpdateProductCommand, ProductDto>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductPictureCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductPictureCommandHandler.cs
similarity index 89%
rename from src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductPictureCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductPictureCommandHandler.cs
index 54a014aae..e1434f190 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductPictureCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductPictureCommandHandler.cs
@@ -1,8 +1,8 @@
-using Grand.Api.Commands.Models.Catalog;
+using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Products;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Catalog;
+namespace Grand.Module.Api.Commands.Handlers.Catalog;
public class UpdateProductPictureCommandHandler : IRequestHandler<UpdateProductPictureCommand, bool>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductSpecificationCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductSpecificationCommandHandler.cs
similarity index 94%
rename from src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductSpecificationCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductSpecificationCommandHandler.cs
index 6eaa725d0..1758f06c5 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductSpecificationCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductSpecificationCommandHandler.cs
@@ -1,9 +1,9 @@
-using Grand.Api.Commands.Models.Catalog;
+using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Domain.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Catalog;
+namespace Grand.Module.Api.Commands.Handlers.Catalog;
public class UpdateProductSpecificationCommandHandler : IRequestHandler<UpdateProductSpecificationCommand, bool>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductStockCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductStockCommandHandler.cs
similarity index 98%
rename from src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductStockCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductStockCommandHandler.cs
index bdc64a5d8..bbb14244f 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductStockCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductStockCommandHandler.cs
@@ -1,11 +1,11 @@
-using Grand.Api.Commands.Models.Catalog;
+using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Domain.Catalog;
using Grand.Infrastructure;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Catalog;
+namespace Grand.Module.Api.Commands.Handlers.Catalog;
public class UpdateProductStockCommandHandler : IRequestHandler<UpdateProductStockCommand, bool>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductTierPriceCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductTierPriceCommandHandler.cs
similarity index 83%
rename from src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductTierPriceCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductTierPriceCommandHandler.cs
index 1d9c74f21..77cfa2b2c 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductTierPriceCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductTierPriceCommandHandler.cs
@@ -1,9 +1,9 @@
-using Grand.Api.Commands.Models.Catalog;
-using Grand.Api.Extensions;
+using Grand.Module.Api.Commands.Models.Catalog;
+using Grand.Module.Api.Extensions;
using Grand.Business.Core.Interfaces.Catalog.Products;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Catalog;
+namespace Grand.Module.Api.Commands.Handlers.Catalog;
public class UpdateProductTierPriceCommandHandler : IRequestHandler<UpdateProductTierPriceCommand, bool>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateSpecificationAttributeCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateSpecificationAttributeCommandHandler.cs
similarity index 90%
rename from src/API/Grand.Api/Commands/Handlers/Catalog/UpdateSpecificationAttributeCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateSpecificationAttributeCommandHandler.cs
index a181a398c..3cf3cd827 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateSpecificationAttributeCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateSpecificationAttributeCommandHandler.cs
@@ -1,12 +1,12 @@
-using Grand.Api.Commands.Models.Catalog;
-using Grand.Api.DTOs.Catalog;
-using Grand.Api.Extensions;
+using Grand.Module.Api.Commands.Models.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
+using Grand.Module.Api.Extensions;
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Catalog;
+namespace Grand.Module.Api.Commands.Handlers.Catalog;
public class
UpdateSpecificationAttributeCommandHandler : IRequestHandler<UpdateSpecificationAttributeCommand,
diff --git a/src/API/Grand.Api/Commands/Handlers/Common/AddPictureCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Common/AddPictureCommandHandler.cs
similarity index 83%
rename from src/API/Grand.Api/Commands/Handlers/Common/AddPictureCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Common/AddPictureCommandHandler.cs
index 0137d4940..59e718a80 100644
--- a/src/API/Grand.Api/Commands/Handlers/Common/AddPictureCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Common/AddPictureCommandHandler.cs
@@ -1,10 +1,10 @@
-using Grand.Api.Commands.Models.Common;
-using Grand.Api.DTOs.Common;
-using Grand.Api.Extensions;
+using Grand.Module.Api.Commands.Models.Common;
+using Grand.Module.Api.DTOs.Common;
+using Grand.Module.Api.Extensions;
using Grand.Business.Core.Interfaces.Storage;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Common;
+namespace Grand.Module.Api.Commands.Handlers.Common;
public class AddPictureCommandHandler : IRequestHandler<AddPictureCommand, PictureDto>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Common/DeletePictureCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Common/DeletePictureCommandHandler.cs
similarity index 85%
rename from src/API/Grand.Api/Commands/Handlers/Common/DeletePictureCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Common/DeletePictureCommandHandler.cs
index fb15a8f19..980390d46 100644
--- a/src/API/Grand.Api/Commands/Handlers/Common/DeletePictureCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Common/DeletePictureCommandHandler.cs
@@ -1,8 +1,8 @@
-using Grand.Api.Commands.Models.Common;
+using Grand.Module.Api.Commands.Models.Common;
using Grand.Business.Core.Interfaces.Storage;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Common;
+namespace Grand.Module.Api.Commands.Handlers.Common;
public class DeletePictureCommandHandler : IRequestHandler<DeletePictureCommand, bool>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Common/GenerateTokenCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Common/GenerateTokenCommandHandler.cs
similarity index 83%
rename from src/API/Grand.Api/Commands/Handlers/Common/GenerateTokenCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Common/GenerateTokenCommandHandler.cs
index 0294a9392..5263d8257 100644
--- a/src/API/Grand.Api/Commands/Handlers/Common/GenerateTokenCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Common/GenerateTokenCommandHandler.cs
@@ -1,10 +1,10 @@
-using Grand.Api.Commands.Models.Common;
-using Grand.Api.Infrastructure.Extensions;
-using Grand.Api.Jwt;
+using Grand.Module.Api.Commands.Models.Common;
+using Grand.Module.Api.Infrastructure.Extensions;
+using Grand.Module.Api.Jwt;
using Grand.Infrastructure.Configuration;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Common;
+namespace Grand.Module.Api.Commands.Handlers.Common;
public class GenerateTokenCommandHandler : IRequestHandler<GenerateTokenCommand, string>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Common/GenerateTokenWebCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Common/GenerateTokenWebCommandHandler.cs
similarity index 84%
rename from src/API/Grand.Api/Commands/Handlers/Common/GenerateTokenWebCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Common/GenerateTokenWebCommandHandler.cs
index c658ebb67..c3591d952 100644
--- a/src/API/Grand.Api/Commands/Handlers/Common/GenerateTokenWebCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Common/GenerateTokenWebCommandHandler.cs
@@ -1,10 +1,10 @@
-using Grand.Api.Commands.Models.Common;
-using Grand.Api.Infrastructure.Extensions;
-using Grand.Api.Jwt;
+using Grand.Module.Api.Commands.Models.Common;
+using Grand.Module.Api.Infrastructure.Extensions;
+using Grand.Module.Api.Jwt;
using Grand.Infrastructure.Configuration;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Common;
+namespace Grand.Module.Api.Commands.Handlers.Common;
public class GenerateTokenWebCommandHandler : IRequestHandler<GenerateTokenWebCommand, string>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Common/UpdatePictureCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Common/UpdatePictureCommandHandler.cs
similarity index 89%
rename from src/API/Grand.Api/Commands/Handlers/Common/UpdatePictureCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Common/UpdatePictureCommandHandler.cs
index 4c0dbce79..348c50249 100644
--- a/src/API/Grand.Api/Commands/Handlers/Common/UpdatePictureCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Common/UpdatePictureCommandHandler.cs
@@ -1,8 +1,8 @@
-using Grand.Api.Commands.Models.Common;
+using Grand.Module.Api.Commands.Models.Common;
using Grand.Business.Core.Interfaces.Storage;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Common;
+namespace Grand.Module.Api.Commands.Handlers.Common;
public class UpdatePictureCommandHandler : IRequestHandler<UpdatePictureCommand, bool>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Customers/AddCustomerAddressCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/AddCustomerAddressCommandHandler.cs
similarity index 78%
rename from src/API/Grand.Api/Commands/Handlers/Customers/AddCustomerAddressCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Customers/AddCustomerAddressCommandHandler.cs
index 802f2ab26..d820660bc 100644
--- a/src/API/Grand.Api/Commands/Handlers/Customers/AddCustomerAddressCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/AddCustomerAddressCommandHandler.cs
@@ -1,10 +1,10 @@
-using Grand.Api.Commands.Models.Customers;
-using Grand.Api.DTOs.Customers;
-using Grand.Api.Extensions;
+using Grand.Module.Api.Commands.Models.Customers;
+using Grand.Module.Api.DTOs.Customers;
+using Grand.Module.Api.Extensions;
using Grand.Business.Core.Interfaces.Customers;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Customers;
+namespace Grand.Module.Api.Commands.Handlers.Customers;
public class AddCustomerAddressCommandHandler : IRequestHandler<AddCustomerAddressCommand, AddressDto>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Customers/AddCustomerCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/AddCustomerCommandHandler.cs
similarity index 95%
rename from src/API/Grand.Api/Commands/Handlers/Customers/AddCustomerCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Customers/AddCustomerCommandHandler.cs
index 4c8b93cc8..bbdc2b223 100644
--- a/src/API/Grand.Api/Commands/Handlers/Customers/AddCustomerCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/AddCustomerCommandHandler.cs
@@ -1,12 +1,12 @@
-using Grand.Api.Commands.Models.Customers;
-using Grand.Api.DTOs.Customers;
-using Grand.Api.Extensions;
+using Grand.Module.Api.Commands.Models.Customers;
+using Grand.Module.Api.DTOs.Customers;
+using Grand.Module.Api.Extensions;
using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Customers;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Customers;
+namespace Grand.Module.Api.Commands.Handlers.Customers;
public class AddCustomerCommandHandler : IRequestHandler<AddCustomerCommand, CustomerDto>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Customers/AddCustomerGroupCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/AddCustomerGroupCommandHandler.cs
similarity index 84%
rename from src/API/Grand.Api/Commands/Handlers/Customers/AddCustomerGroupCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Customers/AddCustomerGroupCommandHandler.cs
index 1997f744b..f99c1864e 100644
--- a/src/API/Grand.Api/Commands/Handlers/Customers/AddCustomerGroupCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/AddCustomerGroupCommandHandler.cs
@@ -1,12 +1,12 @@
-using Grand.Api.Commands.Models.Customers;
-using Grand.Api.DTOs.Customers;
-using Grand.Api.Extensions;
+using Grand.Module.Api.Commands.Models.Customers;
+using Grand.Module.Api.DTOs.Customers;
+using Grand.Module.Api.Extensions;
using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Customers;
+namespace Grand.Module.Api.Commands.Handlers.Customers;
public class AddCustomerGroupCommandHandler : IRequestHandler<AddCustomerGroupCommand, CustomerGroupDto>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Customers/DeleteCustomerAddressCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/DeleteCustomerAddressCommandHandler.cs
similarity index 88%
rename from src/API/Grand.Api/Commands/Handlers/Customers/DeleteCustomerAddressCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Customers/DeleteCustomerAddressCommandHandler.cs
index c8ccf8419..a82782fe8 100644
--- a/src/API/Grand.Api/Commands/Handlers/Customers/DeleteCustomerAddressCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/DeleteCustomerAddressCommandHandler.cs
@@ -1,8 +1,8 @@
-using Grand.Api.Commands.Models.Customers;
+using Grand.Module.Api.Commands.Models.Customers;
using Grand.Business.Core.Interfaces.Customers;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Customers;
+namespace Grand.Module.Api.Commands.Handlers.Customers;
public class DeleteCustomerAddressCommandHandler : IRequestHandler<DeleteCustomerAddressCommand, bool>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Customers/DeleteCustomerCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/DeleteCustomerCommandHandler.cs
similarity index 90%
rename from src/API/Grand.Api/Commands/Handlers/Customers/DeleteCustomerCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Customers/DeleteCustomerCommandHandler.cs
index bd9230ebd..585f10d87 100644
--- a/src/API/Grand.Api/Commands/Handlers/Customers/DeleteCustomerCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/DeleteCustomerCommandHandler.cs
@@ -1,10 +1,10 @@
-using Grand.Api.Commands.Models.Customers;
+using Grand.Module.Api.Commands.Models.Customers;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Business.Core.Interfaces.Customers;
using Grand.Infrastructure;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Customers;
+namespace Grand.Module.Api.Commands.Handlers.Customers;
public class DeleteCustomerCommandHandler : IRequestHandler<DeleteCustomerCommand, bool>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Customers/DeleteCustomerGroupCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/DeleteCustomerGroupCommandHandler.cs
similarity index 90%
rename from src/API/Grand.Api/Commands/Handlers/Customers/DeleteCustomerGroupCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Customers/DeleteCustomerGroupCommandHandler.cs
index 47e31e450..e34a3375c 100644
--- a/src/API/Grand.Api/Commands/Handlers/Customers/DeleteCustomerGroupCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/DeleteCustomerGroupCommandHandler.cs
@@ -1,10 +1,10 @@
-using Grand.Api.Commands.Models.Customers;
+using Grand.Module.Api.Commands.Models.Customers;
using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Customers;
+namespace Grand.Module.Api.Commands.Handlers.Customers;
public class DeleteCustomerGroupCommandHandler : IRequestHandler<DeleteCustomerGroupCommand, bool>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Customers/UpdateCustomerAddressCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/UpdateCustomerAddressCommandHandler.cs
similarity index 84%
rename from src/API/Grand.Api/Commands/Handlers/Customers/UpdateCustomerAddressCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Customers/UpdateCustomerAddressCommandHandler.cs
index 28a8dce3f..18b6e9586 100644
--- a/src/API/Grand.Api/Commands/Handlers/Customers/UpdateCustomerAddressCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/UpdateCustomerAddressCommandHandler.cs
@@ -1,10 +1,10 @@
-using Grand.Api.Commands.Models.Customers;
-using Grand.Api.DTOs.Customers;
-using Grand.Api.Extensions;
+using Grand.Module.Api.Commands.Models.Customers;
+using Grand.Module.Api.DTOs.Customers;
+using Grand.Module.Api.Extensions;
using Grand.Business.Core.Interfaces.Customers;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Customers;
+namespace Grand.Module.Api.Commands.Handlers.Customers;
public class UpdateCustomerAddressCommandHandler : IRequestHandler<UpdateCustomerAddressCommand, AddressDto>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Customers/UpdateCustomerCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/UpdateCustomerCommandHandler.cs
similarity index 95%
rename from src/API/Grand.Api/Commands/Handlers/Customers/UpdateCustomerCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Customers/UpdateCustomerCommandHandler.cs
index 97f482de3..52f29dc79 100644
--- a/src/API/Grand.Api/Commands/Handlers/Customers/UpdateCustomerCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/UpdateCustomerCommandHandler.cs
@@ -1,12 +1,12 @@
-using Grand.Api.Commands.Models.Customers;
-using Grand.Api.DTOs.Customers;
-using Grand.Api.Extensions;
+using Grand.Module.Api.Commands.Models.Customers;
+using Grand.Module.Api.DTOs.Customers;
+using Grand.Module.Api.Extensions;
using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Customers;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Customers;
+namespace Grand.Module.Api.Commands.Handlers.Customers;
public class UpdateCustomerCommandHandler : IRequestHandler<UpdateCustomerCommand, CustomerDto>
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Customers/UpdateCustomerGroupCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/UpdateCustomerGroupCommandHandler.cs
similarity index 85%
rename from src/API/Grand.Api/Commands/Handlers/Customers/UpdateCustomerGroupCommandHandler.cs
rename to src/Modules/Grand.Module.Api/Commands/Handlers/Customers/UpdateCustomerGroupCommandHandler.cs
index 9a026e37e..eab836ce8 100644
--- a/src/API/Grand.Api/Commands/Handlers/Customers/UpdateCustomerGroupCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/UpdateCustomerGroupCommandHandler.cs
@@ -1,12 +1,12 @@
-using Grand.Api.Commands.Models.Customers;
-using Grand.Api.DTOs.Customers;
-using Grand.Api.Extensions;
+using Grand.Module.Api.Commands.Models.Customers;
+using Grand.Module.Api.DTOs.Customers;
+using Grand.Module.Api.Extensions;
using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure;
using MediatR;
-namespace Grand.Api.Commands.Handlers.Customers;
+namespace Grand.Module.Api.Commands.Handlers.Customers;
public class UpdateCustomerGroupCommandHandler : IRequestHandler<UpdateCustomerGroupCommand, CustomerGroupDto>
{
diff --git a/src/API/Grand.Api/Commands/Models/Catalog/AddBrandCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddBrandCommand.cs
similarity index 53%
rename from src/API/Grand.Api/Commands/Models/Catalog/AddBrandCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddBrandCommand.cs
index 726f0a662..39c0e1bb8 100644
--- a/src/API/Grand.Api/Commands/Models/Catalog/AddBrandCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddBrandCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Models.Catalog;
+namespace Grand.Module.Api.Commands.Models.Catalog;
public class AddBrandCommand : IRequest<BrandDto>
{
diff --git a/src/API/Grand.Api/Commands/Models/Catalog/AddCategoryCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddCategoryCommand.cs
similarity index 55%
rename from src/API/Grand.Api/Commands/Models/Catalog/AddCategoryCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddCategoryCommand.cs
index d48bedf9f..5844c9580 100644
--- a/src/API/Grand.Api/Commands/Models/Catalog/AddCategoryCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddCategoryCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Models.Catalog;
+namespace Grand.Module.Api.Commands.Models.Catalog;
public class AddCategoryCommand : IRequest<CategoryDto>
{
diff --git a/src/API/Grand.Api/Commands/Models/Catalog/AddCollectionCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddCollectionCommand.cs
similarity index 57%
rename from src/API/Grand.Api/Commands/Models/Catalog/AddCollectionCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddCollectionCommand.cs
index 17f2d311b..da40324d6 100644
--- a/src/API/Grand.Api/Commands/Models/Catalog/AddCollectionCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddCollectionCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Models.Catalog;
+namespace Grand.Module.Api.Commands.Models.Catalog;
public class AddCollectionCommand : IRequest<CollectionDto>
{
diff --git a/src/API/Grand.Api/Commands/Models/Catalog/AddProductAttributeCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductAttributeCommand.cs
similarity index 66%
rename from src/API/Grand.Api/Commands/Models/Catalog/AddProductAttributeCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductAttributeCommand.cs
index 77099c371..4de3ff2a5 100644
--- a/src/API/Grand.Api/Commands/Models/Catalog/AddProductAttributeCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductAttributeCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Models.Catalog;
+namespace Grand.Module.Api.Commands.Models.Catalog;
public class AddProductAttributeCommand : IRequest<ProductAttributeDto>
{
diff --git a/src/API/Grand.Api/Commands/Models/Catalog/AddProductAttributeMappingCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductAttributeMappingCommand.cs
similarity index 69%
rename from src/API/Grand.Api/Commands/Models/Catalog/AddProductAttributeMappingCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductAttributeMappingCommand.cs
index 8917e4370..76f4be55e 100644
--- a/src/API/Grand.Api/Commands/Models/Catalog/AddProductAttributeMappingCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductAttributeMappingCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Models.Catalog;
+namespace Grand.Module.Api.Commands.Models.Catalog;
public class AddProductAttributeMappingCommand : IRequest<ProductAttributeMappingDto>
{
diff --git a/src/API/Grand.Api/Commands/Models/Catalog/AddProductCategoryCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductCategoryCommand.cs
similarity index 64%
rename from src/API/Grand.Api/Commands/Models/Catalog/AddProductCategoryCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductCategoryCommand.cs
index d0c6f0e3a..7fa1209dc 100644
--- a/src/API/Grand.Api/Commands/Models/Catalog/AddProductCategoryCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductCategoryCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Models.Catalog;
+namespace Grand.Module.Api.Commands.Models.Catalog;
public class AddProductCategoryCommand : IRequest<bool>
{
diff --git a/src/API/Grand.Api/Commands/Models/Catalog/AddProductCollectionCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductCollectionCommand.cs
similarity index 65%
rename from src/API/Grand.Api/Commands/Models/Catalog/AddProductCollectionCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductCollectionCommand.cs
index 2592feb99..fedccd9fa 100644
--- a/src/API/Grand.Api/Commands/Models/Catalog/AddProductCollectionCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductCollectionCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Models.Catalog;
+namespace Grand.Module.Api.Commands.Models.Catalog;
public class AddProductCollectionCommand : IRequest<bool>
{
diff --git a/src/API/Grand.Api/Commands/Models/Catalog/AddProductCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductCommand.cs
similarity index 55%
rename from src/API/Grand.Api/Commands/Models/Catalog/AddProductCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductCommand.cs
index 831800b11..54d5612cb 100644
--- a/src/API/Grand.Api/Commands/Models/Catalog/AddProductCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Models.Catalog;
+namespace Grand.Module.Api.Commands.Models.Catalog;
public class AddProductCommand : IRequest<ProductDto>
{
diff --git a/src/API/Grand.Api/Commands/Models/Catalog/AddProductPictureCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductPictureCommand.cs
similarity index 64%
rename from src/API/Grand.Api/Commands/Models/Catalog/AddProductPictureCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductPictureCommand.cs
index 8271cc5f1..aa179b99e 100644
--- a/src/API/Grand.Api/Commands/Models/Catalog/AddProductPictureCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductPictureCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Models.Catalog;
+namespace Grand.Module.Api.Commands.Models.Catalog;
public class AddProductPictureCommand : IRequest<bool>
{
diff --git a/src/API/Grand.Api/Commands/Models/Catalog/AddProductSpecificationCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductSpecificationCommand.cs
similarity index 66%
rename from src/API/Grand.Api/Commands/Models/Catalog/AddProductSpecificationCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductSpecificationCommand.cs
index fb1703431..d0f732074 100644
--- a/src/API/Grand.Api/Commands/Models/Catalog/AddProductSpecificationCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductSpecificationCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Models.Catalog;
+namespace Grand.Module.Api.Commands.Models.Catalog;
public class AddProductSpecificationCommand : IRequest<bool>
{
diff --git a/src/API/Grand.Api/Commands/Models/Catalog/AddProductTierPriceCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductTierPriceCommand.cs
similarity index 64%
rename from src/API/Grand.Api/Commands/Models/Catalog/AddProductTierPriceCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductTierPriceCommand.cs
index 117bc67c6..6012d5d6a 100644
--- a/src/API/Grand.Api/Commands/Models/Catalog/AddProductTierPriceCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductTierPriceCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Models.Catalog;
+namespace Grand.Module.Api.Commands.Models.Catalog;
public class AddProductTierPriceCommand : IRequest<bool>
{
diff --git a/src/API/Grand.Api/Commands/Models/Catalog/AddSpecificationAttributeCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddSpecificationAttributeCommand.cs
similarity index 63%
rename from src/API/Grand.Api/Commands/Models/Catalog/AddSpecificationAttributeCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddSpecificationAttributeCommand.cs
index 64d436798..7c072e405 100644
--- a/src/API/Grand.Api/Commands/Models/Catalog/AddSpecificationAttributeCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddSpecificationAttributeCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Models.Catalog;
+namespace Grand.Module.Api.Commands.Models.Catalog;
public class AddSpecificationAttributeCommand : IRequest<SpecificationAttributeDto>
{
diff --git a/src/API/Grand.Api/Commands/Models/Catalog/DeleteBrandCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteBrandCommand.cs
similarity index 53%
rename from src/API/Grand.Api/Commands/Models/Catalog/DeleteBrandCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteBrandCommand.cs
index 277c5d8ef..a591a6f4b 100644
--- a/src/API/Grand.Api/Commands/Models/Catalog/DeleteBrandCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteBrandCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Models.Catalog;
+namespace Grand.Module.Api.Commands.Models.Catalog;
public class DeleteBrandCommand : IRequest<bool>
{
diff --git a/src/API/Grand.Api/Commands/Models/Catalog/DeleteCategoryCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteCategoryCommand.cs
similarity index 55%
rename from src/API/Grand.Api/Commands/Models/Catalog/DeleteCategoryCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteCategoryCommand.cs
index 0b91f382b..999b29f86 100644
--- a/src/API/Grand.Api/Commands/Models/Catalog/DeleteCategoryCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteCategoryCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Models.Catalog;
+namespace Grand.Module.Api.Commands.Models.Catalog;
public class DeleteCategoryCommand : IRequest<bool>
{
diff --git a/src/API/Grand.Api/Commands/Models/Catalog/DeleteCollectionCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteCollectionCommand.cs
similarity index 55%
rename from src/API/Grand.Api/Commands/Models/Catalog/DeleteCollectionCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteCollectionCommand.cs
index a39aed343..051d757ff 100644
--- a/src/API/Grand.Api/Commands/Models/Catalog/DeleteCollectionCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteCollectionCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Models.Catalog;
+namespace Grand.Module.Api.Commands.Models.Catalog;
public class DeleteCollectionCommand : IRequest<bool>
{
diff --git a/src/API/Grand.Api/Commands/Models/Catalog/DeleteProductAttributeCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductAttributeCommand.cs
similarity index 58%
rename from src/API/Grand.Api/Commands/Models/Catalog/DeleteProductAttributeCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductAttributeCommand.cs
index 7fbc5fe95..a660ae4eb 100644
--- a/src/API/Grand.Api/Commands/Models/Catalog/DeleteProductAttributeCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductAttributeCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Models.Catalog;
+namespace Grand.Module.Api.Commands.Models.Catalog;
public class DeleteProductAttributeCommand : IRequest<bool>
{
diff --git a/src/API/Grand.Api/Commands/Models/Catalog/DeleteProductAttributeMappingCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductAttributeMappingCommand.cs
similarity index 66%
rename from src/API/Grand.Api/Commands/Models/Catalog/DeleteProductAttributeMappingCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductAttributeMappingCommand.cs
index b01919436..8cc021537 100644
--- a/src/API/Grand.Api/Commands/Models/Catalog/DeleteProductAttributeMappingCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductAttributeMappingCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Models.Catalog;
+namespace Grand.Module.Api.Commands.Models.Catalog;
public class DeleteProductAttributeMappingCommand : IRequest<bool>
{
diff --git a/src/API/Grand.Api/Commands/Models/Catalog/DeleteProductCategoryCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductCategoryCommand.cs
similarity index 63%
rename from src/API/Grand.Api/Commands/Models/Catalog/DeleteProductCategoryCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductCategoryCommand.cs
index f1d957457..15ac79847 100644
--- a/src/API/Grand.Api/Commands/Models/Catalog/DeleteProductCategoryCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductCategoryCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Models.Catalog;
+namespace Grand.Module.Api.Commands.Models.Catalog;
public class DeleteProductCategoryCommand : IRequest<bool>
{
diff --git a/src/API/Grand.Api/Commands/Models/Catalog/DeleteProductCollectionCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductCollectionCommand.cs
similarity index 64%
rename from src/API/Grand.Api/Commands/Models/Catalog/DeleteProductCollectionCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductCollectionCommand.cs
index b4e797a25..ad9bc721f 100644
--- a/src/API/Grand.Api/Commands/Models/Catalog/DeleteProductCollectionCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductCollectionCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Models.Catalog;
+namespace Grand.Module.Api.Commands.Models.Catalog;
public class DeleteProductCollectionCommand : IRequest<bool>
{
diff --git a/src/API/Grand.Api/Commands/Models/Catalog/DeleteProductCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductCommand.cs
similarity index 54%
rename from src/API/Grand.Api/Commands/Models/Catalog/DeleteProductCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductCommand.cs
index b62ebc8fc..4cbae1e52 100644
--- a/src/API/Grand.Api/Commands/Models/Catalog/DeleteProductCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Models.Catalog;
+namespace Grand.Module.Api.Commands.Models.Catalog;
public class DeleteProductCommand : IRequest<bool>
{
diff --git a/src/API/Grand.Api/Commands/Models/Catalog/DeleteProductPictureCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductPictureCommand.cs
similarity index 63%
rename from src/API/Grand.Api/Commands/Models/Catalog/DeleteProductPictureCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductPictureCommand.cs
index 523541b6e..36ebd2818 100644
--- a/src/API/Grand.Api/Commands/Models/Catalog/DeleteProductPictureCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductPictureCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Models.Catalog;
+namespace Grand.Module.Api.Commands.Models.Catalog;
public class DeleteProductPictureCommand : IRequest<bool>
{
diff --git a/src/API/Grand.Api/Commands/Models/Catalog/DeleteProductSpecificationCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductSpecificationCommand.cs
similarity index 63%
rename from src/API/Grand.Api/Commands/Models/Catalog/DeleteProductSpecificationCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductSpecificationCommand.cs
index 3280ce097..7c90195ef 100644
--- a/src/API/Grand.Api/Commands/Models/Catalog/DeleteProductSpecificationCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductSpecificationCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Models.Catalog;
+namespace Grand.Module.Api.Commands.Models.Catalog;
public class DeleteProductSpecificationCommand : IRequest<bool>
{
diff --git a/src/API/Grand.Api/Commands/Models/Catalog/DeleteProductTierPriceCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductTierPriceCommand.cs
similarity index 62%
rename from src/API/Grand.Api/Commands/Models/Catalog/DeleteProductTierPriceCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductTierPriceCommand.cs
index ead89ce4e..39ce8a6a7 100644
--- a/src/API/Grand.Api/Commands/Models/Catalog/DeleteProductTierPriceCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductTierPriceCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Models.Catalog;
+namespace Grand.Module.Api.Commands.Models.Catalog;
public class DeleteProductTierPriceCommand : IRequest<bool>
{
diff --git a/src/API/Grand.Api/Commands/Models/Catalog/DeleteSpecificationAttributeCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteSpecificationAttributeCommand.cs
similarity index 60%
rename from src/API/Grand.Api/Commands/Models/Catalog/DeleteSpecificationAttributeCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteSpecificationAttributeCommand.cs
index d1e5f38bd..8c6eb4e90 100644
--- a/src/API/Grand.Api/Commands/Models/Catalog/DeleteSpecificationAttributeCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteSpecificationAttributeCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Models.Catalog;
+namespace Grand.Module.Api.Commands.Models.Catalog;
public class DeleteSpecificationAttributeCommand : IRequest<bool>
{
diff --git a/src/API/Grand.Api/Commands/Models/Catalog/UpdateBrandCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateBrandCommand.cs
similarity index 54%
rename from src/API/Grand.Api/Commands/Models/Catalog/UpdateBrandCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateBrandCommand.cs
index 4c52f3c79..4cd9eb83e 100644
--- a/src/API/Grand.Api/Commands/Models/Catalog/UpdateBrandCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateBrandCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Models.Catalog;
+namespace Grand.Module.Api.Commands.Models.Catalog;
public class UpdateBrandCommand : IRequest<BrandDto>
{
diff --git a/src/API/Grand.Api/Commands/Models/Catalog/UpdateCategoryCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateCategoryCommand.cs
similarity index 56%
rename from src/API/Grand.Api/Commands/Models/Catalog/UpdateCategoryCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateCategoryCommand.cs
index 4cd1d8129..773427830 100644
--- a/src/API/Grand.Api/Commands/Models/Catalog/UpdateCategoryCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateCategoryCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Models.Catalog;
+namespace Grand.Module.Api.Commands.Models.Catalog;
public class UpdateCategoryCommand : IRequest<CategoryDto>
{
diff --git a/src/API/Grand.Api/Commands/Models/Catalog/UpdateCollectionCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateCollectionCommand.cs
similarity index 57%
rename from src/API/Grand.Api/Commands/Models/Catalog/UpdateCollectionCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateCollectionCommand.cs
index 698efb19d..3a4877fe7 100644
--- a/src/API/Grand.Api/Commands/Models/Catalog/UpdateCollectionCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateCollectionCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Models.Catalog;
+namespace Grand.Module.Api.Commands.Models.Catalog;
public class UpdateCollectionCommand : IRequest<CollectionDto>
{
diff --git a/src/API/Grand.Api/Commands/Models/Catalog/UpdateProductAttributeCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductAttributeCommand.cs
similarity index 60%
rename from src/API/Grand.Api/Commands/Models/Catalog/UpdateProductAttributeCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductAttributeCommand.cs
index a5795c2d8..6e24dcf5c 100644
--- a/src/API/Grand.Api/Commands/Models/Catalog/UpdateProductAttributeCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductAttributeCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Models.Catalog;
+namespace Grand.Module.Api.Commands.Models.Catalog;
public class UpdateProductAttributeCommand : IRequest<ProductAttributeDto>
{
diff --git a/src/API/Grand.Api/Commands/Models/Catalog/UpdateProductAttributeMappingCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductAttributeMappingCommand.cs
similarity index 69%
rename from src/API/Grand.Api/Commands/Models/Catalog/UpdateProductAttributeMappingCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductAttributeMappingCommand.cs
index 597ec826f..23daa7534 100644
--- a/src/API/Grand.Api/Commands/Models/Catalog/UpdateProductAttributeMappingCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductAttributeMappingCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Models.Catalog;
+namespace Grand.Module.Api.Commands.Models.Catalog;
public class UpdateProductAttributeMappingCommand : IRequest<ProductAttributeMappingDto>
{
diff --git a/src/API/Grand.Api/Commands/Models/Catalog/UpdateProductCategoryCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductCategoryCommand.cs
similarity index 64%
rename from src/API/Grand.Api/Commands/Models/Catalog/UpdateProductCategoryCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductCategoryCommand.cs
index d0173cfe5..1c3f14d15 100644
--- a/src/API/Grand.Api/Commands/Models/Catalog/UpdateProductCategoryCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductCategoryCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Models.Catalog;
+namespace Grand.Module.Api.Commands.Models.Catalog;
public class UpdateProductCategoryCommand : IRequest<bool>
{
diff --git a/src/API/Grand.Api/Commands/Models/Catalog/UpdateProductCollectionCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductCollectionCommand.cs
similarity index 65%
rename from src/API/Grand.Api/Commands/Models/Catalog/UpdateProductCollectionCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductCollectionCommand.cs
index 4a98889f8..5dcdb5eba 100644
--- a/src/API/Grand.Api/Commands/Models/Catalog/UpdateProductCollectionCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductCollectionCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Models.Catalog;
+namespace Grand.Module.Api.Commands.Models.Catalog;
public class UpdateProductCollectionCommand : IRequest<bool>
{
diff --git a/src/API/Grand.Api/Commands/Models/Catalog/UpdateProductCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductCommand.cs
similarity index 55%
rename from src/API/Grand.Api/Commands/Models/Catalog/UpdateProductCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductCommand.cs
index 6deb558ae..868093ffc 100644
--- a/src/API/Grand.Api/Commands/Models/Catalog/UpdateProductCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Models.Catalog;
+namespace Grand.Module.Api.Commands.Models.Catalog;
public class UpdateProductCommand : IRequest<ProductDto>
{
diff --git a/src/API/Grand.Api/Commands/Models/Catalog/UpdateProductPictureCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductPictureCommand.cs
similarity index 64%
rename from src/API/Grand.Api/Commands/Models/Catalog/UpdateProductPictureCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductPictureCommand.cs
index aac5f4ebb..2e6da60d8 100644
--- a/src/API/Grand.Api/Commands/Models/Catalog/UpdateProductPictureCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductPictureCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Models.Catalog;
+namespace Grand.Module.Api.Commands.Models.Catalog;
public class UpdateProductPictureCommand : IRequest<bool>
{
diff --git a/src/API/Grand.Api/Commands/Models/Catalog/UpdateProductSpecificationCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductSpecificationCommand.cs
similarity index 67%
rename from src/API/Grand.Api/Commands/Models/Catalog/UpdateProductSpecificationCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductSpecificationCommand.cs
index 4f7c1d7a4..99504687e 100644
--- a/src/API/Grand.Api/Commands/Models/Catalog/UpdateProductSpecificationCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductSpecificationCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Models.Catalog;
+namespace Grand.Module.Api.Commands.Models.Catalog;
public class UpdateProductSpecificationCommand : IRequest<bool>
{
diff --git a/src/API/Grand.Api/Commands/Models/Catalog/UpdateProductStockCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductStockCommand.cs
similarity index 68%
rename from src/API/Grand.Api/Commands/Models/Catalog/UpdateProductStockCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductStockCommand.cs
index caaf7e801..06f6a9c37 100644
--- a/src/API/Grand.Api/Commands/Models/Catalog/UpdateProductStockCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductStockCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Models.Catalog;
+namespace Grand.Module.Api.Commands.Models.Catalog;
public class UpdateProductStockCommand : IRequest<bool>
{
diff --git a/src/API/Grand.Api/Commands/Models/Catalog/UpdateProductTierPriceCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductTierPriceCommand.cs
similarity index 65%
rename from src/API/Grand.Api/Commands/Models/Catalog/UpdateProductTierPriceCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductTierPriceCommand.cs
index 4075b3a48..00d57efb3 100644
--- a/src/API/Grand.Api/Commands/Models/Catalog/UpdateProductTierPriceCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductTierPriceCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Models.Catalog;
+namespace Grand.Module.Api.Commands.Models.Catalog;
public class UpdateProductTierPriceCommand : IRequest<bool>
{
diff --git a/src/API/Grand.Api/Commands/Models/Catalog/UpdateSpecificationAttributeCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateSpecificationAttributeCommand.cs
similarity index 63%
rename from src/API/Grand.Api/Commands/Models/Catalog/UpdateSpecificationAttributeCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateSpecificationAttributeCommand.cs
index 36bfe3aa8..f8ffcb97f 100644
--- a/src/API/Grand.Api/Commands/Models/Catalog/UpdateSpecificationAttributeCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateSpecificationAttributeCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using MediatR;
-namespace Grand.Api.Commands.Models.Catalog;
+namespace Grand.Module.Api.Commands.Models.Catalog;
public class UpdateSpecificationAttributeCommand : IRequest<SpecificationAttributeDto>
{
diff --git a/src/API/Grand.Api/Commands/Models/Common/AddPictureCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Common/AddPictureCommand.cs
similarity index 56%
rename from src/API/Grand.Api/Commands/Models/Common/AddPictureCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Common/AddPictureCommand.cs
index 063ebd114..984cdd281 100644
--- a/src/API/Grand.Api/Commands/Models/Common/AddPictureCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Common/AddPictureCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Common;
+using Grand.Module.Api.DTOs.Common;
using MediatR;
-namespace Grand.Api.Commands.Models.Common;
+namespace Grand.Module.Api.Commands.Models.Common;
public class AddPictureCommand : IRequest<PictureDto>
{
diff --git a/src/API/Grand.Api/Commands/Models/Common/DeletePictureCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Common/DeletePictureCommand.cs
similarity index 56%
rename from src/API/Grand.Api/Commands/Models/Common/DeletePictureCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Common/DeletePictureCommand.cs
index 6cf0b2b63..7c25bc991 100644
--- a/src/API/Grand.Api/Commands/Models/Common/DeletePictureCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Common/DeletePictureCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Common;
+using Grand.Module.Api.DTOs.Common;
using MediatR;
-namespace Grand.Api.Commands.Models.Common;
+namespace Grand.Module.Api.Commands.Models.Common;
public class DeletePictureCommand : IRequest<bool>
{
diff --git a/src/API/Grand.Api/Commands/Models/Common/GenerateTokenCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Common/GenerateTokenCommand.cs
similarity index 72%
rename from src/API/Grand.Api/Commands/Models/Common/GenerateTokenCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Common/GenerateTokenCommand.cs
index 6d29b1c23..831941b78 100644
--- a/src/API/Grand.Api/Commands/Models/Common/GenerateTokenCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Common/GenerateTokenCommand.cs
@@ -1,6 +1,6 @@
using MediatR;
-namespace Grand.Api.Commands.Models.Common;
+namespace Grand.Module.Api.Commands.Models.Common;
public class GenerateTokenCommand : IRequest<string>
{
diff --git a/src/API/Grand.Api/Commands/Models/Common/GenerateTokenWebCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Common/GenerateTokenWebCommand.cs
similarity index 72%
rename from src/API/Grand.Api/Commands/Models/Common/GenerateTokenWebCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Common/GenerateTokenWebCommand.cs
index b268abee0..7c4242788 100644
--- a/src/API/Grand.Api/Commands/Models/Common/GenerateTokenWebCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Common/GenerateTokenWebCommand.cs
@@ -1,6 +1,6 @@
using MediatR;
-namespace Grand.Api.Commands.Models.Common;
+namespace Grand.Module.Api.Commands.Models.Common;
public class GenerateTokenWebCommand : IRequest<string>
{
diff --git a/src/API/Grand.Api/Commands/Models/Common/UpdatePictureCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Common/UpdatePictureCommand.cs
similarity index 55%
rename from src/API/Grand.Api/Commands/Models/Common/UpdatePictureCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Common/UpdatePictureCommand.cs
index 5ccefa801..7ff8eea65 100644
--- a/src/API/Grand.Api/Commands/Models/Common/UpdatePictureCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Common/UpdatePictureCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Common;
+using Grand.Module.Api.DTOs.Common;
using MediatR;
-namespace Grand.Api.Commands.Models.Common;
+namespace Grand.Module.Api.Commands.Models.Common;
public class UpdatePictureCommand : IRequest<bool>
{
diff --git a/src/API/Grand.Api/Commands/Models/Customers/AddCustomerAddressCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Customers/AddCustomerAddressCommand.cs
similarity index 63%
rename from src/API/Grand.Api/Commands/Models/Customers/AddCustomerAddressCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Customers/AddCustomerAddressCommand.cs
index a6ac8901c..5d352bd7d 100644
--- a/src/API/Grand.Api/Commands/Models/Customers/AddCustomerAddressCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Customers/AddCustomerAddressCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Customers;
+using Grand.Module.Api.DTOs.Customers;
using MediatR;
-namespace Grand.Api.Commands.Models.Customers;
+namespace Grand.Module.Api.Commands.Models.Customers;
public class AddCustomerAddressCommand : IRequest<AddressDto>
{
diff --git a/src/API/Grand.Api/Commands/Models/Customers/AddCustomerCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Customers/AddCustomerCommand.cs
similarity index 54%
rename from src/API/Grand.Api/Commands/Models/Customers/AddCustomerCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Customers/AddCustomerCommand.cs
index e46613772..3283703c4 100644
--- a/src/API/Grand.Api/Commands/Models/Customers/AddCustomerCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Customers/AddCustomerCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Customers;
+using Grand.Module.Api.DTOs.Customers;
using MediatR;
-namespace Grand.Api.Commands.Models.Customers;
+namespace Grand.Module.Api.Commands.Models.Customers;
public class AddCustomerCommand : IRequest<CustomerDto>
{
diff --git a/src/API/Grand.Api/Commands/Models/Customers/AddCustomerGroupCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Customers/AddCustomerGroupCommand.cs
similarity index 57%
rename from src/API/Grand.Api/Commands/Models/Customers/AddCustomerGroupCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Customers/AddCustomerGroupCommand.cs
index de5a1dcd0..9a799c135 100644
--- a/src/API/Grand.Api/Commands/Models/Customers/AddCustomerGroupCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Customers/AddCustomerGroupCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Customers;
+using Grand.Module.Api.DTOs.Customers;
using MediatR;
-namespace Grand.Api.Commands.Models.Customers;
+namespace Grand.Module.Api.Commands.Models.Customers;
public class AddCustomerGroupCommand : IRequest<CustomerGroupDto>
{
diff --git a/src/API/Grand.Api/Commands/Models/Customers/DeleteCustomerAddressCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Customers/DeleteCustomerAddressCommand.cs
similarity index 63%
rename from src/API/Grand.Api/Commands/Models/Customers/DeleteCustomerAddressCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Customers/DeleteCustomerAddressCommand.cs
index 9dc2bafc1..f48893cbb 100644
--- a/src/API/Grand.Api/Commands/Models/Customers/DeleteCustomerAddressCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Customers/DeleteCustomerAddressCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Customers;
+using Grand.Module.Api.DTOs.Customers;
using MediatR;
-namespace Grand.Api.Commands.Models.Customers;
+namespace Grand.Module.Api.Commands.Models.Customers;
public class DeleteCustomerAddressCommand : IRequest<bool>
{
diff --git a/src/API/Grand.Api/Commands/Models/Customers/DeleteCustomerCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Customers/DeleteCustomerCommand.cs
similarity index 67%
rename from src/API/Grand.Api/Commands/Models/Customers/DeleteCustomerCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Customers/DeleteCustomerCommand.cs
index 82a032f9e..c3ed2c5e7 100644
--- a/src/API/Grand.Api/Commands/Models/Customers/DeleteCustomerCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Customers/DeleteCustomerCommand.cs
@@ -1,6 +1,6 @@
using MediatR;
-namespace Grand.Api.Commands.Models.Customers;
+namespace Grand.Module.Api.Commands.Models.Customers;
public class DeleteCustomerCommand : IRequest<bool>
{
diff --git a/src/API/Grand.Api/Commands/Models/Customers/DeleteCustomerGroupCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Customers/DeleteCustomerGroupCommand.cs
similarity index 56%
rename from src/API/Grand.Api/Commands/Models/Customers/DeleteCustomerGroupCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Customers/DeleteCustomerGroupCommand.cs
index 80e875e64..9062a46bd 100644
--- a/src/API/Grand.Api/Commands/Models/Customers/DeleteCustomerGroupCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Customers/DeleteCustomerGroupCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Customers;
+using Grand.Module.Api.DTOs.Customers;
using MediatR;
-namespace Grand.Api.Commands.Models.Customers;
+namespace Grand.Module.Api.Commands.Models.Customers;
public class DeleteCustomerGroupCommand : IRequest<bool>
{
diff --git a/src/API/Grand.Api/Commands/Models/Customers/UpdateCustomerAddressCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Customers/UpdateCustomerAddressCommand.cs
similarity index 64%
rename from src/API/Grand.Api/Commands/Models/Customers/UpdateCustomerAddressCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Customers/UpdateCustomerAddressCommand.cs
index 6796af1a6..6003f9223 100644
--- a/src/API/Grand.Api/Commands/Models/Customers/UpdateCustomerAddressCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Customers/UpdateCustomerAddressCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Customers;
+using Grand.Module.Api.DTOs.Customers;
using MediatR;
-namespace Grand.Api.Commands.Models.Customers;
+namespace Grand.Module.Api.Commands.Models.Customers;
public class UpdateCustomerAddressCommand : IRequest<AddressDto>
{
diff --git a/src/API/Grand.Api/Commands/Models/Customers/UpdateCustomerCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Customers/UpdateCustomerCommand.cs
similarity index 55%
rename from src/API/Grand.Api/Commands/Models/Customers/UpdateCustomerCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Customers/UpdateCustomerCommand.cs
index 8bb75d511..138d01c63 100644
--- a/src/API/Grand.Api/Commands/Models/Customers/UpdateCustomerCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Customers/UpdateCustomerCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Customers;
+using Grand.Module.Api.DTOs.Customers;
using MediatR;
-namespace Grand.Api.Commands.Models.Customers;
+namespace Grand.Module.Api.Commands.Models.Customers;
public class UpdateCustomerCommand : IRequest<CustomerDto>
{
diff --git a/src/API/Grand.Api/Commands/Models/Customers/UpdateCustomerGroupCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Customers/UpdateCustomerGroupCommand.cs
similarity index 58%
rename from src/API/Grand.Api/Commands/Models/Customers/UpdateCustomerGroupCommand.cs
rename to src/Modules/Grand.Module.Api/Commands/Models/Customers/UpdateCustomerGroupCommand.cs
index dbdbc60f3..90ea94349 100644
--- a/src/API/Grand.Api/Commands/Models/Customers/UpdateCustomerGroupCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Customers/UpdateCustomerGroupCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Customers;
+using Grand.Module.Api.DTOs.Customers;
using MediatR;
-namespace Grand.Api.Commands.Models.Customers;
+namespace Grand.Module.Api.Commands.Models.Customers;
public class UpdateCustomerGroupCommand : IRequest<CustomerGroupDto>
{
diff --git a/src/API/Grand.Api/Constants/Configurations.cs b/src/Modules/Grand.Module.Api/Constants/Configurations.cs
similarity index 85%
rename from src/API/Grand.Api/Constants/Configurations.cs
rename to src/Modules/Grand.Module.Api/Constants/Configurations.cs
index 8ae78fa1c..7ba4e765e 100644
--- a/src/API/Grand.Api/Constants/Configurations.cs
+++ b/src/Modules/Grand.Module.Api/Constants/Configurations.cs
@@ -1,4 +1,4 @@
-namespace Grand.Api.Constants;
+namespace Grand.Module.Api.Constants;
public static class Configurations
{
diff --git a/src/API/Grand.Api/Controllers/BaseODataController.cs b/src/Modules/Grand.Module.Api/Controllers/BaseODataController.cs
similarity index 83%
rename from src/API/Grand.Api/Controllers/BaseODataController.cs
rename to src/Modules/Grand.Module.Api/Controllers/BaseODataController.cs
index 11295a7a2..5fd18a3b3 100644
--- a/src/API/Grand.Api/Controllers/BaseODataController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/BaseODataController.cs
@@ -1,12 +1,12 @@
-using Grand.Api.Filters;
-using Grand.Api.Infrastructure;
+using Grand.Module.Api.Filters;
+using Grand.Module.Api.Infrastructure;
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.OData.Routing.Attributes;
using Microsoft.AspNetCore.OData.Routing.Controllers;
-namespace Grand.Api.Controllers;
+namespace Grand.Module.Api.Controllers;
[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
[ODataRouteComponent]
diff --git a/src/API/Grand.Api/Controllers/OData/BrandController.cs b/src/Modules/Grand.Module.Api/Controllers/OData/BrandController.cs
similarity index 94%
rename from src/API/Grand.Api/Controllers/OData/BrandController.cs
rename to src/Modules/Grand.Module.Api/Controllers/OData/BrandController.cs
index a16d7b3d9..402bc63df 100644
--- a/src/API/Grand.Api/Controllers/OData/BrandController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/OData/BrandController.cs
@@ -1,6 +1,6 @@
-using Grand.Api.Commands.Models.Catalog;
-using Grand.Api.DTOs.Catalog;
-using Grand.Api.Queries.Models.Common;
+using Grand.Module.Api.Commands.Models.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
+using Grand.Module.Api.Queries.Models.Common;
using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Permissions;
using Grand.Domain.Catalog;
@@ -10,10 +10,11 @@ using Microsoft.AspNetCore.Mvc;
using MongoDB.AspNetCore.OData;
using Swashbuckle.AspNetCore.Annotations;
using System.Net;
+using Grand.Module.Api.Constants;
-namespace Grand.Api.Controllers.OData;
+namespace Grand.Module.Api.Controllers.OData;
-[Route("odata/Brand")]
+[Route($"{Configurations.ODataRoutePrefix}/Brand")]
[ApiExplorerSettings(IgnoreApi = false, GroupName = "v1")]
public class BrandController : BaseODataController
{
diff --git a/src/API/Grand.Api/Controllers/OData/BrandLayoutController.cs b/src/Modules/Grand.Module.Api/Controllers/OData/BrandLayoutController.cs
similarity index 89%
rename from src/API/Grand.Api/Controllers/OData/BrandLayoutController.cs
rename to src/Modules/Grand.Module.Api/Controllers/OData/BrandLayoutController.cs
index 646e45894..f3a84471f 100644
--- a/src/API/Grand.Api/Controllers/OData/BrandLayoutController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/OData/BrandLayoutController.cs
@@ -1,5 +1,5 @@
-using Grand.Api.DTOs.Common;
-using Grand.Api.Queries.Models.Common;
+using Grand.Module.Api.DTOs.Common;
+using Grand.Module.Api.Queries.Models.Common;
using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Permissions;
using Grand.Domain.Catalog;
@@ -9,10 +9,11 @@ using Microsoft.AspNetCore.OData.Query;
using MongoDB.AspNetCore.OData;
using Swashbuckle.AspNetCore.Annotations;
using System.Net;
+using Grand.Module.Api.Constants;
-namespace Grand.Api.Controllers.OData;
+namespace Grand.Module.Api.Controllers.OData;
-[Route("odata/BrandLayout")]
+[Route($"{Configurations.ODataRoutePrefix}/BrandLayout")]
[ApiExplorerSettings(IgnoreApi = false, GroupName = "v1")]
public class BrandLayoutController : BaseODataController
{
diff --git a/src/API/Grand.Api/Controllers/OData/CategoryController.cs b/src/Modules/Grand.Module.Api/Controllers/OData/CategoryController.cs
similarity index 94%
rename from src/API/Grand.Api/Controllers/OData/CategoryController.cs
rename to src/Modules/Grand.Module.Api/Controllers/OData/CategoryController.cs
index e821fafa0..fe9301856 100644
--- a/src/API/Grand.Api/Controllers/OData/CategoryController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/OData/CategoryController.cs
@@ -1,6 +1,6 @@
-using Grand.Api.Commands.Models.Catalog;
-using Grand.Api.DTOs.Catalog;
-using Grand.Api.Queries.Models.Common;
+using Grand.Module.Api.Commands.Models.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
+using Grand.Module.Api.Queries.Models.Common;
using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Permissions;
using Grand.Domain.Catalog;
@@ -11,10 +11,11 @@ using Microsoft.AspNetCore.OData.Query;
using MongoDB.AspNetCore.OData;
using Swashbuckle.AspNetCore.Annotations;
using System.Net;
+using Grand.Module.Api.Constants;
-namespace Grand.Api.Controllers.OData;
+namespace Grand.Module.Api.Controllers.OData;
-[Route("odata/Category")]
+[Route($"{Configurations.ODataRoutePrefix}/Category")]
[ApiExplorerSettings(IgnoreApi = false, GroupName = "v1")]
public class CategoryController : BaseODataController
{
diff --git a/src/API/Grand.Api/Controllers/OData/CategoryLayoutController.cs b/src/Modules/Grand.Module.Api/Controllers/OData/CategoryLayoutController.cs
similarity index 89%
rename from src/API/Grand.Api/Controllers/OData/CategoryLayoutController.cs
rename to src/Modules/Grand.Module.Api/Controllers/OData/CategoryLayoutController.cs
index aabf3761b..ea5d6ce56 100644
--- a/src/API/Grand.Api/Controllers/OData/CategoryLayoutController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/OData/CategoryLayoutController.cs
@@ -1,5 +1,5 @@
-using Grand.Api.DTOs.Common;
-using Grand.Api.Queries.Models.Common;
+using Grand.Module.Api.DTOs.Common;
+using Grand.Module.Api.Queries.Models.Common;
using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Permissions;
using Grand.Domain.Catalog;
@@ -9,10 +9,11 @@ using Microsoft.AspNetCore.OData.Query;
using MongoDB.AspNetCore.OData;
using Swashbuckle.AspNetCore.Annotations;
using System.Net;
+using Grand.Module.Api.Constants;
-namespace Grand.Api.Controllers.OData;
+namespace Grand.Module.Api.Controllers.OData;
-[Route("odata/CategoryLayout")]
+[Route($"{Configurations.ODataRoutePrefix}/CategoryLayout")]
[ApiExplorerSettings(IgnoreApi = false, GroupName = "v1")]
public class CategoryLayoutController : BaseODataController
{
diff --git a/src/API/Grand.Api/Controllers/OData/CollectionController.cs b/src/Modules/Grand.Module.Api/Controllers/OData/CollectionController.cs
similarity index 93%
rename from src/API/Grand.Api/Controllers/OData/CollectionController.cs
rename to src/Modules/Grand.Module.Api/Controllers/OData/CollectionController.cs
index 09b0a4e6f..c5ece8cfb 100644
--- a/src/API/Grand.Api/Controllers/OData/CollectionController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/OData/CollectionController.cs
@@ -1,9 +1,10 @@
-using Grand.Api.Commands.Models.Catalog;
-using Grand.Api.DTOs.Catalog;
-using Grand.Api.Queries.Models.Common;
-using Grand.Business.Core.Interfaces.Common.Security;
-using Grand.Domain.Permissions;
+using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Catalog;
+using Grand.Domain.Permissions;
+using Grand.Module.Api.Commands.Models.Catalog;
+using Grand.Module.Api.Constants;
+using Grand.Module.Api.DTOs.Catalog;
+using Grand.Module.Api.Queries.Models.Common;
using MediatR;
using Microsoft.AspNetCore.JsonPatch;
using Microsoft.AspNetCore.Mvc;
@@ -12,9 +13,9 @@ using MongoDB.AspNetCore.OData;
using Swashbuckle.AspNetCore.Annotations;
using System.Net;
-namespace Grand.Api.Controllers.OData;
+namespace Grand.Module.Api.Controllers.OData;
-[Route("odata/Collection")]
+[Route($"{Configurations.ODataRoutePrefix}/Collection")]
[ApiExplorerSettings(IgnoreApi = false, GroupName = "v1")]
public class CollectionController : BaseODataController
{
diff --git a/src/API/Grand.Api/Controllers/OData/CollectionLayoutController.cs b/src/Modules/Grand.Module.Api/Controllers/OData/CollectionLayoutController.cs
similarity index 89%
rename from src/API/Grand.Api/Controllers/OData/CollectionLayoutController.cs
rename to src/Modules/Grand.Module.Api/Controllers/OData/CollectionLayoutController.cs
index 4c809a718..6c32129ee 100644
--- a/src/API/Grand.Api/Controllers/OData/CollectionLayoutController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/OData/CollectionLayoutController.cs
@@ -1,5 +1,5 @@
-using Grand.Api.DTOs.Common;
-using Grand.Api.Queries.Models.Common;
+using Grand.Module.Api.DTOs.Common;
+using Grand.Module.Api.Queries.Models.Common;
using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Permissions;
using Grand.Domain.Catalog;
@@ -9,10 +9,11 @@ using Microsoft.AspNetCore.OData.Query;
using MongoDB.AspNetCore.OData;
using Swashbuckle.AspNetCore.Annotations;
using System.Net;
+using Grand.Module.Api.Constants;
-namespace Grand.Api.Controllers.OData;
+namespace Grand.Module.Api.Controllers.OData;
-[Route("odata/CollectionLayout")]
+[Route($"{Configurations.ODataRoutePrefix}/CollectionLayout")]
[ApiExplorerSettings(IgnoreApi = false, GroupName = "v1")]
public class CollectionLayoutController : BaseODataController
{
diff --git a/src/API/Grand.Api/Controllers/OData/CountryController.cs b/src/Modules/Grand.Module.Api/Controllers/OData/CountryController.cs
similarity index 89%
rename from src/API/Grand.Api/Controllers/OData/CountryController.cs
rename to src/Modules/Grand.Module.Api/Controllers/OData/CountryController.cs
index 118f061b4..b4f7f3477 100644
--- a/src/API/Grand.Api/Controllers/OData/CountryController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/OData/CountryController.cs
@@ -1,5 +1,5 @@
-using Grand.Api.DTOs.Common;
-using Grand.Api.Queries.Models.Common;
+using Grand.Module.Api.DTOs.Common;
+using Grand.Module.Api.Queries.Models.Common;
using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Permissions;
using Grand.Domain.Directory;
@@ -9,10 +9,11 @@ using Microsoft.AspNetCore.OData.Query;
using MongoDB.AspNetCore.OData;
using Swashbuckle.AspNetCore.Annotations;
using System.Net;
+using Grand.Module.Api.Constants;
-namespace Grand.Api.Controllers.OData;
+namespace Grand.Module.Api.Controllers.OData;
-[Route("odata/Country")]
+[Route($"{Configurations.ODataRoutePrefix}/Country")]
[ApiExplorerSettings(IgnoreApi = false, GroupName = "v1")]
public class CountryController : BaseODataController
{
diff --git a/src/API/Grand.Api/Controllers/OData/CurrencyController.cs b/src/Modules/Grand.Module.Api/Controllers/OData/CurrencyController.cs
similarity index 89%
rename from src/API/Grand.Api/Controllers/OData/CurrencyController.cs
rename to src/Modules/Grand.Module.Api/Controllers/OData/CurrencyController.cs
index d3d273c5f..c8b08cf59 100644
--- a/src/API/Grand.Api/Controllers/OData/CurrencyController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/OData/CurrencyController.cs
@@ -1,5 +1,5 @@
-using Grand.Api.DTOs.Common;
-using Grand.Api.Queries.Models.Common;
+using Grand.Module.Api.DTOs.Common;
+using Grand.Module.Api.Queries.Models.Common;
using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Permissions;
using Grand.Domain.Directory;
@@ -9,10 +9,11 @@ using Microsoft.AspNetCore.OData.Query;
using MongoDB.AspNetCore.OData;
using Swashbuckle.AspNetCore.Annotations;
using System.Net;
+using Grand.Module.Api.Constants;
-namespace Grand.Api.Controllers.OData;
+namespace Grand.Module.Api.Controllers.OData;
-[Route("odata/Currency")]
+[Route($"{Configurations.ODataRoutePrefix}/Currency")]
[ApiExplorerSettings(IgnoreApi = false, GroupName = "v1")]
public class CurrencyController : BaseODataController
{
diff --git a/src/API/Grand.Api/Controllers/OData/CustomerController.cs b/src/Modules/Grand.Module.Api/Controllers/OData/CustomerController.cs
similarity index 96%
rename from src/API/Grand.Api/Controllers/OData/CustomerController.cs
rename to src/Modules/Grand.Module.Api/Controllers/OData/CustomerController.cs
index 5dc6c8dc6..01aa8732a 100644
--- a/src/API/Grand.Api/Controllers/OData/CustomerController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/OData/CustomerController.cs
@@ -1,6 +1,6 @@
-using Grand.Api.Commands.Models.Customers;
-using Grand.Api.DTOs.Customers;
-using Grand.Api.Queries.Models.Customers;
+using Grand.Module.Api.Commands.Models.Customers;
+using Grand.Module.Api.DTOs.Customers;
+using Grand.Module.Api.Queries.Models.Customers;
using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Permissions;
@@ -10,10 +10,11 @@ using MediatR;
using Microsoft.AspNetCore.Mvc;
using Swashbuckle.AspNetCore.Annotations;
using System.Net;
+using Grand.Module.Api.Constants;
-namespace Grand.Api.Controllers.OData;
+namespace Grand.Module.Api.Controllers.OData;
-[Route("odata/Customer")]
+[Route($"{Configurations.ODataRoutePrefix}/Customer")]
[ApiExplorerSettings(IgnoreApi = false, GroupName = "v1")]
public class CustomerController : BaseODataController
{
diff --git a/src/API/Grand.Api/Controllers/OData/CustomerGroupController.cs b/src/Modules/Grand.Module.Api/Controllers/OData/CustomerGroupController.cs
similarity index 95%
rename from src/API/Grand.Api/Controllers/OData/CustomerGroupController.cs
rename to src/Modules/Grand.Module.Api/Controllers/OData/CustomerGroupController.cs
index 118aa6972..a240b131f 100644
--- a/src/API/Grand.Api/Controllers/OData/CustomerGroupController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/OData/CustomerGroupController.cs
@@ -1,6 +1,6 @@
-using Grand.Api.Commands.Models.Customers;
-using Grand.Api.DTOs.Customers;
-using Grand.Api.Queries.Models.Common;
+using Grand.Module.Api.Commands.Models.Customers;
+using Grand.Module.Api.DTOs.Customers;
+using Grand.Module.Api.Queries.Models.Common;
using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Permissions;
using Grand.Domain.Customers;
@@ -11,10 +11,11 @@ using Microsoft.AspNetCore.OData.Query;
using MongoDB.AspNetCore.OData;
using Swashbuckle.AspNetCore.Annotations;
using System.Net;
+using Grand.Module.Api.Constants;
-namespace Grand.Api.Controllers.OData;
+namespace Grand.Module.Api.Controllers.OData;
-[Route("odata/CustomerGroup")]
+[Route($"{Configurations.ODataRoutePrefix}/CustomerGroup")]
[ApiExplorerSettings(IgnoreApi = false, GroupName = "v1")]
public class CustomerGroupController : BaseODataController
{
diff --git a/src/API/Grand.Api/Controllers/OData/DeliveryDateController.cs b/src/Modules/Grand.Module.Api/Controllers/OData/DeliveryDateController.cs
similarity index 89%
rename from src/API/Grand.Api/Controllers/OData/DeliveryDateController.cs
rename to src/Modules/Grand.Module.Api/Controllers/OData/DeliveryDateController.cs
index ab7205013..a9621b1ba 100644
--- a/src/API/Grand.Api/Controllers/OData/DeliveryDateController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/OData/DeliveryDateController.cs
@@ -1,5 +1,5 @@
-using Grand.Api.DTOs.Shipping;
-using Grand.Api.Queries.Models.Common;
+using Grand.Module.Api.DTOs.Shipping;
+using Grand.Module.Api.Queries.Models.Common;
using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Permissions;
using Grand.Domain.Shipping;
@@ -9,10 +9,11 @@ using Microsoft.AspNetCore.OData.Query;
using MongoDB.AspNetCore.OData;
using Swashbuckle.AspNetCore.Annotations;
using System.Net;
+using Grand.Module.Api.Constants;
-namespace Grand.Api.Controllers.OData;
+namespace Grand.Module.Api.Controllers.OData;
-[Route("odata/DeliveryDate")]
+[Route($"{Configurations.ODataRoutePrefix}/DeliveryDate")]
[ApiExplorerSettings(IgnoreApi = false, GroupName = "v1")]
public class DeliveryDateController : BaseODataController
{
diff --git a/src/API/Grand.Api/Controllers/OData/LanguageController.cs b/src/Modules/Grand.Module.Api/Controllers/OData/LanguageController.cs
similarity index 89%
rename from src/API/Grand.Api/Controllers/OData/LanguageController.cs
rename to src/Modules/Grand.Module.Api/Controllers/OData/LanguageController.cs
index 6f3fb7670..9e1a22fa3 100644
--- a/src/API/Grand.Api/Controllers/OData/LanguageController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/OData/LanguageController.cs
@@ -1,5 +1,5 @@
-using Grand.Api.DTOs.Common;
-using Grand.Api.Queries.Models.Common;
+using Grand.Module.Api.DTOs.Common;
+using Grand.Module.Api.Queries.Models.Common;
using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Permissions;
using Grand.Domain.Localization;
@@ -9,10 +9,11 @@ using Microsoft.AspNetCore.OData.Query;
using MongoDB.AspNetCore.OData;
using Swashbuckle.AspNetCore.Annotations;
using System.Net;
+using Grand.Module.Api.Constants;
-namespace Grand.Api.Controllers.OData;
+namespace Grand.Module.Api.Controllers.OData;
-[Route("odata/Language")]
+[Route($"{Configurations.ODataRoutePrefix}/Language")]
[ApiExplorerSettings(IgnoreApi = false, GroupName = "v1")]
public class LanguageController : BaseODataController
{
diff --git a/src/API/Grand.Api/Controllers/OData/PickupPointController.cs b/src/Modules/Grand.Module.Api/Controllers/OData/PickupPointController.cs
similarity index 89%
rename from src/API/Grand.Api/Controllers/OData/PickupPointController.cs
rename to src/Modules/Grand.Module.Api/Controllers/OData/PickupPointController.cs
index 4ee33f3bb..24e59b70c 100644
--- a/src/API/Grand.Api/Controllers/OData/PickupPointController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/OData/PickupPointController.cs
@@ -1,5 +1,5 @@
-using Grand.Api.DTOs.Shipping;
-using Grand.Api.Queries.Models.Common;
+using Grand.Module.Api.DTOs.Shipping;
+using Grand.Module.Api.Queries.Models.Common;
using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Permissions;
using Grand.Domain.Shipping;
@@ -9,10 +9,11 @@ using Microsoft.AspNetCore.OData.Query;
using MongoDB.AspNetCore.OData;
using Swashbuckle.AspNetCore.Annotations;
using System.Net;
+using Grand.Module.Api.Constants;
-namespace Grand.Api.Controllers.OData;
+namespace Grand.Module.Api.Controllers.OData;
-[Route("odata/PickupPoint")]
+[Route($"{Configurations.ODataRoutePrefix}/PickupPoint")]
[ApiExplorerSettings(IgnoreApi = false, GroupName = "v1")]
public class PickupPointController : BaseODataController
{
diff --git a/src/API/Grand.Api/Controllers/OData/PictureController.cs b/src/Modules/Grand.Module.Api/Controllers/OData/PictureController.cs
similarity index 92%
rename from src/API/Grand.Api/Controllers/OData/PictureController.cs
rename to src/Modules/Grand.Module.Api/Controllers/OData/PictureController.cs
index 2d092c4bd..a38639a84 100644
--- a/src/API/Grand.Api/Controllers/OData/PictureController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/OData/PictureController.cs
@@ -1,6 +1,6 @@
-using Grand.Api.Commands.Models.Common;
-using Grand.Api.DTOs.Common;
-using Grand.Api.Queries.Models.Common;
+using Grand.Module.Api.Commands.Models.Common;
+using Grand.Module.Api.DTOs.Common;
+using Grand.Module.Api.Queries.Models.Common;
using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Permissions;
using Grand.Domain.Media;
@@ -8,10 +8,11 @@ using MediatR;
using Microsoft.AspNetCore.Mvc;
using Swashbuckle.AspNetCore.Annotations;
using System.Net;
+using Grand.Module.Api.Constants;
-namespace Grand.Api.Controllers.OData;
+namespace Grand.Module.Api.Controllers.OData;
-[Route("odata/Picture")]
+[Route($"{Configurations.ODataRoutePrefix}/Picture")]
[ApiExplorerSettings(IgnoreApi = false, GroupName = "v1")]
public class PictureController : BaseODataController
{
diff --git a/src/API/Grand.Api/Controllers/OData/ProductAttributeController.cs b/src/Modules/Grand.Module.Api/Controllers/OData/ProductAttributeController.cs
similarity index 94%
rename from src/API/Grand.Api/Controllers/OData/ProductAttributeController.cs
rename to src/Modules/Grand.Module.Api/Controllers/OData/ProductAttributeController.cs
index 37bbcb357..5d295b8f0 100644
--- a/src/API/Grand.Api/Controllers/OData/ProductAttributeController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/OData/ProductAttributeController.cs
@@ -1,6 +1,6 @@
-using Grand.Api.Commands.Models.Catalog;
-using Grand.Api.DTOs.Catalog;
-using Grand.Api.Queries.Models.Common;
+using Grand.Module.Api.Commands.Models.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
+using Grand.Module.Api.Queries.Models.Common;
using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Permissions;
using Grand.Domain.Catalog;
@@ -11,10 +11,11 @@ using Microsoft.AspNetCore.OData.Query;
using MongoDB.AspNetCore.OData;
using Swashbuckle.AspNetCore.Annotations;
using System.Net;
+using Grand.Module.Api.Constants;
-namespace Grand.Api.Controllers.OData;
+namespace Grand.Module.Api.Controllers.OData;
-[Route("odata/ProductAttribute")]
+[Route($"{Configurations.ODataRoutePrefix}/ProductAttribute")]
[ApiExplorerSettings(IgnoreApi = false, GroupName = "v1")]
public class ProductAttributeController : BaseODataController
{
diff --git a/src/API/Grand.Api/Controllers/OData/ProductController.cs b/src/Modules/Grand.Module.Api/Controllers/OData/ProductController.cs
similarity index 99%
rename from src/API/Grand.Api/Controllers/OData/ProductController.cs
rename to src/Modules/Grand.Module.Api/Controllers/OData/ProductController.cs
index 12b63092b..de5d76e1d 100644
--- a/src/API/Grand.Api/Controllers/OData/ProductController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/OData/ProductController.cs
@@ -1,6 +1,6 @@
-using Grand.Api.Commands.Models.Catalog;
-using Grand.Api.DTOs.Catalog;
-using Grand.Api.Queries.Models.Common;
+using Grand.Module.Api.Commands.Models.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
+using Grand.Module.Api.Queries.Models.Common;
using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Permissions;
using Grand.Domain.Catalog;
@@ -11,10 +11,11 @@ using Microsoft.AspNetCore.OData.Query;
using MongoDB.AspNetCore.OData;
using Swashbuckle.AspNetCore.Annotations;
using System.Net;
+using Grand.Module.Api.Constants;
-namespace Grand.Api.Controllers.OData;
+namespace Grand.Module.Api.Controllers.OData;
-[Route("odata/Product")]
+[Route($"{Configurations.ODataRoutePrefix}/Product")]
[ApiExplorerSettings(IgnoreApi = false, GroupName = "v1")]
public class ProductController : BaseODataController
{
diff --git a/src/API/Grand.Api/Controllers/OData/ProductLayoutController.cs b/src/Modules/Grand.Module.Api/Controllers/OData/ProductLayoutController.cs
similarity index 89%
rename from src/API/Grand.Api/Controllers/OData/ProductLayoutController.cs
rename to src/Modules/Grand.Module.Api/Controllers/OData/ProductLayoutController.cs
index 49ba61b52..b3c277949 100644
--- a/src/API/Grand.Api/Controllers/OData/ProductLayoutController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/OData/ProductLayoutController.cs
@@ -1,5 +1,5 @@
-using Grand.Api.DTOs.Common;
-using Grand.Api.Queries.Models.Common;
+using Grand.Module.Api.DTOs.Common;
+using Grand.Module.Api.Queries.Models.Common;
using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Permissions;
using Grand.Domain.Catalog;
@@ -9,10 +9,11 @@ using Microsoft.AspNetCore.OData.Query;
using MongoDB.AspNetCore.OData;
using Swashbuckle.AspNetCore.Annotations;
using System.Net;
+using Grand.Module.Api.Constants;
-namespace Grand.Api.Controllers.OData;
+namespace Grand.Module.Api.Controllers.OData;
-[Route("odata/ProductLayout")]
+[Route($"{Configurations.ODataRoutePrefix}/ProductLayout")]
[ApiExplorerSettings(IgnoreApi = false, GroupName = "v1")]
public class ProductLayoutController : BaseODataController
{
diff --git a/src/API/Grand.Api/Controllers/OData/ShippingMethodController.cs b/src/Modules/Grand.Module.Api/Controllers/OData/ShippingMethodController.cs
similarity index 89%
rename from src/API/Grand.Api/Controllers/OData/ShippingMethodController.cs
rename to src/Modules/Grand.Module.Api/Controllers/OData/ShippingMethodController.cs
index eea4cb144..a483c5829 100644
--- a/src/API/Grand.Api/Controllers/OData/ShippingMethodController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/OData/ShippingMethodController.cs
@@ -1,5 +1,5 @@
-using Grand.Api.DTOs.Shipping;
-using Grand.Api.Queries.Models.Common;
+using Grand.Module.Api.DTOs.Shipping;
+using Grand.Module.Api.Queries.Models.Common;
using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Permissions;
using Grand.Domain.Shipping;
@@ -9,10 +9,11 @@ using Microsoft.AspNetCore.OData.Query;
using MongoDB.AspNetCore.OData;
using Swashbuckle.AspNetCore.Annotations;
using System.Net;
+using Grand.Module.Api.Constants;
-namespace Grand.Api.Controllers.OData;
+namespace Grand.Module.Api.Controllers.OData;
-[Route("odata/ShippingMethod")]
+[Route($"{Configurations.ODataRoutePrefix}/ShippingMethod")]
[ApiExplorerSettings(IgnoreApi = false, GroupName = "v1")]
public class ShippingMethodController : BaseODataController
{
diff --git a/src/API/Grand.Api/Controllers/OData/SpecificationAttributeController.cs b/src/Modules/Grand.Module.Api/Controllers/OData/SpecificationAttributeController.cs
similarity index 94%
rename from src/API/Grand.Api/Controllers/OData/SpecificationAttributeController.cs
rename to src/Modules/Grand.Module.Api/Controllers/OData/SpecificationAttributeController.cs
index af800b00c..f33538794 100644
--- a/src/API/Grand.Api/Controllers/OData/SpecificationAttributeController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/OData/SpecificationAttributeController.cs
@@ -1,6 +1,6 @@
-using Grand.Api.Commands.Models.Catalog;
-using Grand.Api.DTOs.Catalog;
-using Grand.Api.Queries.Models.Common;
+using Grand.Module.Api.Commands.Models.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
+using Grand.Module.Api.Queries.Models.Common;
using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Permissions;
using Grand.Domain.Catalog;
@@ -11,10 +11,11 @@ using Microsoft.AspNetCore.OData.Query;
using MongoDB.AspNetCore.OData;
using Swashbuckle.AspNetCore.Annotations;
using System.Net;
+using Grand.Module.Api.Constants;
-namespace Grand.Api.Controllers.OData;
+namespace Grand.Module.Api.Controllers.OData;
-[Route("odata/SpecificationAttribute")]
+[Route($"{Configurations.ODataRoutePrefix}/SpecificationAttribute")]
[ApiExplorerSettings(IgnoreApi = false, GroupName = "v1")]
public class SpecificationAttributeController : BaseODataController
{
diff --git a/src/API/Grand.Api/Controllers/OData/StoreController.cs b/src/Modules/Grand.Module.Api/Controllers/OData/StoreController.cs
similarity index 89%
rename from src/API/Grand.Api/Controllers/OData/StoreController.cs
rename to src/Modules/Grand.Module.Api/Controllers/OData/StoreController.cs
index 1fc13eab9..ffec76512 100644
--- a/src/API/Grand.Api/Controllers/OData/StoreController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/OData/StoreController.cs
@@ -1,5 +1,5 @@
-using Grand.Api.DTOs.Common;
-using Grand.Api.Queries.Models.Common;
+using Grand.Module.Api.DTOs.Common;
+using Grand.Module.Api.Queries.Models.Common;
using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Permissions;
using Grand.Domain.Stores;
@@ -9,10 +9,11 @@ using Microsoft.AspNetCore.OData.Query;
using MongoDB.AspNetCore.OData;
using Swashbuckle.AspNetCore.Annotations;
using System.Net;
+using Grand.Module.Api.Constants;
-namespace Grand.Api.Controllers.OData;
+namespace Grand.Module.Api.Controllers.OData;
-[Route("odata/Store")]
+[Route($"{Configurations.ODataRoutePrefix}/Store")]
[ApiExplorerSettings(IgnoreApi = false, GroupName = "v1")]
public class StoreController : BaseODataController
{
diff --git a/src/API/Grand.Api/Controllers/OData/VendorController.cs b/src/Modules/Grand.Module.Api/Controllers/OData/VendorController.cs
similarity index 89%
rename from src/API/Grand.Api/Controllers/OData/VendorController.cs
rename to src/Modules/Grand.Module.Api/Controllers/OData/VendorController.cs
index fc0299543..5ed176258 100644
--- a/src/API/Grand.Api/Controllers/OData/VendorController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/OData/VendorController.cs
@@ -1,5 +1,5 @@
-using Grand.Api.DTOs.Customers;
-using Grand.Api.Queries.Models.Common;
+using Grand.Module.Api.DTOs.Customers;
+using Grand.Module.Api.Queries.Models.Common;
using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Permissions;
using Grand.Domain.Vendors;
@@ -9,10 +9,11 @@ using Microsoft.AspNetCore.OData.Query;
using MongoDB.AspNetCore.OData;
using Swashbuckle.AspNetCore.Annotations;
using System.Net;
+using Grand.Module.Api.Constants;
-namespace Grand.Api.Controllers.OData;
+namespace Grand.Module.Api.Controllers.OData;
-[Route("odata/Vendor")]
+[Route($"{Configurations.ODataRoutePrefix}/Vendor")]
[ApiExplorerSettings(IgnoreApi = false, GroupName = "v1")]
public class VendorController : BaseODataController
{
diff --git a/src/API/Grand.Api/Controllers/OData/WarehouseController.cs b/src/Modules/Grand.Module.Api/Controllers/OData/WarehouseController.cs
similarity index 89%
rename from src/API/Grand.Api/Controllers/OData/WarehouseController.cs
rename to src/Modules/Grand.Module.Api/Controllers/OData/WarehouseController.cs
index 19abd77ee..4c35bebbb 100644
--- a/src/API/Grand.Api/Controllers/OData/WarehouseController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/OData/WarehouseController.cs
@@ -1,5 +1,5 @@
-using Grand.Api.DTOs.Shipping;
-using Grand.Api.Queries.Models.Common;
+using Grand.Module.Api.DTOs.Shipping;
+using Grand.Module.Api.Queries.Models.Common;
using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Permissions;
using Grand.Domain.Shipping;
@@ -9,10 +9,11 @@ using Microsoft.AspNetCore.OData.Query;
using MongoDB.AspNetCore.OData;
using Swashbuckle.AspNetCore.Annotations;
using System.Net;
+using Grand.Module.Api.Constants;
-namespace Grand.Api.Controllers.OData;
+namespace Grand.Module.Api.Controllers.OData;
-[Route("odata/Warehouse")]
+[Route($"{Configurations.ODataRoutePrefix}/Warehouse")]
[ApiExplorerSettings(IgnoreApi = false, GroupName = "v1")]
public class WarehouseController : BaseODataController
{
diff --git a/src/API/Grand.Api/Controllers/TokenController.cs b/src/Modules/Grand.Module.Api/Controllers/TokenController.cs
similarity index 90%
rename from src/API/Grand.Api/Controllers/TokenController.cs
rename to src/Modules/Grand.Module.Api/Controllers/TokenController.cs
index 25e51c1ce..ed7e6c5b3 100644
--- a/src/API/Grand.Api/Controllers/TokenController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/TokenController.cs
@@ -1,12 +1,12 @@
-using Grand.Api.Commands.Models.Common;
-using Grand.Api.Models.Common;
+using Grand.Module.Api.Commands.Models.Common;
+using Grand.Module.Api.Models.Common;
using Grand.Business.Core.Interfaces.Customers;
using MediatR;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Swashbuckle.AspNetCore.Annotations;
-namespace Grand.Api.Controllers;
+namespace Grand.Module.Api.Controllers;
[ApiController]
[Area("Api")]
diff --git a/src/API/Grand.Api/Controllers/TokenWebController.cs b/src/Modules/Grand.Module.Api/Controllers/TokenWebController.cs
similarity index 97%
rename from src/API/Grand.Api/Controllers/TokenWebController.cs
rename to src/Modules/Grand.Module.Api/Controllers/TokenWebController.cs
index 56400e1f6..d40caecff 100644
--- a/src/API/Grand.Api/Controllers/TokenWebController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/TokenWebController.cs
@@ -1,6 +1,6 @@
-using Grand.Api.Commands.Models.Common;
-using Grand.Api.DTOs;
-using Grand.Api.Models.Common;
+using Grand.Module.Api.Commands.Models.Common;
+using Grand.Module.Api.DTOs;
+using Grand.Module.Api.Models.Common;
using Grand.Business.Core.Interfaces.Authentication;
using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Common;
@@ -14,7 +14,7 @@ using Microsoft.AspNetCore.Mvc;
using Swashbuckle.AspNetCore.Annotations;
using System.Security.Claims;
-namespace Grand.Api.Controllers;
+namespace Grand.Module.Api.Controllers;
[ApiExplorerSettings(GroupName = "v2")]
[ApiController]
diff --git a/src/API/Grand.Api/DTOs/Catalog/BrandDto.cs b/src/Modules/Grand.Module.Api/DTOs/Catalog/BrandDto.cs
similarity index 91%
rename from src/API/Grand.Api/DTOs/Catalog/BrandDto.cs
rename to src/Modules/Grand.Module.Api/DTOs/Catalog/BrandDto.cs
index b8c7a2c20..fd4b4b309 100644
--- a/src/API/Grand.Api/DTOs/Catalog/BrandDto.cs
+++ b/src/Modules/Grand.Module.Api/DTOs/Catalog/BrandDto.cs
@@ -1,6 +1,6 @@
-using Grand.Api.Models;
+using Grand.Module.Api.Models;
-namespace Grand.Api.DTOs.Catalog;
+namespace Grand.Module.Api.DTOs.Catalog;
public class BrandDto : BaseApiEntityModel
{
diff --git a/src/API/Grand.Api/DTOs/Catalog/CategoryDTO.cs b/src/Modules/Grand.Module.Api/DTOs/Catalog/CategoryDTO.cs
similarity index 93%
rename from src/API/Grand.Api/DTOs/Catalog/CategoryDTO.cs
rename to src/Modules/Grand.Module.Api/DTOs/Catalog/CategoryDTO.cs
index 5aca909c8..354675cd2 100644
--- a/src/API/Grand.Api/DTOs/Catalog/CategoryDTO.cs
+++ b/src/Modules/Grand.Module.Api/DTOs/Catalog/CategoryDTO.cs
@@ -1,6 +1,6 @@
-using Grand.Api.Models;
+using Grand.Module.Api.Models;
-namespace Grand.Api.DTOs.Catalog;
+namespace Grand.Module.Api.DTOs.Catalog;
public class CategoryDto : BaseApiEntityModel
{
diff --git a/src/API/Grand.Api/DTOs/Catalog/CollectionDto.cs b/src/Modules/Grand.Module.Api/DTOs/Catalog/CollectionDto.cs
similarity index 92%
rename from src/API/Grand.Api/DTOs/Catalog/CollectionDto.cs
rename to src/Modules/Grand.Module.Api/DTOs/Catalog/CollectionDto.cs
index f1002195f..6f80f0721 100644
--- a/src/API/Grand.Api/DTOs/Catalog/CollectionDto.cs
+++ b/src/Modules/Grand.Module.Api/DTOs/Catalog/CollectionDto.cs
@@ -1,6 +1,6 @@
-using Grand.Api.Models;
+using Grand.Module.Api.Models;
-namespace Grand.Api.DTOs.Catalog;
+namespace Grand.Module.Api.DTOs.Catalog;
public class CollectionDto : BaseApiEntityModel
{
diff --git a/src/API/Grand.Api/DTOs/Catalog/ProductAttributeCombinationDto.cs b/src/Modules/Grand.Module.Api/DTOs/Catalog/ProductAttributeCombinationDto.cs
similarity index 86%
rename from src/API/Grand.Api/DTOs/Catalog/ProductAttributeCombinationDto.cs
rename to src/Modules/Grand.Module.Api/DTOs/Catalog/ProductAttributeCombinationDto.cs
index a302985ae..baffa4af4 100644
--- a/src/API/Grand.Api/DTOs/Catalog/ProductAttributeCombinationDto.cs
+++ b/src/Modules/Grand.Module.Api/DTOs/Catalog/ProductAttributeCombinationDto.cs
@@ -1,6 +1,6 @@
-using Grand.Api.Models;
+using Grand.Module.Api.Models;
-namespace Grand.Api.DTOs.Catalog;
+namespace Grand.Module.Api.DTOs.Catalog;
public class ProductAttributeCombinationDto : BaseApiEntityModel
{
diff --git a/src/API/Grand.Api/DTOs/Catalog/ProductAttributeDto.cs b/src/Modules/Grand.Module.Api/DTOs/Catalog/ProductAttributeDto.cs
similarity index 89%
rename from src/API/Grand.Api/DTOs/Catalog/ProductAttributeDto.cs
rename to src/Modules/Grand.Module.Api/DTOs/Catalog/ProductAttributeDto.cs
index 4d734dbfa..413d67032 100644
--- a/src/API/Grand.Api/DTOs/Catalog/ProductAttributeDto.cs
+++ b/src/Modules/Grand.Module.Api/DTOs/Catalog/ProductAttributeDto.cs
@@ -1,6 +1,6 @@
-using Grand.Api.Models;
+using Grand.Module.Api.Models;
-namespace Grand.Api.DTOs.Catalog;
+namespace Grand.Module.Api.DTOs.Catalog;
public class ProductAttributeDto : BaseApiEntityModel
{
diff --git a/src/API/Grand.Api/DTOs/Catalog/ProductAttributeMappingDeleteDto.cs b/src/Modules/Grand.Module.Api/DTOs/Catalog/ProductAttributeMappingDeleteDto.cs
similarity index 65%
rename from src/API/Grand.Api/DTOs/Catalog/ProductAttributeMappingDeleteDto.cs
rename to src/Modules/Grand.Module.Api/DTOs/Catalog/ProductAttributeMappingDeleteDto.cs
index f134e7924..cded6626b 100644
--- a/src/API/Grand.Api/DTOs/Catalog/ProductAttributeMappingDeleteDto.cs
+++ b/src/Modules/Grand.Module.Api/DTOs/Catalog/ProductAttributeMappingDeleteDto.cs
@@ -1,4 +1,4 @@
-namespace Grand.Api.DTOs.Catalog;
+namespace Grand.Module.Api.DTOs.Catalog;
public class ProductAttributeMappingDeleteDto
{
diff --git a/src/API/Grand.Api/DTOs/Catalog/ProductAttributeMappingDto.cs b/src/Modules/Grand.Module.Api/DTOs/Catalog/ProductAttributeMappingDto.cs
similarity index 94%
rename from src/API/Grand.Api/DTOs/Catalog/ProductAttributeMappingDto.cs
rename to src/Modules/Grand.Module.Api/DTOs/Catalog/ProductAttributeMappingDto.cs
index d071c20e0..57c034ba4 100644
--- a/src/API/Grand.Api/DTOs/Catalog/ProductAttributeMappingDto.cs
+++ b/src/Modules/Grand.Module.Api/DTOs/Catalog/ProductAttributeMappingDto.cs
@@ -1,7 +1,7 @@
-using Grand.Api.Models;
+using Grand.Module.Api.Models;
using Grand.Domain.Catalog;
-namespace Grand.Api.DTOs.Catalog;
+namespace Grand.Module.Api.DTOs.Catalog;
public class ProductAttributeMappingDto : BaseApiEntityModel
{
diff --git a/src/API/Grand.Api/DTOs/Catalog/ProductCategoryDeleteDto.cs b/src/Modules/Grand.Module.Api/DTOs/Catalog/ProductCategoryDeleteDto.cs
similarity index 65%
rename from src/API/Grand.Api/DTOs/Catalog/ProductCategoryDeleteDto.cs
rename to src/Modules/Grand.Module.Api/DTOs/Catalog/ProductCategoryDeleteDto.cs
index f95706282..802bbb53a 100644
--- a/src/API/Grand.Api/DTOs/Catalog/ProductCategoryDeleteDto.cs
+++ b/src/Modules/Grand.Module.Api/DTOs/Catalog/ProductCategoryDeleteDto.cs
@@ -1,4 +1,4 @@
-namespace Grand.Api.DTOs.Catalog;
+namespace Grand.Module.Api.DTOs.Catalog;
public class ProductCategoryDeleteDto
{
diff --git a/src/API/Grand.Api/DTOs/Catalog/ProductCategoryDto.cs b/src/Modules/Grand.Module.Api/DTOs/Catalog/ProductCategoryDto.cs
similarity index 81%
rename from src/API/Grand.Api/DTOs/Catalog/ProductCategoryDto.cs
rename to src/Modules/Grand.Module.Api/DTOs/Catalog/ProductCategoryDto.cs
index 8f283f11f..cedaebc74 100644
--- a/src/API/Grand.Api/DTOs/Catalog/ProductCategoryDto.cs
+++ b/src/Modules/Grand.Module.Api/DTOs/Catalog/ProductCategoryDto.cs
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;
-namespace Grand.Api.DTOs.Catalog;
+namespace Grand.Module.Api.DTOs.Catalog;
public class ProductCategoryDto
{
diff --git a/src/API/Grand.Api/DTOs/Catalog/ProductCollectionDeleteDto.cs b/src/Modules/Grand.Module.Api/DTOs/Catalog/ProductCollectionDeleteDto.cs
similarity index 66%
rename from src/API/Grand.Api/DTOs/Catalog/ProductCollectionDeleteDto.cs
rename to src/Modules/Grand.Module.Api/DTOs/Catalog/ProductCollectionDeleteDto.cs
index 525d5d265..b44a3d498 100644
--- a/src/API/Grand.Api/DTOs/Catalog/ProductCollectionDeleteDto.cs
+++ b/src/Modules/Grand.Module.Api/DTOs/Catalog/ProductCollectionDeleteDto.cs
@@ -1,4 +1,4 @@
-namespace Grand.Api.DTOs.Catalog;
+namespace Grand.Module.Api.DTOs.Catalog;
public class ProductCollectionDeleteDto
{
diff --git a/src/API/Grand.Api/DTOs/Catalog/ProductCollectionDto.cs b/src/Modules/Grand.Module.Api/DTOs/Catalog/ProductCollectionDto.cs
similarity index 81%
rename from src/API/Grand.Api/DTOs/Catalog/ProductCollectionDto.cs
rename to src/Modules/Grand.Module.Api/DTOs/Catalog/ProductCollectionDto.cs
index 04446eb37..25eefd2dd 100644
--- a/src/API/Grand.Api/DTOs/Catalog/ProductCollectionDto.cs
+++ b/src/Modules/Grand.Module.Api/DTOs/Catalog/ProductCollectionDto.cs
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;
-namespace Grand.Api.DTOs.Catalog;
+namespace Grand.Module.Api.DTOs.Catalog;
public class ProductCollectionDto
{
diff --git a/src/API/Grand.Api/DTOs/Catalog/ProductDto.cs b/src/Modules/Grand.Module.Api/DTOs/Catalog/ProductDto.cs
similarity index 98%
rename from src/API/Grand.Api/DTOs/Catalog/ProductDto.cs
rename to src/Modules/Grand.Module.Api/DTOs/Catalog/ProductDto.cs
index 629916e9d..7ca07b308 100644
--- a/src/API/Grand.Api/DTOs/Catalog/ProductDto.cs
+++ b/src/Modules/Grand.Module.Api/DTOs/Catalog/ProductDto.cs
@@ -1,7 +1,7 @@
-using Grand.Api.Models;
+using Grand.Module.Api.Models;
using Grand.Domain.Catalog;
-namespace Grand.Api.DTOs.Catalog;
+namespace Grand.Module.Api.DTOs.Catalog;
public class ProductDto : BaseApiEntityModel
{
diff --git a/src/API/Grand.Api/DTOs/Catalog/ProductPictureDeleteDto.cs b/src/Modules/Grand.Module.Api/DTOs/Catalog/ProductPictureDeleteDto.cs
similarity index 64%
rename from src/API/Grand.Api/DTOs/Catalog/ProductPictureDeleteDto.cs
rename to src/Modules/Grand.Module.Api/DTOs/Catalog/ProductPictureDeleteDto.cs
index 85855c732..ceb8e98cb 100644
--- a/src/API/Grand.Api/DTOs/Catalog/ProductPictureDeleteDto.cs
+++ b/src/Modules/Grand.Module.Api/DTOs/Catalog/ProductPictureDeleteDto.cs
@@ -1,4 +1,4 @@
-namespace Grand.Api.DTOs.Catalog;
+namespace Grand.Module.Api.DTOs.Catalog;
public class ProductPictureDeleteDto
{
diff --git a/src/API/Grand.Api/DTOs/Catalog/ProductPictureDto.cs b/src/Modules/Grand.Module.Api/DTOs/Catalog/ProductPictureDto.cs
similarity index 83%
rename from src/API/Grand.Api/DTOs/Catalog/ProductPictureDto.cs
rename to src/Modules/Grand.Module.Api/DTOs/Catalog/ProductPictureDto.cs
index 2e176c15c..7798e2d55 100644
--- a/src/API/Grand.Api/DTOs/Catalog/ProductPictureDto.cs
+++ b/src/Modules/Grand.Module.Api/DTOs/Catalog/ProductPictureDto.cs
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;
-namespace Grand.Api.DTOs.Catalog;
+namespace Grand.Module.Api.DTOs.Catalog;
public class ProductPictureDto
{
diff --git a/src/API/Grand.Api/DTOs/Catalog/ProductSpecificationAttributeDeleteDto.cs b/src/Modules/Grand.Module.Api/DTOs/Catalog/ProductSpecificationAttributeDeleteDto.cs
similarity index 66%
rename from src/API/Grand.Api/DTOs/Catalog/ProductSpecificationAttributeDeleteDto.cs
rename to src/Modules/Grand.Module.Api/DTOs/Catalog/ProductSpecificationAttributeDeleteDto.cs
index cab9a16e3..a217e4630 100644
--- a/src/API/Grand.Api/DTOs/Catalog/ProductSpecificationAttributeDeleteDto.cs
+++ b/src/Modules/Grand.Module.Api/DTOs/Catalog/ProductSpecificationAttributeDeleteDto.cs
@@ -1,4 +1,4 @@
-namespace Grand.Api.DTOs.Catalog;
+namespace Grand.Module.Api.DTOs.Catalog;
public class ProductSpecificationAttributeDeleteDto
{
diff --git a/src/API/Grand.Api/DTOs/Catalog/ProductSpecificationAttributeDto.cs b/src/Modules/Grand.Module.Api/DTOs/Catalog/ProductSpecificationAttributeDto.cs
similarity index 87%
rename from src/API/Grand.Api/DTOs/Catalog/ProductSpecificationAttributeDto.cs
rename to src/Modules/Grand.Module.Api/DTOs/Catalog/ProductSpecificationAttributeDto.cs
index 0fdc7a382..6dcb60884 100644
--- a/src/API/Grand.Api/DTOs/Catalog/ProductSpecificationAttributeDto.cs
+++ b/src/Modules/Grand.Module.Api/DTOs/Catalog/ProductSpecificationAttributeDto.cs
@@ -1,7 +1,7 @@
-using Grand.Api.Models;
+using Grand.Module.Api.Models;
using Grand.Domain.Catalog;
-namespace Grand.Api.DTOs.Catalog;
+namespace Grand.Module.Api.DTOs.Catalog;
public class ProductSpecificationAttributeDto : BaseApiEntityModel
{
diff --git a/src/API/Grand.Api/DTOs/Catalog/ProductTierPriceDeleteDto.cs b/src/Modules/Grand.Module.Api/DTOs/Catalog/ProductTierPriceDeleteDto.cs
similarity index 63%
rename from src/API/Grand.Api/DTOs/Catalog/ProductTierPriceDeleteDto.cs
rename to src/Modules/Grand.Module.Api/DTOs/Catalog/ProductTierPriceDeleteDto.cs
index cd8163314..a3a70dc5a 100644
--- a/src/API/Grand.Api/DTOs/Catalog/ProductTierPriceDeleteDto.cs
+++ b/src/Modules/Grand.Module.Api/DTOs/Catalog/ProductTierPriceDeleteDto.cs
@@ -1,4 +1,4 @@
-namespace Grand.Api.DTOs.Catalog;
+namespace Grand.Module.Api.DTOs.Catalog;
public class ProductTierPriceDeleteDto
{
diff --git a/src/API/Grand.Api/DTOs/Catalog/ProductTierPriceDto.cs b/src/Modules/Grand.Module.Api/DTOs/Catalog/ProductTierPriceDto.cs
similarity index 81%
rename from src/API/Grand.Api/DTOs/Catalog/ProductTierPriceDto.cs
rename to src/Modules/Grand.Module.Api/DTOs/Catalog/ProductTierPriceDto.cs
index d944fd390..95d61fb6a 100644
--- a/src/API/Grand.Api/DTOs/Catalog/ProductTierPriceDto.cs
+++ b/src/Modules/Grand.Module.Api/DTOs/Catalog/ProductTierPriceDto.cs
@@ -1,6 +1,6 @@
-using Grand.Api.Models;
+using Grand.Module.Api.Models;
-namespace Grand.Api.DTOs.Catalog;
+namespace Grand.Module.Api.DTOs.Catalog;
public class ProductTierPriceDto : BaseApiEntityModel
{
diff --git a/src/API/Grand.Api/DTOs/Catalog/ProductUpdateStock.cs b/src/Modules/Grand.Module.Api/DTOs/Catalog/ProductUpdateStock.cs
similarity index 71%
rename from src/API/Grand.Api/DTOs/Catalog/ProductUpdateStock.cs
rename to src/Modules/Grand.Module.Api/DTOs/Catalog/ProductUpdateStock.cs
index 3cf39d4e6..55c089c00 100644
--- a/src/API/Grand.Api/DTOs/Catalog/ProductUpdateStock.cs
+++ b/src/Modules/Grand.Module.Api/DTOs/Catalog/ProductUpdateStock.cs
@@ -1,4 +1,4 @@
-namespace Grand.Api.DTOs.Catalog;
+namespace Grand.Module.Api.DTOs.Catalog;
public class ProductUpdateStock
{
diff --git a/src/API/Grand.Api/DTOs/Catalog/ProductWarehouseInventoryDto.cs b/src/Modules/Grand.Module.Api/DTOs/Catalog/ProductWarehouseInventoryDto.cs
similarity index 72%
rename from src/API/Grand.Api/DTOs/Catalog/ProductWarehouseInventoryDto.cs
rename to src/Modules/Grand.Module.Api/DTOs/Catalog/ProductWarehouseInventoryDto.cs
index 95b3ce062..f6ee484db 100644
--- a/src/API/Grand.Api/DTOs/Catalog/ProductWarehouseInventoryDto.cs
+++ b/src/Modules/Grand.Module.Api/DTOs/Catalog/ProductWarehouseInventoryDto.cs
@@ -1,6 +1,6 @@
-using Grand.Api.Models;
+using Grand.Module.Api.Models;
-namespace Grand.Api.DTOs.Catalog;
+namespace Grand.Module.Api.DTOs.Catalog;
public class ProductWarehouseInventoryDto : BaseApiEntityModel
{
diff --git a/src/API/Grand.Api/DTOs/Catalog/SpecificationAttributeDto.cs b/src/Modules/Grand.Module.Api/DTOs/Catalog/SpecificationAttributeDto.cs
similarity index 86%
rename from src/API/Grand.Api/DTOs/Catalog/SpecificationAttributeDto.cs
rename to src/Modules/Grand.Module.Api/DTOs/Catalog/SpecificationAttributeDto.cs
index f9d207c7a..e1d9c93c2 100644
--- a/src/API/Grand.Api/DTOs/Catalog/SpecificationAttributeDto.cs
+++ b/src/Modules/Grand.Module.Api/DTOs/Catalog/SpecificationAttributeDto.cs
@@ -1,6 +1,6 @@
-using Grand.Api.Models;
+using Grand.Module.Api.Models;
-namespace Grand.Api.DTOs.Catalog;
+namespace Grand.Module.Api.DTOs.Catalog;
public class SpecificationAttributeDto : BaseApiEntityModel
{
diff --git a/src/API/Grand.Api/DTOs/Common/CountryDto.cs b/src/Modules/Grand.Module.Api/DTOs/Common/CountryDto.cs
similarity index 92%
rename from src/API/Grand.Api/DTOs/Common/CountryDto.cs
rename to src/Modules/Grand.Module.Api/DTOs/Common/CountryDto.cs
index c03db672e..e0eb11621 100644
--- a/src/API/Grand.Api/DTOs/Common/CountryDto.cs
+++ b/src/Modules/Grand.Module.Api/DTOs/Common/CountryDto.cs
@@ -1,6 +1,6 @@
-using Grand.Api.Models;
+using Grand.Module.Api.Models;
-namespace Grand.Api.DTOs.Common;
+namespace Grand.Module.Api.DTOs.Common;
public class CountryDto : BaseApiEntityModel
{
diff --git a/src/API/Grand.Api/DTOs/Common/CurrencyDto.cs b/src/Modules/Grand.Module.Api/DTOs/Common/CurrencyDto.cs
similarity index 82%
rename from src/API/Grand.Api/DTOs/Common/CurrencyDto.cs
rename to src/Modules/Grand.Module.Api/DTOs/Common/CurrencyDto.cs
index 2a29b3a9f..5e9bb6497 100644
--- a/src/API/Grand.Api/DTOs/Common/CurrencyDto.cs
+++ b/src/Modules/Grand.Module.Api/DTOs/Common/CurrencyDto.cs
@@ -1,6 +1,6 @@
-using Grand.Api.Models;
+using Grand.Module.Api.Models;
-namespace Grand.Api.DTOs.Common;
+namespace Grand.Module.Api.DTOs.Common;
public class CurrencyDto : BaseApiEntityModel
{
diff --git a/src/API/Grand.Api/DTOs/Common/LanguageDto.cs b/src/Modules/Grand.Module.Api/DTOs/Common/LanguageDto.cs
similarity index 84%
rename from src/API/Grand.Api/DTOs/Common/LanguageDto.cs
rename to src/Modules/Grand.Module.Api/DTOs/Common/LanguageDto.cs
index 7f5530614..ae5d72659 100644
--- a/src/API/Grand.Api/DTOs/Common/LanguageDto.cs
+++ b/src/Modules/Grand.Module.Api/DTOs/Common/LanguageDto.cs
@@ -1,6 +1,6 @@
-using Grand.Api.Models;
+using Grand.Module.Api.Models;
-namespace Grand.Api.DTOs.Common;
+namespace Grand.Module.Api.DTOs.Common;
public class LanguageDto : BaseApiEntityModel
{
diff --git a/src/API/Grand.Api/DTOs/Common/LayoutDto.cs b/src/Modules/Grand.Module.Api/DTOs/Common/LayoutDto.cs
similarity index 69%
rename from src/API/Grand.Api/DTOs/Common/LayoutDto.cs
rename to src/Modules/Grand.Module.Api/DTOs/Common/LayoutDto.cs
index 6eb94b814..ab01a309d 100644
--- a/src/API/Grand.Api/DTOs/Common/LayoutDto.cs
+++ b/src/Modules/Grand.Module.Api/DTOs/Common/LayoutDto.cs
@@ -1,6 +1,6 @@
-using Grand.Api.Models;
+using Grand.Module.Api.Models;
-namespace Grand.Api.DTOs.Common;
+namespace Grand.Module.Api.DTOs.Common;
public class LayoutDto : BaseApiEntityModel
{
diff --git a/src/API/Grand.Api/DTOs/Common/PictureDto.cs b/src/Modules/Grand.Module.Api/DTOs/Common/PictureDto.cs
similarity index 87%
rename from src/API/Grand.Api/DTOs/Common/PictureDto.cs
rename to src/Modules/Grand.Module.Api/DTOs/Common/PictureDto.cs
index 618a8b145..23ecfd7e1 100644
--- a/src/API/Grand.Api/DTOs/Common/PictureDto.cs
+++ b/src/Modules/Grand.Module.Api/DTOs/Common/PictureDto.cs
@@ -1,7 +1,7 @@
-using Grand.Api.Models;
+using Grand.Module.Api.Models;
using Grand.Domain.Common;
-namespace Grand.Api.DTOs.Common;
+namespace Grand.Module.Api.DTOs.Common;
public class PictureDto : BaseApiEntityModel
{
diff --git a/src/API/Grand.Api/DTOs/Common/StoreDto.cs b/src/Modules/Grand.Module.Api/DTOs/Common/StoreDto.cs
similarity index 89%
rename from src/API/Grand.Api/DTOs/Common/StoreDto.cs
rename to src/Modules/Grand.Module.Api/DTOs/Common/StoreDto.cs
index 4f802f29f..491f7031b 100644
--- a/src/API/Grand.Api/DTOs/Common/StoreDto.cs
+++ b/src/Modules/Grand.Module.Api/DTOs/Common/StoreDto.cs
@@ -1,6 +1,6 @@
-using Grand.Api.Models;
+using Grand.Module.Api.Models;
-namespace Grand.Api.DTOs.Common;
+namespace Grand.Module.Api.DTOs.Common;
public class StoreDto : BaseApiEntityModel
{
diff --git a/src/API/Grand.Api/DTOs/Customers/AddressDto.cs b/src/Modules/Grand.Module.Api/DTOs/Customers/AddressDto.cs
similarity index 93%
rename from src/API/Grand.Api/DTOs/Customers/AddressDto.cs
rename to src/Modules/Grand.Module.Api/DTOs/Customers/AddressDto.cs
index 8433d2773..ccbfe78ab 100644
--- a/src/API/Grand.Api/DTOs/Customers/AddressDto.cs
+++ b/src/Modules/Grand.Module.Api/DTOs/Customers/AddressDto.cs
@@ -1,4 +1,4 @@
-namespace Grand.Api.DTOs.Customers;
+namespace Grand.Module.Api.DTOs.Customers;
public class AddressDto
{
diff --git a/src/API/Grand.Api/DTOs/Customers/CustomerDto.cs b/src/Modules/Grand.Module.Api/DTOs/Customers/CustomerDto.cs
similarity index 94%
rename from src/API/Grand.Api/DTOs/Customers/CustomerDto.cs
rename to src/Modules/Grand.Module.Api/DTOs/Customers/CustomerDto.cs
index 8545e2543..ff312c5c1 100644
--- a/src/API/Grand.Api/DTOs/Customers/CustomerDto.cs
+++ b/src/Modules/Grand.Module.Api/DTOs/Customers/CustomerDto.cs
@@ -1,7 +1,7 @@
-using Grand.Api.Models;
+using Grand.Module.Api.Models;
using System.ComponentModel.DataAnnotations;
-namespace Grand.Api.DTOs.Customers;
+namespace Grand.Module.Api.DTOs.Customers;
public class CustomerDto : BaseApiEntityModel
{
diff --git a/src/API/Grand.Api/DTOs/Customers/CustomerGroupDto.cs b/src/Modules/Grand.Module.Api/DTOs/Customers/CustomerGroupDto.cs
similarity index 81%
rename from src/API/Grand.Api/DTOs/Customers/CustomerGroupDto.cs
rename to src/Modules/Grand.Module.Api/DTOs/Customers/CustomerGroupDto.cs
index 03b41c4db..09d7c4926 100644
--- a/src/API/Grand.Api/DTOs/Customers/CustomerGroupDto.cs
+++ b/src/Modules/Grand.Module.Api/DTOs/Customers/CustomerGroupDto.cs
@@ -1,6 +1,6 @@
-using Grand.Api.Models;
+using Grand.Module.Api.Models;
-namespace Grand.Api.DTOs.Customers;
+namespace Grand.Module.Api.DTOs.Customers;
public class CustomerGroupDto : BaseApiEntityModel
{
diff --git a/src/API/Grand.Api/DTOs/Customers/DeleteAddressDto.cs b/src/Modules/Grand.Module.Api/DTOs/Customers/DeleteAddressDto.cs
similarity index 61%
rename from src/API/Grand.Api/DTOs/Customers/DeleteAddressDto.cs
rename to src/Modules/Grand.Module.Api/DTOs/Customers/DeleteAddressDto.cs
index 4995414d0..59af4ab9e 100644
--- a/src/API/Grand.Api/DTOs/Customers/DeleteAddressDto.cs
+++ b/src/Modules/Grand.Module.Api/DTOs/Customers/DeleteAddressDto.cs
@@ -1,4 +1,4 @@
-namespace Grand.Api.DTOs.Customers;
+namespace Grand.Module.Api.DTOs.Customers;
public class DeleteAddressDto
{
diff --git a/src/API/Grand.Api/DTOs/Customers/PasswordDto.cs b/src/Modules/Grand.Module.Api/DTOs/Customers/PasswordDto.cs
similarity index 59%
rename from src/API/Grand.Api/DTOs/Customers/PasswordDto.cs
rename to src/Modules/Grand.Module.Api/DTOs/Customers/PasswordDto.cs
index 8f65ebbbb..f87cc8ff4 100644
--- a/src/API/Grand.Api/DTOs/Customers/PasswordDto.cs
+++ b/src/Modules/Grand.Module.Api/DTOs/Customers/PasswordDto.cs
@@ -1,4 +1,4 @@
-namespace Grand.Api.DTOs.Customers;
+namespace Grand.Module.Api.DTOs.Customers;
public class PasswordDto
{
diff --git a/src/API/Grand.Api/DTOs/Customers/VendorDto.cs b/src/Modules/Grand.Module.Api/DTOs/Customers/VendorDto.cs
similarity index 90%
rename from src/API/Grand.Api/DTOs/Customers/VendorDto.cs
rename to src/Modules/Grand.Module.Api/DTOs/Customers/VendorDto.cs
index 8108a782c..448181bc4 100644
--- a/src/API/Grand.Api/DTOs/Customers/VendorDto.cs
+++ b/src/Modules/Grand.Module.Api/DTOs/Customers/VendorDto.cs
@@ -1,6 +1,6 @@
-using Grand.Api.Models;
+using Grand.Module.Api.Models;
-namespace Grand.Api.DTOs.Customers;
+namespace Grand.Module.Api.DTOs.Customers;
public class VendorDto : BaseApiEntityModel
{
diff --git a/src/API/Grand.Api/DTOs/Shipping/DeliveryDateDto.cs b/src/Modules/Grand.Module.Api/DTOs/Shipping/DeliveryDateDto.cs
similarity index 70%
rename from src/API/Grand.Api/DTOs/Shipping/DeliveryDateDto.cs
rename to src/Modules/Grand.Module.Api/DTOs/Shipping/DeliveryDateDto.cs
index 499892684..74eae10de 100644
--- a/src/API/Grand.Api/DTOs/Shipping/DeliveryDateDto.cs
+++ b/src/Modules/Grand.Module.Api/DTOs/Shipping/DeliveryDateDto.cs
@@ -1,6 +1,6 @@
-using Grand.Api.Models;
+using Grand.Module.Api.Models;
-namespace Grand.Api.DTOs.Shipping;
+namespace Grand.Module.Api.DTOs.Shipping;
public class DeliveryDateDto : BaseApiEntityModel
{
diff --git a/src/API/Grand.Api/DTOs/Shipping/PickupPointDto.cs b/src/Modules/Grand.Module.Api/DTOs/Shipping/PickupPointDto.cs
similarity index 81%
rename from src/API/Grand.Api/DTOs/Shipping/PickupPointDto.cs
rename to src/Modules/Grand.Module.Api/DTOs/Shipping/PickupPointDto.cs
index 978959e5c..dbc272e23 100644
--- a/src/API/Grand.Api/DTOs/Shipping/PickupPointDto.cs
+++ b/src/Modules/Grand.Module.Api/DTOs/Shipping/PickupPointDto.cs
@@ -1,6 +1,6 @@
-using Grand.Api.Models;
+using Grand.Module.Api.Models;
-namespace Grand.Api.DTOs.Shipping;
+namespace Grand.Module.Api.DTOs.Shipping;
public class PickupPointDto : BaseApiEntityModel
{
diff --git a/src/API/Grand.Api/DTOs/Shipping/ShippingMethodDto.cs b/src/Modules/Grand.Module.Api/DTOs/Shipping/ShippingMethodDto.cs
similarity index 69%
rename from src/API/Grand.Api/DTOs/Shipping/ShippingMethodDto.cs
rename to src/Modules/Grand.Module.Api/DTOs/Shipping/ShippingMethodDto.cs
index feeb70af5..6df456578 100644
--- a/src/API/Grand.Api/DTOs/Shipping/ShippingMethodDto.cs
+++ b/src/Modules/Grand.Module.Api/DTOs/Shipping/ShippingMethodDto.cs
@@ -1,6 +1,6 @@
-using Grand.Api.Models;
+using Grand.Module.Api.Models;
-namespace Grand.Api.DTOs.Shipping;
+namespace Grand.Module.Api.DTOs.Shipping;
public class ShippingMethodDto : BaseApiEntityModel
{
diff --git a/src/API/Grand.Api/DTOs/Shipping/WarehouseDto.cs b/src/Modules/Grand.Module.Api/DTOs/Shipping/WarehouseDto.cs
similarity index 63%
rename from src/API/Grand.Api/DTOs/Shipping/WarehouseDto.cs
rename to src/Modules/Grand.Module.Api/DTOs/Shipping/WarehouseDto.cs
index ceac8c3fc..d31e55e43 100644
--- a/src/API/Grand.Api/DTOs/Shipping/WarehouseDto.cs
+++ b/src/Modules/Grand.Module.Api/DTOs/Shipping/WarehouseDto.cs
@@ -1,6 +1,6 @@
-using Grand.Api.Models;
+using Grand.Module.Api.Models;
-namespace Grand.Api.DTOs.Shipping;
+namespace Grand.Module.Api.DTOs.Shipping;
public class WarehouseDto : BaseApiEntityModel
{
diff --git a/src/API/Grand.Api/DTOs/TokenDto.cs b/src/Modules/Grand.Module.Api/DTOs/TokenDto.cs
similarity index 75%
rename from src/API/Grand.Api/DTOs/TokenDto.cs
rename to src/Modules/Grand.Module.Api/DTOs/TokenDto.cs
index d81318096..98a3c8d13 100644
--- a/src/API/Grand.Api/DTOs/TokenDto.cs
+++ b/src/Modules/Grand.Module.Api/DTOs/TokenDto.cs
@@ -1,4 +1,4 @@
-namespace Grand.Api.DTOs;
+namespace Grand.Module.Api.DTOs;
public class TokenDto
{
diff --git a/src/API/Grand.Api/Extensions/AddParamOperationFilter.cs b/src/Modules/Grand.Module.Api/Extensions/AddParamOperationFilter.cs
similarity index 98%
rename from src/API/Grand.Api/Extensions/AddParamOperationFilter.cs
rename to src/Modules/Grand.Module.Api/Extensions/AddParamOperationFilter.cs
index a99078bdd..7be72b594 100644
--- a/src/API/Grand.Api/Extensions/AddParamOperationFilter.cs
+++ b/src/Modules/Grand.Module.Api/Extensions/AddParamOperationFilter.cs
@@ -2,7 +2,7 @@
using Microsoft.OpenApi.Models;
using Swashbuckle.AspNetCore.SwaggerGen;
-namespace Grand.Api.Extensions;
+namespace Grand.Module.Api.Extensions;
public class AddParamOperationFilter : IOperationFilter
{
diff --git a/src/API/Grand.Api/Extensions/MappingExtensions.cs b/src/Modules/Grand.Module.Api/Extensions/MappingExtensions.cs
similarity index 97%
rename from src/API/Grand.Api/Extensions/MappingExtensions.cs
rename to src/Modules/Grand.Module.Api/Extensions/MappingExtensions.cs
index 188031bea..e540afb32 100644
--- a/src/API/Grand.Api/Extensions/MappingExtensions.cs
+++ b/src/Modules/Grand.Module.Api/Extensions/MappingExtensions.cs
@@ -1,13 +1,13 @@
-using Grand.Api.DTOs.Catalog;
-using Grand.Api.DTOs.Common;
-using Grand.Api.DTOs.Customers;
+using Grand.Module.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Common;
+using Grand.Module.Api.DTOs.Customers;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Media;
using Grand.Infrastructure.Mapper;
-namespace Grand.Api.Extensions;
+namespace Grand.Module.Api.Extensions;
public static class MappingExtensions
{
diff --git a/src/API/Grand.Api/Extensions/SwaggerODataControllerDocumentFilter.cs b/src/Modules/Grand.Module.Api/Extensions/SwaggerODataControllerDocumentFilter.cs
similarity index 95%
rename from src/API/Grand.Api/Extensions/SwaggerODataControllerDocumentFilter.cs
rename to src/Modules/Grand.Module.Api/Extensions/SwaggerODataControllerDocumentFilter.cs
index 2d3c96e40..29a392cde 100644
--- a/src/API/Grand.Api/Extensions/SwaggerODataControllerDocumentFilter.cs
+++ b/src/Modules/Grand.Module.Api/Extensions/SwaggerODataControllerDocumentFilter.cs
@@ -2,7 +2,7 @@
using Microsoft.OpenApi.Models;
using Swashbuckle.AspNetCore.SwaggerGen;
-namespace Grand.Api.Extensions;
+namespace Grand.Module.Api.Extensions;
public class SwaggerODataControllerDocumentFilter : IDocumentFilter
{
diff --git a/src/API/Grand.Api/Filters/AuthorizeApiAdminAttribute.cs b/src/Modules/Grand.Module.Api/Filters/AuthorizeApiAdminAttribute.cs
similarity index 99%
rename from src/API/Grand.Api/Filters/AuthorizeApiAdminAttribute.cs
rename to src/Modules/Grand.Module.Api/Filters/AuthorizeApiAdminAttribute.cs
index c5e8dd6f8..7566cc253 100644
--- a/src/API/Grand.Api/Filters/AuthorizeApiAdminAttribute.cs
+++ b/src/Modules/Grand.Module.Api/Filters/AuthorizeApiAdminAttribute.cs
@@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
-namespace Grand.Api.Filters;
+namespace Grand.Module.Api.Filters;
/// <summary>
/// Represents a filter attribute that confirms access to the admin panel
diff --git a/src/Modules/Grand.Module.Api/Grand.Module.Api.csproj b/src/Modules/Grand.Module.Api/Grand.Module.Api.csproj
new file mode 100644
index 000000000..70914ac7d
--- /dev/null
+++ b/src/Modules/Grand.Module.Api/Grand.Module.Api.csproj
@@ -0,0 +1,56 @@
+<Project Sdk="Microsoft.NET.Sdk">
+ <PropertyGroup>
+ <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+ </PropertyGroup>
+ <Import Project="..\..\Build\Grand.Common.props" />
+ <ItemGroup>
+ <ProjectReference Include="..\..\Core\Grand.Data\Grand.Data.csproj">
+ <Private>False</Private>
+ <ExcludeAssets>runtime</ExcludeAssets>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
+ <Private>False</Private>
+ <ExcludeAssets>runtime</ExcludeAssets>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
+ <Private>False</Private>
+ <ExcludeAssets>runtime</ExcludeAssets>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj">
+ <Private>False</Private>
+ <ExcludeAssets>runtime</ExcludeAssets>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj">
+ <Private>False</Private>
+ <ExcludeAssets>runtime</ExcludeAssets>
+ </ProjectReference>
+ </ItemGroup>
+
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+ <OutputPath>..\..\Web\Grand.Web\Modules\Grand.Module.Api\</OutputPath>
+ <OutDir>$(OutputPath)</OutDir>
+ </PropertyGroup>
+
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+ <OutputPath>..\..\Web\Grand.Web\Modules\Grand.Module.Api\</OutputPath>
+ <OutDir>$(OutputPath)</OutDir>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <PackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="8.0.10" />
+ <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.10" />
+ <PackageReference Include="Microsoft.AspNetCore.OData" Version="9.0.0" />
+ <PackageReference Include="MongoDB.AspNetCore.OData" Version="1.0.1" >
+ <ExcludeAssets>runtime</ExcludeAssets>
+ <IncludeAssets>compile</IncludeAssets>
+ </PackageReference>
+ <PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />
+ <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.9.0" />
+ </ItemGroup>
+ <Target Name="CopyMongoDBODataDLL" AfterTargets="Build">
+ <ItemGroup>
+ <MongoDBODataFiles Include="$(NuGetPackageRoot)mongodb.aspnetcore.odata\1.0.1\lib\net5.0\MongoDB.AspNetCore.OData.dll" />
+ </ItemGroup>
+ <Copy SourceFiles="@(MongoDBODataFiles)" DestinationFolder="$(OutDir)" />
+ </Target>
+</Project>
diff --git a/src/API/Grand.Api/Infrastructure/ApiAuthenticationRegistrar.cs b/src/Modules/Grand.Module.Api/Infrastructure/ApiAuthenticationRegistrar.cs
similarity index 97%
rename from src/API/Grand.Api/Infrastructure/ApiAuthenticationRegistrar.cs
rename to src/Modules/Grand.Module.Api/Infrastructure/ApiAuthenticationRegistrar.cs
index 670ff180b..c7b5215d1 100644
--- a/src/API/Grand.Api/Infrastructure/ApiAuthenticationRegistrar.cs
+++ b/src/Modules/Grand.Module.Api/Infrastructure/ApiAuthenticationRegistrar.cs
@@ -1,4 +1,4 @@
-using Grand.Api.Infrastructure.Extensions;
+using Grand.Module.Api.Infrastructure.Extensions;
using Grand.Business.Core.Interfaces.Authentication;
using Grand.Infrastructure.Configuration;
using Microsoft.AspNetCore.Authentication;
@@ -8,7 +8,7 @@ using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.IdentityModel.Tokens;
-namespace Grand.Api.Infrastructure;
+namespace Grand.Module.Api.Infrastructure;
public class ApiAuthenticationRegistrar : IAuthenticationBuilder
{
diff --git a/src/API/Grand.Api/Infrastructure/ApiProviderStartup.cs b/src/Modules/Grand.Module.Api/Infrastructure/ApiProviderStartup.cs
similarity index 94%
rename from src/API/Grand.Api/Infrastructure/ApiProviderStartup.cs
rename to src/Modules/Grand.Module.Api/Infrastructure/ApiProviderStartup.cs
index 990469c15..272bf7d5b 100644
--- a/src/API/Grand.Api/Infrastructure/ApiProviderStartup.cs
+++ b/src/Modules/Grand.Module.Api/Infrastructure/ApiProviderStartup.cs
@@ -1,4 +1,4 @@
-using Grand.Api.ApiExplorer;
+using Grand.Module.Api.ApiExplorer;
using Grand.Infrastructure;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
@@ -7,7 +7,7 @@ using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
-namespace Grand.Api.Infrastructure;
+namespace Grand.Module.Api.Infrastructure;
/// <summary>
/// Represents object for the configuring api description provider on application
diff --git a/src/API/Grand.Api/Infrastructure/DependencyEdmModel.cs b/src/Modules/Grand.Module.Api/Infrastructure/DependencyEdmModel.cs
similarity index 98%
rename from src/API/Grand.Api/Infrastructure/DependencyEdmModel.cs
rename to src/Modules/Grand.Module.Api/Infrastructure/DependencyEdmModel.cs
index 705c6c9d2..e8302cd02 100644
--- a/src/API/Grand.Api/Infrastructure/DependencyEdmModel.cs
+++ b/src/Modules/Grand.Module.Api/Infrastructure/DependencyEdmModel.cs
@@ -1,13 +1,13 @@
-using Grand.Api.DTOs.Catalog;
-using Grand.Api.DTOs.Common;
-using Grand.Api.DTOs.Customers;
-using Grand.Api.DTOs.Shipping;
-using Grand.Api.Infrastructure.DependencyManagement;
+using Grand.Module.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Common;
+using Grand.Module.Api.DTOs.Customers;
+using Grand.Module.Api.DTOs.Shipping;
+using Grand.Module.Api.Infrastructure.DependencyManagement;
using Grand.Domain.Catalog;
using Grand.Infrastructure.Configuration;
using Microsoft.OData.ModelBuilder;
-namespace Grand.Api.Infrastructure;
+namespace Grand.Module.Api.Infrastructure;
public class DependencyEdmModel : IDependencyEdmModel
{
diff --git a/src/API/Grand.Api/Infrastructure/DependencyManagement/IDependencyEdmModel.cs b/src/Modules/Grand.Module.Api/Infrastructure/DependencyManagement/IDependencyEdmModel.cs
similarity index 88%
rename from src/API/Grand.Api/Infrastructure/DependencyManagement/IDependencyEdmModel.cs
rename to src/Modules/Grand.Module.Api/Infrastructure/DependencyManagement/IDependencyEdmModel.cs
index 4f9c7d117..fde25a8db 100644
--- a/src/API/Grand.Api/Infrastructure/DependencyManagement/IDependencyEdmModel.cs
+++ b/src/Modules/Grand.Module.Api/Infrastructure/DependencyManagement/IDependencyEdmModel.cs
@@ -1,7 +1,7 @@
using Grand.Infrastructure.Configuration;
using Microsoft.OData.ModelBuilder;
-namespace Grand.Api.Infrastructure.DependencyManagement;
+namespace Grand.Module.Api.Infrastructure.DependencyManagement;
public interface IDependencyEdmModel
{
diff --git a/src/API/Grand.Api/Infrastructure/Extensions/JwtSecurityKey.cs b/src/Modules/Grand.Module.Api/Infrastructure/Extensions/JwtSecurityKey.cs
similarity index 80%
rename from src/API/Grand.Api/Infrastructure/Extensions/JwtSecurityKey.cs
rename to src/Modules/Grand.Module.Api/Infrastructure/Extensions/JwtSecurityKey.cs
index bde184d4f..ee135a224 100644
--- a/src/API/Grand.Api/Infrastructure/Extensions/JwtSecurityKey.cs
+++ b/src/Modules/Grand.Module.Api/Infrastructure/Extensions/JwtSecurityKey.cs
@@ -1,6 +1,6 @@
using Microsoft.IdentityModel.Tokens;
-namespace Grand.Api.Infrastructure.Extensions;
+namespace Grand.Module.Api.Infrastructure.Extensions;
public static class JwtSecurityKey
{
diff --git a/src/API/Grand.Api/Infrastructure/Filters/EnumSchemaFilter.cs b/src/Modules/Grand.Module.Api/Infrastructure/Filters/EnumSchemaFilter.cs
similarity index 91%
rename from src/API/Grand.Api/Infrastructure/Filters/EnumSchemaFilter.cs
rename to src/Modules/Grand.Module.Api/Infrastructure/Filters/EnumSchemaFilter.cs
index 27c7d0d77..0b7190031 100644
--- a/src/API/Grand.Api/Infrastructure/Filters/EnumSchemaFilter.cs
+++ b/src/Modules/Grand.Module.Api/Infrastructure/Filters/EnumSchemaFilter.cs
@@ -2,7 +2,7 @@
using Microsoft.OpenApi.Models;
using Swashbuckle.AspNetCore.SwaggerGen;
-namespace Grand.Api.Infrastructure.Filters;
+namespace Grand.Module.Api.Infrastructure.Filters;
public class EnumSchemaFilter : ISchemaFilter
{
diff --git a/src/API/Grand.Api/Infrastructure/Filters/IgnoreFieldFilter.cs b/src/Modules/Grand.Module.Api/Infrastructure/Filters/IgnoreFieldFilter.cs
similarity index 95%
rename from src/API/Grand.Api/Infrastructure/Filters/IgnoreFieldFilter.cs
rename to src/Modules/Grand.Module.Api/Infrastructure/Filters/IgnoreFieldFilter.cs
index fcbe8bdd8..90995b07d 100644
--- a/src/API/Grand.Api/Infrastructure/Filters/IgnoreFieldFilter.cs
+++ b/src/Modules/Grand.Module.Api/Infrastructure/Filters/IgnoreFieldFilter.cs
@@ -3,7 +3,7 @@ using Microsoft.OpenApi.Models;
using Swashbuckle.AspNetCore.SwaggerGen;
using System.Reflection;
-namespace Grand.Api.Infrastructure.Filters;
+namespace Grand.Module.Api.Infrastructure.Filters;
public class IgnoreFieldFilter : ISchemaFilter
{
diff --git a/src/API/Grand.Api/Infrastructure/Mapper/Profiles/AddressProfile.cs b/src/Modules/Grand.Module.Api/Infrastructure/Mapper/Profiles/AddressProfile.cs
similarity index 78%
rename from src/API/Grand.Api/Infrastructure/Mapper/Profiles/AddressProfile.cs
rename to src/Modules/Grand.Module.Api/Infrastructure/Mapper/Profiles/AddressProfile.cs
index a2a3d92a6..47daeddd7 100644
--- a/src/API/Grand.Api/Infrastructure/Mapper/Profiles/AddressProfile.cs
+++ b/src/Modules/Grand.Module.Api/Infrastructure/Mapper/Profiles/AddressProfile.cs
@@ -1,9 +1,9 @@
using AutoMapper;
-using Grand.Api.DTOs.Customers;
+using Grand.Module.Api.DTOs.Customers;
using Grand.Domain.Common;
using Grand.Infrastructure.Mapper;
-namespace Grand.Api.Infrastructure.Mapper.Profiles;
+namespace Grand.Module.Api.Infrastructure.Mapper.Profiles;
public class AddressProfile : Profile, IAutoMapperProfile
{
diff --git a/src/API/Grand.Api/Infrastructure/Mapper/Profiles/BrandProfile.cs b/src/Modules/Grand.Module.Api/Infrastructure/Mapper/Profiles/BrandProfile.cs
similarity index 90%
rename from src/API/Grand.Api/Infrastructure/Mapper/Profiles/BrandProfile.cs
rename to src/Modules/Grand.Module.Api/Infrastructure/Mapper/Profiles/BrandProfile.cs
index e6d783133..7f97ae451 100644
--- a/src/API/Grand.Api/Infrastructure/Mapper/Profiles/BrandProfile.cs
+++ b/src/Modules/Grand.Module.Api/Infrastructure/Mapper/Profiles/BrandProfile.cs
@@ -1,9 +1,9 @@
using AutoMapper;
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using Grand.Domain.Catalog;
using Grand.Infrastructure.Mapper;
-namespace Grand.Api.Infrastructure.Mapper.Profiles;
+namespace Grand.Module.Api.Infrastructure.Mapper.Profiles;
public class BrandProfile : Profile, IAutoMapperProfile
{
diff --git a/src/API/Grand.Api/Infrastructure/Mapper/Profiles/CategoryProfile.cs b/src/Modules/Grand.Module.Api/Infrastructure/Mapper/Profiles/CategoryProfile.cs
similarity index 90%
rename from src/API/Grand.Api/Infrastructure/Mapper/Profiles/CategoryProfile.cs
rename to src/Modules/Grand.Module.Api/Infrastructure/Mapper/Profiles/CategoryProfile.cs
index b809585c0..81134dc3f 100644
--- a/src/API/Grand.Api/Infrastructure/Mapper/Profiles/CategoryProfile.cs
+++ b/src/Modules/Grand.Module.Api/Infrastructure/Mapper/Profiles/CategoryProfile.cs
@@ -1,9 +1,9 @@
using AutoMapper;
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using Grand.Domain.Catalog;
using Grand.Infrastructure.Mapper;
-namespace Grand.Api.Infrastructure.Mapper.Profiles;
+namespace Grand.Module.Api.Infrastructure.Mapper.Profiles;
public class CategoryProfile : Profile, IAutoMapperProfile
{
diff --git a/src/API/Grand.Api/Infrastructure/Mapper/Profiles/CollectionProfile.cs b/src/Modules/Grand.Module.Api/Infrastructure/Mapper/Profiles/CollectionProfile.cs
similarity index 90%
rename from src/API/Grand.Api/Infrastructure/Mapper/Profiles/CollectionProfile.cs
rename to src/Modules/Grand.Module.Api/Infrastructure/Mapper/Profiles/CollectionProfile.cs
index 6ccf14d56..52d6c3e9e 100644
--- a/src/API/Grand.Api/Infrastructure/Mapper/Profiles/CollectionProfile.cs
+++ b/src/Modules/Grand.Module.Api/Infrastructure/Mapper/Profiles/CollectionProfile.cs
@@ -1,9 +1,9 @@
using AutoMapper;
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using Grand.Domain.Catalog;
using Grand.Infrastructure.Mapper;
-namespace Grand.Api.Infrastructure.Mapper.Profiles;
+namespace Grand.Module.Api.Infrastructure.Mapper.Profiles;
public class CollectionProfile : Profile, IAutoMapperProfile
{
diff --git a/src/API/Grand.Api/Infrastructure/Mapper/Profiles/CustomerGroupProfile.cs b/src/Modules/Grand.Module.Api/Infrastructure/Mapper/Profiles/CustomerGroupProfile.cs
similarity index 80%
rename from src/API/Grand.Api/Infrastructure/Mapper/Profiles/CustomerGroupProfile.cs
rename to src/Modules/Grand.Module.Api/Infrastructure/Mapper/Profiles/CustomerGroupProfile.cs
index 912b987a8..d00fc1ba8 100644
--- a/src/API/Grand.Api/Infrastructure/Mapper/Profiles/CustomerGroupProfile.cs
+++ b/src/Modules/Grand.Module.Api/Infrastructure/Mapper/Profiles/CustomerGroupProfile.cs
@@ -1,9 +1,9 @@
using AutoMapper;
-using Grand.Api.DTOs.Customers;
+using Grand.Module.Api.DTOs.Customers;
using Grand.Domain.Customers;
using Grand.Infrastructure.Mapper;
-namespace Grand.Api.Infrastructure.Mapper.Profiles;
+namespace Grand.Module.Api.Infrastructure.Mapper.Profiles;
public class CustomerGroupProfile : Profile, IAutoMapperProfile
{
diff --git a/src/API/Grand.Api/Infrastructure/Mapper/Profiles/CustomerProfile.cs b/src/Modules/Grand.Module.Api/Infrastructure/Mapper/Profiles/CustomerProfile.cs
similarity index 97%
rename from src/API/Grand.Api/Infrastructure/Mapper/Profiles/CustomerProfile.cs
rename to src/Modules/Grand.Module.Api/Infrastructure/Mapper/Profiles/CustomerProfile.cs
index 9fd91a6b4..f55ded707 100644
--- a/src/API/Grand.Api/Infrastructure/Mapper/Profiles/CustomerProfile.cs
+++ b/src/Modules/Grand.Module.Api/Infrastructure/Mapper/Profiles/CustomerProfile.cs
@@ -1,10 +1,10 @@
using AutoMapper;
-using Grand.Api.DTOs.Customers;
+using Grand.Module.Api.DTOs.Customers;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Infrastructure.Mapper;
-namespace Grand.Api.Infrastructure.Mapper.Profiles;
+namespace Grand.Module.Api.Infrastructure.Mapper.Profiles;
public class CustomerProfile : Profile, IAutoMapperProfile
{
diff --git a/src/API/Grand.Api/Infrastructure/Mapper/Profiles/PictureProfile.cs b/src/Modules/Grand.Module.Api/Infrastructure/Mapper/Profiles/PictureProfile.cs
similarity index 81%
rename from src/API/Grand.Api/Infrastructure/Mapper/Profiles/PictureProfile.cs
rename to src/Modules/Grand.Module.Api/Infrastructure/Mapper/Profiles/PictureProfile.cs
index cda1aa0e5..6a2d98c25 100644
--- a/src/API/Grand.Api/Infrastructure/Mapper/Profiles/PictureProfile.cs
+++ b/src/Modules/Grand.Module.Api/Infrastructure/Mapper/Profiles/PictureProfile.cs
@@ -1,9 +1,9 @@
using AutoMapper;
-using Grand.Api.DTOs.Common;
+using Grand.Module.Api.DTOs.Common;
using Grand.Domain.Media;
using Grand.Infrastructure.Mapper;
-namespace Grand.Api.Infrastructure.Mapper.Profiles;
+namespace Grand.Module.Api.Infrastructure.Mapper.Profiles;
public class PictureProfile : Profile, IAutoMapperProfile
{
diff --git a/src/API/Grand.Api/Infrastructure/Mapper/Profiles/ProductAttributeMappingProfile.cs b/src/Modules/Grand.Module.Api/Infrastructure/Mapper/Profiles/ProductAttributeMappingProfile.cs
similarity index 84%
rename from src/API/Grand.Api/Infrastructure/Mapper/Profiles/ProductAttributeMappingProfile.cs
rename to src/Modules/Grand.Module.Api/Infrastructure/Mapper/Profiles/ProductAttributeMappingProfile.cs
index 4b8744b65..155d10a92 100644
--- a/src/API/Grand.Api/Infrastructure/Mapper/Profiles/ProductAttributeMappingProfile.cs
+++ b/src/Modules/Grand.Module.Api/Infrastructure/Mapper/Profiles/ProductAttributeMappingProfile.cs
@@ -1,9 +1,9 @@
using AutoMapper;
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using Grand.Domain.Catalog;
using Grand.Infrastructure.Mapper;
-namespace Grand.Api.Infrastructure.Mapper.Profiles;
+namespace Grand.Module.Api.Infrastructure.Mapper.Profiles;
public class ProductAttributeMappingProfile : Profile, IAutoMapperProfile
{
diff --git a/src/API/Grand.Api/Infrastructure/Mapper/Profiles/ProductAttributeProfile.cs b/src/Modules/Grand.Module.Api/Infrastructure/Mapper/Profiles/ProductAttributeProfile.cs
similarity index 87%
rename from src/API/Grand.Api/Infrastructure/Mapper/Profiles/ProductAttributeProfile.cs
rename to src/Modules/Grand.Module.Api/Infrastructure/Mapper/Profiles/ProductAttributeProfile.cs
index 8f98cbea4..972fb270a 100644
--- a/src/API/Grand.Api/Infrastructure/Mapper/Profiles/ProductAttributeProfile.cs
+++ b/src/Modules/Grand.Module.Api/Infrastructure/Mapper/Profiles/ProductAttributeProfile.cs
@@ -1,9 +1,9 @@
using AutoMapper;
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using Grand.Domain.Catalog;
using Grand.Infrastructure.Mapper;
-namespace Grand.Api.Infrastructure.Mapper.Profiles;
+namespace Grand.Module.Api.Infrastructure.Mapper.Profiles;
public class ProductAttributeProfile : Profile, IAutoMapperProfile
{
diff --git a/src/API/Grand.Api/Infrastructure/Mapper/Profiles/ProductProfile.cs b/src/Modules/Grand.Module.Api/Infrastructure/Mapper/Profiles/ProductProfile.cs
similarity index 96%
rename from src/API/Grand.Api/Infrastructure/Mapper/Profiles/ProductProfile.cs
rename to src/Modules/Grand.Module.Api/Infrastructure/Mapper/Profiles/ProductProfile.cs
index 55c1ea5ad..3a108eb0b 100644
--- a/src/API/Grand.Api/Infrastructure/Mapper/Profiles/ProductProfile.cs
+++ b/src/Modules/Grand.Module.Api/Infrastructure/Mapper/Profiles/ProductProfile.cs
@@ -1,9 +1,9 @@
using AutoMapper;
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using Grand.Domain.Catalog;
using Grand.Infrastructure.Mapper;
-namespace Grand.Api.Infrastructure.Mapper.Profiles;
+namespace Grand.Module.Api.Infrastructure.Mapper.Profiles;
public class ProductProfile : Profile, IAutoMapperProfile
{
diff --git a/src/API/Grand.Api/Infrastructure/Mapper/Profiles/SpecificationAttributeProfile.cs b/src/Modules/Grand.Module.Api/Infrastructure/Mapper/Profiles/SpecificationAttributeProfile.cs
similarity index 87%
rename from src/API/Grand.Api/Infrastructure/Mapper/Profiles/SpecificationAttributeProfile.cs
rename to src/Modules/Grand.Module.Api/Infrastructure/Mapper/Profiles/SpecificationAttributeProfile.cs
index a797dea9c..a667583a1 100644
--- a/src/API/Grand.Api/Infrastructure/Mapper/Profiles/SpecificationAttributeProfile.cs
+++ b/src/Modules/Grand.Module.Api/Infrastructure/Mapper/Profiles/SpecificationAttributeProfile.cs
@@ -1,9 +1,9 @@
using AutoMapper;
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using Grand.Domain.Catalog;
using Grand.Infrastructure.Mapper;
-namespace Grand.Api.Infrastructure.Mapper.Profiles;
+namespace Grand.Module.Api.Infrastructure.Mapper.Profiles;
public class SpecificationAttributeProfile : Profile, IAutoMapperProfile
{
diff --git a/src/API/Grand.Api/Infrastructure/Mapper/Profiles/TierPriceProfile.cs b/src/Modules/Grand.Module.Api/Infrastructure/Mapper/Profiles/TierPriceProfile.cs
similarity index 77%
rename from src/API/Grand.Api/Infrastructure/Mapper/Profiles/TierPriceProfile.cs
rename to src/Modules/Grand.Module.Api/Infrastructure/Mapper/Profiles/TierPriceProfile.cs
index 21bcd0e2a..97b96fd01 100644
--- a/src/API/Grand.Api/Infrastructure/Mapper/Profiles/TierPriceProfile.cs
+++ b/src/Modules/Grand.Module.Api/Infrastructure/Mapper/Profiles/TierPriceProfile.cs
@@ -1,9 +1,9 @@
using AutoMapper;
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using Grand.Domain.Catalog;
using Grand.Infrastructure.Mapper;
-namespace Grand.Api.Infrastructure.Mapper.Profiles;
+namespace Grand.Module.Api.Infrastructure.Mapper.Profiles;
public class TierPriceProfile : Profile, IAutoMapperProfile
{
diff --git a/src/API/Grand.Api/Infrastructure/ModelValidationAttribute.cs b/src/Modules/Grand.Module.Api/Infrastructure/ModelValidationAttribute.cs
similarity index 88%
rename from src/API/Grand.Api/Infrastructure/ModelValidationAttribute.cs
rename to src/Modules/Grand.Module.Api/Infrastructure/ModelValidationAttribute.cs
index c23e09da3..57d3f8d63 100644
--- a/src/API/Grand.Api/Infrastructure/ModelValidationAttribute.cs
+++ b/src/Modules/Grand.Module.Api/Infrastructure/ModelValidationAttribute.cs
@@ -1,7 +1,7 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
-namespace Grand.Api.Infrastructure;
+namespace Grand.Module.Api.Infrastructure;
public class ModelValidationAttribute : ActionFilterAttribute
{
diff --git a/src/API/Grand.Api/Infrastructure/ODataStartup.cs b/src/Modules/Grand.Module.Api/Infrastructure/ODataStartup.cs
similarity index 93%
rename from src/API/Grand.Api/Infrastructure/ODataStartup.cs
rename to src/Modules/Grand.Module.Api/Infrastructure/ODataStartup.cs
index 3400064bd..05bcdd7f1 100644
--- a/src/API/Grand.Api/Infrastructure/ODataStartup.cs
+++ b/src/Modules/Grand.Module.Api/Infrastructure/ODataStartup.cs
@@ -1,11 +1,11 @@
-using Grand.Api.Constants;
-using Grand.Api.DTOs.Catalog;
-using Grand.Api.DTOs.Common;
-using Grand.Api.DTOs.Customers;
-using Grand.Api.DTOs.Shipping;
-using Grand.Api.Infrastructure.DependencyManagement;
-using Grand.Api.Queries.Handlers.Common;
-using Grand.Api.Queries.Models.Common;
+using Grand.Module.Api.Constants;
+using Grand.Module.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Common;
+using Grand.Module.Api.DTOs.Customers;
+using Grand.Module.Api.DTOs.Shipping;
+using Grand.Module.Api.Infrastructure.DependencyManagement;
+using Grand.Module.Api.Queries.Handlers.Common;
+using Grand.Module.Api.Queries.Models.Common;
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
using Grand.Domain.Directory;
@@ -29,7 +29,7 @@ using Microsoft.Extensions.Options;
using Microsoft.OData.Edm;
using Microsoft.OData.ModelBuilder;
-namespace Grand.Api.Infrastructure;
+namespace Grand.Module.Api.Infrastructure;
public class ODataStartup : IStartupApplication
{
diff --git a/src/API/Grand.Api/Infrastructure/SwaggerStartup.cs b/src/Modules/Grand.Module.Api/Infrastructure/SwaggerStartup.cs
similarity index 97%
rename from src/API/Grand.Api/Infrastructure/SwaggerStartup.cs
rename to src/Modules/Grand.Module.Api/Infrastructure/SwaggerStartup.cs
index 672773b84..3f49fca5b 100644
--- a/src/API/Grand.Api/Infrastructure/SwaggerStartup.cs
+++ b/src/Modules/Grand.Module.Api/Infrastructure/SwaggerStartup.cs
@@ -1,5 +1,5 @@
-using Grand.Api.Extensions;
-using Grand.Api.Infrastructure.Filters;
+using Grand.Module.Api.Extensions;
+using Grand.Module.Api.Infrastructure.Filters;
using Grand.Infrastructure;
using Grand.Infrastructure.Configuration;
using Microsoft.AspNetCore.Authentication.JwtBearer;
@@ -10,7 +10,7 @@ using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.OpenApi.Models;
-namespace Grand.Api.Infrastructure;
+namespace Grand.Module.Api.Infrastructure;
public class SwaggerStartup : IStartupApplication
{
diff --git a/src/API/Grand.Api/Jwt/JwtToken.cs b/src/Modules/Grand.Module.Api/Jwt/JwtToken.cs
similarity index 90%
rename from src/API/Grand.Api/Jwt/JwtToken.cs
rename to src/Modules/Grand.Module.Api/Jwt/JwtToken.cs
index 37e112388..a38862a64 100644
--- a/src/API/Grand.Api/Jwt/JwtToken.cs
+++ b/src/Modules/Grand.Module.Api/Jwt/JwtToken.cs
@@ -1,6 +1,6 @@
using System.IdentityModel.Tokens.Jwt;
-namespace Grand.Api.Jwt;
+namespace Grand.Module.Api.Jwt;
public sealed class JwtToken
{
diff --git a/src/API/Grand.Api/Jwt/JwtTokenBuilder.cs b/src/Modules/Grand.Module.Api/Jwt/JwtTokenBuilder.cs
similarity index 98%
rename from src/API/Grand.Api/Jwt/JwtTokenBuilder.cs
rename to src/Modules/Grand.Module.Api/Jwt/JwtTokenBuilder.cs
index 68e300a7e..9e6dcc8de 100644
--- a/src/API/Grand.Api/Jwt/JwtTokenBuilder.cs
+++ b/src/Modules/Grand.Module.Api/Jwt/JwtTokenBuilder.cs
@@ -2,7 +2,7 @@
using System.IdentityModel.Tokens.Jwt;
using System.Security.Claims;
-namespace Grand.Api.Jwt;
+namespace Grand.Module.Api.Jwt;
public sealed class JwtTokenBuilder
{
diff --git a/src/API/Grand.Api/Models/BaseApiEntityModel.cs b/src/Modules/Grand.Module.Api/Models/BaseApiEntityModel.cs
similarity index 85%
rename from src/API/Grand.Api/Models/BaseApiEntityModel.cs
rename to src/Modules/Grand.Module.Api/Models/BaseApiEntityModel.cs
index 0a076a306..6525ce05b 100644
--- a/src/API/Grand.Api/Models/BaseApiEntityModel.cs
+++ b/src/Modules/Grand.Module.Api/Models/BaseApiEntityModel.cs
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;
-namespace Grand.Api.Models;
+namespace Grand.Module.Api.Models;
public class BaseApiEntityModel
{
diff --git a/src/API/Grand.Api/Models/Common/LoginModel.cs b/src/Modules/Grand.Module.Api/Models/Common/LoginModel.cs
similarity index 69%
rename from src/API/Grand.Api/Models/Common/LoginModel.cs
rename to src/Modules/Grand.Module.Api/Models/Common/LoginModel.cs
index 96842e02b..9c4faf277 100644
--- a/src/API/Grand.Api/Models/Common/LoginModel.cs
+++ b/src/Modules/Grand.Module.Api/Models/Common/LoginModel.cs
@@ -1,4 +1,4 @@
-namespace Grand.Api.Models.Common;
+namespace Grand.Module.Api.Models.Common;
public class LoginModel
{
diff --git a/src/API/Grand.Api/Models/Common/LoginWebModel.cs b/src/Modules/Grand.Module.Api/Models/Common/LoginWebModel.cs
similarity index 70%
rename from src/API/Grand.Api/Models/Common/LoginWebModel.cs
rename to src/Modules/Grand.Module.Api/Models/Common/LoginWebModel.cs
index 5bbd18299..f60b83220 100644
--- a/src/API/Grand.Api/Models/Common/LoginWebModel.cs
+++ b/src/Modules/Grand.Module.Api/Models/Common/LoginWebModel.cs
@@ -1,4 +1,4 @@
-namespace Grand.Api.Models.Common;
+namespace Grand.Module.Api.Models.Common;
public class LoginWebModel
{
diff --git a/src/API/Grand.Api/Queries/Handlers/Common/GetGenericQueryHandler.cs b/src/Modules/Grand.Module.Api/Queries/Handlers/Common/GetGenericQueryHandler.cs
similarity index 83%
rename from src/API/Grand.Api/Queries/Handlers/Common/GetGenericQueryHandler.cs
rename to src/Modules/Grand.Module.Api/Queries/Handlers/Common/GetGenericQueryHandler.cs
index 42f9e5187..5a4d10a95 100644
--- a/src/API/Grand.Api/Queries/Handlers/Common/GetGenericQueryHandler.cs
+++ b/src/Modules/Grand.Module.Api/Queries/Handlers/Common/GetGenericQueryHandler.cs
@@ -1,10 +1,10 @@
-using Grand.Api.Models;
-using Grand.Api.Queries.Models.Common;
+using Grand.Module.Api.Models;
+using Grand.Module.Api.Queries.Models.Common;
using Grand.Data;
using Grand.Domain;
using MediatR;
-namespace Grand.Api.Queries.Handlers.Common;
+namespace Grand.Module.Api.Queries.Handlers.Common;
public class GetGenericQueryHandler<T, C> : IRequestHandler<GetGenericQuery<T, C>, IQueryable<T>>
where T : BaseApiEntityModel
diff --git a/src/API/Grand.Api/Queries/Handlers/Customers/GetCustomerQueryHandler.cs b/src/Modules/Grand.Module.Api/Queries/Handlers/Customers/GetCustomerQueryHandler.cs
similarity index 74%
rename from src/API/Grand.Api/Queries/Handlers/Customers/GetCustomerQueryHandler.cs
rename to src/Modules/Grand.Module.Api/Queries/Handlers/Customers/GetCustomerQueryHandler.cs
index ac8bc87e1..c906b1101 100644
--- a/src/API/Grand.Api/Queries/Handlers/Customers/GetCustomerQueryHandler.cs
+++ b/src/Modules/Grand.Module.Api/Queries/Handlers/Customers/GetCustomerQueryHandler.cs
@@ -1,10 +1,10 @@
-using Grand.Api.DTOs.Customers;
-using Grand.Api.Extensions;
-using Grand.Api.Queries.Models.Customers;
+using Grand.Module.Api.DTOs.Customers;
+using Grand.Module.Api.Extensions;
+using Grand.Module.Api.Queries.Models.Customers;
using Grand.Business.Core.Interfaces.Customers;
using MediatR;
-namespace Grand.Api.Queries.Handlers.Customers;
+namespace Grand.Module.Api.Queries.Handlers.Customers;
public class GetCustomerQueryHandler : IRequestHandler<GetCustomerQuery, CustomerDto>
{
diff --git a/src/API/Grand.Api/Queries/Models/Common/GetGenericQuery.cs b/src/Modules/Grand.Module.Api/Queries/Models/Common/GetGenericQuery.cs
similarity index 60%
rename from src/API/Grand.Api/Queries/Models/Common/GetGenericQuery.cs
rename to src/Modules/Grand.Module.Api/Queries/Models/Common/GetGenericQuery.cs
index 16b491fea..df79fb8ce 100644
--- a/src/API/Grand.Api/Queries/Models/Common/GetGenericQuery.cs
+++ b/src/Modules/Grand.Module.Api/Queries/Models/Common/GetGenericQuery.cs
@@ -1,8 +1,8 @@
-using Grand.Api.Models;
+using Grand.Module.Api.Models;
using Grand.Domain;
using MediatR;
-namespace Grand.Api.Queries.Models.Common;
+namespace Grand.Module.Api.Queries.Models.Common;
public record GetGenericQuery<T, C>(string Id = null)
: IRequest<IQueryable<T>> where T : BaseApiEntityModel where C : BaseEntity;
\ No newline at end of file
diff --git a/src/API/Grand.Api/Queries/Models/Common/GetQuery.cs b/src/Modules/Grand.Module.Api/Queries/Models/Common/GetQuery.cs
similarity index 70%
rename from src/API/Grand.Api/Queries/Models/Common/GetQuery.cs
rename to src/Modules/Grand.Module.Api/Queries/Models/Common/GetQuery.cs
index 081b92828..1cc837f87 100644
--- a/src/API/Grand.Api/Queries/Models/Common/GetQuery.cs
+++ b/src/Modules/Grand.Module.Api/Queries/Models/Common/GetQuery.cs
@@ -1,6 +1,6 @@
using MediatR;
-namespace Grand.Api.Queries.Models.Common;
+namespace Grand.Module.Api.Queries.Models.Common;
public class GetQuery<T> : IRequest<IQueryable<T>> where T : class
{
diff --git a/src/API/Grand.Api/Queries/Models/Customers/GetCustomerQuery.cs b/src/Modules/Grand.Module.Api/Queries/Models/Customers/GetCustomerQuery.cs
similarity index 53%
rename from src/API/Grand.Api/Queries/Models/Customers/GetCustomerQuery.cs
rename to src/Modules/Grand.Module.Api/Queries/Models/Customers/GetCustomerQuery.cs
index 04ef3f5ce..dbe04f6f7 100644
--- a/src/API/Grand.Api/Queries/Models/Customers/GetCustomerQuery.cs
+++ b/src/Modules/Grand.Module.Api/Queries/Models/Customers/GetCustomerQuery.cs
@@ -1,7 +1,7 @@
-using Grand.Api.DTOs.Customers;
+using Grand.Module.Api.DTOs.Customers;
using MediatR;
-namespace Grand.Api.Queries.Models.Customers;
+namespace Grand.Module.Api.Queries.Models.Customers;
public class GetCustomerQuery : IRequest<CustomerDto>
{
diff --git a/src/API/Grand.Api/Validators/Catalog/BrandValidator.cs b/src/Modules/Grand.Module.Api/Validators/Catalog/BrandValidator.cs
similarity index 95%
rename from src/API/Grand.Api/Validators/Catalog/BrandValidator.cs
rename to src/Modules/Grand.Module.Api/Validators/Catalog/BrandValidator.cs
index 5f776ba09..010c1de0d 100644
--- a/src/API/Grand.Api/Validators/Catalog/BrandValidator.cs
+++ b/src/Modules/Grand.Module.Api/Validators/Catalog/BrandValidator.cs
@@ -1,11 +1,11 @@
using FluentValidation;
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Brands;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Business.Core.Interfaces.Storage;
using Grand.Infrastructure.Validators;
-namespace Grand.Api.Validators.Catalog;
+namespace Grand.Module.Api.Validators.Catalog;
public class BrandValidator : BaseGrandValidator<BrandDto>
{
diff --git a/src/API/Grand.Api/Validators/Catalog/CategoryValidator.cs b/src/Modules/Grand.Module.Api/Validators/Catalog/CategoryValidator.cs
similarity index 96%
rename from src/API/Grand.Api/Validators/Catalog/CategoryValidator.cs
rename to src/Modules/Grand.Module.Api/Validators/Catalog/CategoryValidator.cs
index 1c735c39c..36ffc3454 100644
--- a/src/API/Grand.Api/Validators/Catalog/CategoryValidator.cs
+++ b/src/Modules/Grand.Module.Api/Validators/Catalog/CategoryValidator.cs
@@ -1,11 +1,11 @@
using FluentValidation;
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Categories;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Business.Core.Interfaces.Storage;
using Grand.Infrastructure.Validators;
-namespace Grand.Api.Validators.Catalog;
+namespace Grand.Module.Api.Validators.Catalog;
public class CategoryValidator : BaseGrandValidator<CategoryDto>
{
diff --git a/src/API/Grand.Api/Validators/Catalog/CollectionValidator.cs b/src/Modules/Grand.Module.Api/Validators/Catalog/CollectionValidator.cs
similarity index 96%
rename from src/API/Grand.Api/Validators/Catalog/CollectionValidator.cs
rename to src/Modules/Grand.Module.Api/Validators/Catalog/CollectionValidator.cs
index bf80eb01b..65c5f2e47 100644
--- a/src/API/Grand.Api/Validators/Catalog/CollectionValidator.cs
+++ b/src/Modules/Grand.Module.Api/Validators/Catalog/CollectionValidator.cs
@@ -1,11 +1,11 @@
using FluentValidation;
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Collections;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Business.Core.Interfaces.Storage;
using Grand.Infrastructure.Validators;
-namespace Grand.Api.Validators.Catalog;
+namespace Grand.Module.Api.Validators.Catalog;
public class CollectionValidator : BaseGrandValidator<CollectionDto>
{
diff --git a/src/API/Grand.Api/Validators/Catalog/ProductAttributeMappingValidator.cs b/src/Modules/Grand.Module.Api/Validators/Catalog/ProductAttributeMappingValidator.cs
similarity index 91%
rename from src/API/Grand.Api/Validators/Catalog/ProductAttributeMappingValidator.cs
rename to src/Modules/Grand.Module.Api/Validators/Catalog/ProductAttributeMappingValidator.cs
index 1ea7455c5..d45464ecb 100644
--- a/src/API/Grand.Api/Validators/Catalog/ProductAttributeMappingValidator.cs
+++ b/src/Modules/Grand.Module.Api/Validators/Catalog/ProductAttributeMappingValidator.cs
@@ -1,10 +1,10 @@
using FluentValidation;
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure.Validators;
-namespace Grand.Api.Validators.Catalog;
+namespace Grand.Module.Api.Validators.Catalog;
public class ProductAttributeMappingValidator : BaseGrandValidator<ProductAttributeMappingDto>
{
diff --git a/src/API/Grand.Api/Validators/Catalog/ProductAttributeValidator.cs b/src/Modules/Grand.Module.Api/Validators/Catalog/ProductAttributeValidator.cs
similarity index 94%
rename from src/API/Grand.Api/Validators/Catalog/ProductAttributeValidator.cs
rename to src/Modules/Grand.Module.Api/Validators/Catalog/ProductAttributeValidator.cs
index 5d10a209f..3e7f3725d 100644
--- a/src/API/Grand.Api/Validators/Catalog/ProductAttributeValidator.cs
+++ b/src/Modules/Grand.Module.Api/Validators/Catalog/ProductAttributeValidator.cs
@@ -1,10 +1,10 @@
using FluentValidation;
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure.Validators;
-namespace Grand.Api.Validators.Catalog;
+namespace Grand.Module.Api.Validators.Catalog;
public class ProductAttributeValidator : BaseGrandValidator<ProductAttributeDto>
{
diff --git a/src/API/Grand.Api/Validators/Catalog/ProductCategoryValidator.cs b/src/Modules/Grand.Module.Api/Validators/Catalog/ProductCategoryValidator.cs
similarity index 90%
rename from src/API/Grand.Api/Validators/Catalog/ProductCategoryValidator.cs
rename to src/Modules/Grand.Module.Api/Validators/Catalog/ProductCategoryValidator.cs
index 37389a2d9..664dae3e9 100644
--- a/src/API/Grand.Api/Validators/Catalog/ProductCategoryValidator.cs
+++ b/src/Modules/Grand.Module.Api/Validators/Catalog/ProductCategoryValidator.cs
@@ -1,10 +1,10 @@
using FluentValidation;
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Categories;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure.Validators;
-namespace Grand.Api.Validators.Catalog;
+namespace Grand.Module.Api.Validators.Catalog;
public class ProductCategoryValidator : BaseGrandValidator<ProductCategoryDto>
{
diff --git a/src/API/Grand.Api/Validators/Catalog/ProductCollectionValidator.cs b/src/Modules/Grand.Module.Api/Validators/Catalog/ProductCollectionValidator.cs
similarity index 90%
rename from src/API/Grand.Api/Validators/Catalog/ProductCollectionValidator.cs
rename to src/Modules/Grand.Module.Api/Validators/Catalog/ProductCollectionValidator.cs
index 1fe0cc0ba..3ca6cc462 100644
--- a/src/API/Grand.Api/Validators/Catalog/ProductCollectionValidator.cs
+++ b/src/Modules/Grand.Module.Api/Validators/Catalog/ProductCollectionValidator.cs
@@ -1,10 +1,10 @@
using FluentValidation;
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Collections;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure.Validators;
-namespace Grand.Api.Validators.Catalog;
+namespace Grand.Module.Api.Validators.Catalog;
public class ProductCollectionValidator : BaseGrandValidator<ProductCollectionDto>
{
diff --git a/src/API/Grand.Api/Validators/Catalog/ProductPictureValidator.cs b/src/Modules/Grand.Module.Api/Validators/Catalog/ProductPictureValidator.cs
similarity index 89%
rename from src/API/Grand.Api/Validators/Catalog/ProductPictureValidator.cs
rename to src/Modules/Grand.Module.Api/Validators/Catalog/ProductPictureValidator.cs
index d6e5235bb..a59f3bb2b 100644
--- a/src/API/Grand.Api/Validators/Catalog/ProductPictureValidator.cs
+++ b/src/Modules/Grand.Module.Api/Validators/Catalog/ProductPictureValidator.cs
@@ -1,10 +1,10 @@
using FluentValidation;
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Business.Core.Interfaces.Storage;
using Grand.Infrastructure.Validators;
-namespace Grand.Api.Validators.Catalog;
+namespace Grand.Module.Api.Validators.Catalog;
public class ProductPictureValidator : BaseGrandValidator<ProductPictureDto>
{
diff --git a/src/API/Grand.Api/Validators/Catalog/ProductSpecificationAttributeValidator.cs b/src/Modules/Grand.Module.Api/Validators/Catalog/ProductSpecificationAttributeValidator.cs
similarity index 94%
rename from src/API/Grand.Api/Validators/Catalog/ProductSpecificationAttributeValidator.cs
rename to src/Modules/Grand.Module.Api/Validators/Catalog/ProductSpecificationAttributeValidator.cs
index 2b3323d47..799744fd1 100644
--- a/src/API/Grand.Api/Validators/Catalog/ProductSpecificationAttributeValidator.cs
+++ b/src/Modules/Grand.Module.Api/Validators/Catalog/ProductSpecificationAttributeValidator.cs
@@ -1,10 +1,10 @@
using FluentValidation;
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure.Validators;
-namespace Grand.Api.Validators.Catalog;
+namespace Grand.Module.Api.Validators.Catalog;
public class ProductSpecificationAttributeValidator : BaseGrandValidator<ProductSpecificationAttributeDto>
{
diff --git a/src/API/Grand.Api/Validators/Catalog/ProductTierPriceValidator.cs b/src/Modules/Grand.Module.Api/Validators/Catalog/ProductTierPriceValidator.cs
similarity index 95%
rename from src/API/Grand.Api/Validators/Catalog/ProductTierPriceValidator.cs
rename to src/Modules/Grand.Module.Api/Validators/Catalog/ProductTierPriceValidator.cs
index 6a55e3ba1..cc344097b 100644
--- a/src/API/Grand.Api/Validators/Catalog/ProductTierPriceValidator.cs
+++ b/src/Modules/Grand.Module.Api/Validators/Catalog/ProductTierPriceValidator.cs
@@ -1,11 +1,11 @@
using FluentValidation;
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Business.Core.Interfaces.Common.Stores;
using Grand.Infrastructure.Validators;
-namespace Grand.Api.Validators.Catalog;
+namespace Grand.Module.Api.Validators.Catalog;
public class ProductTierPriceValidator : BaseGrandValidator<ProductTierPriceDto>
{
diff --git a/src/API/Grand.Api/Validators/Catalog/ProductValidator.cs b/src/Modules/Grand.Module.Api/Validators/Catalog/ProductValidator.cs
similarity index 98%
rename from src/API/Grand.Api/Validators/Catalog/ProductValidator.cs
rename to src/Modules/Grand.Module.Api/Validators/Catalog/ProductValidator.cs
index 75e72132a..e1f4de9b1 100644
--- a/src/API/Grand.Api/Validators/Catalog/ProductValidator.cs
+++ b/src/Modules/Grand.Module.Api/Validators/Catalog/ProductValidator.cs
@@ -1,5 +1,5 @@
using FluentValidation;
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Brands;
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Business.Core.Interfaces.Common.Localization;
@@ -8,7 +8,7 @@ using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Infrastructure.Validators;
-namespace Grand.Api.Validators.Catalog;
+namespace Grand.Module.Api.Validators.Catalog;
public class ProductValidator : BaseGrandValidator<ProductDto>
{
diff --git a/src/API/Grand.Api/Validators/Catalog/SpecificationAttributeValidator.cs b/src/Modules/Grand.Module.Api/Validators/Catalog/SpecificationAttributeValidator.cs
similarity index 94%
rename from src/API/Grand.Api/Validators/Catalog/SpecificationAttributeValidator.cs
rename to src/Modules/Grand.Module.Api/Validators/Catalog/SpecificationAttributeValidator.cs
index c9430eaa6..ee673538a 100644
--- a/src/API/Grand.Api/Validators/Catalog/SpecificationAttributeValidator.cs
+++ b/src/Modules/Grand.Module.Api/Validators/Catalog/SpecificationAttributeValidator.cs
@@ -1,10 +1,10 @@
using FluentValidation;
-using Grand.Api.DTOs.Catalog;
+using Grand.Module.Api.DTOs.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure.Validators;
-namespace Grand.Api.Validators.Catalog;
+namespace Grand.Module.Api.Validators.Catalog;
public class SpecificationAttributeValidator : BaseGrandValidator<SpecificationAttributeDto>
{
diff --git a/src/API/Grand.Api/Validators/Common/LoginValidator.cs b/src/Modules/Grand.Module.Api/Validators/Common/LoginValidator.cs
similarity index 95%
rename from src/API/Grand.Api/Validators/Common/LoginValidator.cs
rename to src/Modules/Grand.Module.Api/Validators/Common/LoginValidator.cs
index 5bcd04255..68d4b2440 100644
--- a/src/API/Grand.Api/Validators/Common/LoginValidator.cs
+++ b/src/Modules/Grand.Module.Api/Validators/Common/LoginValidator.cs
@@ -1,12 +1,12 @@
using FluentValidation;
-using Grand.Api.Models.Common;
+using Grand.Module.Api.Models.Common;
using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Customers;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Validators;
-namespace Grand.Api.Validators.Common;
+namespace Grand.Module.Api.Validators.Common;
public class LoginValidator : BaseGrandValidator<LoginModel>
{
diff --git a/src/API/Grand.Api/Validators/Common/LoginWebValidator.cs b/src/Modules/Grand.Module.Api/Validators/Common/LoginWebValidator.cs
similarity index 95%
rename from src/API/Grand.Api/Validators/Common/LoginWebValidator.cs
rename to src/Modules/Grand.Module.Api/Validators/Common/LoginWebValidator.cs
index 12a5b7d70..ebc17d0ca 100644
--- a/src/API/Grand.Api/Validators/Common/LoginWebValidator.cs
+++ b/src/Modules/Grand.Module.Api/Validators/Common/LoginWebValidator.cs
@@ -1,11 +1,11 @@
using FluentValidation;
-using Grand.Api.Models.Common;
+using Grand.Module.Api.Models.Common;
using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Customers;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Validators;
-namespace Grand.Api.Validators.Common;
+namespace Grand.Module.Api.Validators.Common;
public class LoginWebValidator : BaseGrandValidator<LoginWebModel>
{
diff --git a/src/API/Grand.Api/Validators/Common/PictureValidator.cs b/src/Modules/Grand.Module.Api/Validators/Common/PictureValidator.cs
similarity index 91%
rename from src/API/Grand.Api/Validators/Common/PictureValidator.cs
rename to src/Modules/Grand.Module.Api/Validators/Common/PictureValidator.cs
index 6004931aa..ce65b6d5a 100644
--- a/src/API/Grand.Api/Validators/Common/PictureValidator.cs
+++ b/src/Modules/Grand.Module.Api/Validators/Common/PictureValidator.cs
@@ -1,9 +1,9 @@
using FluentValidation;
-using Grand.Api.DTOs.Common;
+using Grand.Module.Api.DTOs.Common;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure.Validators;
-namespace Grand.Api.Validators.Common;
+namespace Grand.Module.Api.Validators.Common;
public class PictureValidator : BaseGrandValidator<PictureDto>
{
diff --git a/src/API/Grand.Api/Validators/Customers/AddressValidator.cs b/src/Modules/Grand.Module.Api/Validators/Customers/AddressValidator.cs
similarity index 98%
rename from src/API/Grand.Api/Validators/Customers/AddressValidator.cs
rename to src/Modules/Grand.Module.Api/Validators/Customers/AddressValidator.cs
index 3ead38822..1b4dfc2e3 100644
--- a/src/API/Grand.Api/Validators/Customers/AddressValidator.cs
+++ b/src/Modules/Grand.Module.Api/Validators/Customers/AddressValidator.cs
@@ -1,11 +1,11 @@
using FluentValidation;
-using Grand.Api.DTOs.Customers;
+using Grand.Module.Api.DTOs.Customers;
using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Domain.Common;
using Grand.Infrastructure.Validators;
-namespace Grand.Api.Validators.Customers;
+namespace Grand.Module.Api.Validators.Customers;
public class AddressValidator : BaseGrandValidator<AddressDto>
{
diff --git a/src/API/Grand.Api/Validators/Customers/CustomerGroupValidator.cs b/src/Modules/Grand.Module.Api/Validators/Customers/CustomerGroupValidator.cs
similarity index 95%
rename from src/API/Grand.Api/Validators/Customers/CustomerGroupValidator.cs
rename to src/Modules/Grand.Module.Api/Validators/Customers/CustomerGroupValidator.cs
index d86db112f..a9f9b6ee6 100644
--- a/src/API/Grand.Api/Validators/Customers/CustomerGroupValidator.cs
+++ b/src/Modules/Grand.Module.Api/Validators/Customers/CustomerGroupValidator.cs
@@ -1,10 +1,10 @@
using FluentValidation;
-using Grand.Api.DTOs.Customers;
+using Grand.Module.Api.DTOs.Customers;
using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure.Validators;
-namespace Grand.Api.Validators.Customers;
+namespace Grand.Module.Api.Validators.Customers;
public class CustomerGroupValidator : BaseGrandValidator<CustomerGroupDto>
{
diff --git a/src/API/Grand.Api/Validators/Customers/CustomerValidator.cs b/src/Modules/Grand.Module.Api/Validators/Customers/CustomerValidator.cs
similarity index 98%
rename from src/API/Grand.Api/Validators/Customers/CustomerValidator.cs
rename to src/Modules/Grand.Module.Api/Validators/Customers/CustomerValidator.cs
index 88a175fb0..3071ae6bd 100644
--- a/src/API/Grand.Api/Validators/Customers/CustomerValidator.cs
+++ b/src/Modules/Grand.Module.Api/Validators/Customers/CustomerValidator.cs
@@ -1,5 +1,5 @@
using FluentValidation;
-using Grand.Api.DTOs.Customers;
+using Grand.Module.Api.DTOs.Customers;
using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Business.Core.Interfaces.Common.Stores;
@@ -7,7 +7,7 @@ using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Customers;
using Grand.Infrastructure.Validators;
-namespace Grand.Api.Validators.Customers;
+namespace Grand.Module.Api.Validators.Customers;
public class CustomerValidator : BaseGrandValidator<CustomerDto>
{
diff --git a/src/API/Grand.Api/Validators/Customers/PasswordValidator.cs b/src/Modules/Grand.Module.Api/Validators/Customers/PasswordValidator.cs
similarity index 90%
rename from src/API/Grand.Api/Validators/Customers/PasswordValidator.cs
rename to src/Modules/Grand.Module.Api/Validators/Customers/PasswordValidator.cs
index 8463ef5f1..2636f3a5e 100644
--- a/src/API/Grand.Api/Validators/Customers/PasswordValidator.cs
+++ b/src/Modules/Grand.Module.Api/Validators/Customers/PasswordValidator.cs
@@ -1,10 +1,10 @@
using FluentValidation;
-using Grand.Api.DTOs.Customers;
+using Grand.Module.Api.DTOs.Customers;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Domain.Customers;
using Grand.Infrastructure.Validators;
-namespace Grand.Api.Validators.Customers;
+namespace Grand.Module.Api.Validators.Customers;
public class PasswordValidator : BaseGrandValidator<PasswordDto>
{
diff --git a/src/Modules/Grand.Module.Installer/Grand.Module.Installer.csproj b/src/Modules/Grand.Module.Installer/Grand.Module.Installer.csproj
index 038a100e0..c662309f3 100644
--- a/src/Modules/Grand.Module.Installer/Grand.Module.Installer.csproj
+++ b/src/Modules/Grand.Module.Installer/Grand.Module.Installer.csproj
@@ -21,12 +21,12 @@
</ItemGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
- <OutputPath>..\..\Web\Grand.Web\Modules\</OutputPath>
+ <OutputPath>..\..\Web\Grand.Web\Modules\Grand.Module.Installer\</OutputPath>
<OutDir>$(OutputPath)</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
- <OutputPath>..\..\Web\Grand.Web\Modules\</OutputPath>
+ <OutputPath>..\..\Web\Grand.Web\Modules\Grand.Module.Installer\</OutputPath>
<OutDir>$(OutputPath)</OutDir>
</PropertyGroup>
diff --git a/src/Modules/Grand.Module.Migration/Grand.Module.Migration.csproj b/src/Modules/Grand.Module.Migration/Grand.Module.Migration.csproj
index 521571d15..9da05d2eb 100644
--- a/src/Modules/Grand.Module.Migration/Grand.Module.Migration.csproj
+++ b/src/Modules/Grand.Module.Migration/Grand.Module.Migration.csproj
@@ -20,12 +20,12 @@
</ItemGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
- <OutputPath>..\..\Web\Grand.Web\Modules\</OutputPath>
+ <OutputPath>..\..\Web\Grand.Web\Modules\Grand.Module.Migration\</OutputPath>
<OutDir>$(OutputPath)</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
- <OutputPath>..\..\Web\Grand.Web\Modules\</OutputPath>
+ <OutputPath>..\..\Web\Grand.Web\Modules\Grand.Module.Migration\</OutputPath>
<OutDir>$(OutputPath)</OutDir>
</PropertyGroup>
diff --git a/src/Tests/Grand.Infrastructure.Tests/TypeSearcher/TypeSearcherTests.cs b/src/Tests/Grand.Infrastructure.Tests/TypeSearcher/TypeSearcherTests.cs
index 19bbe0292..ef67eba35 100644
--- a/src/Tests/Grand.Infrastructure.Tests/TypeSearcher/TypeSearcherTests.cs
+++ b/src/Tests/Grand.Infrastructure.Tests/TypeSearcher/TypeSearcherTests.cs
@@ -17,7 +17,7 @@ public class TypeSearcherTests
[TestMethod]
public void ClassesOfTypeTest_onlyConcreteClasses_false()
{
- Assert.IsTrue(_typeSearcher.ClassesOfType<ICacheBase>(false).Any());
+ Assert.IsTrue(_typeSearcher.ClassesOfType<ICacheBase>().Any());
}
[TestMethod]
diff --git a/src/Web/Grand.Web/App_Data/appsettings.json b/src/Web/Grand.Web/App_Data/appsettings.json
index d860345e4..5460b62f0 100644
--- a/src/Web/Grand.Web/App_Data/appsettings.json
+++ b/src/Web/Grand.Web/App_Data/appsettings.json
@@ -147,7 +147,8 @@
"FeatureFlags": {
"Modules": {
"Grand.Module.Installer": true,
- "Grand.Module.Migration": true
+ "Grand.Module.Migration": true,
+ "Grand.Module.Api": false
}
},
"Redis": {
@@ -221,7 +222,7 @@
//access to the api to web controllers
"FrontendAPI": {
- "Enabled": false,
+ "Enabled": true,
"JsonContentType": false, //when is enabled, use ContentType = application/json to read json from body, default is form-data
"SecretKey": "your private secret key to use api",
"ValidateIssuer": false,
@@ -235,7 +236,7 @@
},
//api for admin
"BackendAPI": {
- "Enabled": false,
+ "Enabled": true,
"SecretKey": "your private secret key to use api",
"ValidateIssuer": false,
"ValidIssuer": "",
@@ -247,7 +248,7 @@
//generate system model
"SystemModel": true
},
- "UseSwagger": false,
+ "UseSwagger": true,
"Logging": {
"LogLevel": {
diff --git a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetWishlistHandler.cs b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetWishlistHandler.cs
index 435b9672d..1db013cfd 100644
--- a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetWishlistHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetWishlistHandler.cs
@@ -1,5 +1,4 @@
-using Grand.Api.Validators.Common;
-using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Extensions;
using Grand.Business.Core.Interfaces.Catalog.Prices;
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Business.Core.Interfaces.Catalog.Tax;
diff --git a/src/Web/Grand.Web/Grand.Web.csproj b/src/Web/Grand.Web/Grand.Web.csproj
index 48d608808..e14340768 100644
--- a/src/Web/Grand.Web/Grand.Web.csproj
+++ b/src/Web/Grand.Web/Grand.Web.csproj
@@ -23,7 +23,6 @@
<ProjectReference Include="..\Grand.Web.Common\Grand.Web.Common.csproj" />
<ProjectReference Include="..\Grand.Web.Admin\Grand.Web.Admin.csproj" />
<ProjectReference Include="..\Grand.Web.Vendor\Grand.Web.Vendor.csproj" />
- <ProjectReference Include="..\..\API\Grand.Api\Grand.Api.csproj" />
</ItemGroup>
<ItemGroup>