Refactor admin services and reorganize structure

grandnode · Nov 18, 2024 · 875c74c · 875c74c
1 parent 9288c1c
commit 875c74c
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/src/Business/Grand.Business.System/Startup/StartupApplication.cs b/src/Business/Grand.Business.System/Startup/StartupApplication.cs
@@ -1,7 +1,5 @@
-using Grand.Business.Core.Interfaces.System.Admin;
-using Grand.Business.Core.Interfaces.System.Reports;
+using Grand.Business.Core.Interfaces.System.Reports;
 using Grand.Business.Core.Interfaces.System.ScheduleTasks;
-using Grand.Business.System.Services.Admin;
 using Grand.Business.System.Services.BackgroundServices.ScheduleTasks;
 using Grand.Business.System.Services.Reports;
 using Grand.Infrastructure;
@@ -18,7 +16,6 @@ public void ConfigureServices(IServiceCollection services, IConfiguration config
     {
         RegisterReports(services);
         RegisterTask(services);
-        RegisterAdmin(services);
     }
 
     public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)
@@ -46,8 +43,4 @@ private void RegisterReports(IServiceCollection serviceCollection)
         serviceCollection.AddScoped<IOrderReportService, OrderReportService>();
         serviceCollection.AddScoped<IProductsReportService, ProductsReportService>();
     }
-    private void RegisterAdmin(IServiceCollection serviceCollection)
-    {
-        serviceCollection.AddScoped<IAdminSiteMapService, AdminSiteMapService>();        
-    }
 }
diff --git a/src/Tests/Grand.Web.Common.Tests/Grand.Web.Common.Tests.csproj b/src/Tests/Grand.Web.Common.Tests/Grand.Web.Common.Tests.csproj
@@ -26,4 +26,7 @@
 		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
 	</ItemGroup>
+	<ItemGroup>
+	  <Folder Include="Services\" />
+	</ItemGroup>
 </Project>
diff --git a/...ervices/Admin/AdminSiteMapServiceTests.cs → ...ervices/Admin/AdminSiteMapServiceTests.cs b/...ervices/Admin/AdminSiteMapServiceTests.cs → ...ervices/Admin/AdminSiteMapServiceTests.cs
@@ -1,12 +1,12 @@
-using Grand.Business.System.Services.Admin;
-using Grand.Data;
+using Grand.Data;
 using Grand.Domain.Admin;
 using Grand.Infrastructure.Caching;
+using Grand.Web.Common.Menu;
 using MediatR;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 
-namespace Grand.Business.System.Tests.Services.Admin;
+namespace Grand.Web.Common.Tests.Services.Admin;
 
 [TestClass]
 public class AdminSiteMapServiceTests

diff --git a/...tem/Services/Admin/AdminSiteMapService.cs → ...nd.Web.Common/Menu/AdminSiteMapService.cs b/...tem/Services/Admin/AdminSiteMapService.cs → ...nd.Web.Common/Menu/AdminSiteMapService.cs
@@ -6,7 +6,7 @@
 using Grand.Infrastructure.Extensions;
 using MediatR;
 
-namespace Grand.Business.System.Services.Admin;
+namespace Grand.Web.Common.Menu;
 
 public class AdminSiteMapService : IAdminSiteMapService
 {

diff --git a/src/Web/Grand.Web.Common/Startup/StartupApplication.cs b/src/Web/Grand.Web.Common/Startup/StartupApplication.cs
@@ -1,4 +1,5 @@
 using Grand.Business.Core.Interfaces.Common.Pdf;
+using Grand.Business.Core.Interfaces.System.Admin;
 using Grand.Data;
 using Grand.Infrastructure;
 using Grand.Infrastructure.Caching;
@@ -8,6 +9,7 @@
 using Grand.Infrastructure.Configuration;
 using Grand.Infrastructure.Validators;
 using Grand.Web.Common.Localization;
+using Grand.Web.Common.Menu;
 using Grand.Web.Common.Middleware;
 using Grand.Web.Common.Page;
 using Grand.Web.Common.Routing;
@@ -97,6 +99,9 @@ private void RegisterContextService(IServiceCollection serviceCollection)
 
         //Default theme view
         serviceCollection.AddScoped<IThemeView, DefaultThemeView>();
+
+        //Admin site map service
+        serviceCollection.AddScoped<IAdminSiteMapService, AdminSiteMapService>();        
     }