Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Admin panel - Push Notification settings - use automapper
KrzysztofPajak08d1bfe3728e
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/PushNotifications.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/PushNotifications.cshtmlindex 44b15add0..b904783b9 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/PushNotifications.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/PushNotifications.cshtml@@ -1,4 +1,4 @@-@model Grand.Web.Admin.Models.PushNotifications.ConfigurationModel+@model Grand.Web.Admin.Models.Settings.PushNotificationsSettingsModel@{//page titleViewBag.Title = Loc["Admin.PushNotifications"];diff --git a/src/Web/Grand.Web.Admin/Controllers/SettingController.cs b/src/Web/Grand.Web.Admin/Controllers/SettingController.csindex 9f9e1cc74..ddc572a5f 100644--- a/src/Web/Grand.Web.Admin/Controllers/SettingController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/SettingController.cs@@ -1001,39 +1001,19 @@ namespace Grand.Web.Admin.Controllers{var storeScope = await GetActiveStore();var settings = _settingService.LoadSetting<PushNotificationsSettings>(storeScope);-- var model = new ConfigurationModel {- AllowGuestNotifications = settings.AllowGuestNotifications,- AuthDomain = settings.AuthDomain,- DatabaseUrl = settings.DatabaseUrl,- ProjectId = settings.ProjectId,- PushApiKey = settings.PublicApiKey,- SenderId = settings.SenderId,- StorageBucket = settings.StorageBucket,- PrivateApiKey = settings.PrivateApiKey,- AppId = settings.AppId,- Enabled = settings.Enabled- };+ var model = settings.ToModel();return View(model);}[HttpPost][IgnoreAntiforgeryToken]- public async Task<IActionResult> PushNotifications(ConfigurationModel model)+ public async Task<IActionResult> PushNotifications(PushNotificationsSettingsModel model){var storeScope = await GetActiveStore();var settings = _settingService.LoadSetting<PushNotificationsSettings>(storeScope);- settings.AllowGuestNotifications = model.AllowGuestNotifications;- settings.AuthDomain = model.AuthDomain;- settings.DatabaseUrl = model.DatabaseUrl;- settings.ProjectId = model.ProjectId;- settings.PublicApiKey = model.PushApiKey;- settings.SenderId = model.SenderId;- settings.StorageBucket = model.StorageBucket;- settings.PrivateApiKey = model.PrivateApiKey;- settings.AppId = model.AppId;- settings.Enabled = model.Enabled;+ settings = model.ToEntity(settings);+await _settingService.SaveSetting(settings);//now clear cache@@ -1046,7 +1026,7 @@ namespace Grand.Web.Admin.Controllersreturn await PushNotifications();}- private void SavePushNotificationsToFile(ConfigurationModel model)+ private void SavePushNotificationsToFile(PushNotificationsSettingsModel model){//edit js file needed by firebasevar filename = "firebase-messaging-sw.js";diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/Settings/PushSettingsMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/Settings/PushSettingsMappingExtensions.csnew file mode 100644index 000000000..2349fcb5a--- /dev/null+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/Settings/PushSettingsMappingExtensions.cs@@ -0,0 +1,18 @@+using Grand.Domain.PushNotifications;+using Grand.Infrastructure.Mapper;+using Grand.Web.Admin.Models.Settings;++namespace Grand.Web.Admin.Extensions+{+ public static class PushSettingsMappingExtensions+ {+ public static PushNotificationsSettingsModel ToModel(this PushNotificationsSettings entity)+ {+ return entity.MapTo<PushNotificationsSettings, PushNotificationsSettingsModel>();+ }+ public static PushNotificationsSettings ToEntity(this PushNotificationsSettingsModel model, PushNotificationsSettings destination)+ {+ return model.MapTo(destination);+ }+ }+}\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Mapper/PushNotificationsSettingsProfile.cs b/src/Web/Grand.Web.Admin/Mapper/PushNotificationsSettingsProfile.csnew file mode 100644index 000000000..471c0bffb--- /dev/null+++ b/src/Web/Grand.Web.Admin/Mapper/PushNotificationsSettingsProfile.cs@@ -0,0 +1,22 @@+using AutoMapper;+using Grand.Domain.PushNotifications;+using Grand.Infrastructure.Mapper;+using Grand.Web.Admin.Models.Settings;++namespace Grand.Web.Admin.Mapper+{+ public class PushNotificationsSettingsProfile : Profile, IAutoMapperProfile+ {+ public PushNotificationsSettingsProfile()+ {+ CreateMap<PushNotificationsSettings, PushNotificationsSettingsModel>()+ .ForMember(dest => dest.PushApiKey, mo => mo.MapFrom(y=>y.PublicApiKey))+ .ForMember(dest => dest.UserFields, mo => mo.Ignore());++ CreateMap<PushNotificationsSettingsModel, PushNotificationsSettings>()+ .ForMember(dest => dest.PublicApiKey, mo => mo.MapFrom(y => y.PushApiKey));+ }++ public int Order => 0;+ }+}\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Models/PushNotifications/ConfigurationModel.cs b/src/Web/Grand.Web.Admin/Models/Settings/PushNotificationsSettingsModel.cssimilarity index 93%rename from src/Web/Grand.Web.Admin/Models/PushNotifications/ConfigurationModel.csrename to src/Web/Grand.Web.Admin/Models/Settings/PushNotificationsSettingsModel.csindex 46de1b581..4af7ddbd6 100644--- a/src/Web/Grand.Web.Admin/Models/PushNotifications/ConfigurationModel.cs+++ b/src/Web/Grand.Web.Admin/Models/Settings/PushNotificationsSettingsModel.cs@@ -1,9 +1,9 @@using Grand.Infrastructure.ModelBinding;using Grand.Infrastructure.Models;-namespace Grand.Web.Admin.Models.PushNotifications+namespace Grand.Web.Admin.Models.Settings{- public class ConfigurationModel : BaseModel+ public class PushNotificationsSettingsModel : BaseModel{[GrandResourceDisplayName("Admin.Settings.PushNotifications.NotificationsEnabled")]public bool Enabled { get; set; }