tochno

.gitignore

@@ -13,6 +13,7 @@
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
+ImplementationExtensions
 
 # Mono auto generated files
 mono_crash.*

SushiBar/SushiBar/FormMail.Designer.cs

@@ -0,0 +1,119 @@
+namespace SushiBarView
+{
+	partial class FormMail
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+            this.textBoxHead = new System.Windows.Forms.TextBox();
+            this.textBoxBody = new System.Windows.Forms.TextBox();
+            this.button1 = new System.Windows.Forms.Button();
+            this.button2 = new System.Windows.Forms.Button();
+            this.labelHead = new System.Windows.Forms.Label();
+            this.labelAnswer = new System.Windows.Forms.Label();
+            this.SuspendLayout();
+            // 
+            // textBoxHead
+            // 
+            this.textBoxHead.Location = new System.Drawing.Point(82, 7);
+            this.textBoxHead.Name = "textBoxHead";
+            this.textBoxHead.Size = new System.Drawing.Size(400, 23);
+            this.textBoxHead.TabIndex = 0;
+            // 
+            // textBoxBody
+            // 
+            this.textBoxBody.Location = new System.Drawing.Point(82, 36);
+            this.textBoxBody.Name = "textBoxBody";
+            this.textBoxBody.Size = new System.Drawing.Size(400, 23);
+            this.textBoxBody.TabIndex = 1;
+            // 
+            // button1
+            // 
+            this.button1.Location = new System.Drawing.Point(326, 86);
+            this.button1.Name = "button1";
+            this.button1.Size = new System.Drawing.Size(75, 23);
+            this.button1.TabIndex = 2;
+            this.button1.Text = "Сохранить";
+            this.button1.UseVisualStyleBackColor = true;
+            this.button1.Click += new System.EventHandler(this.ButtonSave_Click);
+            // 
+            // button2
+            // 
+            this.button2.Location = new System.Drawing.Point(407, 86);
+            this.button2.Name = "button2";
+            this.button2.Size = new System.Drawing.Size(75, 23);
+            this.button2.TabIndex = 3;
+            this.button2.Text = "Отмена";
+            this.button2.UseVisualStyleBackColor = true;
+            this.button2.Click += new System.EventHandler(this.ButtonCancel_Click);
+            // 
+            // labelHead
+            // 
+            this.labelHead.AutoSize = true;
+            this.labelHead.Location = new System.Drawing.Point(12, 10);
+            this.labelHead.Name = "labelHead";
+            this.labelHead.Size = new System.Drawing.Size(65, 15);
+            this.labelHead.TabIndex = 4;
+            this.labelHead.Text = "Заголовок";
+            // 
+            // labelAnswer
+            // 
+            this.labelAnswer.AutoSize = true;
+            this.labelAnswer.Location = new System.Drawing.Point(12, 39);
+            this.labelAnswer.Name = "labelAnswer";
+            this.labelAnswer.Size = new System.Drawing.Size(38, 15);
+            this.labelAnswer.TabIndex = 5;
+            this.labelAnswer.Text = "Ответ";
+            // 
+            // FormMail
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(494, 121);
+            this.Controls.Add(this.labelAnswer);
+            this.Controls.Add(this.labelHead);
+            this.Controls.Add(this.button2);
+            this.Controls.Add(this.button1);
+            this.Controls.Add(this.textBoxBody);
+            this.Controls.Add(this.textBoxHead);
+            this.Name = "FormMail";
+            this.Text = "Письмо";
+            this.Load += new System.EventHandler(this.FormMail_Load);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private TextBox textBoxHead;
+		private TextBox textBoxBody;
+		private Button button1;
+		private Button button2;
+        private Label labelHead;
+        private Label labelAnswer;
+    }
+}

SushiBar/SushiBar/FormMail.cs

