From 584401e1d64b30807709fd34f7974b875097bc9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=BE=D0=BB=D0=B0=D0=B9?= Date: Sun, 12 Feb 2023 15:55:52 +0400 Subject: [PATCH] fix --- .../Implements/OrderStorage.cs | 1 - .../FoodOrdersFileImplement/Models/Dish.cs | 6 +++--- .../FoodOrdersFileImplement/Models/Order.cs | 17 +++++------------ 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/FoodOrders/FoodOrdersFileImplement/Implements/OrderStorage.cs b/FoodOrders/FoodOrdersFileImplement/Implements/OrderStorage.cs index 1024b80..f27af04 100644 --- a/FoodOrders/FoodOrdersFileImplement/Implements/OrderStorage.cs +++ b/FoodOrders/FoodOrdersFileImplement/Implements/OrderStorage.cs @@ -2,7 +2,6 @@ using FoodOrdersContracts.SearchModels; using FoodOrdersContracts.StoragesContracts; using FoodOrdersContracts.ViewModels; -using FoodOrdersFileImplement; using FoodOrdersFileImplement.Models; namespace FoodOrdersFileImplement.Implements diff --git a/FoodOrders/FoodOrdersFileImplement/Models/Dish.cs b/FoodOrders/FoodOrdersFileImplement/Models/Dish.cs index cbe04fb..fb355f3 100644 --- a/FoodOrders/FoodOrdersFileImplement/Models/Dish.cs +++ b/FoodOrders/FoodOrdersFileImplement/Models/Dish.cs @@ -84,11 +84,11 @@ namespace FoodOrdersFileImplement.Models new XElement("DishName", DishName), new XElement("Price", Price.ToString()), new XElement("DishComponents", Components.Select(x => - new XElement("DishComponent", + new XElement("DishComponent", - new XElement("Key", x.Key), + new XElement("Key", x.Key), - new XElement("Value", x.Value))) + new XElement("Value", x.Value))) .ToArray())); } diff --git a/FoodOrders/FoodOrdersFileImplement/Models/Order.cs b/FoodOrders/FoodOrdersFileImplement/Models/Order.cs index 695c825..4dafdb7 100644 --- a/FoodOrders/FoodOrdersFileImplement/Models/Order.cs +++ b/FoodOrders/FoodOrdersFileImplement/Models/Order.cs @@ -23,23 +23,16 @@ namespace FoodOrdersFileImplement.Models { return null; } - var order = new Order() + return new Order() { Id = Convert.ToInt32(element.Attribute("Id")!.Value), DishId = Convert.ToInt32(element.Element("DishId")!.Value), - Count = Convert.ToInt32(element.Element("Count")!.Value), Sum = Convert.ToDouble(element.Element("Sum")!.Value), - DateCreate = DateTime.ParseExact(element.Element("DateCreate")!.Value, "G", null), + Count = Convert.ToInt32(element.Element("Count")!.Value), + Status = (OrderStatus)Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value), + DateCreate = Convert.ToDateTime(element.Element("DateCreate")!.Value), + DateImplement = string.IsNullOrEmpty(element.Element("DateImplement")!.Value) ? null : Convert.ToDateTime(element.Element("DateImplement")!.Value) }; - DateTime.TryParse(element.Element("DateImplement")!.Value, out DateTime dateImpl); - order.DateImplement = dateImpl; - - if (!Enum.TryParse(element.Element("Status")!.Value, out OrderStatus status)) - { - return null; - } - order.Status = status; - return order; } public static Order? Create(OrderBindingModel? model)