From 21cab702fcad1de814f55560942b9195ddf99a55 Mon Sep 17 00:00:00 2001
From: Loretta <jozsef.b@aycode.com>
Date: Tue, 12 Nov 2024 16:06:59 +0100
Subject: [PATCH] Auction improvements, etc...

---
 .../Controllers/AnnouncementController.cs     | 11 ++++---
 .../Controllers/AuctionController.cs          | 17 ++++++++++
 .../Domains/AnnouncementEntity.cs             | 20 ------------
 .../Domains/BidEntity.cs                      | 19 -----------
 .../Domains/Entities/Announcement.cs          | 22 +++++++++++++
 .../Domains/Entities/Auction.cs               | 20 ++++++++++++
 .../Domains/Entities/AuctionBid.cs            | 22 +++++++++++++
 .../Domains/Entities/AuctionItem.cs           | 11 +++++++
 .../Entities/ProductToAuctionMapping.cs       | 21 ++++++++++++
 .../Domains/Enums/AuctionStatus.cs            | 11 +++++++
 .../Domains/Enums/AuctionType.cs              |  8 +++++
 .../Infrastructure/PluginNopStartup.cs        |  2 +-
 .../Mapping/AnnouncementBuilder.cs            | 11 ++++---
 .../Mapping/Builders/PluginBuilder.cs         |  3 +-
 .../Migrations/SchemaMigration.cs             |  9 ++++--
 .../Nop.Plugin.Misc.AuctionPlugin.csproj      | 32 +++++++++++++++++++
 .../Services/AnnouncementService.cs           | 19 +++++------
 .../{BidService.cs => AuctionService.cs}      | 25 ++++++++-------
 .../Services/IAnnouncementService.cs          | 13 ++++----
 .../{IBidService.cs => IAuctionService.cs}    | 13 ++++----
 20 files changed, 223 insertions(+), 86 deletions(-)
 create mode 100644 Nop.Plugin.Misc.AuctionPlugin/Controllers/AuctionController.cs
 delete mode 100644 Nop.Plugin.Misc.AuctionPlugin/Domains/AnnouncementEntity.cs
 delete mode 100644 Nop.Plugin.Misc.AuctionPlugin/Domains/BidEntity.cs
 create mode 100644 Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/Announcement.cs
 create mode 100644 Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/Auction.cs
 create mode 100644 Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/AuctionBid.cs
 create mode 100644 Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/AuctionItem.cs
 create mode 100644 Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/ProductToAuctionMapping.cs
 create mode 100644 Nop.Plugin.Misc.AuctionPlugin/Domains/Enums/AuctionStatus.cs
 create mode 100644 Nop.Plugin.Misc.AuctionPlugin/Domains/Enums/AuctionType.cs
 rename Nop.Plugin.Misc.AuctionPlugin/Services/{BidService.cs => AuctionService.cs} (75%)
 rename Nop.Plugin.Misc.AuctionPlugin/Services/{IBidService.cs => IAuctionService.cs} (59%)

diff --git a/Nop.Plugin.Misc.AuctionPlugin/Controllers/AnnouncementController.cs b/Nop.Plugin.Misc.AuctionPlugin/Controllers/AnnouncementController.cs
index 352f4c6..dc40abb 100644
--- a/Nop.Plugin.Misc.AuctionPlugin/Controllers/AnnouncementController.cs
+++ b/Nop.Plugin.Misc.AuctionPlugin/Controllers/AnnouncementController.cs
@@ -9,6 +9,7 @@ using Nop.Web.Areas.Admin.Controllers;
 using Nop.Web.Framework.Mvc;
 using System;
 using System.Linq;
