diff --git a/ConfectionaryFileImplement/Order.cs b/ConfectionaryFileImplement/Order.cs index ce5c0ed..d3067f1 100644 --- a/ConfectionaryFileImplement/Order.cs +++ b/ConfectionaryFileImplement/Order.cs @@ -45,15 +45,16 @@ namespace ConfectioneryFileImplement.Models { return null; } + var dateImplement = element.Element("DateImplement")!.Value; return new() { - Id = Convert.ToInt32(element.Attribute("Id")), - Sum = Convert.ToDouble(element.Element("Sum")), - Count = Convert.ToInt32(element.Element("Count")), - Status = (OrderStatus)Convert.ToInt32(element.Element("Status")), - PastryId = Convert.ToInt32(element.Element("PastryId")), - DateCreate = Convert.ToDateTime(element.Element("DateCreate")), - DateImplement = Convert.ToDateTime(element.Element("DateImplement")), + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + Sum = Convert.ToDouble(element.Element("Sum")!.Value), + Count = Convert.ToInt32(element.Element("Count")!.Value), + Status = (OrderStatus)Convert.ToInt32(element.Element("Status")!.Value), + PastryId = Convert.ToInt32(element.Element("PastryId")!.Value), + DateCreate = Convert.ToDateTime(element.Element("DateCreate")!.Value), + DateImplement = string.IsNullOrEmpty(dateImplement) ? null : Convert.ToDateTime(dateImplement), }; }