From 104a5c95448e4749d16eb38ec474670f771b1add Mon Sep 17 00:00:00 2001 From: Loretta Date: Mon, 11 Nov 2024 12:38:44 +0100 Subject: [PATCH] renamed Table to Entity --- .../Controllers/AnnouncementController.cs | 6 +++--- ...ouncementTable.cs => AnnouncementEntity.cs} | 2 +- .../Domains/{BidTable.cs => BidEntity.cs} | 4 +--- .../Mapping/AnnouncementBuilder.cs | 11 +++++------ .../Mapping/Builders/PluginBuilder.cs | 2 +- .../Migrations/SchemaMigration.cs | 4 ++-- .../Services/AnnouncementService.cs | 18 +++++++++--------- .../Services/BidService.cs | 18 +++++++++--------- .../Services/IAnnouncementService.cs | 12 ++++++------ .../Services/IBidService.cs | 10 +++++----- ...p.Plugin.Misc.AuctionPlugin.AssemblyInfo.cs | 2 +- ...Misc.AuctionPlugin.AssemblyInfoInputs.cache | 2 +- 12 files changed, 44 insertions(+), 47 deletions(-) rename Nop.Plugin.Misc.AuctionPlugin/Domains/{AnnouncementTable.cs => AnnouncementEntity.cs} (84%) rename Nop.Plugin.Misc.AuctionPlugin/Domains/{BidTable.cs => BidEntity.cs} (88%) diff --git a/Nop.Plugin.Misc.AuctionPlugin/Controllers/AnnouncementController.cs b/Nop.Plugin.Misc.AuctionPlugin/Controllers/AnnouncementController.cs index 1491ae8..51ff062 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Controllers/AnnouncementController.cs +++ b/Nop.Plugin.Misc.AuctionPlugin/Controllers/AnnouncementController.cs @@ -71,7 +71,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Controllers { - AnnouncementTable objOfAnnouncementDomain = new AnnouncementTable(); + AnnouncementEntity objOfAnnouncementDomain = new AnnouncementEntity(); objOfAnnouncementDomain.Name = model.Name; @@ -98,7 +98,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Controllers } [HttpPost] - public IActionResult Edit(AnnouncementTable model) + public IActionResult Edit(AnnouncementEntity model) { @@ -134,7 +134,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Controllers var singleAnnouncement = await _announcementService.GetAnnouncementByIdAsync(Id); - var model = new AnnouncementTable(); + var model = new AnnouncementEntity(); model.Id = singleAnnouncement.Id; diff --git a/Nop.Plugin.Misc.AuctionPlugin/Domains/AnnouncementTable.cs b/Nop.Plugin.Misc.AuctionPlugin/Domains/AnnouncementEntity.cs similarity index 84% rename from Nop.Plugin.Misc.AuctionPlugin/Domains/AnnouncementTable.cs rename to Nop.Plugin.Misc.AuctionPlugin/Domains/AnnouncementEntity.cs index 6975f26..41384c1 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Domains/AnnouncementTable.cs +++ b/Nop.Plugin.Misc.AuctionPlugin/Domains/AnnouncementEntity.cs @@ -3,7 +3,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Domains { - public class AnnouncementTable : BaseEntity + public class AnnouncementEntity : BaseEntity { diff --git a/Nop.Plugin.Misc.AuctionPlugin/Domains/BidTable.cs b/Nop.Plugin.Misc.AuctionPlugin/Domains/BidEntity.cs similarity index 88% rename from Nop.Plugin.Misc.AuctionPlugin/Domains/BidTable.cs rename to Nop.Plugin.Misc.AuctionPlugin/Domains/BidEntity.cs index 055107c..a9bc613 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Domains/BidTable.cs +++ b/Nop.Plugin.Misc.AuctionPlugin/Domains/BidEntity.cs @@ -3,10 +3,8 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Domains { - public class BidTable : BaseEntity - + public class BidEntity : BaseEntity { - public int CustomerId { get; set; } public int ProductId { get; set; } diff --git a/Nop.Plugin.Misc.AuctionPlugin/Mapping/AnnouncementBuilder.cs b/Nop.Plugin.Misc.AuctionPlugin/Mapping/AnnouncementBuilder.cs index 403a85c..3dcd10f 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Mapping/AnnouncementBuilder.cs +++ b/Nop.Plugin.Misc.AuctionPlugin/Mapping/AnnouncementBuilder.cs @@ -7,7 +7,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Mapping; /// /// Represents a pickup point entity builder /// -public class AnnouncementBuilder : NopEntityBuilder +public class AnnouncementBuilder : NopEntityBuilder { #region Methods @@ -17,17 +17,16 @@ public class AnnouncementBuilder : NopEntityBuilder /// Create table expression builder public override void MapEntity(CreateTableExpressionBuilder table) { - table - .WithColumn(nameof(AnnouncementTable.Id)) + table.WithColumn(nameof(AnnouncementEntity.Id)) .AsInt16() .NotNullable() - .WithColumn(nameof(AnnouncementTable.Name)) + .WithColumn(nameof(AnnouncementEntity.Name)) .AsString(250) .NotNullable() - .WithColumn(nameof(AnnouncementTable.IsActive)) + .WithColumn(nameof(AnnouncementEntity.IsActive)) .AsBoolean() .NotNullable().WithDefault(0) - .WithColumn(nameof(AnnouncementTable.Body)) + .WithColumn(nameof(AnnouncementEntity.Body)) .AsString(500) .NotNullable(); } diff --git a/Nop.Plugin.Misc.AuctionPlugin/Mapping/Builders/PluginBuilder.cs b/Nop.Plugin.Misc.AuctionPlugin/Mapping/Builders/PluginBuilder.cs index 046a24a..d51eb66 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Mapping/Builders/PluginBuilder.cs +++ b/Nop.Plugin.Misc.AuctionPlugin/Mapping/Builders/PluginBuilder.cs @@ -4,7 +4,7 @@ using Nop.Plugin.Misc.AuctionPlugin.Domains; namespace Nop.Plugin.Misc.AuctionPlugin.Mapping.Builders { - public class PluginBuilder : NopEntityBuilder + public class PluginBuilder : NopEntityBuilder { #region Methods diff --git a/Nop.Plugin.Misc.AuctionPlugin/Migrations/SchemaMigration.cs b/Nop.Plugin.Misc.AuctionPlugin/Migrations/SchemaMigration.cs index 074d78c..232469b 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Migrations/SchemaMigration.cs +++ b/Nop.Plugin.Misc.AuctionPlugin/Migrations/SchemaMigration.cs @@ -13,8 +13,8 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Migrations /// public override void Up() { - Create.TableFor(); - Create.TableFor(); + Create.TableFor(); + Create.TableFor(); } } } \ No newline at end of file diff --git a/Nop.Plugin.Misc.AuctionPlugin/Services/AnnouncementService.cs b/Nop.Plugin.Misc.AuctionPlugin/Services/AnnouncementService.cs index 5cf25a6..9ee887a 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Services/AnnouncementService.cs +++ b/Nop.Plugin.Misc.AuctionPlugin/Services/AnnouncementService.cs @@ -14,13 +14,13 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Services { #region Field - private readonly IRepository _announcementRepository; + private readonly IRepository _announcementRepository; #endregion #region Ctr - public AnnouncementService(IRepository announcementRepository) + public AnnouncementService(IRepository announcementRepository) { _announcementRepository = announcementRepository; @@ -31,7 +31,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Services #region Methods - public async Task DeleteAsync(AnnouncementTable announcement) + public async Task DeleteAsync(AnnouncementEntity announcement) { await _announcementRepository.DeleteAsync(announcement); @@ -40,7 +40,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Services - public async Task UpdateAsync(AnnouncementTable announcement) + public async Task UpdateAsync(AnnouncementEntity announcement) { @@ -57,7 +57,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Services } - public async Task InsertAsync(AnnouncementTable announcement) + public async Task InsertAsync(AnnouncementEntity announcement) { @@ -66,7 +66,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Services } - public async Task> GetAnnouncementsAsync(int pageIndex = 0, int pageSize = int.MaxValue) + public async Task> GetAnnouncementsAsync(int pageIndex = 0, int pageSize = int.MaxValue) { @@ -76,13 +76,13 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Services var query2 = query.OrderBy(b => b.IsActive).ToList(); - var liveAnnouncementDomain = new PagedList(query2, pageIndex, pageSize); + var liveAnnouncementDomain = new PagedList(query2, pageIndex, pageSize); return liveAnnouncementDomain; } - public async Task GetAnnouncementDesignFirstAsync() + public async Task GetAnnouncementDesignFirstAsync() { var result = await _announcementRepository.GetAllAsync(query => @@ -105,7 +105,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Services } - public async Task GetAnnouncementByIdAsync(int Id) + public async Task GetAnnouncementByIdAsync(int Id) { diff --git a/Nop.Plugin.Misc.AuctionPlugin/Services/BidService.cs b/Nop.Plugin.Misc.AuctionPlugin/Services/BidService.cs index a42508c..2383de7 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Services/BidService.cs +++ b/Nop.Plugin.Misc.AuctionPlugin/Services/BidService.cs @@ -25,7 +25,7 @@ public class BidService : IBidService #region Fields - protected readonly IRepository _customerBidRepository; + protected readonly IRepository _customerBidRepository; protected readonly IShortTermCacheManager _shortTermCacheManager; protected readonly IStaticCacheManager _staticCacheManager; @@ -39,7 +39,7 @@ public class BidService : IBidService /// Store pickup point repository /// Short term cache manager /// Cache manager - public BidService(IRepository customerBidRepository, + public BidService(IRepository customerBidRepository, IShortTermCacheManager shortTermCacheManager, IStaticCacheManager staticCacheManager) { @@ -62,9 +62,9 @@ public class BidService : IBidService /// A task that represents the asynchronous operation /// The task result contains the bids /// - public virtual async Task> GetAllBidsAsync(int customerId = 0, int pageIndex = 0, int pageSize = int.MaxValue) + public virtual async Task> GetAllBidsAsync(int customerId = 0, int pageIndex = 0, int pageSize = int.MaxValue) { - var rez = new List(); + var rez = new List(); //var rez = await _shortTermCacheManager.GetAsync(async () => await _customerBidRepository.GetAllAsync(query => //{ // if (customerId > 0) @@ -74,21 +74,21 @@ public class BidService : IBidService // return query; //}), _pickupPointAllKey, customerId); - return new PagedList(rez, pageIndex, pageSize); + return new PagedList(rez, pageIndex, pageSize); } - public virtual async Task GetBidByIdAsync(int bidId) + public virtual async Task GetBidByIdAsync(int bidId) { return await _customerBidRepository.GetByIdAsync(bidId); } - public virtual async Task InsertBidAsync(BidTable bid) + public virtual async Task InsertBidAsync(BidEntity bid) { await _customerBidRepository.InsertAsync(bid, false); await _staticCacheManager.RemoveByPrefixAsync(AUCTION_PATTERN_KEY); } - public virtual async Task UpdateBidAsync(BidTable bid) + public virtual async Task UpdateBidAsync(BidEntity bid) { await _customerBidRepository.UpdateAsync(bid, false); await _staticCacheManager.RemoveByPrefixAsync(AUCTION_PATTERN_KEY); @@ -99,7 +99,7 @@ public class BidService : IBidService /// /// Pickup point /// A task that represents the asynchronous operation - public virtual async Task DeleteBidAsync(BidTable pickupPoint) + public virtual async Task DeleteBidAsync(BidEntity pickupPoint) { await _customerBidRepository.DeleteAsync(pickupPoint, false); await _staticCacheManager.RemoveByPrefixAsync(AUCTION_PATTERN_KEY); diff --git a/Nop.Plugin.Misc.AuctionPlugin/Services/IAnnouncementService.cs b/Nop.Plugin.Misc.AuctionPlugin/Services/IAnnouncementService.cs index 0c59fdf..ed24e08 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Services/IAnnouncementService.cs +++ b/Nop.Plugin.Misc.AuctionPlugin/Services/IAnnouncementService.cs @@ -13,17 +13,17 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Services { - public Task DeleteAsync(AnnouncementTable announcement); + public Task DeleteAsync(AnnouncementEntity announcement); - public Task InsertAsync(AnnouncementTable announcement); + public Task InsertAsync(AnnouncementEntity announcement); - public Task UpdateAsync(AnnouncementTable announcement); + public Task UpdateAsync(AnnouncementEntity announcement); - public Task> GetAnnouncementsAsync(int pageIndex = 0, int pageSize = int.MaxValue); + public Task> GetAnnouncementsAsync(int pageIndex = 0, int pageSize = int.MaxValue); - public Task GetAnnouncementDesignFirstAsync(); + public Task GetAnnouncementDesignFirstAsync(); - public Task GetAnnouncementByIdAsync(int Id); + public Task GetAnnouncementByIdAsync(int Id); } diff --git a/Nop.Plugin.Misc.AuctionPlugin/Services/IBidService.cs b/Nop.Plugin.Misc.AuctionPlugin/Services/IBidService.cs index 507b4bd..c016f53 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Services/IBidService.cs +++ b/Nop.Plugin.Misc.AuctionPlugin/Services/IBidService.cs @@ -18,17 +18,17 @@ public interface IBidService /// A task that represents the asynchronous operation /// The task result contains the bids /// - Task> GetAllBidsAsync(int customerId = 0, int pageIndex = 0, int pageSize = int.MaxValue); + Task> GetAllBidsAsync(int customerId = 0, int pageIndex = 0, int pageSize = int.MaxValue); - Task GetBidByIdAsync(int bidId); + Task GetBidByIdAsync(int bidId); - Task InsertBidAsync(BidTable bidTable); + Task InsertBidAsync(BidEntity bidEntity); - Task UpdateBidAsync(BidTable bid); + Task UpdateBidAsync(BidEntity bid); - Task DeleteBidAsync(BidTable pickupPoint); + Task DeleteBidAsync(BidEntity pickupPoint); } \ No newline at end of file diff --git a/Nop.Plugin.Misc.AuctionPlugin/obj/Debug/net8.0/Nop.Plugin.Misc.AuctionPlugin.AssemblyInfo.cs b/Nop.Plugin.Misc.AuctionPlugin/obj/Debug/net8.0/Nop.Plugin.Misc.AuctionPlugin.AssemblyInfo.cs index dc71fcc..70a169f 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/obj/Debug/net8.0/Nop.Plugin.Misc.AuctionPlugin.AssemblyInfo.cs +++ b/Nop.Plugin.Misc.AuctionPlugin/obj/Debug/net8.0/Nop.Plugin.Misc.AuctionPlugin.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Nop.Plugin.Misc.AuctionPlugin")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+34184c6a9f0a84d2194da6cfd8fdf416357056ef")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+971f4934d58e82b225c4ae427f13f08251e27410")] [assembly: System.Reflection.AssemblyProductAttribute("Nop.Plugin.Misc.AuctionPlugin")] [assembly: System.Reflection.AssemblyTitleAttribute("Nop.Plugin.Misc.AuctionPlugin")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Nop.Plugin.Misc.AuctionPlugin/obj/Debug/net8.0/Nop.Plugin.Misc.AuctionPlugin.AssemblyInfoInputs.cache b/Nop.Plugin.Misc.AuctionPlugin/obj/Debug/net8.0/Nop.Plugin.Misc.AuctionPlugin.AssemblyInfoInputs.cache index 174c5a1..9430f01 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/obj/Debug/net8.0/Nop.Plugin.Misc.AuctionPlugin.AssemblyInfoInputs.cache +++ b/Nop.Plugin.Misc.AuctionPlugin/obj/Debug/net8.0/Nop.Plugin.Misc.AuctionPlugin.AssemblyInfoInputs.cache @@ -1 +1 @@ -d64ed4ed36a99c43d3d81f6442418fbb91a5a610f4437c0f2490b978c47ca144 +78c79a6279758bf6029272b201ba6b7198a9b5ffd66137652c24adcb76d3bd07