From 27d772da25197c92352f7c5c4562225078f96655 Mon Sep 17 00:00:00 2001
From: ujijrujijr <ujijrujijr@mail.ru>
Date: Wed, 17 Apr 2024 19:13:58 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=B0=D0=BB=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81?=
 =?UTF-8?q?=D1=8B=20=D0=BC=D0=BE=D0=B4=D0=B5=D0=BB=D0=B5=D0=B9,=20=D0=BD?=
 =?UTF-8?q?=D0=B0=D1=87=D0=B0=D0=BB=20=D0=B4=D0=B5=D0=BB=D0=B0=D1=82=D1=8C?=
 =?UTF-8?q?=20=D1=81=D0=BB=D0=BE=D0=B9=20=D0=BA=D0=BE=D0=BD=D1=82=D1=80?=
 =?UTF-8?q?=D0=B0=D0=BA=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BindingModels/ShipmentBindingModel.cs           | 13 +++++++++++++
 ComputerShopContracts/ComputerShopContracts.csproj  |  4 ----
 .../Models/{IOrder.cs => IOrderModel.cs}            |  6 +++---
 .../Models/{IRequest.cs => IRequestModel.cs}        |  2 +-
 .../Models/{IShipment.cs => IShipmentModel.cs}      |  2 +-
 5 files changed, 18 insertions(+), 9 deletions(-)
 create mode 100644 ComputerShopContracts/BindingModels/ShipmentBindingModel.cs
 rename ComputerShopDataModels/Models/{IOrder.cs => IOrderModel.cs} (87%)
 rename ComputerShopDataModels/Models/{IRequest.cs => IRequestModel.cs} (95%)
 rename ComputerShopDataModels/Models/{IShipment.cs => IShipmentModel.cs} (93%)

diff --git a/ComputerShopContracts/BindingModels/ShipmentBindingModel.cs b/ComputerShopContracts/BindingModels/ShipmentBindingModel.cs
new file mode 100644
index 0000000..3479ea9
--- /dev/null
+++ b/ComputerShopContracts/BindingModels/ShipmentBindingModel.cs
@@ -0,0 +1,13 @@
+using ComputerShopDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ComputerShopContracts.BindingModels
+{
+	public class ShipmentBindingModel : IShipmentModel
+	{
+	}
+}
diff --git a/ComputerShopContracts/ComputerShopContracts.csproj b/ComputerShopContracts/ComputerShopContracts.csproj
index 351e363..ac0c524 100644
--- a/ComputerShopContracts/ComputerShopContracts.csproj
+++ b/ComputerShopContracts/ComputerShopContracts.csproj
@@ -10,8 +10,4 @@
     <ProjectReference Include="..\ComputerShopDataModels\ComputerShopDataModels.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="BindingModels\" />
-  </ItemGroup>
-
 </Project>
diff --git a/ComputerShopDataModels/Models/IOrder.cs b/ComputerShopDataModels/Models/IOrderModel.cs
similarity index 87%
rename from ComputerShopDataModels/Models/IOrder.cs
rename to ComputerShopDataModels/Models/IOrderModel.cs
index 067aaad..f5a66f8 100644
--- a/ComputerShopDataModels/Models/IOrder.cs
+++ b/ComputerShopDataModels/Models/IOrderModel.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace ComputerShopDataModels.Models
 {
-	public interface IOrder : IId
+	public interface IOrderModel : IId
 	{
 		//ID пользователя, который создал заказ
 		int UserId { get; }
@@ -15,7 +15,7 @@ namespace ComputerShopDataModels.Models
 		/// <summary>
 		/// Заявки в заказе (может не быть)
 		/// </summary>
-		Dictionary<int, IRequest>? OrderRequests { get; }
+		Dictionary<int, IRequestModel>? OrderRequests { get; }
 
 		//!!!УДАЛИТЬ
 		//ID заявки (может быть пустым)
@@ -28,7 +28,7 @@ namespace ComputerShopDataModels.Models
 		/// <summary>
 		/// Партии товаров в заказе (может не быть)
 		/// </summary>
-		Dictionary<int, IShipment>? OrderShipments {  get; } 
+		Dictionary<int, IShipmentModel>? OrderShipments {  get; } 
 
 
 
diff --git a/ComputerShopDataModels/Models/IRequest.cs b/ComputerShopDataModels/Models/IRequestModel.cs
similarity index 95%
rename from ComputerShopDataModels/Models/IRequest.cs
rename to ComputerShopDataModels/Models/IRequestModel.cs
index 03ec143..253f184 100644
--- a/ComputerShopDataModels/Models/IRequest.cs
+++ b/ComputerShopDataModels/Models/IRequestModel.cs
@@ -9,7 +9,7 @@ namespace ComputerShopDataModels.Models
 	/// <summary>
 	/// Заявка
 	/// </summary>
-	public interface IRequest : IId
+	public interface IRequestModel : IId
 	{
 		//ID пользователя, создавшего заявку
 		int UserId { get; }
diff --git a/ComputerShopDataModels/Models/IShipment.cs b/ComputerShopDataModels/Models/IShipmentModel.cs
similarity index 93%
rename from ComputerShopDataModels/Models/IShipment.cs
rename to ComputerShopDataModels/Models/IShipmentModel.cs
index ecf3913..704647d 100644
--- a/ComputerShopDataModels/Models/IShipment.cs
+++ b/ComputerShopDataModels/Models/IShipmentModel.cs
@@ -9,7 +9,7 @@ namespace ComputerShopDataModels.Models
 	/// <summary>
 	/// Поставка товара
 	/// </summary>
-	public interface IShipment : IId
+	public interface IShipmentModel : IId
 	{
 		//ID пользователя, создавшего поставку
 		int UserId { get; }