Serxionaft/PIbd-21_KozyrevSS_SewingDresses_Base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PIbd-21 Lab3-Hard KozyrevSS SewingDresses #14

Closed
Serxionaft wants to merge 5 commits from Lab3-Hard into Lab2-Hard
pull from: Lab3-Hard
merge into: Serxionaft:Lab2-Hard
Conversation 1 Commits 5 Files Changed 20 +7 -8
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 10e49e048a - Show all commits

15
SewingDresses/SewingDressesDatabaseImplement/Implements/OrderStorage.cs
View File

@ -11,7 +11,7 @@ namespace SewingDressesDatabaseImplement.Implements
public List<OrderViewModel?> 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<OrderViewModel?> 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)
{