diff --git a/BlacksmithWorkshop/BlacksmithWorkshopFileImplement/Implements/OrderStorage.cs b/BlacksmithWorkshop/BlacksmithWorkshopFileImplement/Implements/OrderStorage.cs index 0e684e3..1bb4b75 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshopFileImplement/Implements/OrderStorage.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshopFileImplement/Implements/OrderStorage.cs @@ -14,18 +14,16 @@ namespace BlacksmithWorkshopFileImplement.Implements { source = DataFileSingleton.GetInstance(); } + private OrderViewModel AddManufactureName (OrderViewModel model) + { + model.ManufactureName = source.Manufactures.SingleOrDefault(x => x.Id == model.ManufactureId)?.ManufactureName ?? string.Empty; + return model; + } public List GetFullList() { - List orderList = new(); - orderList = source.Orders - .Select(x => x.GetViewModel) + return source.Orders + .Select(x => AddManufactureName(x.GetViewModel)) .ToList(); - foreach (var order in orderList) - { - var manufactureName = source.Manufactures.SingleOrDefault(x => x.Id == order.ManufactureId)?.ManufactureName ?? string.Empty; - order.ManufactureName = manufactureName; - } - return orderList; } public List GetFilteredList(OrderSearchModel model) { @@ -33,17 +31,10 @@ namespace BlacksmithWorkshopFileImplement.Implements { return new(); } - List orderList = new(); - orderList = source.Orders + return source.Orders .Where(x => x.Id == model.Id) - .Select(x => x.GetViewModel) + .Select(x => AddManufactureName(x.GetViewModel)) .ToList(); - foreach (var order in orderList) - { - var manufactureName = source.Manufactures.SingleOrDefault(x => x.Id == order.ManufactureId)?.ManufactureName ?? string.Empty; - order.ManufactureName = manufactureName; - } - return orderList; } public OrderViewModel? GetElement(OrderSearchModel model) {