diff --git a/Nop.Plugin.Misc.AuctionPlugin/Controllers/AnnouncementController.cs b/Nop.Plugin.Misc.AuctionPlugin/Controllers/AnnouncementController.cs index a2997b0..f670d8f 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Controllers/AnnouncementController.cs +++ b/Nop.Plugin.Misc.AuctionPlugin/Controllers/AnnouncementController.cs @@ -1,6 +1,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.SignalR; using Nop.Plugin.Misc.AuctionPlugin.Domains; +using Nop.Plugin.Misc.AuctionPlugin.Domains.Entities; using Nop.Plugin.Misc.AuctionPlugin.Hubs; using Nop.Plugin.Misc.AuctionPlugin.Models; using Nop.Plugin.Misc.AuctionPlugin.Services; @@ -37,16 +38,16 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Controllers #region Methods - public IActionResult Announcement() + public IActionResult GetAnnouncementViewModel() { var model = new AnnouncementViewModel(); return View("~/Plugins/Misc.AuctionPlugin/Admin/Views/Announcement.cshtml", model); } [HttpPost] - public async Task Announcement(AnnouncementViewModel viewModel) + public async Task GetAnnouncementViewModel(AnnouncementViewModel viewModel) { - AnnouncementEntity objOfAnnouncementDomain = new AnnouncementEntity(); + Announcement objOfAnnouncementDomain = new Announcement(); objOfAnnouncementDomain.Name = viewModel.Name; objOfAnnouncementDomain.Body = viewModel.Body; objOfAnnouncementDomain.IsActive = viewModel.IsActive; @@ -62,7 +63,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Controllers } [HttpPost] - public async Task Edit(AnnouncementEntity model) + public async Task Edit(Announcement model) { var entity = await _announcementService.GetAnnouncementByIdAsync(model.Id); entity.Name = model.Name; @@ -82,7 +83,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Controllers public async Task Edit(int Id) { var singleAnnouncement = await _announcementService.GetAnnouncementByIdAsync(Id); - var model = new AnnouncementEntity(); + var model = new Announcement(); model.Id = singleAnnouncement.Id; model.Name = singleAnnouncement.Name; model.Body = singleAnnouncement.Body; diff --git a/Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/Announcement.cs b/Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/Announcement.cs index 361579d..9d87d9f 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/Announcement.cs +++ b/Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/Announcement.cs @@ -6,7 +6,6 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Domains.Entities { public class Announcement : BaseEntity, IEntityInt, ITimeStampCreated - { public string Name { get; set; } diff --git a/Nop.Plugin.Misc.AuctionPlugin/Mapping/Builders/AnnouncementBuilder.cs b/Nop.Plugin.Misc.AuctionPlugin/Mapping/Builders/AnnouncementBuilder.cs index 49ed00c..32fddd8 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Mapping/Builders/AnnouncementBuilder.cs +++ b/Nop.Plugin.Misc.AuctionPlugin/Mapping/Builders/AnnouncementBuilder.cs @@ -2,13 +2,14 @@ using FluentMigrator.Builders.Create.Table; using Nop.Data.Mapping.Builders; using Nop.Plugin.Misc.AuctionPlugin.Domains; +using Nop.Plugin.Misc.AuctionPlugin.Domains.Entities; namespace Nop.Plugin.Misc.AuctionPlugin.Mapping.Builders; /// /// Represents a pickup point entity builder /// -public class AnnouncementBuilder : NopEntityBuilder +public class AnnouncementBuilder : NopEntityBuilder { #region Methods @@ -18,16 +19,17 @@ public class AnnouncementBuilder : NopEntityBuilder /// Create table expression builder public override void MapEntity(CreateTableExpressionBuilder table) { - table.WithColumn(nameof(AnnouncementEntity.Name)) + table.WithColumn(nameof(Announcement.Name)) .AsString(250) .NotNullable() - .WithColumn(nameof(AnnouncementEntity.IsActive)) + .WithColumn(nameof(Announcement.IsActive)) .AsBoolean() .NotNullable().WithDefault(0) - .WithColumn(nameof(AnnouncementEntity.Body)) + .WithColumn(nameof(Announcement.Body)) .AsString(500) .NotNullable() - .WithColumn(nameof(AnnouncementEntity.Created)).AsDateTime().NotNullable().WithDefault(SystemMethods.CurrentUTCDateTime); + .WithColumn(nameof(Announcement.Created)) + .AsDateTime().NotNullable().WithDefault(SystemMethods.CurrentUTCDateTime); } diff --git a/Nop.Plugin.Misc.AuctionPlugin/Nop.Plugin.Misc.AuctionPlugin.csproj b/Nop.Plugin.Misc.AuctionPlugin/Nop.Plugin.Misc.AuctionPlugin.csproj index 1f96710..5684121 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Nop.Plugin.Misc.AuctionPlugin.csproj +++ b/Nop.Plugin.Misc.AuctionPlugin/Nop.Plugin.Misc.AuctionPlugin.csproj @@ -101,6 +101,7 @@ +