From 0396a7c4756a98aeff1fb820aa43a396578352b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=95=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=91=D0=B0=D0=BA=D0=B0?=
 =?UTF-8?q?=D0=BB=D1=8C=D1=81=D0=BA=D0=B0=D1=8F?= <elina_kallin@mail.ru>
Date: Fri, 17 May 2024 22:32:53 +0400
Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?=
 =?UTF-8?q?=D0=B0=20Id=20=D0=B2=20=D0=BC=D0=B5=D1=81=D1=81=D0=B5=D0=B4?=
 =?UTF-8?q?=D0=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BindingModel/MessageInfoBindingModel.cs            |  1 +
 SushiBarContracts/ViewModels/MessageInfoViewModel.cs   | 10 +++-------
 SushiBarDataModels/IMessageInfoModel.cs                |  2 +-
 SushiBarDatabaseImplement/Models/MessageInfo.cs        |  4 ++++
 SushiBarFileImplement/Models/MessageInfo.cs            |  2 ++
 SushiBarListImplements/Models/MessageInfo.cs           |  1 +
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/SushiBarContracts/BindingModel/MessageInfoBindingModel.cs b/SushiBarContracts/BindingModel/MessageInfoBindingModel.cs
index 9e4b824..14877d4 100644
--- a/SushiBarContracts/BindingModel/MessageInfoBindingModel.cs
+++ b/SushiBarContracts/BindingModel/MessageInfoBindingModel.cs
@@ -3,6 +3,7 @@ namespace SushiBarContracts.BindingModel
 {
     public class MessageInfoBindingModel : IMessageInfoModel
     {
+        public int Id { get; set; }
         public string MessageId { get; set; } = string.Empty;
 
         public int? ClientId { get; set; }
diff --git a/SushiBarContracts/ViewModels/MessageInfoViewModel.cs b/SushiBarContracts/ViewModels/MessageInfoViewModel.cs
index 83eaa08..9b5ce0b 100644
--- a/SushiBarContracts/ViewModels/MessageInfoViewModel.cs
+++ b/SushiBarContracts/ViewModels/MessageInfoViewModel.cs
@@ -1,17 +1,13 @@
 using SushiBarContracts.Attributes;
 using SushiBarDataModels;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SushiBarContracts.ViewModels
 {
     public class MessageInfoViewModel : IMessageInfoModel
     {
+        [Column(visible: false)]
+        public int Id { get; set; }
+
         [Column(visible: false)]
         public string MessageId { get; set; } = string.Empty;
 
diff --git a/SushiBarDataModels/IMessageInfoModel.cs b/SushiBarDataModels/IMessageInfoModel.cs
index e922f0d..c67282a 100644
--- a/SushiBarDataModels/IMessageInfoModel.cs
+++ b/SushiBarDataModels/IMessageInfoModel.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace SushiBarDataModels
 {
-    public interface IMessageInfoModel
+    public interface IMessageInfoModel : IId
     {
         string MessageId { get; }
         int? ClientId { get; }
diff --git a/SushiBarDatabaseImplement/Models/MessageInfo.cs b/SushiBarDatabaseImplement/Models/MessageInfo.cs
index f6c558e..c0814ad 100644
--- a/SushiBarDatabaseImplement/Models/MessageInfo.cs
+++ b/SushiBarDatabaseImplement/Models/MessageInfo.cs
@@ -2,6 +2,7 @@
 using SushiBarContracts.ViewModels;
 using SushiBarDataModels;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 using System.Runtime.Serialization;
 
 namespace SushiBarDatabaseImplement.Models
@@ -9,6 +10,9 @@ namespace SushiBarDatabaseImplement.Models
     [DataContract]
     public class MessageInfo : IMessageInfoModel
     {
+        [NotMapped]
+        public int Id { get; set; }
+
         [DataMember]
         [Key]
         public string MessageId { get; set; } = string.Empty;
diff --git a/SushiBarFileImplement/Models/MessageInfo.cs b/SushiBarFileImplement/Models/MessageInfo.cs
index 750ded9..b91602d 100644
--- a/SushiBarFileImplement/Models/MessageInfo.cs
+++ b/SushiBarFileImplement/Models/MessageInfo.cs
@@ -9,6 +9,8 @@ namespace SushiBarFileImplement.Models
     [DataContract]
     public class MessageInfo : IMessageInfoModel
     {
+        [DataMember]
+        public int Id { get; set; }
         [DataMember]
         public string MessageId { get; set; } = string.Empty;
 
diff --git a/SushiBarListImplements/Models/MessageInfo.cs b/SushiBarListImplements/Models/MessageInfo.cs
index 691dc0d..a07d916 100644
--- a/SushiBarListImplements/Models/MessageInfo.cs
+++ b/SushiBarListImplements/Models/MessageInfo.cs
@@ -6,6 +6,7 @@ namespace SushiBarListImplements.Models
 {
     public class MessageInfo : IMessageInfoModel
     {
+        public int Id { get; set; }
         public string MessageId { get; set; } = string.Empty;
 
         public int? ClientId { get; set; }