From 0334b81e8f3af18c4efaea356a0e756f6261c1fd Mon Sep 17 00:00:00 2001
From: malimova <nemarina73@list.ru>
Date: Fri, 29 Mar 2024 10:25:32 +0400
Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B5=D0=BB?=
 =?UTF-8?q?=D0=B0=D0=BB=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ConfectioneryDatabase.cs                  |  3 +-
 .../ConfectioneryDatabaseImplement/Order.cs   | 42 ++++++++++---------
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/Confectionery/ConfectioneryDatabaseImplement/ConfectioneryDatabase.cs b/Confectionery/ConfectioneryDatabaseImplement/ConfectioneryDatabase.cs
index e5bdf61..5447a27 100644
--- a/Confectionery/ConfectioneryDatabaseImplement/ConfectioneryDatabase.cs
+++ b/Confectionery/ConfectioneryDatabaseImplement/ConfectioneryDatabase.cs
@@ -15,8 +15,7 @@ namespace ConfectioneryDatabaseImplement
         {
             if (optionsBuilder.IsConfigured == false)
             {
-                optionsBuilder.UseSqlServer(@"Data Source=localhost\SQLEXPRESS;Initial Catalog=ConfectioneryDatabaseFull;Integrated
-                Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
+                optionsBuilder.UseSqlServer(@"Data Source=localhost\SQLEXPRESS;Initial Catalog=ConfectioneryDatabaseFull;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
             }
             base.OnConfiguring(optionsBuilder);
         }
diff --git a/Confectionery/ConfectioneryDatabaseImplement/Order.cs b/Confectionery/ConfectioneryDatabaseImplement/Order.cs
index d8ad1b6..8bd0ea9 100644
--- a/Confectionery/ConfectioneryDatabaseImplement/Order.cs
+++ b/Confectionery/ConfectioneryDatabaseImplement/Order.cs
@@ -14,34 +14,38 @@ namespace ConfectioneryDatabaseImplement.Models
     public class Order : IOrderModel
     {
         public int Id { get; private set; }
-        [Required]
-        public int Count { get; private set; }
-        [Required]
-        public double Sum { get; private set; }
-        [Required]
-        public OrderStatus Status { get; private set; }
-        [Required]
-        public DateTime DateCreate { get; private set; }
-        public DateTime? DateImplement { get; private set; }
+
         [Required]
         public int PastryId { get; private set; }
-        public virtual Pastry Pastry { get; private set; }
-        public static Order? Create(ConfectioneryDatabase context, OrderBindingModel model)
+
+        public virtual Pastry Pastry { get; set; } = new();
+
+        [Required]
+        public int Count { get; private set; }
+
+        [Required]
+        public double Sum { get; private set; }
+
+        [Required]
+        public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
+
+        [Required]
+        public DateTime DateCreate { get; private set; } = DateTime.Now;
+
+        public DateTime? DateImplement { get; private set; }
+
+        public static Order Create(ConfectioneryDatabase context, OrderBindingModel model)
         {
-            if (model == null)
-            {
-                return null;
-            }
             return new Order()
             {
                 Id = model.Id,
+                PastryId = model.PastryId,
+                Pastry = context.Pastrys.First(x => x.Id == model.PastryId),
                 Count = model.Count,
                 Sum = model.Sum,
                 Status = model.Status,
                 DateCreate = model.DateCreate,
                 DateImplement = model.DateImplement,
-                PastryId = model.PastryId,
-                Pastry = context.Pastrys.FirstOrDefault(x => x.Id == model.PastryId)
             };
         }
 
@@ -57,14 +61,14 @@ namespace ConfectioneryDatabaseImplement.Models
 
         public OrderViewModel GetViewModel => new()
         {
+            Id = Id,
             PastryId = PastryId,
+            PastryName = Pastry.PastryName,
             Count = Count,
             Sum = Sum,
             Status = Status,
             DateCreate = DateCreate,
             DateImplement = DateImplement,
-            PastryName = Pastry.PastryName,
-            Id = Id,
         };
     }
 }