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.

Remove unused code

KrzysztofPajak01f6784b6237
diff --git a/src/Business/Grand.Business.Core/Commands/System/Security/InstallNewPermissionsCommand.cs b/src/Business/Grand.Business.Core/Commands/System/Security/InstallNewPermissionsCommand.cs
deleted file mode 100644
index 440aca796..000000000
--- a/src/Business/Grand.Business.Core/Commands/System/Security/InstallNewPermissionsCommand.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Grand.Business.Core.Interfaces.Common.Security;
-using MediatR;
-
-namespace Grand.Business.Core.Commands.System.Security;
-
-public class InstallNewPermissionsCommand : IRequest<bool>
-{
- public IPermissionProvider PermissionProvider { get; set; }
-}
\ No newline at end of file
diff --git a/src/Business/Grand.Business.Core/Extensions/TranslateExtensions.cs b/src/Business/Grand.Business.Core/Extensions/TranslateExtensions.cs
index 968a1f128..081661610 100644
--- a/src/Business/Grand.Business.Core/Extensions/TranslateExtensions.cs
+++ b/src/Business/Grand.Business.Core/Extensions/TranslateExtensions.cs
@@ -114,42 +114,6 @@ public static class TranslateExtensions
return $"Permission.{permissionRecord.SystemName}";
}
- /// <summary>
- /// Save translation name of a permission
- /// </summary>
- /// <param name="permissionRecord">Permission record</param>
- /// <param name="translationService">Translation service</param>
- /// <param name="languageService">Language service</param>
- public static async Task SaveTranslationPermissionName(this Permission permissionRecord,
- ITranslationService translationService, ILanguageService languageService)
- {
- ArgumentNullException.ThrowIfNull(permissionRecord);
- ArgumentNullException.ThrowIfNull(translationService);
- ArgumentNullException.ThrowIfNull(languageService);
-
- var name = $"Permission.{permissionRecord.SystemName}";
- var value = permissionRecord.Name;
-
- foreach (var lang in await languageService.GetAllLanguages(true))
- {
- var lsr = await translationService.GetTranslateResourceByName(name, lang.Id);
- if (lsr == null)
- {
- lsr = new TranslationResource {
- LanguageId = lang.Id,
- Name = name,
- Value = value
- };
- await translationService.InsertTranslateResource(lsr);
- }
- else
- {
- lsr.Value = value;
- await translationService.UpdateTranslateResource(lsr);
- }
- }
- }
-
/// <summary>
/// Delete a translation name of a permission
/// </summary>
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Security/InstallNewPermissionsCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Security/InstallNewPermissionsCommandHandler.cs
deleted file mode 100644
index 975bf00aa..000000000
--- a/src/Business/Grand.Business.System/Commands/Handlers/Security/InstallNewPermissionsCommandHandler.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using Grand.Business.Core.Commands.System.Security;
-using Grand.Business.Core.Extensions;
-using Grand.Business.Core.Interfaces.Common.Localization;
-using Grand.Business.Core.Interfaces.Common.Security;
-using Grand.Domain.Permissions;
-using MediatR;
-
-namespace Grand.Business.System.Commands.Handlers.Security;
-
-public class InstallNewPermissionsCommandHandler : IRequestHandler<InstallNewPermissionsCommand, bool>
-{
- private readonly ILanguageService _languageService;
- private readonly IPermissionService _permissionService;
- private readonly ITranslationService _translationService;
-
- public InstallNewPermissionsCommandHandler(
- IPermissionService permissionService,
- ITranslationService translationService,
- ILanguageService languageService)
- {
- _permissionService = permissionService;
- _translationService = translationService;
- _languageService = languageService;
- }
-
- public async Task<bool> Handle(InstallNewPermissionsCommand request, CancellationToken cancellationToken)
- {
- //install new permissions
- var permissions = request.PermissionProvider.GetPermissions();
- foreach (var permission in permissions)
- {
- var permission1 = await _permissionService.GetPermissionBySystemName(permission.SystemName);
- if (permission1 != null) continue;
- //new permission (install it)
- permission1 = new Permission {
- Name = permission.Name,
- SystemName = permission.SystemName,
- Area = permission.Area,
- Category = permission.Category,
- Actions = permission.Actions
- };
-
- //save new permission
- await _permissionService.InsertPermission(permission1);
-
- //save localization
- await permission1.SaveTranslationPermissionName(_translationService, _languageService);
- }
-
- return true;
- }
-}
\ No newline at end of file
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Security/InstallPermissionsCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Security/InstallPermissionsCommandHandler.cs
index 42fba7dc0..60371dc42 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Security/InstallPermissionsCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Security/InstallPermissionsCommandHandler.cs
@@ -1,9 +1,9 @@
using Grand.Business.Core.Commands.System.Security;
-using Grand.Business.Core.Extensions;
using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Customers;
+using Grand.Domain.Localization;
using Grand.Domain.Permissions;
using MediatR;
@@ -74,9 +74,33 @@ public class InstallPermissionsCommandHandler : IRequestHandler<InstallPermissio
await _permissionService.InsertPermission(permission1);
//save localization
- await permission1.SaveTranslationPermissionName(_translationService, _languageService);
+ await SaveTranslationPermissionName(permission1);
}
return true;
}
+ private async Task SaveTranslationPermissionName(Permission permissionRecord)
+ {
+ var name = $"Permission.{permissionRecord.SystemName}";
+ var value = permissionRecord.Name;
+
+ foreach (var lang in await _languageService.GetAllLanguages(true))
+ {
+ var lsr = await _translationService.GetTranslateResourceByName(name, lang.Id);
+ if (lsr == null)
+ {
+ lsr = new TranslationResource {
+ LanguageId = lang.Id,
+ Name = name,
+ Value = value
+ };
+ await _translationService.InsertTranslateResource(lsr);
+ }
+ else
+ {
+ lsr.Value = value;
+ await _translationService.UpdateTranslateResource(lsr);
+ }
+ }
+ }
}
\ No newline at end of file