From 049582dbc4f4e1be2451d344f70bda7ad92db46c Mon Sep 17 00:00:00 2001
From: ujijrujijr <ujijrujijr@mail.ru>
Date: Wed, 24 Apr 2024 21:39:13 +0400
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D1=81=D0=B2=D1=8F=D0=B7=D1=8C=20=D1=81=D0=BE=20=D1=81=D0=B1?=
 =?UTF-8?q?=D0=BE=D1=80=D0=BA=D0=BE=D0=B9=20=D0=BD=D0=B0=20=D1=83=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=BD=D1=8F=D1=85=20=D0=BC=D0=BE=D0=B4=D0=B5=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=B9=20=D0=B8=20=D0=BA=D0=BE=D0=BD=D1=82=D1=80=D0=B0?=
 =?UTF-8?q?=D0=BA=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BindingModels/RequestBindingModel.cs               |  3 +--
 .../SearchModels/RequestSearchModel.cs                 |  3 ++-
 ComputerShopContracts/ViewModels/RequestViewModel.cs   |  2 +-
 ComputerShopDataModels/Models/IRequestModel.cs         | 10 ++++------
 .../ComputerShopDatabaseImplement.csproj               | 10 ++++++----
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ComputerShopContracts/BindingModels/RequestBindingModel.cs b/ComputerShopContracts/BindingModels/RequestBindingModel.cs
index eef6ad9..6eb6316 100644
--- a/ComputerShopContracts/BindingModels/RequestBindingModel.cs
+++ b/ComputerShopContracts/BindingModels/RequestBindingModel.cs
@@ -13,8 +13,7 @@ namespace ComputerShopContracts.BindingModels
 
 		public int UserId { get; set; }
 
-		//!!!ДОБАВИТЬ ССЫЛКУ НА СБОРКУ
-
+		public int AssemblyId { get; set; }
 
 		public DateTime DateMake { get; set; } = DateTime.Now;
 
diff --git a/ComputerShopContracts/SearchModels/RequestSearchModel.cs b/ComputerShopContracts/SearchModels/RequestSearchModel.cs
index c696ba4..d63f114 100644
--- a/ComputerShopContracts/SearchModels/RequestSearchModel.cs
+++ b/ComputerShopContracts/SearchModels/RequestSearchModel.cs
@@ -11,7 +11,8 @@ namespace ComputerShopContracts.SearchModels
 		public int? Id { get; set; }
 		public int? UserId { get; set; }
 
-		//!!!ДОБАВИТЬ ПОИСК ПО СБОРКЕ (СУЩНОСТИ ОЛЕГА)
+		//поиск по сборкам
+		public int? AssemblyId { get; set; }
 
 		//!!!мб надо добавить поиск по заказам
 
diff --git a/ComputerShopContracts/ViewModels/RequestViewModel.cs b/ComputerShopContracts/ViewModels/RequestViewModel.cs
index dec0ec2..d420d64 100644
--- a/ComputerShopContracts/ViewModels/RequestViewModel.cs
+++ b/ComputerShopContracts/ViewModels/RequestViewModel.cs
@@ -19,7 +19,7 @@ namespace ComputerShopContracts.ViewModels
 
 		//!!!МБ ДОБАВИТЬ НИК ПОЛЬЗОВАТЕЛЯ, СОЗДАВШЕГО ЗАЯВКУ
 
-		//!!!МБ ДОБАВИТЬ ID СБОРКИ
+		public int AssemblyId { get; set; }
 
 		public Dictionary<int, IOrderModel> RequestOrders { get; set; } = new();
 
diff --git a/ComputerShopDataModels/Models/IRequestModel.cs b/ComputerShopDataModels/Models/IRequestModel.cs
index ed3c073..4c0dd4c 100644
--- a/ComputerShopDataModels/Models/IRequestModel.cs
+++ b/ComputerShopDataModels/Models/IRequestModel.cs
@@ -14,12 +14,10 @@ namespace ComputerShopDataModels.Models
 		//ID пользователя, создавшего заявку
 		int UserId { get; }
 
-
-
-
-
-		//!!!ДОБАВИТЬ ССЫЛКУ НА СБОРКУ ИЗ ЧАСТИ ОЛЕГА
-
+		/// <summary>
+		/// ID сборки
+		/// </summary>
+		int AssemblyId { get; }
 
 		Dictionary<int, IOrderModel> RequestOrders { get; }
 
diff --git a/ComputerShopDatabaseImplement/ComputerShopDatabaseImplement.csproj b/ComputerShopDatabaseImplement/ComputerShopDatabaseImplement.csproj
index b721344..e13cf1a 100644
--- a/ComputerShopDatabaseImplement/ComputerShopDatabaseImplement.csproj
+++ b/ComputerShopDatabaseImplement/ComputerShopDatabaseImplement.csproj
@@ -6,6 +6,12 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Remove="Implements\**" />
+    <EmbeddedResource Remove="Implements\**" />
+    <None Remove="Implements\**" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.18" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.18">
@@ -20,8 +26,4 @@
     <ProjectReference Include="..\ComputerShopDataModels\ComputerShopDataModels.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Implements\" />
-  </ItemGroup>
-
 </Project>