diff --git a/SewingDresses/SewingDressesDatabaseImplement/Implements/OrderStorage.cs b/SewingDresses/SewingDressesDatabaseImplement/Implements/OrderStorage.cs index c4061a6..b482b0e 100644 --- a/SewingDresses/SewingDressesDatabaseImplement/Implements/OrderStorage.cs +++ b/SewingDresses/SewingDressesDatabaseImplement/Implements/OrderStorage.cs @@ -11,7 +11,7 @@ namespace SewingDressesDatabaseImplement.Implements public List GetFullList() { using var context = new SewingDressesDatabase(); - return context.Orders.Select(x => AcessDressesStorage(x.GetViewModel)).ToList(); + return context.Orders.Select(x => AcessDressesStorage(x.GetViewModel, context)).ToList(); } public List GetFilteredList(OrderSearchModel model) { @@ -20,7 +20,7 @@ namespace SewingDressesDatabaseImplement.Implements return new(); } using var context = new SewingDressesDatabase(); - return context.Orders.Where(x => x.Id == model.Id).Select(x => AcessDressesStorage(x.GetViewModel)).ToList(); + return context.Orders.Where(x => x.Id == model.Id).Select(x => AcessDressesStorage(x.GetViewModel, context)).ToList(); } public OrderViewModel? GetElement(OrderSearchModel model) { @@ -29,7 +29,7 @@ namespace SewingDressesDatabaseImplement.Implements return null; } using var context = new SewingDressesDatabase(); - return AcessDressesStorage(context.Orders.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel); + return AcessDressesStorage(context.Orders.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel, context); } public OrderViewModel? Insert(OrderBindingModel model) { @@ -41,7 +41,7 @@ namespace SewingDressesDatabaseImplement.Implements using var context = new SewingDressesDatabase(); context.Orders.Add(order); context.SaveChanges(); - return AcessDressesStorage(order.GetViewModel); + return AcessDressesStorage(order.GetViewModel, context); } public OrderViewModel? Update(OrderBindingModel model) @@ -55,7 +55,7 @@ namespace SewingDressesDatabaseImplement.Implements } order.Update(model); context.SaveChanges(); - return AcessDressesStorage(order.GetViewModel); + return AcessDressesStorage(order.GetViewModel, context); } public OrderViewModel? Delete(OrderBindingModel model) @@ -68,15 +68,14 @@ namespace SewingDressesDatabaseImplement.Implements } context.Orders.Remove(element); context.SaveChanges(); - return AcessDressesStorage(element.GetViewModel); + return AcessDressesStorage(element.GetViewModel, context); } - public static OrderViewModel? AcessDressesStorage(OrderViewModel? model) + public static OrderViewModel? AcessDressesStorage(OrderViewModel? model, SewingDressesDatabase context) { if (model == null) { return null; } - using var context = new SewingDressesDatabase(); var dress = context.Dresses.FirstOrDefault(x => x.Id == model.DressId); if (dress == null) {