@@ -0,0 +1,81 @@
+using Microsoft.Extensions.Logging;
+using SushiBarBusinessLogic.MailWorker;
+using SushiBarContracts.BusinessLogicsContracts;
+using SushiBarContracts.ViewModels;
+
+namespace SushiBarView
+{
+	public partial class FormMail : Form
+	{
+        private readonly ILogger _logger;
+        private readonly IMessageInfoLogic _logic;
+        private readonly AbstractMailWorker _mailWorker;
+        private MessageInfoViewModel? _message;
+
+        public string MessageId { get; set; } = string.Empty;
+
+        public FormMail(ILogger<FormMail> logger, AbstractMailWorker mailWorker, IMessageInfoLogic logic)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _mailWorker = mailWorker;
+            _logic = logic;
+        }
+
+        private void FormMail_Load(object sender, EventArgs e)
+        {
+            try
+            {
+                _message = _logic.ReadElement(new() { MessageId = MessageId });
+                if (_message != null)
+                {
+                    textBoxHead.Text = _message.Subject;
+                    textBoxBody.Text = _message.Answer;
+                    if (!_message.HasRead)
+                    {
+                        _logic.Update(new() 
+                        { 
+                            MessageId = MessageId, 
+                            HasRead = true,
+                            Answer = _message.Answer
+                        });
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка получения собщения");
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
+                    MessageBoxIcon.Error);
+            }
+        }
+        private void ButtonSave_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(textBoxBody.Text))
+            {
+                MessageBox.Show("Заполните ответ", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            _mailWorker.MailSendAsync(new()
+            {
+                MailAddress = _message.SenderName,
+                Subject = _message.Subject,
+                Text = textBoxBody.Text,
+            });
+            _logic.Update(new()
+            {
+                MessageId = MessageId,
+                Answer = textBoxBody.Text,
+                HasRead = true,
+            });
+            MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK);
+            DialogResult = DialogResult.OK;
+            Close();
+        }
+        private void ButtonCancel_Click(object sender, EventArgs e)
+        {
+            DialogResult = DialogResult.Cancel;
+            Close();
+        }
+    }
+}

SushiBar/SushiBar/FormMail.resx

@@ -0,0 +1,60 @@
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

SushiBar/SushiBar/FormMails.Designer.cs

@@ -30,35 +30,89 @@ namespace SushiBarView
         /// </summary>
         private void InitializeComponent()
         {
-            dataGridView = new DataGridView();
-            ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
-            SuspendLayout();
+            this.dataGridView = new System.Windows.Forms.DataGridView();
+            this.buttonPrev = new System.Windows.Forms.Button();
+            this.buttonNext = new System.Windows.Forms.Button();
+            this.labelPage = new System.Windows.Forms.Label();
+            this.buttonAnswer = new System.Windows.Forms.Button();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+            this.SuspendLayout();
             // 
             // dataGridView
             // 
-            dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridView.Dock = DockStyle.Fill;
-            dataGridView.Location = new Point(0, 0);
-            dataGridView.Name = "dataGridView";
-            dataGridView.RowTemplate.Height = 25;
-            dataGridView.Size = new Size(803, 450);
-            dataGridView.TabIndex = 0;
+            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dataGridView.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dataGridView.Location = new System.Drawing.Point(0, 0);
+            this.dataGridView.Name = "dataGridView";
+            this.dataGridView.RowTemplate.Height = 25;
+            this.dataGridView.Size = new System.Drawing.Size(836, 217);
+            this.dataGridView.TabIndex = 0;
+            // 
+            // buttonPrev
+            // 
+            this.buttonPrev.Location = new System.Drawing.Point(712, 183);
+            this.buttonPrev.Name = "buttonPrev";
+            this.buttonPrev.Size = new System.Drawing.Size(53, 23);
+            this.buttonPrev.TabIndex = 1;
+            this.buttonPrev.Text = "<<";
+            this.buttonPrev.UseVisualStyleBackColor = true;
+            this.buttonPrev.Click += new System.EventHandler(this.ButtonPrev_Click);
+            // 
+            // buttonNext
+            // 
+            this.buttonNext.Location = new System.Drawing.Point(771, 183);
+            this.buttonNext.Name = "buttonNext";
+            this.buttonNext.Size = new System.Drawing.Size(53, 23);
+            this.buttonNext.TabIndex = 2;
+            this.buttonNext.Text = ">>";
+            this.buttonNext.UseVisualStyleBackColor = true;
+            this.buttonNext.Click += new System.EventHandler(this.ButtonNext_Click);
+            // 
+            // labelPage
+            // 
+            this.labelPage.AutoSize = true;
+            this.labelPage.Location = new System.Drawing.Point(667, 187);
+            this.labelPage.Name = "labelPage";
+            this.labelPage.Size = new System.Drawing.Size(25, 15);
+            this.labelPage.TabIndex = 3;
+            this.labelPage.Text = "с. 1";
+            // 
+            // buttonAnswer
+            // 
+            this.buttonAnswer.Location = new System.Drawing.Point(712, 154);
+            this.buttonAnswer.Name = "buttonAnswer";
+            this.buttonAnswer.Size = new System.Drawing.Size(112, 23);
+            this.buttonAnswer.TabIndex = 4;
+            this.buttonAnswer.Text = "Ответить";
+            this.buttonAnswer.UseVisualStyleBackColor = true;
+            this.buttonAnswer.Click += new System.EventHandler(this.ButtonAnswer_Click);
             // 
             // FormMails
             // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(800, 450);
-            Controls.Add(dataGridView);
-            Name = "FormMails";
-            Text = "Письма";
-            Load += FormMails_Load;
-            ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
-            ResumeLayout(false);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(836, 217);
+            this.Controls.Add(this.buttonAnswer);
+            this.Controls.Add(this.labelPage);
+            this.Controls.Add(this.buttonNext);
+            this.Controls.Add(this.buttonPrev);
+            this.Controls.Add(this.dataGridView);
+            this.Name = "FormMails";
+            this.Text = "Письма";
+            this.Load += new System.EventHandler(this.FormMails_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
         }
 
         #endregion
 
         private DataGridView dataGridView;
+        private Button buttonPrev;
+        private Button buttonNext;
+        private Label labelPage;
+        private Button button1;
+        private Button buttonAnswer;
     }
 }

