renamed Table to Entity

This commit is contained in:
Loretta 2024-11-11 12:38:44 +01:00
parent 971f4934d5
commit 104a5c9544
12 changed files with 44 additions and 47 deletions

View File

@ -71,7 +71,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Controllers
{ {
AnnouncementTable objOfAnnouncementDomain = new AnnouncementTable(); AnnouncementEntity objOfAnnouncementDomain = new AnnouncementEntity();
objOfAnnouncementDomain.Name = model.Name; objOfAnnouncementDomain.Name = model.Name;
@ -98,7 +98,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Controllers
} }
[HttpPost] [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 singleAnnouncement = await _announcementService.GetAnnouncementByIdAsync(Id);
var model = new AnnouncementTable(); var model = new AnnouncementEntity();
model.Id = singleAnnouncement.Id; model.Id = singleAnnouncement.Id;

View File

@ -3,7 +3,7 @@
namespace Nop.Plugin.Misc.AuctionPlugin.Domains namespace Nop.Plugin.Misc.AuctionPlugin.Domains
{ {
public class AnnouncementTable : BaseEntity public class AnnouncementEntity : BaseEntity
{ {

View File

@ -3,10 +3,8 @@
namespace Nop.Plugin.Misc.AuctionPlugin.Domains namespace Nop.Plugin.Misc.AuctionPlugin.Domains
{ {
public class BidTable : BaseEntity public class BidEntity : BaseEntity
{ {
public int CustomerId { get; set; } public int CustomerId { get; set; }
public int ProductId { get; set; } public int ProductId { get; set; }

View File

@ -7,7 +7,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Mapping;
/// <summary> /// <summary>
/// Represents a pickup point entity builder /// Represents a pickup point entity builder
/// </summary> /// </summary>
public class AnnouncementBuilder : NopEntityBuilder<AnnouncementTable> public class AnnouncementBuilder : NopEntityBuilder<AnnouncementEntity>
{ {
#region Methods #region Methods
@ -17,17 +17,16 @@ public class AnnouncementBuilder : NopEntityBuilder<AnnouncementTable>
/// <param name="table">Create table expression builder</param> /// <param name="table">Create table expression builder</param>
public override void MapEntity(CreateTableExpressionBuilder table) public override void MapEntity(CreateTableExpressionBuilder table)
{ {
table table.WithColumn(nameof(AnnouncementEntity.Id))
.WithColumn(nameof(AnnouncementTable.Id))
.AsInt16() .AsInt16()
.NotNullable() .NotNullable()
.WithColumn(nameof(AnnouncementTable.Name)) .WithColumn(nameof(AnnouncementEntity.Name))
.AsString(250) .AsString(250)
.NotNullable() .NotNullable()
.WithColumn(nameof(AnnouncementTable.IsActive)) .WithColumn(nameof(AnnouncementEntity.IsActive))
.AsBoolean() .AsBoolean()
.NotNullable().WithDefault(0) .NotNullable().WithDefault(0)
.WithColumn(nameof(AnnouncementTable.Body)) .WithColumn(nameof(AnnouncementEntity.Body))
.AsString(500) .AsString(500)
.NotNullable(); .NotNullable();
} }

View File

@ -4,7 +4,7 @@ using Nop.Plugin.Misc.AuctionPlugin.Domains;
namespace Nop.Plugin.Misc.AuctionPlugin.Mapping.Builders namespace Nop.Plugin.Misc.AuctionPlugin.Mapping.Builders
{ {
public class PluginBuilder : NopEntityBuilder<BidTable> public class PluginBuilder : NopEntityBuilder<BidEntity>
{ {
#region Methods #region Methods

View File

@ -13,8 +13,8 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Migrations
/// </summary> /// </summary>
public override void Up() public override void Up()
{ {
Create.TableFor<BidTable>(); Create.TableFor<BidEntity>();
Create.TableFor<AnnouncementTable>(); Create.TableFor<AnnouncementEntity>();
} }
} }
} }

View File

@ -14,13 +14,13 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Services
{ {
#region Field #region Field
private readonly IRepository<AnnouncementTable> _announcementRepository; private readonly IRepository<AnnouncementEntity> _announcementRepository;
#endregion #endregion
#region Ctr #region Ctr
public AnnouncementService(IRepository<AnnouncementTable> announcementRepository) public AnnouncementService(IRepository<AnnouncementEntity> announcementRepository)
{ {
_announcementRepository = announcementRepository; _announcementRepository = announcementRepository;
@ -31,7 +31,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Services
#region Methods #region Methods
public async Task DeleteAsync(AnnouncementTable announcement) public async Task DeleteAsync(AnnouncementEntity announcement)
{ {
await _announcementRepository.DeleteAsync(announcement); await _announcementRepository.DeleteAsync(announcement);
@ -40,7 +40,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Services
public async Task<bool> UpdateAsync(AnnouncementTable announcement) public async Task<bool> 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<IPagedList<AnnouncementTable>> GetAnnouncementsAsync(int pageIndex = 0, int pageSize = int.MaxValue) public async Task<IPagedList<AnnouncementEntity>> 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 query2 = query.OrderBy(b => b.IsActive).ToList();
var liveAnnouncementDomain = new PagedList<AnnouncementTable>(query2, pageIndex, pageSize); var liveAnnouncementDomain = new PagedList<AnnouncementEntity>(query2, pageIndex, pageSize);
return liveAnnouncementDomain; return liveAnnouncementDomain;
} }
public async Task<AnnouncementTable> GetAnnouncementDesignFirstAsync() public async Task<AnnouncementEntity> GetAnnouncementDesignFirstAsync()
{ {
var result = await _announcementRepository.GetAllAsync(query => var result = await _announcementRepository.GetAllAsync(query =>
@ -105,7 +105,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Services
} }
public async Task<AnnouncementTable> GetAnnouncementByIdAsync(int Id) public async Task<AnnouncementEntity> GetAnnouncementByIdAsync(int Id)
{ {

View File

@ -25,7 +25,7 @@ public class BidService : IBidService
#region Fields #region Fields
protected readonly IRepository<BidTable> _customerBidRepository; protected readonly IRepository<BidEntity> _customerBidRepository;
protected readonly IShortTermCacheManager _shortTermCacheManager; protected readonly IShortTermCacheManager _shortTermCacheManager;
protected readonly IStaticCacheManager _staticCacheManager; protected readonly IStaticCacheManager _staticCacheManager;
@ -39,7 +39,7 @@ public class BidService : IBidService
/// <param name="customerBidRepository">Store pickup point repository</param> /// <param name="customerBidRepository">Store pickup point repository</param>
/// <param name="shortTermCacheManager">Short term cache manager</param> /// <param name="shortTermCacheManager">Short term cache manager</param>
/// <param name="staticCacheManager">Cache manager</param> /// <param name="staticCacheManager">Cache manager</param>
public BidService(IRepository<BidTable> customerBidRepository, public BidService(IRepository<BidEntity> customerBidRepository,
IShortTermCacheManager shortTermCacheManager, IShortTermCacheManager shortTermCacheManager,
IStaticCacheManager staticCacheManager) IStaticCacheManager staticCacheManager)
{ {
@ -62,9 +62,9 @@ public class BidService : IBidService
/// A task that represents the asynchronous operation /// A task that represents the asynchronous operation
/// The task result contains the bids /// The task result contains the bids
/// </returns> /// </returns>
public virtual async Task<IPagedList<BidTable>> GetAllBidsAsync(int customerId = 0, int pageIndex = 0, int pageSize = int.MaxValue) public virtual async Task<IPagedList<BidEntity>> GetAllBidsAsync(int customerId = 0, int pageIndex = 0, int pageSize = int.MaxValue)
{ {
var rez = new List<BidTable>(); var rez = new List<BidEntity>();
//var rez = await _shortTermCacheManager.GetAsync(async () => await _customerBidRepository.GetAllAsync(query => //var rez = await _shortTermCacheManager.GetAsync(async () => await _customerBidRepository.GetAllAsync(query =>
//{ //{
// if (customerId > 0) // if (customerId > 0)
@ -74,21 +74,21 @@ public class BidService : IBidService
// return query; // return query;
//}), _pickupPointAllKey, customerId); //}), _pickupPointAllKey, customerId);
return new PagedList<BidTable>(rez, pageIndex, pageSize); return new PagedList<BidEntity>(rez, pageIndex, pageSize);
} }
public virtual async Task<BidTable> GetBidByIdAsync(int bidId) public virtual async Task<BidEntity> GetBidByIdAsync(int bidId)
{ {
return await _customerBidRepository.GetByIdAsync(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 _customerBidRepository.InsertAsync(bid, false);
await _staticCacheManager.RemoveByPrefixAsync(AUCTION_PATTERN_KEY); 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 _customerBidRepository.UpdateAsync(bid, false);
await _staticCacheManager.RemoveByPrefixAsync(AUCTION_PATTERN_KEY); await _staticCacheManager.RemoveByPrefixAsync(AUCTION_PATTERN_KEY);
@ -99,7 +99,7 @@ public class BidService : IBidService
/// </summary> /// </summary>
/// <param name="pickupPoint">Pickup point</param> /// <param name="pickupPoint">Pickup point</param>
/// <returns>A task that represents the asynchronous operation</returns> /// <returns>A task that represents the asynchronous operation</returns>
public virtual async Task DeleteBidAsync(BidTable pickupPoint) public virtual async Task DeleteBidAsync(BidEntity pickupPoint)
{ {
await _customerBidRepository.DeleteAsync(pickupPoint, false); await _customerBidRepository.DeleteAsync(pickupPoint, false);
await _staticCacheManager.RemoveByPrefixAsync(AUCTION_PATTERN_KEY); await _staticCacheManager.RemoveByPrefixAsync(AUCTION_PATTERN_KEY);

View File

@ -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<bool> UpdateAsync(AnnouncementTable announcement); public Task<bool> UpdateAsync(AnnouncementEntity announcement);
public Task<IPagedList<AnnouncementTable>> GetAnnouncementsAsync(int pageIndex = 0, int pageSize = int.MaxValue); public Task<IPagedList<AnnouncementEntity>> GetAnnouncementsAsync(int pageIndex = 0, int pageSize = int.MaxValue);
public Task<AnnouncementTable> GetAnnouncementDesignFirstAsync(); public Task<AnnouncementEntity> GetAnnouncementDesignFirstAsync();
public Task<AnnouncementTable> GetAnnouncementByIdAsync(int Id); public Task<AnnouncementEntity> GetAnnouncementByIdAsync(int Id);
} }

View File

@ -18,17 +18,17 @@ public interface IBidService
/// A task that represents the asynchronous operation /// A task that represents the asynchronous operation
/// The task result contains the bids /// The task result contains the bids
/// </returns> /// </returns>
Task<IPagedList<BidTable>> GetAllBidsAsync(int customerId = 0, int pageIndex = 0, int pageSize = int.MaxValue); Task<IPagedList<BidEntity>> GetAllBidsAsync(int customerId = 0, int pageIndex = 0, int pageSize = int.MaxValue);
Task<BidTable> GetBidByIdAsync(int bidId); Task<BidEntity> 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);
} }

View File

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Nop.Plugin.Misc.AuctionPlugin")] [assembly: System.Reflection.AssemblyCompanyAttribute("Nop.Plugin.Misc.AuctionPlugin")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [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.AssemblyProductAttribute("Nop.Plugin.Misc.AuctionPlugin")]
[assembly: System.Reflection.AssemblyTitleAttribute("Nop.Plugin.Misc.AuctionPlugin")] [assembly: System.Reflection.AssemblyTitleAttribute("Nop.Plugin.Misc.AuctionPlugin")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

View File

@ -1 +1 @@
d64ed4ed36a99c43d3d81f6442418fbb91a5a610f4437c0f2490b978c47ca144 78c79a6279758bf6029272b201ba6b7198a9b5ffd66137652c24adcb76d3bd07