From 51c263ca230fd2296f14d941d3e0bfb262fe37bc Mon Sep 17 00:00:00 2001
From: Zakharov_Rostislav <r.z.8102.80@gmail.com>
Date: Mon, 25 Mar 2024 21:46:50 +0400
Subject: [PATCH] lab-3 it is finish

---
 ...Designer.cs => 20240325174141_InitialCreate.Designer.cs} | 2 +-
 ...611_InitialCreate.cs => 20240325174141_InitialCreate.cs} | 0
 .../BlacksmithWorkshopDatabaseImplement/Models/Order.cs     | 6 +++---
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Migrations/{20240324164611_InitialCreate.Designer.cs => 20240325174141_InitialCreate.Designer.cs} (99%)
 rename BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Migrations/{20240324164611_InitialCreate.cs => 20240325174141_InitialCreate.cs} (100%)

diff --git a/BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Migrations/20240324164611_InitialCreate.Designer.cs b/BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Migrations/20240325174141_InitialCreate.Designer.cs
similarity index 99%
rename from BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Migrations/20240324164611_InitialCreate.Designer.cs
rename to BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Migrations/20240325174141_InitialCreate.Designer.cs
index 1629012..4643766 100644
--- a/BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Migrations/20240324164611_InitialCreate.Designer.cs
+++ b/BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Migrations/20240325174141_InitialCreate.Designer.cs
@@ -12,7 +12,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 namespace BlacksmithWorkshopDatabaseImplement.Migrations
 {
     [DbContext(typeof(BlacksmithWorkshopDataBase))]
-    [Migration("20240324164611_InitialCreate")]
+    [Migration("20240325174141_InitialCreate")]
     partial class InitialCreate
     {
         /// <inheritdoc />
diff --git a/BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Migrations/20240324164611_InitialCreate.cs b/BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Migrations/20240325174141_InitialCreate.cs
similarity index 100%
rename from BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Migrations/20240324164611_InitialCreate.cs
rename to BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Migrations/20240325174141_InitialCreate.cs
diff --git a/BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Models/Order.cs b/BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Models/Order.cs
index 8a5b48d..4d6fd5b 100644
--- a/BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Models/Order.cs
+++ b/BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Models/Order.cs
@@ -25,9 +25,9 @@ namespace BlacksmithWorkshopDatabaseImplement.Models
         public DateTime? DateImplement { get; private set; }
         [Required]
         public int ManufactureId { get; private set; }
-        public virtual Manufacture Manufacture { get; set; } = new();
+        public virtual Manufacture? Manufacture { get; set; }
 
-        public static Order? Create(OrderBindingModel model)
+        public static Order Create(OrderBindingModel model)
         {
             return new Order()
             {
@@ -52,7 +52,7 @@ namespace BlacksmithWorkshopDatabaseImplement.Models
         public OrderViewModel GetViewModel => new()
         {
             ManufactureId = ManufactureId,
-            ManufactureName = Manufacture.ManufactureName,
+            ManufactureName = Manufacture?.ManufactureName ?? string.Empty,
             Count = Count,
             Sum = Sum,
             Status = Status,