SushiBar/SushiBar/FormMails.cs

@@ -7,6 +7,8 @@ namespace SushiBarView
     {
         private readonly ILogger _logger;
         private readonly IMessageInfoLogic _logic;
+        private int currentPage = 1;
+        private int pageSize = 3;
 
         public FormMails(ILogger<FormMails> logger, IMessageInfoLogic logic)
         {
@@ -16,10 +18,28 @@ namespace SushiBarView
         }
 
         private void FormMails_Load(object sender, EventArgs e)
+        {
+            LoadData();
+        }
+
+        private void LoadData()
         {
             try
             {
-                var list = _logic.ReadList(null);
+                var list = _logic.ReadList(new()
+                {
+                    PageSize = pageSize,
+                    CurrentPage = currentPage
+                });
+                if (list != null && list.Count == 0 && currentPage != 1)
+                {
+                    currentPage--;
+                    list = _logic.ReadList(new()
+                    {
+                        PageSize = pageSize,
+                        CurrentPage = currentPage
+                    });
+                }
                 if (list != null)
                 {
                     dataGridView.DataSource = list;
@@ -27,6 +47,7 @@ namespace SushiBarView
                     dataGridView.Columns["MessageId"].Visible = false;
                     dataGridView.Columns["Body"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
                 }
+                labelPage.Text = "c. " + currentPage;
                 _logger.LogInformation("Загрузка писем");
             }
             catch (Exception ex)
@@ -36,5 +57,34 @@ namespace SushiBarView
                 MessageBoxIcon.Error);
             }
         }
+
+        private void ButtonPrev_Click(object sender, EventArgs e)
+        {
+            if (currentPage - 1 >= 1)
+                currentPage--;
+            LoadData();
+        }
+
+        private void ButtonNext_Click(object sender, EventArgs e)
+        {
+            currentPage++;
+            LoadData();
+        }
+
+        private void ButtonAnswer_Click(object sender, EventArgs e)
+        {
+            if (dataGridView.SelectedRows.Count == 1)
+            {
+                var service = Program.ServiceProvider?.GetService(typeof(FormMail));
+                if (service is FormMail form)
+                {
+                    form.MessageId = Convert.ToString(dataGridView.SelectedRows[0].Cells["MessageId"].Value);
+                    if (form.ShowDialog() == DialogResult.OK)
+                    {
+                        LoadData();
+                    }
+                }
+            }
+        }
     }
 }

SushiBar/SushiBar/FormMails.resx

@@ -1,64 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
+<root>
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">

SushiBar/SushiBar/Program.cs

@@ -103,6 +103,7 @@ namespace SushiBarView
             services.AddTransient<FormImplementers>();
             services.AddTransient<FormImplementer>();
             services.AddTransient<FormMails>();
+            services.AddTransient<FormMail>();
         }
 
         private static void MailCheck(object obj) => ServiceProvider?.GetService<AbstractMailWorker>()?.MailCheck();

SushiBar/SushiBarBusinessLogic/BusinessLogics/MessageInfoLogic.cs

@@ -25,6 +25,18 @@ namespace SushiBarBusinessLogic.BusinessLogics
             }
             return true;
         }
+
+        public MessageInfoViewModel? ReadElement(MessageInfoSearchModel model)
+        {
+            var result = _messageStorage.GetElement(model);
+            if (result == null)
+            {
+                _logger.LogWarning("Read element operation failed");
+                return null;
+            }
+            return result;
+        }
+
         public List<MessageInfoViewModel>? ReadList(MessageInfoSearchModel? model)
         {
             _logger.LogInformation("ReadList. MessageId:{MessageId}.ClientId:{ClientId} ", 
@@ -39,5 +51,15 @@ namespace SushiBarBusinessLogic.BusinessLogics
             _logger.LogInformation("ReadList. Count: {Count}", list.Count);
             return list;
         }
+
+        public bool Update(MessageInfoBindingModel model)
+        {
+            if (_messageStorage.Update(model) == null)
+            {
+                _logger.LogWarning("Update operation failed");
+                return false;
+            }
+            return true;
+        }
     }
 }

SushiBar/SushiBarBusinessLogic/BusinessLogics/OrderLogic.cs

