дурка

FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/MessageInfoLogic.cs

@@ -27,6 +27,27 @@ namespace FoodOrdersBusinessLogic.BusinessLogics
             return true;
         }
 
+        public MessageInfoViewModel? ReadElement(MessageInfoSearchModel model)
+        {
+            var res = _messageInfoStorage.GetElement(model);
+            if (res == null)
+            {
+                _logger.LogWarning("Read element operation failed");
+                return null;
+            }
+            return res;
+        }
+
+        public bool Update(MessageInfoBindingModel model)
+        {
+            if (_messageInfoStorage.Update(model) == null)
+            {
+                _logger.LogWarning("Update operation failed");
+                return false;
+            }
+            return true;
+        }
+
         public List<MessageInfoViewModel>? ReadList(MessageInfoSearchModel? model)
         {
             _logger.LogInformation("ReadList. ClientId:{ClientId}", model?.ClientId);

FoodOrders/FoodOrdersContracts/BindingModels/MessageInfoBindingModel.cs

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

FoodOrders/FoodOrdersContracts/SearchModels/MessageInfoSearchModel.cs

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

FoodOrders/FoodOrdersContracts/StoragesContracts/IMessageInfoStorage.cs

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

FoodOrders/FoodOrdersContracts/ViewModels/MessageInfoViewModel.cs

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

FoodOrders/FoodOrdersDatabaseImplement/Implements/MessageInfoStorage.cs

@@ -20,15 +20,15 @@ namespace FoodOrdersDatabaseImplement.Implements
 
         public List<MessageInfoViewModel> GetFilteredList(MessageInfoSearchModel model)
         {
-            if (!model.ClientId.HasValue)
-            {
-                return new();
-            }
             using var context = new FoodOrdersDatabase();
-            return context.Messages
+            var res = context.Messages
-                    .Where(x => x.ClientId == model.ClientId)
+                .Where(x => !model.ClientId.HasValue || x.ClientId == model.ClientId)
-                    .Select(x => x.GetViewModel)
+                .Select(x => x.GetViewModel);
-                    .ToList();
+            if (!(model.Page.HasValue && model.PageSize.HasValue))
+            {
+                return res.ToList();
+            }
+            return res.Skip((model.Page.Value - 1) * model.PageSize.Value).Take(model.PageSize.Value).ToList();
         }
 
         public List<MessageInfoViewModel> GetFullList()
@@ -50,7 +50,19 @@ namespace FoodOrdersDatabaseImplement.Implements
             context.Messages.Add(newMessage);
             context.SaveChanges();
             return context.Messages
-                                 .FirstOrDefault(x => x.MessageId == newMessage.MessageId)?.GetViewModel;
+                                 .FirstOrDefault(x => x.MessageId == newMessage.MessageId)?
+                                 .GetViewModel;
+        }
+        public MessageInfoViewModel? Update(MessageInfoBindingModel model)
+        {
+            using var context = new FoodOrdersDatabase();
+            var res = context.Messages.FirstOrDefault(x => x.MessageId.Equals(model.MessageId));
+            if (res != null)
+            {
+                res.Update(model);
+                context.SaveChanges();
+            }
+            return res?.GetViewModel;
         }
     }
 }

FoodOrders/FoodOrdersDatabaseImplement/Models/EmailMessage.cs

@@ -1,49 +0,0 @@
-using FoodOrdersContracts.BindingModels;
-using FoodOrdersContracts.ViewModels;
-using FoodOrdersDataModels.Models;
-using System.ComponentModel.DataAnnotations;
-
-namespace FoodOrdersDatabaseImplement.Models
-{
-	public class MessageInfo : IMessageInfoModel
-	{
-		[Key]
-		public string MessageId { get; private set; } = string.Empty;
-
-		public int? ClientId { get; private set; }
-		[Required]
-		public string SenderName { get; private set; } = string.Empty;
-		[Required]
-		public DateTime DateDelivery { get; private set; }
-		[Required]
-		public string Subject { get; private set; } = string.Empty;
-		[Required]
-		public string Body { get; private set; } = string.Empty;
-		public virtual Client? Client { get; set; }
-		public static MessageInfo? Create(MessageInfoBindingModel model)
-		{
-			if (model == null)
-			{
-				return null;
-			}
-			return new MessageInfo()
-			{
-				MessageId = model.MessageId,
-				ClientId = model.ClientId,
-				SenderName = model.SenderName,
-				Body = model.Body,
-				Subject = model.Subject,
-				DateDelivery = model.DateDelivery,
-			};
-		}
-		public MessageInfoViewModel GetViewModel => new()
-		{
-			MessageId = MessageId,
-			ClientId = ClientId,
-			SenderName = SenderName,
-			Body = Body,
-			Subject = Subject,
-			DateDelivery = DateDelivery,
-		};
-	}
-}

FoodOrders/FoodOrdersDatabaseImplement/Models/MessageInfo.cs

@@ -0,0 +1,65 @@
+using FoodOrdersContracts.BindingModels;
+using FoodOrdersContracts.ViewModels;
+using FoodOrdersDataModels.Models;
+using System.ComponentModel.DataAnnotations;
+
+namespace FoodOrdersDatabaseImplement.Models
+{
+	public class MessageInfo : IMessageInfoModel
+	{
+		[Key]
+		public string MessageId { get; private set; } = string.Empty;
+
+		public int? ClientId { get; private set; }
+		[Required]
+		public string SenderName { get; private set; } = string.Empty;
+		[Required]
+		public DateTime DateDelivery { get; private set; }
+		[Required]
+		public string Subject { get; private set; } = string.Empty;
+		[Required]
+		public string Body { get; private set; } = string.Empty;
+		public virtual Client? Client { get; set; }
+        public bool HasRead { get; private set; }
+        public string? Reply { get; private set; }
+        public static MessageInfo? Create(MessageInfoBindingModel model)
+		{
+			if (model == null)
+			{
+				return null;
+			}
+			return new MessageInfo()
+			{
+                Body = model.Body,
+                Reply = model.Reply,
+                HasRead = model.HasRead,
+                Subject = model.Subject,
+                ClientId = model.ClientId,
+                MessageId = model.MessageId,
+                SenderName = model.SenderName,
+                DateDelivery = model.DateDelivery,
+            };
+		}
+        public void Update(MessageInfoBindingModel model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            Reply = model.Reply;
+            HasRead = model.HasRead;
+        }
+
+        public MessageInfoViewModel GetViewModel => new()
+        {
+            Body = Body,
+            Reply = Reply,
+            HasRead = HasRead,
+            Subject = Subject,
+            ClientId = ClientId,
+            MessageId = MessageId,
+            SenderName = SenderName,
+            DateDelivery = DateDelivery,
+        };
+    }
+}

FoodOrders/FoodOrdersFileImplement/Implements/MessageInfoStorage.cs

@@ -26,5 +26,10 @@ namespace FoodOrdersFileImplement.Implements
         {
             throw new NotImplementedException();
         }
+
+        public MessageInfoViewModel? Update(MessageInfoBindingModel model)
+        {
+            throw new NotImplementedException();
+        }
     }
 }

FoodOrders/FoodOrdersListImplement/Implements/MessageInfoStorage.cs

@@ -26,5 +26,10 @@ namespace FoodOrdersListImplement.Implements
         {
             throw new NotImplementedException();
         }
+
+        public MessageInfoViewModel? Update(MessageInfoBindingModel model)
+        {
+            throw new NotImplementedException();
+        }
     }
 }