From 92139ca32583ce4065f3b122a00720d4449a96ee Mon Sep 17 00:00:00 2001 From: Viltskaa Date: Sun, 26 Mar 2023 17:15:42 +0400 Subject: [PATCH] Add client to order --- .../SushiBarContracts/BindingModels/OrderBindingModel.cs | 1 + SushiBar/SushiBarContracts/ViewModels/OrderViewModel.cs | 8 +++++--- SushiBar/SushiBarDatabaseImplement/Models/Order.cs | 7 +++++++ SushiBar/SushiBarFileImplement/Models/Order.cs | 1 + SushiBar/SushiBarModels/Models/IOrderModel.cs | 1 + SushiBar/SushibarListImplement/Models/Order.cs | 1 + 6 files changed, 16 insertions(+), 3 deletions(-) diff --git a/SushiBar/SushiBarContracts/BindingModels/OrderBindingModel.cs b/SushiBar/SushiBarContracts/BindingModels/OrderBindingModel.cs index fc24db9..a0a2b1b 100644 --- a/SushiBar/SushiBarContracts/BindingModels/OrderBindingModel.cs +++ b/SushiBar/SushiBarContracts/BindingModels/OrderBindingModel.cs @@ -7,6 +7,7 @@ namespace SushiBarContracts.BindingModels { public int Id { get; set; } public int SushiId { get; set; } + public int ClientId { get; } public string SushiName { get; set; } = string.Empty; public int Count { get; set; } public double Sum { get; set; } diff --git a/SushiBar/SushiBarContracts/ViewModels/OrderViewModel.cs b/SushiBar/SushiBarContracts/ViewModels/OrderViewModel.cs index 046f8f6..10d3889 100644 --- a/SushiBar/SushiBarContracts/ViewModels/OrderViewModel.cs +++ b/SushiBar/SushiBarContracts/ViewModels/OrderViewModel.cs @@ -7,11 +7,13 @@ namespace SushiBarContracts.ViewModels public class OrderViewModel : IOrderModel { [DisplayName("Number")] - public int Id { get; set; } - public int SushiId { get; set; } + public int Id { get; init; } + + public int SushiId { get; init; } + public int ClientId { get; init; } [DisplayName("Name of Product")] - public string SushiName { get; set; } = string.Empty; + public string SushiName { get; init; } = string.Empty; [DisplayName("Count")] public int Count { get; set; } diff --git a/SushiBar/SushiBarDatabaseImplement/Models/Order.cs b/SushiBar/SushiBarDatabaseImplement/Models/Order.cs index 564399b..e9849b3 100644 --- a/SushiBar/SushiBarDatabaseImplement/Models/Order.cs +++ b/SushiBar/SushiBarDatabaseImplement/Models/Order.cs @@ -11,6 +11,8 @@ namespace SushiBarDatabaseImplement.Models public int Id { get; private set; } public int SushiId { get; private set; } + + public int ClientId { get; private set; } public string SushiName { get; private set; } = string.Empty; @@ -29,6 +31,8 @@ namespace SushiBarDatabaseImplement.Models public DateTime? DateImplement { get; private set; } public virtual Sushi Sushi { get; set; } + + public virtual Client Client { get; set; } public static Order? Create(OrderBindingModel? model) { @@ -42,6 +46,7 @@ namespace SushiBarDatabaseImplement.Models Id = model.Id, SushiId = model.SushiId, SushiName = model.SushiName, + ClientId = model.ClientId, Count = model.Count, Sum = model.Sum, Status = model.Status, @@ -59,6 +64,7 @@ namespace SushiBarDatabaseImplement.Models SushiId = model.SushiId; SushiName = model.SushiName; + ClientId = model.ClientId; Count = model.Count; Sum = model.Sum; Status = model.Status; @@ -71,6 +77,7 @@ namespace SushiBarDatabaseImplement.Models Id = Id, SushiId = SushiId, SushiName = SushiName, + ClientId = ClientId, Count = Count, Sum = Sum, Status = Status, diff --git a/SushiBar/SushiBarFileImplement/Models/Order.cs b/SushiBar/SushiBarFileImplement/Models/Order.cs index 35fa392..51796bc 100644 --- a/SushiBar/SushiBarFileImplement/Models/Order.cs +++ b/SushiBar/SushiBarFileImplement/Models/Order.cs @@ -11,6 +11,7 @@ namespace SushiBarFileImplement.Models public int Id { get; private set; } public string SushiName { get; private set; } = string.Empty; public int SushiId { get; private set; } + public int ClientId { get; } public int Count { get; private set; } public double Sum { get; private set; } public OrderStatus Status { get; private set; } = OrderStatus.Unknown; diff --git a/SushiBar/SushiBarModels/Models/IOrderModel.cs b/SushiBar/SushiBarModels/Models/IOrderModel.cs index 3770e12..7330013 100644 --- a/SushiBar/SushiBarModels/Models/IOrderModel.cs +++ b/SushiBar/SushiBarModels/Models/IOrderModel.cs @@ -5,6 +5,7 @@ namespace SushiBarDataModels.Models public interface IOrderModel : IId { int SushiId { get; } + int ClientId { get; } int Count { get; } double Sum { get; } OrderStatus Status { get; } diff --git a/SushiBar/SushibarListImplement/Models/Order.cs b/SushiBar/SushibarListImplement/Models/Order.cs index 2fdef34..98d5579 100644 --- a/SushiBar/SushibarListImplement/Models/Order.cs +++ b/SushiBar/SushibarListImplement/Models/Order.cs @@ -11,6 +11,7 @@ namespace SushibarListImplement.Models public int Id { get; private set; } public string SushiName { get; private set; } = string.Empty; public int SushiId { get; private set; } + public int ClientId { get; } public int Count { get; private set; } public double Sum { get; private set; } public OrderStatus Status { get; set; } = OrderStatus.Unknown;