@@ -18,8 +18,7 @@ namespace SushiBarBusinessLogic.BusinessLogics
         private readonly AbstractMailWorker _mailWorker;
         private readonly IClientLogic _clientLogic;
 
-        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IShopLogic shopLogic, ISushiStorage sushiStorage)
-        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, AbstractMailWorker mailWorker, IClientLogic clientLogic)
+        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IShopLogic shopLogic, ISushiStorage sushiStorage, AbstractMailWorker mailWorker, IClientLogic clientLogic)
         {
             _logger = logger;
             _orderStorage = orderStorage;

SushiBar/SushiBarClientApp/Controllers/HomeController.cs

@@ -145,13 +145,21 @@ namespace SushiBarClientApp.Controllers
         }
 
         [HttpGet]
-        public IActionResult Mails()
+        public IActionResult Mails(int page = 1)
         {
             if (APIClient.Client == null)
             {
                 return Redirect("~/Home/Enter");
             }
-            return View(APIClient.GetRequest<List<MessageInfoViewModel>>($"api/client/getmessages?clientId={APIClient.Client.Id}"));
+            ViewBag.Page = page;
+            List<MessageInfoViewModel>? list = APIClient.GetRequest<List<MessageInfoViewModel>>($"api/client/getmessages?clientId={APIClient.Client.Id}&currentPage={page}");
+            if (list != null && list.Count <= 0 && page != 1)
+            {
+                page--;
+                ViewBag.Page = page;
+                list = APIClient.GetRequest<List<MessageInfoViewModel>>($"api/client/getmessages?clientId={APIClient.Client.Id}&currentPage={page}");
+            }
+            return View(list);
         }
     }
 }

SushiBar/SushiBarClientApp/Views/Home/Mails.cshtml

@@ -34,21 +34,31 @@
 				</tr>
 			</thead>
 			<tbody>
-				@foreach (var item in Model)
-				{
-					<tr>
-						<td>
-							@Html.DisplayFor(modelItem => item.DateDelivery)
-						</td>
-						<td>
-							@Html.DisplayFor(modelItem => item.Subject)
-						</td>
-						<td>
-							@Html.DisplayFor(modelItem => item.Body)
-						</td>
-					</tr>
-				}
+			@foreach (var item in Model)
+			{
+				<tr>
+					<td>
+				@Html.DisplayFor(modelItem => item.DateDelivery)
+					</td>
+					<td>
+				@Html.DisplayFor(modelItem => item.Subject)
+					</td>
+					<td>
+				@Html.DisplayFor(modelItem => item.Body)
+					</td>
+				</tr>
+			}
 			</tbody>
 		</table>
+		<p>с. @ViewBag.Page</p>
+			<a href="@Url.Action("Mails", new { page = ViewBag.Page - 1 > 1 ? ViewBag.Page - 1 : 1 })"
+			class="btn btn-primary">
+			Назад
+		</a>
+
+		<a href="@Url.Action("Mails", new { page = ViewBag.Page + 1 })"
+			class="btn btn-primary">
+			Вперед
+		</a>
 	}
 </div>

SushiBar/SushiBarContracts/BindingModels/MessageInfoBindingModel.cs

@@ -15,5 +15,9 @@ namespace SushiBarContracts.BindingModels
         public string Body { get; set; } = string.Empty;
 
         public DateTime DateDelivery { get; set; }
+
+        public bool HasRead { get; set; }
+
+        public string? Answer { get; set; } = string.Empty;
     }
 }

SushiBar/SushiBarContracts/BusinessLogicsContracts/IMessageInfoLogic.cs

@@ -8,6 +8,10 @@ namespace SushiBarContracts.BusinessLogicsContracts
     {
         List<MessageInfoViewModel>? ReadList(MessageInfoSearchModel? model);
 
+        MessageInfoViewModel? ReadElement(MessageInfoSearchModel model);
+
         bool Create(MessageInfoBindingModel model);
+
+        bool Update(MessageInfoBindingModel model);
     }
 }

SushiBar/SushiBarContracts/SearchModels/MessageInfoSearchModel.cs

@@ -5,5 +5,9 @@
         public int? ClientId { get; set; }
 
         public string? MessageId { get; set; }
+
+        public int? PageSize { get; set; }
+
+        public int? CurrentPage { get; set; }
     }
 }

SushiBar/SushiBarContracts/StoragesContracts/IMessageInfoStorage.cs

@@ -13,5 +13,7 @@ namespace SushiBarContracts.StoragesContracts
         MessageInfoViewModel? GetElement(MessageInfoSearchModel model);
 
         MessageInfoViewModel? Insert(MessageInfoBindingModel model);
+
+        MessageInfoViewModel? Update(MessageInfoBindingModel model);
     }
 }

SushiBar/SushiBarContracts/ViewModels/MessageInfoViewModel.cs

