diff --git a/Shipyard/ShipyardDataBaseImplement/Implements/OrderStorage.cs b/Shipyard/ShipyardDataBaseImplement/Implements/OrderStorage.cs index 8369eda..be227d3 100644 --- a/Shipyard/ShipyardDataBaseImplement/Implements/OrderStorage.cs +++ b/Shipyard/ShipyardDataBaseImplement/Implements/OrderStorage.cs @@ -1,4 +1,5 @@ -using ShipyardContracts.BindingModels; +using Microsoft.EntityFrameworkCore; +using ShipyardContracts.BindingModels; using ShipyardContracts.SearchModels; using ShipyardContracts.StoragesContracts; using ShipyardContracts.ViewModels; @@ -65,17 +66,8 @@ namespace ShipyardDataBaseImplement.Implements { using var context = new ShipyardDataBase(); return context.Orders - .Select(x => new OrderViewModel - { - Id = x.Id, - ShipId = x.ShipId, - Count = x.Count, - Sum = x.Sum, - Status = x.Status, - DateCreate = x.DateCreate, - DateImplement = x.DateImplement, - ShipName = x.Ship.ShipName - }) + .Include(x => x.Ship) + .Select(x => x.GetViewModel) .ToList(); } diff --git a/Shipyard/ShipyardDataBaseImplement/Models/Order.cs b/Shipyard/ShipyardDataBaseImplement/Models/Order.cs index a3cc7bd..b1d8d01 100644 --- a/Shipyard/ShipyardDataBaseImplement/Models/Order.cs +++ b/Shipyard/ShipyardDataBaseImplement/Models/Order.cs @@ -27,7 +27,7 @@ namespace ShipyardDataBaseImplement.Models public DateTime? DateImplement { get; set; } public int Id { get; set; } - public Ship? Ship { get; set; } + public virtual Ship Ship { get; set; } public static Order? Create(OrderBindingModel? model) { if (model == null) @@ -64,7 +64,8 @@ namespace ShipyardDataBaseImplement.Models Sum = Sum, Status = Status, DateCreate = DateCreate, - DateImplement = DateImplement + DateImplement = DateImplement, + ShipName=Ship.ShipName }; } }