пользовательские интерфейсы для почты

SushiBar/SushiBarClientApi/Controllers/HomeController.cs

@@ -22,6 +22,7 @@ namespace SushiBarClientApp.Controllers
 			return
 			View(APIClient.GetRequest<List<OrderViewModel>>($"api/main/getorders?clientId={APIClient.Client.Id}"));
 		}
+		
 		[HttpGet]
 		public IActionResult Privacy()
 		{
@@ -31,6 +32,7 @@ namespace SushiBarClientApp.Controllers
 			}
 			return View(APIClient.Client);
 		}
+
 		[HttpPost]
 		public void Privacy(string login, string password, string fio)
 		{
@@ -38,8 +40,7 @@ namespace SushiBarClientApp.Controllers
 			{
 				throw new Exception("Вы как суда попали? Суда вход только авторизованным");
 			}
-			if (string.IsNullOrEmpty(login) ||
+			if (string.IsNullOrEmpty(login) || string.IsNullOrEmpty(password) || string.IsNullOrEmpty(fio))
-			string.IsNullOrEmpty(password) || string.IsNullOrEmpty(fio))
 			{
 				throw new Exception("Введите логин, пароль и ФИО");
 			}
@@ -56,6 +57,7 @@ namespace SushiBarClientApp.Controllers
 			APIClient.Client.Password = password;
 			Response.Redirect("Index");
 		}
+		
 		[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
 		public IActionResult Error()
 		{
@@ -65,16 +67,17 @@ namespace SushiBarClientApp.Controllers
 			Activity.Current?.Id ?? HttpContext.TraceIdentifier
 			});
 		}
+
 		[HttpGet]
 		public IActionResult Enter()
 		{
 			return View();
 		}
+
 		[HttpPost]
 		public void Enter(string login, string password)
 		{
-			if (string.IsNullOrEmpty(login) ||
+			if (string.IsNullOrEmpty(login) || string.IsNullOrEmpty(password))
-			string.IsNullOrEmpty(password))
 			{
 				throw new Exception("Введите логин и пароль");
 			}
@@ -85,16 +88,17 @@ namespace SushiBarClientApp.Controllers
 			}
 			Response.Redirect("Index");
 		}
+
 		[HttpGet]
 		public IActionResult Register()
 		{
 			return View();
 		}
+		
 		[HttpPost]
 		public void Register(string login, string password, string fio)
 		{
-			if (string.IsNullOrEmpty(login) ||
+			if (string.IsNullOrEmpty(login) || string.IsNullOrEmpty(password) || string.IsNullOrEmpty(fio))
-			string.IsNullOrEmpty(password) || string.IsNullOrEmpty(fio))
 			{
 				throw new Exception("Введите логин, пароль и ФИО");
 			}
@@ -108,12 +112,14 @@ namespace SushiBarClientApp.Controllers
 			Response.Redirect("Enter");
 			return;
 		}
+
 		[HttpGet]
 		public IActionResult Create()
 		{
 			ViewBag.Sushis = APIClient.GetRequest<List<SushiViewModel>>("api/main/getsushilist");
 			return View();
 		}
+
 		[HttpPost]
 		public void Create(int sushi, int count)
 		{
@@ -125,8 +131,7 @@ namespace SushiBarClientApp.Controllers
 			{
 				throw new Exception("Количество и сумма должны быть больше 0");
 			}
-			APIClient.PostRequest("api/main/createorder", new
+			APIClient.PostRequest("api/main/createorder", new OrderBindingModel
-			OrderBindingModel
 			{
 				ClientId = APIClient.Client.Id,
 				SushiId = sushi,
@@ -135,13 +140,23 @@ namespace SushiBarClientApp.Controllers
 			});
 			Response.Redirect("Index");
 		}
+
 		[HttpPost]
 		public double Calc(int count, int sushi)
 		{
-			var _sushi =
+			var _sushi = APIClient.GetRequest<SushiViewModel>($"api/main/getsushi?sushiid={sushi}");
-				APIClient.GetRequest<SushiViewModel>($"api/main/getsushi?sushiid={sushi}"
-			);
 			return Math.Round(count * (_sushi?.Price ?? 1), 2);
 		}
-	}
+
+        [HttpGet]
+        public IActionResult Mails()
+        {
+            if (APIClient.Client == null)
+            {
+                return Redirect("~/Home/Enter");
+            }
+            return
+            View(APIClient.GetRequest<List<MessageInfoViewModel>>($"api/client/getmessages?clientId={APIClient.Client.Id}"));
+        }
+    }
 }

SushiBar/SushiBarClientApi/Views/Home/Mails.cshtml

@@ -0,0 +1,54 @@
+@using SushiBarContracts.ViewModels
+
+@model List<MessageInfoViewModel>
+
+@{
+	ViewData["Title"] = "Mails";
+}
+
+<div class="text-center">
+	<h1 class="display-4">Заказы</h1>
+</div>
+
+
+<div class="text-center">
+	@{
+		if (Model == null)
+		{
+			<h3 class="display-4">Авторизируйтесь</h3>
+			return;
+		}
+
+		<table class="table">
+			<thead>
+				<tr>
+					<th>
+						Дата письма
+					</th>
+					<th>
+						Заголовок
+					</th>
+					<th>
+						Текст
+					</th>
+				</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>
+				}
+			</tbody>
+		</table>
+	}
+</div>

SushiBar/SushiBarRestApi/Controllers/ClientController.cs

@@ -12,11 +12,14 @@ namespace SushiBarRestApi.Controllers
     {
         private readonly ILogger _logger;
         private readonly IClientLogic _logic;
-        public ClientController(IClientLogic logic, ILogger<ClientController> logger)
+        private readonly IMessageInfoLogic _mailLogic;
+        public ClientController(IClientLogic logic, IMessageInfoLogic mailLogic, ILogger<ClientController> logger)
         {
             _logger = logger;
             _logic = logic;
+            _mailLogic = mailLogic;
         }
+
         [HttpGet]
         public ClientViewModel? Login(string login, string password)
         {
@@ -34,6 +37,24 @@ namespace SushiBarRestApi.Controllers
                 throw;
             }
         }
+
+        [HttpGet]
+        public List<MessageInfoViewModel>? GetMessages(int clientId)
+        {
+            try
+            {
+                return _mailLogic.ReadList(new MessageInfoSearchModel
+                {
+                    ClientId = clientId
+                });
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка получения писем клиента");
+                throw;
+            }
+        }
+
         [HttpPost]
         public void Register(ClientBindingModel model)
         {
@@ -47,6 +68,7 @@ namespace SushiBarRestApi.Controllers
                 throw;
             }
         }
+
         [HttpPost]
         public void UpdateData(ClientBindingModel model)
         {