@@ -20,5 +20,11 @@ namespace SushiBarContracts.ViewModels
 
         [DisplayName("Текст")]
         public string Body { get; set; } = string.Empty;
+
+        [DisplayName("Прочитано")]
+        public bool HasRead { get; set; }
+
+        [DisplayName("Ответ")]
+        public string? Answer { get; set; }
     }
 }

SushiBar/SushiBarDataModels/Models/IMessageInfoModel.cs

@@ -13,5 +13,9 @@
         string Subject { get; }
 
         string Body { get; }
+
+        bool HasRead { get; }
+
+        string? Answer { get; }
     }
 }

SushiBar/SushiBarDatabaseImplement/Implements/MessageInfoStorage.cs

@@ -18,9 +18,22 @@ namespace SushiBarDatabaseImplement.Implements
 
         public List<MessageInfoViewModel> GetFilteredList(MessageInfoSearchModel model)
         {
-            if (!model.ClientId.HasValue)
+            if (!model.ClientId.HasValue && (!model.PageSize.HasValue || !model.CurrentPage.HasValue))
                 return new();
             using var context = new SushiBarDatabase();
+            if (model.CurrentPage.HasValue && model.PageSize.HasValue && model.ClientId.HasValue)
+            {
+                return context.Messages
+                    .Where(x => x.ClientId == model.ClientId)
+                    .Skip((model.CurrentPage.Value - 1) * model.PageSize.Value)
+                    .Take(model.PageSize.Value).Select(x => x.GetViewModel).ToList();
+            }
+            if (model.CurrentPage.HasValue && model.PageSize.HasValue)
+            {
+                return context.Messages
+                    .Skip((model.CurrentPage.Value - 1) * model.PageSize.Value)
+                    .Take(model.PageSize.Value).Select(x => x.GetViewModel).ToList();
+            }
             return context.Messages
                 .Where(x => x.ClientId == model.ClientId)
                 .Select(x => x.GetViewModel)
@@ -47,5 +60,18 @@ namespace SushiBarDatabaseImplement.Implements
             context.SaveChanges();
             return newMessage.GetViewModel;
         }
+
+        public MessageInfoViewModel? Update(MessageInfoBindingModel model)
+        {
+            using var context = new SushiBarDatabase();
+            var message = context.Messages.FirstOrDefault(x => x.MessageId == model.MessageId);
+            if (message == null)
+            {
+                return null;
+            }
+            message.Update(model);
+            context.SaveChanges();
+            return message.GetViewModel;
+        }
     }
 }

SushiBar/SushiBarDatabaseImplement/Migrations/20230502124207_AnswersMigration.Designer.cs

