Adam
/
Mango.Nop.Plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improvements

This commit is contained in:
Loretta 2024-11-15 15:15:56 +01:00
parent 379710e120
commit 38504edba6
10 changed files with 88 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Nop.Plugin.Misc.AuctionPlugin/Domains/DataLayer/AuctionDbContext.cs
View File

@ -1,4 +1,5 @@
using Mango.Nop.Core.Repositories;
using Nop.Core;
using Nop.Data;
using Nop.Plugin.Misc.AuctionPlugin.Domains.Entities;
using System;

6
Nop.Plugin.Misc.AuctionPlugin/Domains/DataLayer/AuctionDbTable.cs
View File

@ -13,4 +13,10 @@ public class AuctionDbTable: MgDbTableBase<Auction>
public AuctionDbTable(IEventPublisher eventPublisher, INopDataProvider dataProvider, IShortTermCacheManager shortTermCacheManager, IStaticCacheManager staticCacheManager, AppSettings appSettings) : base(eventPublisher, dataProvider, shortTermCacheManager, staticCacheManager, appSettings)
{
}
public Task<IList<Auction>> GetAllAuctionsAsync()
{
return GetAllAsync(auctions => auctions.OrderByDescending(x => x.StartDateUtc), _ => default);
}
}

2
Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/Announcement.cs
View File

