diff --git a/LuminousSales/Business/Business/Interfaces/ISalesController.cs b/LuminousSales/Business/Business/Interfaces/ISalesController.cs index 1b6e2fe..1305bfb 100644 --- a/LuminousSales/Business/Business/Interfaces/ISalesController.cs +++ b/LuminousSales/Business/Business/Interfaces/ISalesController.cs @@ -8,7 +8,7 @@ namespace Business.Business.Sales { ICollection GetAll(); T Get(int id); - ICollection GetByTime(byte[] startPeriod, byte[] endPeriod); + ICollection GetByTime(DateTime time); void Add(int productId, double Amount); void Add(string productName, double Amount); void Delete(int id); diff --git a/LuminousSales/Business/Business/Sales/StockController.cs b/LuminousSales/Business/Business/Sales/StockController.cs index 4632ba5..62f132d 100644 --- a/LuminousSales/Business/Business/Sales/StockController.cs +++ b/LuminousSales/Business/Business/Sales/StockController.cs @@ -8,11 +8,30 @@ using Models.Models; namespace Business.Business.Sales { - public class StockController : IStockController + public class StockController : ISalesController { private LuminousContext context; - + Product ISalesController.Get(int id) + { + return context.Product.Find(id); + } + ICollection ISalesController.GetByTime(DateTime time) + { + throw new NotImplementedException(); + } + void ISalesController.Add(int productId, double Amount) + { + throw new NotImplementedException(); + } + void ISalesController.Add(string productName, double Amount) + { + throw new NotImplementedException(); + } + void ISalesController.Delete(int id) + { + throw new NotImplementedException(); + } public ICollection GetAll() { using (context = new LuminousContext()) @@ -21,15 +40,6 @@ namespace Business.Business.Sales } } - - public Product GetById(int id) - { - using (context = new LuminousContext()) - { - return context.Product.Find(id); - } - } - public void AddProduct(Product product) { using (context = new LuminousContext()) @@ -41,8 +51,7 @@ namespace Business.Business.Sales } } - - public void LoadProductById(int id) + public void LoadProduct(int id) { using (context = new LuminousContext()) { @@ -55,7 +64,7 @@ namespace Business.Business.Sales } } - public void LoadProductByName(Product product) + public void LoadProduct(Product product) { using (context = new LuminousContext()) { @@ -93,11 +102,6 @@ namespace Business.Business.Sales } } } - - public Product GetByName(string name) - { - throw new NotImplementedException(); - } } } diff --git a/LuminousSales/Models/Data.csproj b/LuminousSales/Models/Data.csproj index 0cd4ad8..cc61d3b 100644 --- a/LuminousSales/Models/Data.csproj +++ b/LuminousSales/Models/Data.csproj @@ -4,6 +4,13 @@ netstandard2.1 + + + + + + + @@ -18,4 +25,8 @@ + + + + diff --git a/LuminousSales/Models/Migrations/20210318105825_init.Designer.cs b/LuminousSales/Models/Migrations/20210318193112_init.Designer.cs similarity index 92% rename from LuminousSales/Models/Migrations/20210318105825_init.Designer.cs rename to LuminousSales/Models/Migrations/20210318193112_init.Designer.cs index f835cde..4033470 100644 --- a/LuminousSales/Models/Migrations/20210318105825_init.Designer.cs +++ b/LuminousSales/Models/Migrations/20210318193112_init.Designer.cs @@ -10,7 +10,7 @@ using Models; namespace Data.Migrations { [DbContext(typeof(LuminousContext))] - [Migration("20210318105825_init")] + [Migration("20210318193112_init")] partial class init { protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -34,11 +34,8 @@ namespace Data.Migrations b.Property("ProductId") .HasColumnType("int"); - b.Property("Time") - .IsConcurrencyToken() - .IsRequired() - .ValueGeneratedOnAddOrUpdate() - .HasColumnType("rowversion"); + b.Property("Time") + .HasColumnType("datetime2"); b.Property("UserId") .HasColumnType("int"); @@ -109,11 +106,8 @@ namespace Data.Migrations b.Property("ProductId") .HasColumnType("int"); - b.Property("Time") - .IsConcurrencyToken() - .IsRequired() - .ValueGeneratedOnAddOrUpdate() - .HasColumnType("rowversion"); + b.Property("Time") + .HasColumnType("datetime2"); b.Property("UserId") .HasColumnType("int"); diff --git a/LuminousSales/Models/Migrations/20210318105825_init.cs b/LuminousSales/Models/Migrations/20210318193112_init.cs similarity index 97% rename from LuminousSales/Models/Migrations/20210318105825_init.cs rename to LuminousSales/Models/Migrations/20210318193112_init.cs index ec2bf8f..e964aea 100644 --- a/LuminousSales/Models/Migrations/20210318105825_init.cs +++ b/LuminousSales/Models/Migrations/20210318193112_init.cs @@ -65,7 +65,7 @@ namespace Data.Migrations UserId = table.Column(nullable: false), ProductId = table.Column(nullable: false), Amount = table.Column(nullable: false), - Time = table.Column(rowVersion: true, nullable: false) + Time = table.Column(nullable: false) }, constraints: table => { @@ -93,7 +93,7 @@ namespace Data.Migrations UserId = table.Column(nullable: false), ProductId = table.Column(nullable: false), Amount = table.Column(nullable: false), - Time = table.Column(rowVersion: true, nullable: false) + Time = table.Column(nullable: false) }, constraints: table => { diff --git a/LuminousSales/Models/Migrations/LuminousContextModelSnapshot.cs b/LuminousSales/Models/Migrations/LuminousContextModelSnapshot.cs index 05368e7..fcbad47 100644 --- a/LuminousSales/Models/Migrations/LuminousContextModelSnapshot.cs +++ b/LuminousSales/Models/Migrations/LuminousContextModelSnapshot.cs @@ -32,11 +32,8 @@ namespace Data.Migrations b.Property("ProductId") .HasColumnType("int"); - b.Property("Time") - .IsConcurrencyToken() - .IsRequired() - .ValueGeneratedOnAddOrUpdate() - .HasColumnType("rowversion"); + b.Property("Time") + .HasColumnType("datetime2"); b.Property("UserId") .HasColumnType("int"); @@ -107,11 +104,8 @@ namespace Data.Migrations b.Property("ProductId") .HasColumnType("int"); - b.Property("Time") - .IsConcurrencyToken() - .IsRequired() - .ValueGeneratedOnAddOrUpdate() - .HasColumnType("rowversion"); + b.Property("Time") + .HasColumnType("datetime2"); b.Property("UserId") .HasColumnType("int"); diff --git a/LuminousSales/Models/Models/Base/BaseSales.cs b/LuminousSales/Models/Models/Base/BaseSales.cs index 6135325..3fbf1f1 100644 --- a/LuminousSales/Models/Models/Base/BaseSales.cs +++ b/LuminousSales/Models/Models/Base/BaseSales.cs @@ -33,8 +33,8 @@ namespace Data.Base public virtual Product Products { get; set; } [Required] public double Amount { get; set; } - [Timestamp] + // [DataType(DataType.DateTime)] [Required] - public byte[] Time { get; set; } + public DateTime Time { get; set; } } }