From 8ad64ac523dbdc78bce74fbb82ca6daa3f0665f3 Mon Sep 17 00:00:00 2001 From: Loretta Date: Fri, 15 Nov 2024 15:38:30 +0100 Subject: [PATCH] MessageWrapper --- .../Areas/Admin/Controllers/AnnouncementController.cs | 4 ++-- Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/Auction.cs | 4 ++++ .../Hubs/Messages/{MessageBase.cs => MessageWrapper.cs} | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) rename Nop.Plugin.Misc.AuctionPlugin/Hubs/Messages/{MessageBase.cs => MessageWrapper.cs} (89%) diff --git a/Nop.Plugin.Misc.AuctionPlugin/Areas/Admin/Controllers/AnnouncementController.cs b/Nop.Plugin.Misc.AuctionPlugin/Areas/Admin/Controllers/AnnouncementController.cs index 0812704..c51c69a 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Areas/Admin/Controllers/AnnouncementController.cs +++ b/Nop.Plugin.Misc.AuctionPlugin/Areas/Admin/Controllers/AnnouncementController.cs @@ -68,7 +68,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Areas.Admin.Controllers if (viewModel.IsActive == true) { - var announcement = new MessageBase + var announcement = new MessageWrapper { MessageType = "announcement", Data = new AnnouncementMessage @@ -108,7 +108,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Areas.Admin.Controllers //await _announcementService.InsertAsync(objOfAuctionBid); - var bid = new MessageBase + var bid = new MessageWrapper { MessageType = "bidNotification", Data = new BidNotificationMessage diff --git a/Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/Auction.cs b/Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/Auction.cs index 48cc913..f36ebed 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/Auction.cs +++ b/Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/Auction.cs @@ -1,6 +1,7 @@ using System.ComponentModel.DataAnnotations.Schema; using AyCode.Interfaces.Entities; using AyCode.Interfaces.TimeStampInfo; +using LinqToDB.Mapping; using Mango.Nop.Core.Entities; using Mango.Nop.Core.Interfaces; using Nop.Core; @@ -11,6 +12,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Domains.Entities; public partial class Auction: MgEntityBase, ITimeStampInfo//, ISoftRemoveEntityInt { public string AuctionName { get; set; } + public AuctionType AuctionType{ get; set; } public DateTime StartDateUtc { get; set; } @@ -19,8 +21,10 @@ public partial class Auction: MgEntityBase, ITimeStampInfo//, ISoftRemoveEntityI public bool Closed { get; set; } [NotMapped] + [NotColumn] public List ProductToAuctionMappings { get; } = []; + [SkipValuesOnUpdate] public DateTime Created { get; set; } public DateTime Modified { get; set; } } \ No newline at end of file diff --git a/Nop.Plugin.Misc.AuctionPlugin/Hubs/Messages/MessageBase.cs b/Nop.Plugin.Misc.AuctionPlugin/Hubs/Messages/MessageWrapper.cs similarity index 89% rename from Nop.Plugin.Misc.AuctionPlugin/Hubs/Messages/MessageBase.cs rename to Nop.Plugin.Misc.AuctionPlugin/Hubs/Messages/MessageWrapper.cs index 636d5b5..a081d82 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Hubs/Messages/MessageBase.cs +++ b/Nop.Plugin.Misc.AuctionPlugin/Hubs/Messages/MessageWrapper.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace Nop.Plugin.Misc.AuctionPlugin.Hubs.Messages { - public class MessageBase + public class MessageWrapper { public string MessageType { get; set; } public object Data { get; set; }