@ -6,7 +6,7 @@ using Nop.Core;
namespace Nop.Plugin.Misc.AuctionPlugin.Domains.Entities
{
public class Announcement : EntityBase, ITimeStampCreated
public class Announcement : MgEntityBase, ITimeStampCreated
{
public string Name { get; set; }

8
Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/Auction.cs
View File

@ -1,4 +1,5 @@
using AyCode.Interfaces.Entities;
using System.ComponentModel.DataAnnotations.Schema;
using AyCode.Interfaces.Entities;
using AyCode.Interfaces.TimeStampInfo;
using Mango.Nop.Core.Entities;
using Mango.Nop.Core.Interfaces;
@ -7,7 +8,7 @@ using Nop.Plugin.Misc.AuctionPlugin.Domains.Enums;
namespace Nop.Plugin.Misc.AuctionPlugin.Domains.Entities;
public class Auction: EntityBase, ITimeStampInfo//, ISoftRemoveEntityInt
public partial class Auction: MgEntityBase, ITimeStampInfo//, ISoftRemoveEntityInt
{
public string AuctionName { get; set; }
public AuctionType AuctionType{ get; set; }
@ -17,6 +18,9 @@ public class Auction: EntityBase, ITimeStampInfo//, ISoftRemoveEntityInt
public bool Closed { get; set; }
[NotMapped]
public List<ProductToAuctionMapping> ProductToAuctionMappings { get; } = [];
public DateTime Created { get; set; }
public DateTime Modified { get; set; }
}

2
Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/AuctionBid.cs
View File

@ -5,7 +5,7 @@ using Nop.Core;
namespace Nop.Plugin.Misc.AuctionPlugin.Domains.Entities
{
public class AuctionBid : EntityBase, ITimeStampInfo//, ISoftRemoveEntityInt
public partial class AuctionBid : MgEntityBase, ITimeStampInfo//, ISoftRemoveEntityInt
{
public int ProductAuctionMappingId { get; set; }

2
Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/AuctionItem.cs
View File

@ -5,7 +5,7 @@ using Nop.Core;
namespace Nop.Plugin.Misc.AuctionPlugin.Domains.Entities;
public class AuctionItem : EntityBase, ITimeStampInfo//, ISoftRemoveEntityInt
public partial class AuctionItem : MgEntityBase, ITimeStampInfo//, ISoftRemoveEntityInt
{
public DateTime Created { get; set; }
public DateTime Modified { get; set; }

2
Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/ProductToAuctionMapping.cs
View File

@ -6,7 +6,7 @@ using Nop.Plugin.Misc.AuctionPlugin.Domains.Enums;
namespace Nop.Plugin.Misc.AuctionPlugin.Domains.Entities;
public class ProductToAuctionMapping : EntityBase, ITimeStampInfo//, ISoftRemoveEntityInt
public partial class ProductToAuctionMapping : MgEntityBase, ITimeStampInfo//, ISoftRemoveEntityInt
{
public int ProductId { get; set; }
public int AuctionId { get; set; }

38
Nop.Plugin.Misc.AuctionPlugin/Mapping/Builders/ProductToAuctionBuilder.cs Normal file
View File

@ -0,0 +1,38 @@
using FluentMigrator;
using FluentMigrator.Builders.Create.Table;
using Nop.Data.Mapping.Builders;
using Nop.Plugin.Misc.AuctionPlugin.Domains.Entities;
using Nop.Data.Extensions;
using System.Data;
using Nop.Core.Domain.Catalog;
using Nop.Core.Domain.Common;
using Nop.Data.Mapping;
namespace Nop.Plugin.Misc.AuctionPlugin.Mapping.Builders;
public class ProductToAuctionMappingBuilder : NopEntityBuilder<ProductToAuctionMapping>
{
#region Methods
/// <summary>
/// Apply entity configuration
/// </summary>
/// <param name="table">Create table expression builder</param>
public override void MapEntity(CreateTableExpressionBuilder table)
{
table.WithColumn(nameof(ProductToAuctionMapping.Id)).AsInt32().PrimaryKey()
.WithColumn(nameof(ProductToAuctionMapping.AuctionId)).AsInt32().ForeignKey<Auction>(onDelete: Rule.None) //Rule.Cascade??
.WithColumn(nameof(ProductToAuctionMapping.ProductId)).AsInt32().ForeignKey<Product>(onDelete: Rule.None) //Rule.Cascade??
.WithColumn(nameof(ProductToAuctionMapping.AuctionStatus)).AsByte().NotNullable() //enum??? - J.
.WithColumn(nameof(ProductToAuctionMapping.StartingPrice)).AsInt32().NotNullable()
.WithColumn(nameof(ProductToAuctionMapping.BidPrice)).AsInt32().NotNullable()
.WithColumn(nameof(ProductToAuctionMapping.BidAmount)).AsInt32().NotNullable().WithDefaultValue(1)
.WithColumn(nameof(ProductToAuctionMapping.Created)).AsDateTime().NotNullable()
.WithColumn(nameof(ProductToAuctionMapping.Modified)).AsDateTime().NotNullable().WithDefault(SystemMethods.CurrentUTCDateTime);
}
#endregion
}

40
Nop.Plugin.Misc.AuctionPlugin/Services/AuctionService.cs
View File

@ -1,5 +1,6 @@
using Nop.Core;
using Nop.Core.Caching;
using Nop.Core.Domain.Customers;
using Nop.Data;
using Nop.Plugin.Misc.AuctionPlugin.Domains;
using Nop.Plugin.Misc.AuctionPlugin.Domains.DataLayer;
@ -32,7 +33,7 @@ public class AuctionService : IAuctionService
//protected readonly IRepository<Auction> _auctionRepository;
protected readonly IShortTermCacheManager _shortTermCacheManager;
protected readonly IStaticCacheManager _staticCacheManager;
protected readonly IWorkContext _workContext;
#endregion
#region Ctor
@ -43,7 +44,7 @@ public class AuctionService : IAuctionService
/// <param name="customerBidRepository">Store pickup point repository</param>
/// <param name="shortTermCacheManager">Short term cache manager</param>
/// <param name="staticCacheManager">Cache manager</param>
public AuctionService(AuctionDbContext ctx, IShortTermCacheManager shortTermCacheManager, IStaticCacheManager staticCacheManager)
public AuctionService(AuctionDbContext ctx, IShortTermCacheManager shortTermCacheManager, IStaticCacheManager staticCacheManager, IWorkContext workContext)
{
_ctx = ctx;
//_customerBidRepository = customerBidRepository;
@ -51,12 +52,23 @@ public class AuctionService : IAuctionService
_shortTermCacheManager = shortTermCacheManager;
_staticCacheManager = staticCacheManager;
_workContext = workContext;
}
#endregion
#region Methods
private async Task<bool> ValidateAuctionBid(AuctionBid auctionBid)
{
auctionBid.CustomerId = (await _workContext.GetCurrentCustomerAsync()).Id; //elvileg megnézi cache-ben, csak utána DB-zik! - J.
auctionBid.Modified = DateTime.UtcNow;
//etc...
return true;
}
/// <summary>
/// Gets all bids
/// </summary>
@ -89,14 +101,20 @@ public class AuctionService : IAuctionService
public virtual async Task InsertBidAsync(AuctionBid auctionBid)
{
await _ctx.AuctionBids.InsertAsync(auctionBid, false);
await _staticCacheManager.RemoveByPrefixAsync(AUCTION_PATTERN_KEY);
if (await ValidateAuctionBid(auctionBid))
{
await _ctx.AuctionBids.InsertAsync(auctionBid, false);
await _staticCacheManager.RemoveByPrefixAsync(AUCTION_PATTERN_KEY);
}
}
public virtual async Task UpdateBidAsync(AuctionBid auctionBid)
{
await _ctx.AuctionBids.UpdateAsync(auctionBid, false);
await _staticCacheManager.RemoveByPrefixAsync(AUCTION_PATTERN_KEY);
if (await ValidateAuctionBid(auctionBid))
{
await _ctx.AuctionBids.UpdateAsync(auctionBid, false);
await _staticCacheManager.RemoveByPrefixAsync(AUCTION_PATTERN_KEY);
}
}
/// <summary>
@ -117,9 +135,15 @@ public class AuctionService : IAuctionService
await _staticCacheManager.RemoveByPrefixAsync(AUCTION_PATTERN_KEY);
}
public async Task<List<Auction>> GetAllAuctionsAsync()
public async Task<IList<Auction>> GetAllAuctionsAsync()
{
return (await _ctx.Auctions.GetAllAsync(auctions => auctions.OrderByDescending(x => x.StartDateUtc), _ => default)).ToList();
return await _ctx.Auctions.GetAllAuctionsAsync();
}
public async Task<List<ProductToAuctionMapping>> GetProductToAuctionsByAuctionIdAsync(int auctionId, bool onlyActiveItems = false)
{
//return (await _ctx.Auctions.GetAllAsync(auctions => auctions.OrderByDescending(x => x.StartDateUtc), _ => default)).ToList();
return [];
}
#endregion

2
Nop.Plugin.Misc.AuctionPlugin/Services/IAuctionService.cs
View File

@ -31,5 +31,5 @@ public interface IAuctionService
Task InsertAuctionAsync(Auction auction);
Task<List<Auction>> GetAllAuctionsAsync();
Task<IList<Auction>> GetAllAuctionsAsync();
}