SewingDresses/SewingDressesDatabaseImplement/Implements/MessageInfoStorage.cs

@@ -41,17 +41,14 @@ namespace SewingDressesDatabaseImplement.Implements
 			using var context = new SewingDressesDatabase();
 			model.ClientId = context.Clients.FirstOrDefault(x => x.Email.Equals(model.SenderName))?.Id;
 			var message = MessageInfo.Create(model);
-			if (message == null)
-				return null;
-			context.Messages.Add(message);
-			try {
-				context.SaveChanges();
-				return message.GetViewModel;
-			}
-			catch (Exception ex)
+			if (message == null || context.Messages.Any(x => x.MessageId.Equals(model.MessageId)))
 			{
 				return null;
 			}
+			context.Messages.Add(message);
+			context.SaveChanges();
+			return message.GetViewModel;
+
 		}
 	}
 }