@@ -0,0 +1,381 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using SushiBarDatabaseImplement;
+
+#nullable disable
+
+namespace SushiBarDatabaseImplement.Migrations
+{
+    [DbContext(typeof(SushiBarDatabase))]
+    [Migration("20230502124207_AnswersMigration")]
+    partial class AnswersMigration
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.3")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Client", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClientFIO")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Clients");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Implementer", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ImplementerFIO")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("Qualification")
+                        .HasColumnType("int");
+
+                    b.Property<int>("WorkExperience")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Implementers");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Ingredient", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<double>("Cost")
+                        .HasColumnType("float");
+
+                    b.Property<string>("IngredientName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Ingredients");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Message", b =>
+                {
+                    b.Property<string>("MessageId")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("Answer")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int?>("ClientId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("DateDelivery")
+                        .HasColumnType("datetime2");
+
+                    b.Property<bool>("HasRead")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("SenderName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("MessageId");
+
+                    b.HasIndex("ClientId");
+
+                    b.ToTable("Messages");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Order", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ClientId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Count")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("DateCreate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime?>("DateImplement")
+                        .HasColumnType("datetime2");
+
+                    b.Property<int?>("ImplementerId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("int");
+
+                    b.Property<double>("Sum")
+                        .HasColumnType("float");
+
+                    b.Property<int>("SushiId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ClientId");
+
+                    b.HasIndex("ImplementerId");
+
+                    b.HasIndex("SushiId");
+
+                    b.ToTable("Orders");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Shop", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Address")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("DateOpening")
+                        .HasColumnType("datetime2");
+
+                    b.Property<int>("MaxCountSushi")
+                        .HasColumnType("int");
+
+                    b.Property<string>("ShopName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Shops");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.ShopSushi", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("Count")
+                        .HasColumnType("int");
+
+                    b.Property<int>("ShopId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("SushiId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ShopId");
+
+                    b.HasIndex("SushiId");
+
+                    b.ToTable("ShopSushi");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Sushi", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<double>("Price")
+                        .HasColumnType("float");
+
+                    b.Property<string>("SushiName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ListSushi");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.SushiIngredient", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("Count")
+                        .HasColumnType("int");
+
+                    b.Property<int>("IngredientId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("SushiId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IngredientId");
+
+                    b.HasIndex("SushiId");
+
+                    b.ToTable("SushiIngredients");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Message", b =>
+                {
+                    b.HasOne("SushiBarDatabaseImplement.Models.Client", null)
+                        .WithMany("Messages")
+                        .HasForeignKey("ClientId");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Order", b =>
+                {
+                    b.HasOne("SushiBarDatabaseImplement.Models.Client", "Client")
+                        .WithMany("Orders")
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("SushiBarDatabaseImplement.Models.Implementer", "Implementer")
+                        .WithMany("Orders")
+                        .HasForeignKey("ImplementerId");
+
+                    b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
+                        .WithMany("Orders")
+                        .HasForeignKey("SushiId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Client");
+
+                    b.Navigation("Implementer");
+
+                    b.Navigation("Sushi");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.ShopSushi", b =>
+                {
+                    b.HasOne("SushiBarDatabaseImplement.Models.Shop", "Shop")
+                        .WithMany("ListSushiFk")
+                        .HasForeignKey("ShopId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
+                        .WithMany("ShopsFk")
+                        .HasForeignKey("SushiId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Shop");
+
+                    b.Navigation("Sushi");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.SushiIngredient", b =>
+                {
+                    b.HasOne("SushiBarDatabaseImplement.Models.Ingredient", "Ingredient")
+                        .WithMany("SushiIngredients")
+                        .HasForeignKey("IngredientId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
+                        .WithMany("Ingredients")
+                        .HasForeignKey("SushiId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Ingredient");
+
+                    b.Navigation("Sushi");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Client", b =>
+                {
+                    b.Navigation("Messages");
+
+                    b.Navigation("Orders");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Implementer", b =>
+                {
+                    b.Navigation("Orders");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Ingredient", b =>
+                {
+                    b.Navigation("SushiIngredients");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Shop", b =>
+                {
+                    b.Navigation("ListSushiFk");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Sushi", b =>
+                {
+                    b.Navigation("Ingredients");
+
+                    b.Navigation("Orders");
+
+                    b.Navigation("ShopsFk");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

SushiBar/SushiBarDatabaseImplement/Migrations/20230502124207_AnswersMigration.cs

@@ -0,0 +1,39 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace SushiBarDatabaseImplement.Migrations
+{
+    /// <inheritdoc />
+    public partial class AnswersMigration : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "Answer",
+                table: "Messages",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<bool>(
+                name: "HasRead",
+                table: "Messages",
+                type: "bit",
+                nullable: false,
+                defaultValue: false);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Answer",
+                table: "Messages");
+
+            migrationBuilder.DropColumn(
+                name: "HasRead",
+                table: "Messages");
+        }
+    }
+}

SushiBar/SushiBarDatabaseImplement/Migrations/SushiBarDatabaseModelSnapshot.cs

@@ -99,6 +99,9 @@ namespace SushiBarDatabaseImplement.Migrations
                     b.Property<string>("MessageId")
                         .HasColumnType("nvarchar(450)");
 
+                    b.Property<string>("Answer")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<string>("Body")
                         .IsRequired()
                         .HasColumnType("nvarchar(max)");
@@ -109,6 +112,9 @@ namespace SushiBarDatabaseImplement.Migrations
                     b.Property<DateTime>("DateDelivery")
                         .HasColumnType("datetime2");
 
+                    b.Property<bool>("HasRead")
+                        .HasColumnType("bit");
+
                     b.Property<string>("SenderName")
                         .IsRequired()
                         .HasColumnType("nvarchar(max)");

SushiBar/SushiBarDatabaseImplement/Models/Message.cs

@@ -18,6 +18,9 @@ namespace SushiBarDatabaseImplement.Models
         public string Subject { get; private set; } = string.Empty;
         [Required]
         public string Body { get; private set; } = string.Empty;
+        [Required]
+        public bool HasRead { get; set; }
+        public string? Answer { get; set; }
 
         public static Message? Create(MessageInfoBindingModel model)
         {
@@ -33,9 +36,21 @@ namespace SushiBarDatabaseImplement.Models
                 MessageId = model.MessageId,
                 SenderName = model.SenderName,
                 DateDelivery = model.DateDelivery,
+                HasRead = model.HasRead,
+                Answer = model.Answer
             };
         }
 
+        public void Update(MessageInfoBindingModel model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            HasRead = model.HasRead;
+            Answer = model.Answer;
+        }
+
         public MessageInfoViewModel GetViewModel => new()
         {
             Body = Body,
@@ -44,6 +59,8 @@ namespace SushiBarDatabaseImplement.Models
             MessageId = MessageId,
             SenderName = SenderName,
             DateDelivery = DateDelivery,
+            HasRead = HasRead,
+            Answer = Answer
         };
     }
 }

SushiBar/SushiBarDatabaseImplement/SushiBarDatabase.cs

@@ -10,7 +10,7 @@ namespace SushiBarDatabaseImplement
             if (optionsBuilder.IsConfigured == false)
             {
                 // D8KMQQU comp JC256C6 nout
-                optionsBuilder.UseSqlServer(@"Data Source=DESKTOP-JC256C6\SQLEXPRESS;Initial Catalog=SushiBarDatabase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
+                optionsBuilder.UseSqlServer(@"Data Source=DESKTOP-D8KMQQU\SQLEXPRESS;Initial Catalog=SushiBarDatabase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
             }
             base.OnConfiguring(optionsBuilder);
         }

SushiBar/SushiBarFileImplement/Implements/MessageInfoStorage.cs

@@ -22,8 +22,21 @@ namespace SushiBarFileImplement.Implements
 
         public List<MessageInfoViewModel> GetFilteredList(MessageInfoSearchModel model)
         {
-            if (!model.ClientId.HasValue)
+            if (!model.ClientId.HasValue && (!model.PageSize.HasValue || !model.CurrentPage.HasValue))
                 return new();
+            if (model.CurrentPage.HasValue && model.PageSize.HasValue && model.ClientId.HasValue)
+            {
+                return source.Messages
+                    .Where(x => x.ClientId == model.ClientId)
+                    .Skip((model.CurrentPage.Value - 1) * model.PageSize.Value)
+                    .Take(model.PageSize.Value).Select(x => x.GetViewModel).ToList();
+            }
+            if (model.CurrentPage.HasValue && model.PageSize.HasValue)
+            {
+                return source.Messages
+                    .Skip((model.CurrentPage.Value - 1) * model.PageSize.Value)
+                    .Take(model.PageSize.Value).Select(x => x.GetViewModel).ToList();
+            }
             return source.Messages
                 .Where(x => x.ClientId == model.ClientId)
                 .Select(x => x.GetViewModel)
@@ -48,5 +61,17 @@ namespace SushiBarFileImplement.Implements
             source.SaveMessages();
             return newMessage.GetViewModel;
         }
+
+        public MessageInfoViewModel? Update(MessageInfoBindingModel model)
+        {
+            var message = source.Messages.FirstOrDefault(x => x.MessageId == model.MessageId);
+            if (message == null)
+            {
+                return null;
+            }
+            message.Update(model);
+            source.SaveIngredients();
+            return message.GetViewModel;
+        }
     }
 }

SushiBar/SushiBarFileImplement/Models/Message.cs

@@ -18,7 +18,11 @@ namespace SushiBarFileImplement.Models
 
         public string Subject { get; private set; } = string.Empty;
 
-        public string Body { get; private set; } = string.Empty;
+        public string Body { get; private set; } = string.Empty; 
+        
+        public bool HasRead { get; set; }
+
+        public string? Answer { get; set; }
 
         public static Message? Create(MessageInfoBindingModel model)
         {
@@ -33,7 +37,9 @@ namespace SushiBarFileImplement.Models
                 DateDelivery = model.DateDelivery,
                 SenderName = model.SenderName,
                 ClientId = model.ClientId,
-                MessageId = model.MessageId
+                MessageId = model.MessageId,
+                HasRead = model.HasRead,
+                Answer = model.Answer
             };
         }
 
@@ -51,9 +57,21 @@ namespace SushiBarFileImplement.Models
                 SenderName = element.Attribute("SenderName")!.Value,
                 ClientId = Convert.ToInt32(element.Attribute("ClientId")!.Value),
                 MessageId = element.Attribute("MessageId")!.Value,
+                HasRead = Convert.ToBoolean(element.Attribute("HasRead")!.Value),
+                Answer = element.Attribute("Answer")!.Value,
             };
         }
 
+        public void Update(MessageInfoBindingModel model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            HasRead = model.HasRead;
+            Answer = model.Answer;
+        }
+
         public MessageInfoViewModel GetViewModel => new()
         {
             Body = Body,
@@ -61,7 +79,9 @@ namespace SushiBarFileImplement.Models
             DateDelivery = DateDelivery,
             SenderName = SenderName,
             ClientId = ClientId,
-            MessageId = MessageId
+            MessageId = MessageId,
+            HasRead = HasRead,
+            Answer = Answer
         };
 
         public XElement GetXElement => new("MessageInfo",
@@ -70,7 +90,9 @@ namespace SushiBarFileImplement.Models
             new XAttribute("ClientId", ClientId),
             new XAttribute("MessageId", MessageId),
             new XAttribute("SenderName", SenderName),
-            new XAttribute("DateDelivery", DateDelivery)
+            new XAttribute("DateDelivery", DateDelivery),
+            new XAttribute("HasRead", HasRead),
+            new XAttribute("Answer", Answer)
             );
     }
 }

SushiBar/SushiBarListImplement/Implements/MessageInfoStorage.cs

@@ -29,19 +29,35 @@ namespace SushiBarListImplement.Implements
 
         public List<MessageInfoViewModel> GetFilteredList(MessageInfoSearchModel model)
         {
-            if (!model.ClientId.HasValue)
-            {
-                return new();
-            }
             var result = new List<MessageInfoViewModel>();
-            foreach (var item in _source.Messages)
-            {
-                if (item.ClientId == model.ClientId)
+            if (model.ClientId.HasValue)
+                foreach (var item in _source.Messages)
                 {
-                    result.Add(item.GetViewModel);
+                    if (item.ClientId == model.ClientId)
+                    {
+                        result.Add(item.GetViewModel);
+                    }
+                }
+
+            if (!model.CurrentPage.HasValue || !model.PageSize.HasValue)
+                return result;
+
+            var resultPages = new List<MessageInfoViewModel>();
+            if (model.ClientId.HasValue)
+            {
+                for (int i = (model.CurrentPage.Value - 1) * model.PageSize.Value; i < model.PageSize.Value * model.CurrentPage.Value; i++)
+                {
+                    resultPages.Add(result[i]);
                 }
             }
-            return result;
+            else
+            {
+                for (int i = (model.CurrentPage.Value - 1) * model.PageSize.Value; i < model.PageSize.Value * model.CurrentPage.Value; i++)
+                {
+                    resultPages.Add(_source.Messages[i].GetViewModel);
+                }
+            }
+            return resultPages;
         }
 
         public List<MessageInfoViewModel> GetFullList()
@@ -64,5 +80,18 @@ namespace SushiBarListImplement.Implements
             _source.Messages.Add(newMessage);
             return newMessage.GetViewModel;
         }
+
+        public MessageInfoViewModel? Update(MessageInfoBindingModel model)
+        {
+            foreach (var message in _source.Messages)
+            {
+                if (message.MessageId == model.MessageId)
+                {
+                    message.Update(model);
+                    return message.GetViewModel;
+                }
+            }
+            return null;
+        }
     }
 }

SushiBar/SushiBarListImplement/Models/Message.cs

@@ -1,6 +1,7 @@
 using SushiBarContracts.BindingModels;
 using SushiBarContracts.ViewModels;
 using SushiBarDataModels.Models;
+using System.ComponentModel.DataAnnotations;
 
 namespace SushiBarListImplement.Models
 {
@@ -16,7 +17,11 @@ namespace SushiBarListImplement.Models
 
         public string Subject { get; private set; } = string.Empty;
 
-        public string Body { get; private set; } = string.Empty;
+        public string Body { get; private set; } = string.Empty; 
+        
+        public bool HasRead { get; set; }
+
+        public string? Answer { get; set; }
 
         public static Message? Create(MessageInfoBindingModel model)
         {
@@ -31,10 +36,22 @@ namespace SushiBarListImplement.Models
                 DateDelivery = model.DateDelivery,
                 SenderName = model.SenderName,
                 ClientId = model.ClientId,
-                MessageId = model.MessageId
+                MessageId = model.MessageId,
+                HasRead = model.HasRead,
+                Answer = model.Answer
             };
         }
 
+        public void Update(MessageInfoBindingModel model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            HasRead = model.HasRead;
+            Answer = model.Answer;
+        }
+
         public MessageInfoViewModel GetViewModel => new()
         {
             Body = Body,
@@ -42,7 +59,9 @@ namespace SushiBarListImplement.Models
             DateDelivery = DateDelivery,
             SenderName = SenderName,
             ClientId = ClientId,
-            MessageId = MessageId
+            MessageId = MessageId,
+            Answer = Answer,
+            HasRead = HasRead
         };
     }
 }

SushiBar/SushiBarRestApi/Controllers/ClientController.cs

@@ -70,13 +70,22 @@ namespace SushiBarRestApi.Controllers
         }
 
         [HttpGet]
-        public List<MessageInfoViewModel>? GetMessages(int clientId)
+        public List<MessageInfoViewModel>? GetMessages(int clientId, int? currentPage)
         {
             try
             {
+                if (currentPage == null)
+                {
+                    return _mailLogic.ReadList(new MessageInfoSearchModel
+                    {
+                        ClientId = clientId
+                    });
+                }
                 return _mailLogic.ReadList(new MessageInfoSearchModel
                 {
-                    ClientId = clientId
+                    ClientId = clientId,
+                    CurrentPage = currentPage,
+                    PageSize = 3
                 });
             }
             catch (Exception ex)