+using Nop.Plugin.Misc.AuctionPlugin.Domains.Entities;
 
 namespace Nop.Plugin.Misc.AuctionPlugin.Controllers
 {
@@ -71,7 +72,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Controllers
 
         {
 
-            AnnouncementEntity objOfAnnouncementDomain = new AnnouncementEntity();
+            Announcement objOfAnnouncementDomain = new Announcement();
 
             objOfAnnouncementDomain.Name = viewModel.Name;
 
@@ -79,7 +80,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Controllers
 
             objOfAnnouncementDomain.IsActive = viewModel.IsActive;
 
-            objOfAnnouncementDomain.CreateDate = DateTime.UtcNow;
+            objOfAnnouncementDomain.Created = DateTime.UtcNow;
 
             await _announcementService.InsertAsync(objOfAnnouncementDomain);
 
@@ -98,7 +99,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Controllers
         }
 
         [HttpPost]
-        public async Task<IActionResult> Edit(AnnouncementEntity model)
+        public async Task<IActionResult> Edit(Announcement model)
 
         {
 
@@ -110,7 +111,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Controllers
 
             entity.IsActive = model.IsActive;
 
-            entity.CreateDate = DateTime.UtcNow;
+            entity.Created = DateTime.UtcNow;
 
             await _announcementService.UpdateAsync(entity);
 
@@ -134,7 +135,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Controllers
 
             var singleAnnouncement = await _announcementService.GetAnnouncementByIdAsync(Id);
 
-            var model = new AnnouncementEntity();
+            var model = new Announcement();
 
             model.Id = singleAnnouncement.Id;
 
diff --git a/Nop.Plugin.Misc.AuctionPlugin/Controllers/AuctionController.cs b/Nop.Plugin.Misc.AuctionPlugin/Controllers/AuctionController.cs
new file mode 100644
index 0000000..3553fd8
--- /dev/null
+++ b/Nop.Plugin.Misc.AuctionPlugin/Controllers/AuctionController.cs
@@ -0,0 +1,17 @@
+using AyCode.Core.Extensions;
+using Microsoft.AspNetCore.Mvc;
+using Nop.Plugin.Misc.AuctionPlugin.Domains.Entities;
+using Nop.Plugin.Misc.AuctionPlugin.Services;
+using Nop.Web.Areas.Admin.Controllers;
+
+namespace Nop.Plugin.Misc.AuctionPlugin.Controllers;
+
+public class AuctionController(AuctionService _auctionService) : BaseAdminController
+{
+    // GET
+    public IActionResult Index()
+    {
+        //var a = new Auction();
+        return View();
+    }
+}
\ No newline at end of file
diff --git a/Nop.Plugin.Misc.AuctionPlugin/Domains/AnnouncementEntity.cs b/Nop.Plugin.Misc.AuctionPlugin/Domains/AnnouncementEntity.cs
deleted file mode 100644
index 41384c1..0000000
--- a/Nop.Plugin.Misc.AuctionPlugin/Domains/AnnouncementEntity.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Nop.Core;
-
-namespace Nop.Plugin.Misc.AuctionPlugin.Domains
-{
-
-    public class AnnouncementEntity : BaseEntity
-
-    {
-
-        public string Name { get; set; }
-
-        public string Body { get; set; }
-
-        public bool IsActive { get; set; }
-
-        public DateTime CreateDate { get; set; }
-
-    }
-
-}
\ No newline at end of file
diff --git a/Nop.Plugin.Misc.AuctionPlugin/Domains/BidEntity.cs b/Nop.Plugin.Misc.AuctionPlugin/Domains/BidEntity.cs
deleted file mode 100644
index a9bc613..0000000
--- a/Nop.Plugin.Misc.AuctionPlugin/Domains/BidEntity.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Nop.Core;
-
-namespace Nop.Plugin.Misc.AuctionPlugin.Domains
-{
-
-    public class BidEntity : BaseEntity
-    {
-        public int CustomerId { get; set; }
-
-        public int ProductId { get; set; }
-
-        public bool IsWinner { get; set; }
-        public int Value { get; set; }
-
-        public DateTime CreateDate { get; set; }
-
-    }
-
-}
\ No newline at end of file
diff --git a/Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/Announcement.cs b/Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/Announcement.cs
new file mode 100644
index 0000000..361579d
--- /dev/null
+++ b/Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/Announcement.cs
@@ -0,0 +1,22 @@
+using AyCode.Interfaces.Entities;
+using AyCode.Interfaces.TimeStampInfo;
+using Nop.Core;
+
+namespace Nop.Plugin.Misc.AuctionPlugin.Domains.Entities
+{
+
+    public class Announcement : BaseEntity, IEntityInt, ITimeStampCreated
+
+    {
+
+        public string Name { get; set; }
+
+        public string Body { get; set; }
+
+        public bool IsActive { get; set; }
+
+        public DateTime Created { get; set; }
+
+    }
+
+}
\ No newline at end of file
diff --git a/Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/Auction.cs b/Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/Auction.cs
new file mode 100644
index 0000000..70d66a9
--- /dev/null
+++ b/Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/Auction.cs
@@ -0,0 +1,20 @@
+using AyCode.Interfaces.Entities;
+using AyCode.Interfaces.TimeStampInfo;
+using Nop.Core;
+using Nop.Plugin.Misc.AuctionPlugin.Domains.Enums;
+
+namespace Nop.Plugin.Misc.AuctionPlugin.Domains.Entities;
+
+public class Auction: BaseEntity, IEntityInt, ITimeStampInfo
+{
+    public string AuctionName { get; set; }
+    public AuctionType AuctionType{ get; set; }
+
+    public DateTime StartDateUtc { get; set; }
+    public DateTime? EndDateUtc { get; set; }
+
+    public bool Closed { get; set; }
+
+    public DateTime Created { get; set; }
+    public DateTime Modified { get; set; }
+}
\ No newline at end of file
diff --git a/Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/AuctionBid.cs b/Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/AuctionBid.cs
new file mode 100644
index 0000000..359edfc
--- /dev/null
+++ b/Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/AuctionBid.cs
@@ -0,0 +1,22 @@
+using AyCode.Interfaces.Entities;
+using AyCode.Interfaces.TimeStampInfo;
+using Nop.Core;
+
+namespace Nop.Plugin.Misc.AuctionPlugin.Domains.Entities
+{
+    public class AuctionBid : BaseEntity, IEntityInt, ITimeStampInfo
+    {
+        public int CustomerId { get; set; }
+
+        public int ProductId { get; set; }
+
+        public bool IsWinner { get; set; }
+        public int BidPrice { get; set; }
+
+        public DateTime CreateDate { get; set; }
+
+        public DateTime Created { get; set; }
+        public DateTime Modified { get; set; }
+    }
+
+}
\ No newline at end of file
diff --git a/Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/AuctionItem.cs b/Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/AuctionItem.cs
new file mode 100644
index 0000000..7bb0e1d
--- /dev/null
+++ b/Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/AuctionItem.cs
@@ -0,0 +1,11 @@
+using AyCode.Interfaces.Entities;
+using AyCode.Interfaces.TimeStampInfo;
+using Nop.Core;
+
+namespace Nop.Plugin.Misc.AuctionPlugin.Domains.Entities;
+
+public class AuctionItem : BaseEntity, IEntityInt, ITimeStampInfo
+{
+    public DateTime Created { get; set; }
+    public DateTime Modified { get; set; }
+}
\ No newline at end of file
diff --git a/Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/ProductToAuctionMapping.cs b/Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/ProductToAuctionMapping.cs
new file mode 100644
index 0000000..a58d0c1
--- /dev/null
+++ b/Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/ProductToAuctionMapping.cs
@@ -0,0 +1,21 @@
+using AyCode.Interfaces.Entities;
+using AyCode.Interfaces.TimeStampInfo;
+using Nop.Core;
+using Nop.Plugin.Misc.AuctionPlugin.Domains.Enums;
+
+namespace Nop.Plugin.Misc.AuctionPlugin.Domains.Entities;
+
+public class ProductToAuctionMapping : BaseEntity, IEntityInt, ITimeStampInfo
+{
+    public int ProductId { get; set; }
+    public int AuctionId { get; set; }
+
+    public AuctionStatus AuctionStatus { get; set; } = AuctionStatus.None;
+
+    public int StartingPrice { get; set; }
+    public int BidPrice { get; set; }
+
+    public int BidAmount { get; set; } = 1;
+    public DateTime Created { get; set; }
+    public DateTime Modified { get; set; }
+}
\ No newline at end of file
diff --git a/Nop.Plugin.Misc.AuctionPlugin/Domains/Enums/AuctionStatus.cs b/Nop.Plugin.Misc.AuctionPlugin/Domains/Enums/AuctionStatus.cs
new file mode 100644
index 0000000..5374a6c
--- /dev/null
+++ b/Nop.Plugin.Misc.AuctionPlugin/Domains/Enums/AuctionStatus.cs
@@ -0,0 +1,11 @@
+namespace Nop.Plugin.Misc.AuctionPlugin.Domains.Enums;
+
+public enum AuctionStatus : byte
+{
+    None = 0,
+    Active = 5,
+    FirstWarning = 10,
+    SecondWarning = 15,
+    SoldOut = 20,
+    NotSold = 25
+}
\ No newline at end of file
diff --git a/Nop.Plugin.Misc.AuctionPlugin/Domains/Enums/AuctionType.cs b/Nop.Plugin.Misc.AuctionPlugin/Domains/Enums/AuctionType.cs
new file mode 100644
index 0000000..90fb742
--- /dev/null
+++ b/Nop.Plugin.Misc.AuctionPlugin/Domains/Enums/AuctionType.cs
@@ -0,0 +1,8 @@
+namespace Nop.Plugin.Misc.AuctionPlugin.Domains.Enums;
+
+public enum AuctionType : byte
+{
+    //TODO: átbeszélni és kitalálni - J.
+    Manual = 0,
+    AutomaticNext = 5,
+}
\ No newline at end of file
diff --git a/Nop.Plugin.Misc.AuctionPlugin/Infrastructure/PluginNopStartup.cs b/Nop.Plugin.Misc.AuctionPlugin/Infrastructure/PluginNopStartup.cs
index 28c091e..7374737 100644
--- a/Nop.Plugin.Misc.AuctionPlugin/Infrastructure/PluginNopStartup.cs
+++ b/Nop.Plugin.Misc.AuctionPlugin/Infrastructure/PluginNopStartup.cs
@@ -33,7 +33,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Infrastructure
 
             //register services and interfaces
             services.AddScoped<IAnnouncementService, AnnouncementService>();
-            services.AddScoped<IBidService, BidService>();
+            services.AddScoped<IAuctionService, AuctionService>();
             services.AddScoped<EventConsumer>();
         }
 
diff --git a/Nop.Plugin.Misc.AuctionPlugin/Mapping/AnnouncementBuilder.cs b/Nop.Plugin.Misc.AuctionPlugin/Mapping/AnnouncementBuilder.cs
index 3dcd10f..efddd3a 100644
--- a/Nop.Plugin.Misc.AuctionPlugin/Mapping/AnnouncementBuilder.cs
+++ b/Nop.Plugin.Misc.AuctionPlugin/Mapping/AnnouncementBuilder.cs
@@ -1,13 +1,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;
 
 /// <summary>
 /// Represents a pickup point entity builder
 /// </summary>
-public class AnnouncementBuilder : NopEntityBuilder<AnnouncementEntity>
+public class AnnouncementBuilder : NopEntityBuilder<Announcement>
 {
     #region Methods
 
@@ -17,16 +18,16 @@ public class AnnouncementBuilder : NopEntityBuilder<AnnouncementEntity>
     /// <param name="table">Create table expression builder</param>
     public override void MapEntity(CreateTableExpressionBuilder table)
     {
-        table.WithColumn(nameof(AnnouncementEntity.Id))
+        table.WithColumn(nameof(Announcement.Id))
                 .AsInt16()
                 .NotNullable()
-            .WithColumn(nameof(AnnouncementEntity.Name))
+            .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();
     }
diff --git a/Nop.Plugin.Misc.AuctionPlugin/Mapping/Builders/PluginBuilder.cs b/Nop.Plugin.Misc.AuctionPlugin/Mapping/Builders/PluginBuilder.cs
index d51eb66..c4aec41 100644
--- a/Nop.Plugin.Misc.AuctionPlugin/Mapping/Builders/PluginBuilder.cs
+++ b/Nop.Plugin.Misc.AuctionPlugin/Mapping/Builders/PluginBuilder.cs
@@ -1,10 +1,11 @@
 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
 {
-    public class PluginBuilder : NopEntityBuilder<BidEntity>
+    public class PluginBuilder : NopEntityBuilder<AuctionBid>
     {
         #region Methods
 
diff --git a/Nop.Plugin.Misc.AuctionPlugin/Migrations/SchemaMigration.cs b/Nop.Plugin.Misc.AuctionPlugin/Migrations/SchemaMigration.cs
index 232469b..a44e009 100644
--- a/Nop.Plugin.Misc.AuctionPlugin/Migrations/SchemaMigration.cs
+++ b/Nop.Plugin.Misc.AuctionPlugin/Migrations/SchemaMigration.cs
@@ -2,6 +2,7 @@
 using Nop.Data.Extensions;
 using Nop.Data.Migrations;
 using Nop.Plugin.Misc.AuctionPlugin.Domains;
+using Nop.Plugin.Misc.AuctionPlugin.Domains.Entities;
 
 namespace Nop.Plugin.Misc.AuctionPlugin.Migrations
 {
@@ -13,8 +14,12 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Migrations
         /// </summary>
         public override void Up()
         {
-            Create.TableFor<BidEntity>();
-            Create.TableFor<AnnouncementEntity>();
+            Create.TableFor<Auction>();
+            Create.TableFor<AuctionItem>();
+            Create.TableFor<ProductToAuctionMapping>();
+            Create.TableFor<AuctionBid>();
+
+            Create.TableFor<Announcement>();
         }
     }
 }
\ No newline at end of file
diff --git a/Nop.Plugin.Misc.AuctionPlugin/Nop.Plugin.Misc.AuctionPlugin.csproj b/Nop.Plugin.Misc.AuctionPlugin/Nop.Plugin.Misc.AuctionPlugin.csproj
index a908b9a..c1d2443 100644
--- a/Nop.Plugin.Misc.AuctionPlugin/Nop.Plugin.Misc.AuctionPlugin.csproj
+++ b/Nop.Plugin.Misc.AuctionPlugin/Nop.Plugin.Misc.AuctionPlugin.csproj
@@ -60,7 +60,11 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\NopCommerce\Libraries\Nop.Core\Nop.Core.csproj" />
+    <ProjectReference Include="..\..\..\..\NopCommerce\Libraries\Nop.Data\Nop.Data.csproj" />
     <ProjectReference Include="..\..\..\..\NopCommerce\Presentation\Nop.Web\Nop.Web.csproj" />
+    <ProjectReference Include="..\..\Libraries\Mango.Nop.Core\Mango.Nop.Core.csproj" />
+    <ProjectReference Include="..\..\Libraries\Mango.Nop.Services\Mango.Nop.Services.csproj" />
     <ClearPluginAssemblies Include="$(MSBuildProjectDirectory)\..\..\..\..\NopCommerce\Build\ClearPluginAssemblies.proj" />
   </ItemGroup>
 
@@ -75,6 +79,34 @@
     <Folder Include="Factories\" />
     <Folder Include="Validators\" />    
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.10" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="AyCode.Core">
+      <HintPath>..\..\..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="AyCode.Core.Server">
+      <HintPath>..\..\..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Core.Server.dll</HintPath>
+    </Reference>
+    <Reference Include="AyCode.Entities">
+      <HintPath>..\..\..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Entities.dll</HintPath>
+    </Reference>
+    <Reference Include="AyCode.Entities.Server">
+      <HintPath>..\..\..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Entities.Server.dll</HintPath>
+    </Reference>
+    <Reference Include="AyCode.Interfaces">
+      <HintPath>..\..\..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Interfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="AyCode.Interfaces.Server">
+      <HintPath>..\..\..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Interfaces.Server.dll</HintPath>
+    </Reference>
+    <Reference Include="AyCode.Utils">
+      <HintPath>..\..\..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Utils.dll</HintPath>
+    </Reference>
+  </ItemGroup>
  
   <!-- This target execute after "Build" target -->
   <Target Name="NopTarget" AfterTargets="Build">
diff --git a/Nop.Plugin.Misc.AuctionPlugin/Services/AnnouncementService.cs b/Nop.Plugin.Misc.AuctionPlugin/Services/AnnouncementService.cs
index 9ee887a..6b3fc4e 100644
--- a/Nop.Plugin.Misc.AuctionPlugin/Services/AnnouncementService.cs
+++ b/Nop.Plugin.Misc.AuctionPlugin/Services/AnnouncementService.cs
@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Nop.Plugin.Misc.AuctionPlugin.Domains.Entities;
 
 namespace Nop.Plugin.Misc.AuctionPlugin.Services
 {
@@ -14,13 +15,13 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Services
     {
         #region Field
 
-        private readonly IRepository<AnnouncementEntity> _announcementRepository;
+        private readonly IRepository<Announcement> _announcementRepository;
 
         #endregion
 
         #region Ctr
 
-        public AnnouncementService(IRepository<AnnouncementEntity> announcementRepository)
+        public AnnouncementService(IRepository<Announcement> announcementRepository)
         {
 
             _announcementRepository = announcementRepository;
@@ -31,7 +32,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Services
 
         #region Methods
 
-        public async Task DeleteAsync(AnnouncementEntity announcement)
+        public async Task DeleteAsync(Announcement announcement)
         {
 
             await _announcementRepository.DeleteAsync(announcement);
@@ -40,7 +41,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Services
 
 
 
-        public async Task<bool> UpdateAsync(AnnouncementEntity announcement)
+        public async Task<bool> UpdateAsync(Announcement announcement)
 
         {
 
@@ -57,7 +58,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Services
         }
 
 
-        public async Task InsertAsync(AnnouncementEntity announcement)
+        public async Task InsertAsync(Announcement announcement)
 
         {
 
@@ -66,7 +67,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Services
         }
 
 
-        public async Task<IPagedList<AnnouncementEntity>> GetAnnouncementsAsync(int pageIndex = 0, int pageSize = int.MaxValue)
+        public async Task<IPagedList<Announcement>> GetAnnouncementsAsync(int pageIndex = 0, int pageSize = int.MaxValue)
 
         {
 
@@ -76,13 +77,13 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Services
 
             var query2 = query.OrderBy(b => b.IsActive).ToList();
 
-            var liveAnnouncementDomain = new PagedList<AnnouncementEntity>(query2, pageIndex, pageSize);
+            var liveAnnouncementDomain = new PagedList<Announcement>(query2, pageIndex, pageSize);
 
             return liveAnnouncementDomain;
 
         }
 
-        public async Task<AnnouncementEntity> GetAnnouncementDesignFirstAsync()
+        public async Task<Announcement> GetAnnouncementDesignFirstAsync()
 
         {
             var result = await _announcementRepository.GetAllAsync(query =>
@@ -105,7 +106,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Services
 
         }
 
-        public async Task<AnnouncementEntity> GetAnnouncementByIdAsync(int Id)
+        public async Task<Announcement> GetAnnouncementByIdAsync(int Id)
 
         {
 
diff --git a/Nop.Plugin.Misc.AuctionPlugin/Services/BidService.cs b/Nop.Plugin.Misc.AuctionPlugin/Services/AuctionService.cs
similarity index 75%
rename from Nop.Plugin.Misc.AuctionPlugin/Services/BidService.cs
rename to Nop.Plugin.Misc.AuctionPlugin/Services/AuctionService.cs
index 2383de7..3209522 100644
--- a/Nop.Plugin.Misc.AuctionPlugin/Services/BidService.cs
+++ b/Nop.Plugin.Misc.AuctionPlugin/Services/AuctionService.cs
@@ -2,13 +2,14 @@
 using Nop.Core.Caching;
 using Nop.Data;
 using Nop.Plugin.Misc.AuctionPlugin.Domains;
+using Nop.Plugin.Misc.AuctionPlugin.Domains.Entities;
 
 namespace Nop.Plugin.Misc.AuctionPlugin.Services;
 
 /// <summary>
 /// Store pickup point service
 /// </summary>
-public class BidService : IBidService
+public class AuctionService : IAuctionService
 {
     #region Constants
 
@@ -25,7 +26,7 @@ public class BidService : IBidService
 
     #region Fields
 
-    protected readonly IRepository<BidEntity> _customerBidRepository;
+    protected readonly IRepository<AuctionBid> _customerBidRepository;
     protected readonly IShortTermCacheManager _shortTermCacheManager;
     protected readonly IStaticCacheManager _staticCacheManager;
 
@@ -39,7 +40,7 @@ public class BidService : IBidService
     /// <param name="customerBidRepository">Store pickup point repository</param>
     /// <param name="shortTermCacheManager">Short term cache manager</param>
     /// <param name="staticCacheManager">Cache manager</param>
-    public BidService(IRepository<BidEntity> customerBidRepository,
+    public AuctionService(IRepository<AuctionBid> customerBidRepository,
         IShortTermCacheManager shortTermCacheManager,
         IStaticCacheManager staticCacheManager)
     {
@@ -62,9 +63,9 @@ public class BidService : IBidService
     /// A task that represents the asynchronous operation
     /// The task result contains the bids
     /// </returns>
-    public virtual async Task<IPagedList<BidEntity>> GetAllBidsAsync(int customerId = 0, int pageIndex = 0, int pageSize = int.MaxValue)
+    public virtual async Task<IPagedList<AuctionBid>> GetAllBidsAsync(int customerId = 0, int pageIndex = 0, int pageSize = int.MaxValue)
     {
-        var rez = new List<BidEntity>();
+        var rez = new List<AuctionBid>();
         //var rez = await _shortTermCacheManager.GetAsync(async () => await _customerBidRepository.GetAllAsync(query =>
         //{
         //    if (customerId > 0)
@@ -74,23 +75,23 @@ public class BidService : IBidService
         //    return query;
         //}), _pickupPointAllKey, customerId);
 
-        return new PagedList<BidEntity>(rez, pageIndex, pageSize);
+        return new PagedList<AuctionBid>(rez, pageIndex, pageSize);
     }
 
-    public virtual async Task<BidEntity> GetBidByIdAsync(int bidId)
+    public virtual async Task<AuctionBid> GetBidByIdAsync(int bidId)
     {
         return await _customerBidRepository.GetByIdAsync(bidId);
     }
 
-    public virtual async Task InsertBidAsync(BidEntity bid)
+    public virtual async Task InsertBidAsync(AuctionBid auctionBid)
     {
-        await _customerBidRepository.InsertAsync(bid, false);
+        await _customerBidRepository.InsertAsync(auctionBid, false);
         await _staticCacheManager.RemoveByPrefixAsync(AUCTION_PATTERN_KEY);
     }
 
-    public virtual async Task UpdateBidAsync(BidEntity bid)
+    public virtual async Task UpdateBidAsync(AuctionBid auctionBid)
     {
-        await _customerBidRepository.UpdateAsync(bid, false);
+        await _customerBidRepository.UpdateAsync(auctionBid, false);
         await _staticCacheManager.RemoveByPrefixAsync(AUCTION_PATTERN_KEY);
     }
 
@@ -99,7 +100,7 @@ public class BidService : IBidService
     /// </summary>
     /// <param name="pickupPoint">Pickup point</param>
     /// <returns>A task that represents the asynchronous operation</returns>
-    public virtual async Task DeleteBidAsync(BidEntity pickupPoint)
+    public virtual async Task DeleteBidAsync(AuctionBid 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 ed24e08..fa3d2fb 100644
--- a/Nop.Plugin.Misc.AuctionPlugin/Services/IAnnouncementService.cs
+++ b/Nop.Plugin.Misc.AuctionPlugin/Services/IAnnouncementService.cs
@@ -5,6 +5,7 @@ using Nop.Core;
 using Nop.Plugin.Misc.AuctionPlugin.Domains;
 
 using System.Collections.Generic;
+using Nop.Plugin.Misc.AuctionPlugin.Domains.Entities;
 
 namespace Nop.Plugin.Misc.AuctionPlugin.Services
 
@@ -13,17 +14,17 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Services
 
     {
 
-        public Task DeleteAsync(AnnouncementEntity announcement);
+        public Task DeleteAsync(Announcement announcement);
 
-        public Task InsertAsync(AnnouncementEntity announcement);
+        public Task InsertAsync(Announcement announcement);
 
-        public Task<bool> UpdateAsync(AnnouncementEntity announcement);
+        public Task<bool> UpdateAsync(Announcement announcement);
 
-        public Task<IPagedList<AnnouncementEntity>> GetAnnouncementsAsync(int pageIndex = 0, int pageSize = int.MaxValue);
+        public Task<IPagedList<Announcement>> GetAnnouncementsAsync(int pageIndex = 0, int pageSize = int.MaxValue);
 
-        public Task<AnnouncementEntity> GetAnnouncementDesignFirstAsync();
+        public Task<Announcement> GetAnnouncementDesignFirstAsync();
 
-        public Task<AnnouncementEntity> GetAnnouncementByIdAsync(int Id);
+        public Task<Announcement> GetAnnouncementByIdAsync(int Id);
 
     }
 
diff --git a/Nop.Plugin.Misc.AuctionPlugin/Services/IBidService.cs b/Nop.Plugin.Misc.AuctionPlugin/Services/IAuctionService.cs
similarity index 59%
rename from Nop.Plugin.Misc.AuctionPlugin/Services/IBidService.cs
rename to Nop.Plugin.Misc.AuctionPlugin/Services/IAuctionService.cs
index c016f53..e0a2393 100644
--- a/Nop.Plugin.Misc.AuctionPlugin/Services/IBidService.cs
+++ b/Nop.Plugin.Misc.AuctionPlugin/Services/IAuctionService.cs
@@ -1,12 +1,13 @@
 using Nop.Core;
 using Nop.Plugin.Misc.AuctionPlugin.Domains;
+using Nop.Plugin.Misc.AuctionPlugin.Domains.Entities;
 
 namespace Nop.Plugin.Misc.AuctionPlugin.Services;
 
 /// <summary>
 /// Store pickup point service interface
 /// </summary>
-public interface IBidService
+public interface IAuctionService
 {
     /// <summary>
     /// Gets all bids
@@ -18,17 +19,17 @@ public interface IBidService
     /// A task that represents the asynchronous operation
     /// The task result contains the bids
     /// </returns>
-    Task<IPagedList<BidEntity>> GetAllBidsAsync(int customerId = 0, int pageIndex = 0, int pageSize = int.MaxValue);
+    Task<IPagedList<AuctionBid>> GetAllBidsAsync(int customerId = 0, int pageIndex = 0, int pageSize = int.MaxValue);
 
    
-    Task<BidEntity> GetBidByIdAsync(int bidId);
+    Task<AuctionBid> GetBidByIdAsync(int bidId);
 
    
-    Task InsertBidAsync(BidEntity bidEntity);
+    Task InsertBidAsync(AuctionBid auctionBid);
 
    
-    Task UpdateBidAsync(BidEntity bid);
+    Task UpdateBidAsync(AuctionBid auctionBid);
 
   
-    Task DeleteBidAsync(BidEntity pickupPoint);
+    Task DeleteBidAsync(AuctionBid pickupPoint);
 }
\ No newline at end of file