не работает

Confectionery/ConfectioneryBusinessLogic/BusinessLogics/ClientLogic.cs

@@ -66,8 +66,7 @@ namespace ConfectioneryBusinessLogic.BusinessLogics
         public List<ClientViewModel>? ReadList(ClientSearchModel? model)
         {
             _logger.LogInformation("ReadList. Email:{Email}.Id:{ Id} ", model?.Email, model?.Id);
-            var list = (model == null) ? _clientStorage.GetFullList() :
+            var list = (model == null) ? _clientStorage.GetFullList() : _clientStorage.GetFilteredList(model);
-            _clientStorage.GetFilteredList(model);
             if (list == null)
             {
                 _logger.LogWarning("ReadList return null list");
@@ -106,7 +105,11 @@ namespace ConfectioneryBusinessLogic.BusinessLogics
             {
                 throw new ArgumentNullException("Нет логина клиента", nameof(model.Email));
             }
-            _logger.LogInformation("Client. Id: {Id}, FIO: {fio}, email: {email}", model.Id, model.ClientFIO, model.Email);
+            if (string.IsNullOrEmpty(model.Password))
+            {
+                throw new ArgumentNullException("У клиента отсутствует пароль", nameof(model.Email));
+            }
+            _logger.LogInformation("Client. Id: {Id}, FIO: {fio}, email: {email}", model.Id, model.ClientFIO, model.Email, model.Password);
             var element = _clientStorage.GetElement(new ClientSearchModel
             {
                 Email = model.Email,

Confectionery/ConfectioneryClientApp/APIClient.cs

@@ -0,0 +1,44 @@
+using ConfectioneryContracts.ViewModels;
+using Newtonsoft.Json;
+using System.Net.Http.Headers;
+using System.Text;
+
+namespace ConfectioneryClientApp
+{
+    public static class APIClient
+    {
+        private static readonly HttpClient _client = new();
+        public static ClientViewModel? Client { get; set; } = null;
+        public static void Connect(IConfiguration configuration)
+        {
+            _client.BaseAddress = new Uri(configuration["IPAddress"]);
+            _client.DefaultRequestHeaders.Accept.Clear();
+            _client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+        }
+        public static T? GetRequest<T>(string requestUrl)
+        {
+            var response = _client.GetAsync(requestUrl);
+            var result = response.Result.Content.ReadAsStringAsync().Result;
+            if (response.Result.IsSuccessStatusCode)
+            {
+                return JsonConvert.DeserializeObject<T>(result);
+            }
+            else
+            {
+                throw new Exception(result);
+            }
+        }
+        public static void PostRequest<T>(string requestUrl, T model)
+        {
+            var json = JsonConvert.SerializeObject(model);
+            var data = new StringContent(json, Encoding.UTF8, "application/json");
+            var response = _client.PostAsync(requestUrl, data);
+            var result = response.Result.Content.ReadAsStringAsync().Result;
+            if (!response.Result.IsSuccessStatusCode)
+            {
+                throw new Exception(result);
+            }
+        }
+
+    }
+}

Confectionery/ConfectioneryClientApp/ConfectioneryClientApp.csproj

@@ -6,4 +6,12 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ConfectioneryContracts\ConfectioneryContracts.csproj" />
+  </ItemGroup>
+
 </Project>

Confectionery/ConfectioneryClientApp/Controllers/HomeController.cs

@@ -1,4 +1,6 @@
 using ConfectioneryClientApp.Models;
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.ViewModels;
 using Microsoft.AspNetCore.Mvc;
 using System.Diagnostics;
 
@@ -7,20 +9,49 @@ namespace ConfectioneryClientApp.Controllers
     public class HomeController : Controller
     {
         private readonly ILogger<HomeController> _logger;
-
         public HomeController(ILogger<HomeController> logger)
         {
             _logger = logger;
         }
-
         public IActionResult Index()
         {
-            return View();
+            if (APIClient.Client == null)
+            {
+                return Redirect("~/Home/Enter");
             }
-
+            return View(APIClient.GetRequest<List<OrderViewModel>>($"api/main/getorders?clientId={APIClient.Client.Id}"));
+        }
+        [HttpGet]
         public IActionResult Privacy()
         {
-            return View();
+            if (APIClient.Client == null)
+            {
+                return Redirect("~/Home/Enter");
+            }
+            return View(APIClient.Client);
+        }
+        [HttpPost]
+        public void Privacy(string login, string password, string fio)
+        {
+            if (APIClient.Client == null)
+            {
+                throw new Exception("Вы как суда попали? Суда вход только авторизованным");
+            }
+            if (string.IsNullOrEmpty(login) || string.IsNullOrEmpty(password) || string.IsNullOrEmpty(fio))
+            {
+                throw new Exception("Введите логин, пароль и ФИО");
+            }
+            APIClient.PostRequest("api/client/updatedata", new ClientBindingModel
+            {
+                Id = APIClient.Client.Id,
+                ClientFIO = fio,
+                Email = login,
+                Password = password
+            });
+            APIClient.Client.ClientFIO = fio;
+            APIClient.Client.Email = login;
+            APIClient.Client.Password = password;
+            Response.Redirect("Index");
         }
 
         [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
@@ -28,5 +59,85 @@ namespace ConfectioneryClientApp.Controllers
         {
             return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });
         }
+
+        [HttpGet]
+        public IActionResult Enter()
+        {
+            return View();
+        }
+
+        [HttpPost]
+        public void Enter(string login, string password)
+        {
+            if (string.IsNullOrEmpty(login) ||
+            string.IsNullOrEmpty(password))
+            {
+                throw new Exception("Введите логин и пароль");
+            }
+            APIClient.Client = APIClient.GetRequest<ClientViewModel>($"api/client/login?login={login}&password={password}");
+            if (APIClient.Client == null)
+            {
+                throw new Exception("Неверный логин/пароль");
+            }
+            Response.Redirect("Index");
+        }
+
+        [HttpGet]
+        public IActionResult Register()
+        {
+            return View();
+        }
+
+        [HttpPost]
+        public void Register(string login, string password, string fio)
+        {
+            if (string.IsNullOrEmpty(login) || string.IsNullOrEmpty(password) || string.IsNullOrEmpty(fio))
+            {
+                throw new Exception("Введите логин, пароль и ФИО");
+            }
+            APIClient.PostRequest("api/client/register", new ClientBindingModel
+            {
+                ClientFIO = fio,
+                Email = login,
+                Password = password
+            });
+            Response.Redirect("Enter");
+            return;
+        }
+
+        [HttpGet]
+        public IActionResult Create()
+        {
+            ViewBag.Pastries = APIClient.GetRequest<List<PastryViewModel>>("api/main/getpastrylist");
+            return View();
+        }
+
+        [HttpPost]
+        public void Create(int pastry, int count)
+        {
+            if (APIClient.Client == null)
+            {
+                throw new Exception("Вы как суда попали? Суда вход только авторизованным");
+            }
+            if (count <= 0)
+            {
+                throw new Exception("Количество и сумма должны быть больше 0");
+            }
+            APIClient.PostRequest("api/main/createorder", new OrderBindingModel
+            {
+                ClientId = APIClient.Client.Id,
+                PastryId = pastry,
+                Count = count,
+                Sum = Calc(count, pastry)
+            });
+            Response.Redirect("Index");
+        }
+
+        [HttpPost]
+        public double Calc(int count, int pastry)
+        {
+            var prod = APIClient.GetRequest<PastryViewModel>($"api/main/getpastry?pastryId={pastry}");
+            return count * (prod?.Price ?? 1);
+        }
     }
 }

Confectionery/ConfectioneryClientApp/Program.cs

@@ -1,3 +1,5 @@
+using ConfectioneryClientApp;
+
 var builder = WebApplication.CreateBuilder(args);
 
 // Add services to the container.
@@ -5,6 +7,8 @@ builder.Services.AddControllersWithViews();
 
 var app = builder.Build();
 
+APIClient.Connect(builder.Configuration);
+
 // Configure the HTTP request pipeline.
 if (!app.Environment.IsDevelopment())
 {

Confectionery/ConfectioneryClientApp/Views/Home/Create.cshtml

@@ -0,0 +1,56 @@
+@{
+	ViewData["Title"] = "Create";
+}
+<div class="text-center">
+	<h2 class="display-4">Создание заказа</h2>
+</div>
+<form method="post">
+	<div class="row">
+		<div class="col-4">Изделие:</div>
+		<div class="col-8">
+			<select id="pastry" name="pastry" class="form-control" asp-items="@(new SelectList(@ViewBag.Pastries,"Id", "PastryName"))"></select>
+		</div>
+	</div>
+	<div class="row">
+		<div class="col-4">Количество:</div>
+		<div class="col-8">
+			<input type="text" name="count" id="count" />
+		</div>
+	</div>
+	<div class="row">
+		<div class="col-4">Сумма:</div>
+		<div class="col-8">
+			<input type="text" id="sum" name="sum" readonly />
+		</div>
+	</div>
+	<div class="row">
+		<div class="col-8"></div>
+		<div class="col-4">
+			<input type="submit" value="Создать" class="btn btn-primary" />
+		</div>
+	</div>
+</form>
+@section scripts{
+<script>
+	$('#pastry').on('change', function () {
+		check();
+	});
+	$('#count').on('change', function () {
+		check();
+	});
+	function check() {
+		var count = $('#count').val();
+		var pastry = $('#pastry').val();
+		if (count && pastry) {
+			$.ajax({
+				method: "POST",
+				url: "/Home/Calc",
+				data: { count: count, pastry: pastry },
+				success: function (result) {
+					$("#sum").val(result);
+				}
+			});
+		};
+	}
+</script>
+}

Confectionery/ConfectioneryClientApp/Views/Home/Enter.cshtml

@@ -0,0 +1,20 @@
+@{
+	ViewData["Title"] = "Enter";
+}
+<div class="text-center">
+	<h2 class="display-4">Вход в приложение</h2>
+</div>
+<form method="post">
+	<div class="row">
+		<div class="col-4">Логин:</div>
+		<div class="col-8"><input type="text" name="login" /></div>
+	</div>
+	<div class="row">
+		<div class="col-4">Пароль:</div>
+		<div class="col-8"><input type="password" name="password" /></div>
+	</div>
+	<div class="row">
+		<div class="col-8"></div>
+		<div class="col-4"><input type="submit" value="Вход" class="btn btnprimary" /></div>
+	</div>
+</form>

Confectionery/ConfectioneryClientApp/Views/Home/Index.cshtml

@@ -1,8 +1,75 @@
-@{
+@using ConfectioneryContracts.ViewModels;
+
+@model List<OrderViewModel>
+
+@{
 	ViewData["Title"] = "Home Page";
 }
 
 <div class="text-center">
-    <h1 class="display-4">Welcome</h1>
+	<h1 class="display-4">Заказы</h1>
-    <p>Learn about <a href="https://docs.microsoft.com/aspnet/core">building Web apps with ASP.NET Core</a>.</p>
+</div>
+
+
+<div class="text-center">
+	@{
+		if (Model == null)
+		{
+							<h3 class="display-4">Авторизируйтесь</h3>
+			return;
+		}
+
+				<p>
+					<a asp-action="Create">Создать заказ</a>
+				</p>
+				<table class="table">
+					<thead>
+						<tr>
+							<th>
+								Номер
+							</th>
+							<th>
+								Изделие
+							</th>
+							<th>
+								Дата создания
+							</th>
+							<th>
+								Количество
+							</th>
+							<th>
+								Сумма
+							</th>
+							<th>
+								Статус
+							</th>
+						</tr>
+					</thead>
+					<tbody>
+				@foreach (var item in Model)
+				{
+									<tr>
+										<td>
+							@Html.DisplayFor(modelItem => item.Id)
+										</td>
+										<td>
+							@Html.DisplayFor(modelItem => item.PastryName)
+										</td>
+										<td>
+							@Html.DisplayFor(modelItem => item.DateCreate)
+										</td>
+										<td>
+							@Html.DisplayFor(modelItem => item.Count)
+										</td>
+										<td>
+							@Html.DisplayFor(modelItem => item.Sum)
+										</td>
+										<td>
+							@Html.DisplayFor(modelItem => item.Status)
+										</td>
+									</tr>
+				}
+					</tbody>
+				</table>
+	}
 </div>

Confectionery/ConfectioneryClientApp/Views/Home/Privacy.cshtml

@@ -1,6 +1,28 @@
-@{
+@using ConfectioneryContracts.ViewModels;
+
+@model ClientViewModel
+
+@{
 	ViewData["Title"] = "Privacy Policy";
 }
-<h1>@ViewData["Title"]</h1>
+<div class="text-center">
-
+	<h2 class="display-4">Личные данные</h2>
-<p>Use this page to detail your site's privacy policy.</p>
+</div>
+<form method="post">
+	<div class="row">
+		<div class="col-4">Логин:</div>
+		<div class="col-8"><input type="text" name="login" value="@Model.Email" /></div>
+	</div>
+	<div class="row">
+		<div class="col-4">Пароль:</div>
+		<div class="col-8"><input type="password" name="password" value="@Model.Password" /></div>
+	</div>
+	<div class="row">
+		<div class="col-4">ФИО:</div>
+		<div class="col-8"><input type="text" name="fio" value="@Model.ClientFIO" /></div>
+	</div>
+	<div class="row">
+		<div class="col-8"></div>
+		<div class="col-4"><input type="submit" value="Сохранить" class="btn btn-primary" /></div>
+	</div>
+</form>

Confectionery/ConfectioneryClientApp/Views/Home/Register.cshtml

@@ -0,0 +1,25 @@
+@{
+ViewData["Title"] = "Register";
+}
+<div class="text-center">
+<h2 class="display-4">Регистрация</h2>
+</div>
+<form method="post">
+<div class="row">
+<div class="col-4">Логин:</div>
+<div class="col-8"><input type="text" name="login" /></div>
+</div>
+<div class="row">
+<div class="col-4">Пароль:</div>
+<div class="col-8"><input type="password" name="password" /></div>
+</div>
+<div class="row">
+<div class="col-4">ФИО:</div>
+<div class="col-8"><input type="text" name="fio" /></div>
+</div>
+<div class="row">
+<div class="col-8"></div>
+<div class="col-4"><input type="submit" value="Регистрация"
+class="btn btn-primary" /></div>
+</div>
+</form>

Confectionery/ConfectioneryClientApp/Views/Shared/_Layout.cshtml

@@ -10,20 +10,26 @@
 </head>
 <body>
     <header>
-        <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
+        <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bgwhite border-bottom box-shadow mb-3">
-            <div class="container-fluid">
+            <div class="container">
-                <a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">ConfectioneryClientApp</a>
+                <a class="navbar-brand" asp-area="" asp-controller="Home" aspaction="Index">Абстрактный магазин</a>
-                <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target=".navbar-collapse" aria-controls="navbarSupportedContent"
+                <button class="navbar-toggler" type="button" datatoggle="collapse" data-target=".navbar-collapse" ariacontrols="navbarSupportedContent"
                         aria-expanded="false" aria-label="Toggle navigation">
                     <span class="navbar-toggler-icon"></span>
                 </button>
-                <div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
+                <div class="navbar-collapse collapse d-sm-inline-flex flex-smrow-reverse">
                     <ul class="navbar-nav flex-grow-1">
                         <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Home</a>
+                            <a class="nav-link text-dark" asparea="" asp-controller="Home" asp-action="Index">Заказы</a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
+                            <a class="nav-link text-dark" asparea="" asp-controller="Home" asp-action="Privacy">Личные данные</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link text-dark" asparea="" asp-controller="Home" asp-action="Enter">Вход</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link text-dark" asparea="" asp-controller="Home" asp-action="Register">Регистрация</a>
                         </li>
                     </ul>
                 </div>

Confectionery/ConfectioneryClientApp/appsettings.json

@@ -5,5 +5,7 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "AllowedHosts": "*"
+  "AllowedHosts": "*",
+
+  "IPAddress": "http://localhost:5149/"
 }

Confectionery/ConfectioneryDataModels/Models/IOrderModel.cs

@@ -11,6 +11,8 @@ namespace ConfectioneryDataModels.Models
     {
         int PastryId { get; }
 
+        int ClientId { get; }
+
         int Count { get; }
 
         double Sum { get; }

Confectionery/ConfectioneryDatabaseImplement/Implements/ClientStorage.cs

@@ -36,9 +36,7 @@ namespace ConfectioneryDatabaseImplement.Implements
                                       && x.Password.Equals(model.Password))
                     ?.GetViewModel;
             if (model.Email != null)
-                return context.Clients
+                return context.Clients.FirstOrDefault(x => x.Email.Equals(model.Email))?.GetViewModel;
-                    .FirstOrDefault(x => x.Email
-                    .Equals(model.Email))?.GetViewModel;
             return null;
         }
 

Confectionery/ConfectioneryDatabaseImplement/Implements/OrderStorage.cs

@@ -50,14 +50,38 @@ namespace ConfectioneryDatabaseImplement.Implements
 
 		public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
 		{
-            if (!model.Id.HasValue && !model.DateFrom.HasValue && !model.DateTo.HasValue)
+            using var context = new ConfectioneryDatabase();
+            if (model.Id.HasValue)
+            {
+                return context.Orders
+                    .Include(x => x.Pastry)
+                    .Include(x => x.Client)
+                    .Where(x => x.Id == model.Id)
+                    .Select(x => x.GetViewModel)
+                    .ToList();
+            }
+            else if (model.DateFrom != null && model.DateTo != null)
+            {
+                return context.Orders
+                    .Include(x => x.Pastry)
+                    .Include(x => x.Client)
+                    .Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo)
+                    .Select(x => x.GetViewModel)
+                    .ToList();
+            }
+            else if (model.ClientId.HasValue)
+            {
+                return context.Orders
+                    .Include(x => x.Pastry)
+                    .Include(x => x.Client)
+                    .Where(x => x.ClientId == model.ClientId)
+                    .Select(x => x.GetViewModel)
+                    .ToList();
+            }
+            else
             {
                 return new();
             }
-            using var context = new ConfectioneryDatabase();
-
-            return context.Orders.Where(x => x.Id == model.Id || model.DateFrom <= x.DateCreate && x.DateCreate <= model.DateTo)
-                .Select(x => GetViewModel(x)).ToList();
         }
 
 		public List<OrderViewModel> GetFullList()
@@ -107,14 +131,5 @@ namespace ConfectioneryDatabaseImplement.Implements
                           .FirstOrDefault(x => x.Id == model.Id)
                           ?.GetViewModel;
         }
-
-		private static OrderViewModel GetViewModel(Order order)
-		{
-			var viewModel = order.GetViewModel;
-			using var context = new ConfectioneryDatabase();
-			var element = context.Pastries.FirstOrDefault(x => x.Id == order.PastryId);
-			viewModel.PastryName = element.PastryName;
-			return viewModel;
-		}
 	}
 }

Confectionery/ConfectioneryDatabaseImplement/Migrations/20230424180732_migr3.Designer.cs

@@ -0,0 +1,212 @@
+// <auto-generated />
+using System;
+using ConfectioneryDatabaseImplement;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace ConfectioneryDatabaseImplement.Migrations
+{
+    [DbContext(typeof(ConfectioneryDatabase))]
+    [Migration("20230424180732_migr3")]
+    partial class migr3
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.3")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Client", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClientFIO")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Clients");
+                });
+
+            modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Component", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ComponentName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<double>("Cost")
+                        .HasColumnType("double precision");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Components");
+                });
+
+            modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Order", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ClientId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Count")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("DateCreate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime?>("DateImplement")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<int>("PastryId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<double>("Sum")
+                        .HasColumnType("double precision");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ClientId");
+
+                    b.HasIndex("PastryId");
+
+                    b.ToTable("Orders");
+                });
+
+            modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Pastry", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("PastryName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<double>("Price")
+                        .HasColumnType("double precision");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Pastries");
+                });
+
+            modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.PastryComponent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ComponentId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Count")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("PastryId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ComponentId");
+
+                    b.HasIndex("PastryId");
+
+                    b.ToTable("PastryComponents");
+                });
+
+            modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Order", b =>
+                {
+                    b.HasOne("ConfectioneryDatabaseImplement.Models.Client", "Client")
+                        .WithMany("Orders")
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("ConfectioneryDatabaseImplement.Models.Pastry", "Pastry")
+                        .WithMany()
+                        .HasForeignKey("PastryId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Client");
+
+                    b.Navigation("Pastry");
+                });
+
+            modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.PastryComponent", b =>
+                {
+                    b.HasOne("ConfectioneryDatabaseImplement.Models.Component", "Component")
+                        .WithMany("PastryComponents")
+                        .HasForeignKey("ComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("ConfectioneryDatabaseImplement.Models.Pastry", "Pastry")
+                        .WithMany("Components")
+                        .HasForeignKey("PastryId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Component");
+
+                    b.Navigation("Pastry");
+                });
+
+            modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Client", b =>
+                {
+                    b.Navigation("Orders");
+                });
+
+            modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Component", b =>
+                {
+                    b.Navigation("PastryComponents");
+                });
+
+            modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Pastry", b =>
+                {
+                    b.Navigation("Components");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

Confectionery/ConfectioneryDatabaseImplement/Migrations/20230424180732_migr3.cs

@@ -0,0 +1,59 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ConfectioneryDatabaseImplement.Migrations
+{
+    /// <inheritdoc />
+    public partial class migr3 : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_Orders_Clients_ClientId",
+                table: "Orders");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "ClientId",
+                table: "Orders",
+                type: "integer",
+                nullable: false,
+                defaultValue: 0,
+                oldClrType: typeof(int),
+                oldType: "integer",
+                oldNullable: true);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Orders_Clients_ClientId",
+                table: "Orders",
+                column: "ClientId",
+                principalTable: "Clients",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_Orders_Clients_ClientId",
+                table: "Orders");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "ClientId",
+                table: "Orders",
+                type: "integer",
+                nullable: true,
+                oldClrType: typeof(int),
+                oldType: "integer");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Orders_Clients_ClientId",
+                table: "Orders",
+                column: "ClientId",
+                principalTable: "Clients",
+                principalColumn: "Id");
+        }
+    }
+}

Confectionery/ConfectioneryDatabaseImplement/Migrations/20230424190153_migr4.Designer.cs

@@ -0,0 +1,214 @@
+// <auto-generated />
+using System;
+using ConfectioneryDatabaseImplement;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace ConfectioneryDatabaseImplement.Migrations
+{
+    [DbContext(typeof(ConfectioneryDatabase))]
+    [Migration("20230424190153_migr4")]
+    partial class migr4
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.3")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Client", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClientFIO")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Clients");
+                });
+
+            modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Component", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ComponentName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<double>("Cost")
+                        .HasColumnType("double precision");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Components");
+                });
+
+            modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Order", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ClientId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Count")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("DateCreate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime?>("DateImplement")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<int>("PastryId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<double>("Sum")
+                        .HasColumnType("double precision");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ClientId");
+
+                    b.HasIndex("PastryId");
+
+                    b.ToTable("Orders");
+                });
+
+            modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Pastry", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("PastryName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<double>("Price")
+                        .HasColumnType("double precision");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Pastries");
+                });
+
+            modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.PastryComponent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ComponentId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Count")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("PastryId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ComponentId");
+
+                    b.HasIndex("PastryId");
+
+                    b.ToTable("PastryComponents");
+                });
+
+            modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Order", b =>
+                {
+                    b.HasOne("ConfectioneryDatabaseImplement.Models.Client", "Client")
+                        .WithMany("Orders")
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("ConfectioneryDatabaseImplement.Models.Pastry", "Pastry")
+                        .WithMany("Orders")
+                        .HasForeignKey("PastryId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Client");
+
+                    b.Navigation("Pastry");
+                });
+
+            modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.PastryComponent", b =>
+                {
+                    b.HasOne("ConfectioneryDatabaseImplement.Models.Component", "Component")
+                        .WithMany("PastryComponents")
+                        .HasForeignKey("ComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("ConfectioneryDatabaseImplement.Models.Pastry", "Pastry")
+                        .WithMany("Components")
+                        .HasForeignKey("PastryId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Component");
+
+                    b.Navigation("Pastry");
+                });
+
+            modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Client", b =>
+                {
+                    b.Navigation("Orders");
+                });
+
+            modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Component", b =>
+                {
+                    b.Navigation("PastryComponents");
+                });
+
+            modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Pastry", b =>
+                {
+                    b.Navigation("Components");
+
+                    b.Navigation("Orders");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

Confectionery/ConfectioneryDatabaseImplement/Migrations/20230424190153_migr4.cs

@@ -0,0 +1,22 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ConfectioneryDatabaseImplement.Migrations
+{
+    /// <inheritdoc />
+    public partial class migr4 : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+
+        }
+    }
+}

Confectionery/ConfectioneryDatabaseImplement/Migrations/ConfectioneryDatabaseModelSnapshot.cs

@@ -75,7 +75,7 @@ namespace ConfectioneryDatabaseImplement.Migrations
 
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
-                    b.Property<int?>("ClientId")
+                    b.Property<int>("ClientId")
                         .HasColumnType("integer");
 
                     b.Property<int>("Count")
@@ -153,16 +153,20 @@ namespace ConfectioneryDatabaseImplement.Migrations
 
             modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Order", b =>
                 {
-                    b.HasOne("ConfectioneryDatabaseImplement.Models.Client", null)
+                    b.HasOne("ConfectioneryDatabaseImplement.Models.Client", "Client")
                         .WithMany("Orders")
-                        .HasForeignKey("ClientId");
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
 
                     b.HasOne("ConfectioneryDatabaseImplement.Models.Pastry", "Pastry")
-                        .WithMany()
+                        .WithMany("Orders")
                         .HasForeignKey("PastryId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.Navigation("Client");
+
                     b.Navigation("Pastry");
                 });
 
@@ -198,6 +202,8 @@ namespace ConfectioneryDatabaseImplement.Migrations
             modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Pastry", b =>
                 {
                     b.Navigation("Components");
+
+                    b.Navigation("Orders");
                 });
 #pragma warning restore 612, 618
         }

Confectionery/ConfectioneryDatabaseImplement/Models/Order.cs

@@ -45,6 +45,7 @@ namespace ConfectioneryDatabaseImplement.Models
             {
                 Id = model.Id,
                 PastryId = model.PastryId,
+                ClientId = model.ClientId,
                 Count = model.Count,
                 Sum = model.Sum,
                 Status = model.Status,
@@ -67,6 +68,9 @@ namespace ConfectioneryDatabaseImplement.Models
         {
             Id = Id,
             PastryId = PastryId,
+            ClientId = ClientId,
+            ClientFIO = Client.ClientFIO,
+            PastryName = Pastry.PastryName,
             Count = Count,
             Sum = Sum,
             Status = Status,

Confectionery/ConfectioneryDatabaseImplement/Models/Pastry.cs

@@ -42,6 +42,9 @@ namespace ConfectioneryDatabaseImplement.Models
         [ForeignKey("PastryId")]
         public virtual List<PastryComponent> Components { get; set; } = new();
 
+        [ForeignKey("PastryId")]
+        public virtual List<Order> Orders { get; set; } = new();
+
         public static Pastry? Create(ConfectioneryDatabase context ,PastryBindingModel? model)
         {
             if (model == null)

Confectionery/ConfectioneryFileImplement/Implements/OrderStorage.cs

@@ -31,11 +31,22 @@ namespace ConfectioneryFileImplement.Implements
 
         public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
         {
-            if (!model.Id.HasValue)
+            if (!model.Id.HasValue && model.DateFrom.HasValue && model.DateTo.HasValue)
             {
-                return new();
+                return source.Orders
+                    .Where(x => model.DateFrom <= x.DateCreate.Date && x.DateCreate <= model.DateTo)
+                    .Select(x => GetViewModel(x))
+                    .ToList();
             }
-            return source.Orders.Where(x => x.Id == model.Id).Select(x => GetViewModel(x)).ToList();
+            if (!model.Id.HasValue && model.ClientId.HasValue)
+            {
+                return source.Orders
+                    .Where(x => x.ClientId == model.ClientId)
+                    .Select(x => GetViewModel(x))
+                    .ToList();
+            }
+            var result = GetElement(model);
+            return result != null ? new() { result } : new();
         }
 
         public List<OrderViewModel> GetFullList()
@@ -82,11 +93,19 @@ namespace ConfectioneryFileImplement.Implements
         private OrderViewModel GetViewModel(Order order)
         {
             var viewModel = order.GetViewModel;
-            foreach (var comp in source.Pastries)
+            foreach (var pastr in source.Pastries)
             {
-                if (comp.Id == order.PastryId)
+                if (pastr.Id == order.PastryId)
                 {
-                    viewModel.PastryName = comp.PastryName;
+                    viewModel.PastryName = pastr.PastryName;
+                    break;
+                }
+            }
+            foreach (var client in source.Clients)
+            {
+                if (client.Id == order.ClientId)
+                {
+                    viewModel.ClientFIO = client.ClientFIO;
                     break;
                 }
             }

Confectionery/ConfectioneryFileImplement/Models/Order.cs

@@ -17,6 +17,8 @@ namespace ConfectioneryFileImplement.Models
 
         public int PastryId { get; private set; }
 
+        public int ClientId { get; private set; }
+
         public int Count { get; private set; }
 
         public double Sum { get; private set; }
@@ -38,6 +40,7 @@ namespace ConfectioneryFileImplement.Models
             {
                 Id = model.Id,
                 PastryId = model.PastryId,
+                ClientId = model.ClientId,
                 Count = model.Count,
                 Sum = model.Sum,
                 Status = model.Status,
@@ -56,6 +59,7 @@ namespace ConfectioneryFileImplement.Models
             {
                 Id = Convert.ToInt32(element.Attribute("Id")!.Value),
                 PastryId = Convert.ToInt32(element.Element("PastryId")!.Value),
+                ClientId = Convert.ToInt32(element.Element("ClientId")!.Value),
                 Count = Convert.ToInt32(element.Element("Count")!.Value),
                 Sum = Convert.ToDouble(element.Element("Sum")!.Value),
                 DateCreate = DateTime.ParseExact(element.Element("DateCreate")!.Value, "G", null),
@@ -91,6 +95,7 @@ namespace ConfectioneryFileImplement.Models
         {
             Id = Id,
             PastryId = PastryId,
+            ClientId = ClientId,
             Count = Count,
             Sum = Sum,
             Status = Status,
@@ -101,6 +106,7 @@ namespace ConfectioneryFileImplement.Models
         public XElement GetXElement => new("Order",
           new XAttribute("Id", Id),
           new XElement("PastryId", PastryId),
+          new XElement("ClientId", ClientId),
           new XElement("Count", Count.ToString()),
           new XElement("Sum", Sum.ToString()),
           new XElement("Status", Status.ToString()),

Confectionery/ConfectioneryListImplement/Implements/OrderStorage.cs

@@ -32,15 +32,19 @@ namespace ConfectioneryListImplement.Implements
 		public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
 		{
             var result = new List<OrderViewModel>();
-			if (model == null)
+            foreach (var order in _source.Orders)
             {
-				return result;
+                if (order.Id == model.Id)
+                {
+                    return new() { GetViewModel(order) };
                 }
-			foreach (var Order in _source.Orders)
+                else if (model.DateFrom.HasValue && model.DateTo.HasValue && model.DateFrom <= order.DateCreate.Date && order.DateCreate.Date <= model.DateTo)
                 {
-				if (Order.Id == model.Id)
+                    result.Add(GetViewModel(order));
+                }
+                else if (model.ClientId.HasValue && order.ClientId == model.ClientId)
                 {
-					result.Add(GetViewModel(Order));
+                    result.Add(GetViewModel(order));
                 }
             }
             return result;
@@ -115,6 +119,14 @@ namespace ConfectioneryListImplement.Implements
 					break;
 				}
 			}
+            foreach (var client in _source.Clients)
+            {
+                if (client.Id == order.ClientId)
+                {
+                    viewModel.ClientFIO = client.ClientFIO;
+                    break;
+                }
+            }
             return viewModel;
 		}
 	}

Confectionery/ConfectioneryListImplement/Models/Order.cs

@@ -16,6 +16,8 @@ namespace ConfectioneryListImplement.Models
 
         public int PastryId { get; private set; }
 
+        public int ClientId { get; private set; }
+
         public int Count { get; private set; }
 
         public double Sum { get; private set; }
@@ -37,6 +39,7 @@ namespace ConfectioneryListImplement.Models
             {
                 Id = model.Id,
                 PastryId = model.PastryId,
+                ClientId = model.ClientId,
                 Count = model.Count,
                 Sum = model.Sum,
                 Status = model.Status,
@@ -64,6 +67,7 @@ namespace ConfectioneryListImplement.Models
         {
             Id = Id,
             PastryId = PastryId,
+            ClientId = ClientId,
             Count = Count,
             Sum = Sum,
             Status = Status,

Confectionery/ConfectioneryView/FormClients.cs

@@ -65,7 +65,6 @@ namespace ConfectioneryView
                         {
                             throw new Exception("Ошибка при удалении. Дополнительная информация в логах.");
                         }                   
-                        LoadData();
                     }
                     catch (Exception ex)
                     {
@@ -73,6 +72,7 @@ namespace ConfectioneryView
                         MessageBox.Show(ex.Message, "Ошибка",
                         MessageBoxButtons.OK, MessageBoxIcon.Error);
                     }
+                    LoadData();
                 }
             }
         }

Confectionery/ConfectioneryView/FormCreateOrder.Designer.cs

@@ -36,6 +36,8 @@
             this.comboBoxPastry = new System.Windows.Forms.ComboBox();
             this.textBoxCount = new System.Windows.Forms.TextBox();
             this.textBoxSum = new System.Windows.Forms.TextBox();
+            this.label4 = new System.Windows.Forms.Label();
+            this.comboBoxClient = new System.Windows.Forms.ComboBox();
             this.SuspendLayout();
             // 
             // label1
@@ -67,7 +69,7 @@
             // 
             // buttonSave
             // 
-            this.buttonSave.Location = new System.Drawing.Point(199, 143);
+            this.buttonSave.Location = new System.Drawing.Point(199, 195);
             this.buttonSave.Name = "buttonSave";
             this.buttonSave.Size = new System.Drawing.Size(75, 23);
             this.buttonSave.TabIndex = 3;
@@ -77,7 +79,7 @@
             // 
             // buttonCancel
             // 
-            this.buttonCancel.Location = new System.Drawing.Point(280, 143);
+            this.buttonCancel.Location = new System.Drawing.Point(290, 195);
             this.buttonCancel.Name = "buttonCancel";
             this.buttonCancel.Size = new System.Drawing.Size(75, 23);
             this.buttonCancel.TabIndex = 4;
@@ -109,11 +111,30 @@
             this.textBoxSum.Size = new System.Drawing.Size(271, 23);
             this.textBoxSum.TabIndex = 7;
             // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Location = new System.Drawing.Point(12, 141);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(49, 15);
+            this.label4.TabIndex = 8;
+            this.label4.Text = "Клиент:";
+            // 
+            // comboBoxClient
+            // 
+            this.comboBoxClient.FormattingEnabled = true;
+            this.comboBoxClient.Location = new System.Drawing.Point(94, 141);
+            this.comboBoxClient.Name = "comboBoxClient";
+            this.comboBoxClient.Size = new System.Drawing.Size(268, 23);
+            this.comboBoxClient.TabIndex = 9;
+            // 
             // FormCreateOrder
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(375, 187);
+            this.ClientSize = new System.Drawing.Size(374, 230);
+            this.Controls.Add(this.comboBoxClient);
+            this.Controls.Add(this.label4);
             this.Controls.Add(this.textBoxSum);
             this.Controls.Add(this.textBoxCount);
             this.Controls.Add(this.comboBoxPastry);
@@ -140,5 +161,7 @@
         private ComboBox comboBoxPastry;
         private TextBox textBoxCount;
         private TextBox textBoxSum;
+        private Label label4;
+        private ComboBox comboBoxClient;
     }
 }

Confectionery/ConfectioneryView/FormCreateOrder.cs

@@ -1,4 +1,5 @@
-using ConfectioneryContracts.BindingModels;
+using ConfectioneryBusinessLogic.BusinessLogics;
+using ConfectioneryContracts.BindingModels;
 using ConfectioneryContracts.BusinessLogicsContracts;
 using ConfectioneryContracts.SearchModels;
 using Microsoft.Extensions.Logging;
@@ -19,17 +20,21 @@ namespace ConfectioneryView
         private readonly ILogger _logger;
         private readonly IPastryLogic _logicP;
         private readonly IOrderLogic _logicO;
-        public FormCreateOrder(ILogger<FormCreateOrder> logger, IPastryLogic logicP, IOrderLogic logicO)
+        private readonly IClientLogic _clientLogic;
+
+        public FormCreateOrder(ILogger<FormCreateOrder> logger, IPastryLogic logicP, IOrderLogic logicO, IClientLogic clientLogic)
         {
             InitializeComponent();
             _logger = logger;
             _logicP = logicP;
             _logicO = logicO;
+            _clientLogic = clientLogic;
         }
 
         private void FormCreateOrder_Load(object sender, EventArgs e)
         {
             _logger.LogInformation("Загрузка изделий для заказа");
+
             try
             {
                 var list = _logicP.ReadList(null);
@@ -40,11 +45,18 @@ namespace ConfectioneryView
                     comboBoxPastry.DataSource = list;
                     comboBoxPastry.SelectedItem = null;
                 }
-
+                var clients = _clientLogic.ReadList(null);
+                if (clients != null)
+                {
+                    comboBoxClient.DisplayMember = "ClientFIO";
+                    comboBoxClient.ValueMember = "Id";
+                    comboBoxClient.DataSource = clients;
+                    comboBoxClient.SelectedItem = null;
+                }
             }
             catch (Exception ex)
             {
-                _logger.LogError(ex, "Ошибка загрузки списка кондитерских изделий.");
+                _logger.LogError(ex, "Ошибка загрузки списка изделий");
                 MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
         }
@@ -90,14 +102,12 @@ namespace ConfectioneryView
         {
             if (string.IsNullOrEmpty(textBoxCount.Text))
             {
-                MessageBox.Show("Заполните поле Количество", "Ошибка",
+                MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-               MessageBoxButtons.OK, MessageBoxIcon.Error);
                 return;
             }
             if (comboBoxPastry.SelectedValue == null)
             {
-                MessageBox.Show("Выберите изделие", "Ошибка",
+                MessageBox.Show("Выберите компьютер", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-               MessageBoxButtons.OK, MessageBoxIcon.Error);
                 return;
             }
             _logger.LogInformation("Создание заказа");
@@ -106,6 +116,7 @@ namespace ConfectioneryView
                 var operationResult = _logicO.CreateOrder(new OrderBindingModel
                 {
                     PastryId = Convert.ToInt32(comboBoxPastry.SelectedValue),
+                    ClientId = Convert.ToInt32(comboBoxClient.SelectedValue),
                     Count = Convert.ToInt32(textBoxCount.Text),
                     Sum = Convert.ToDouble(textBoxSum.Text)
                 });
@@ -113,8 +124,7 @@ namespace ConfectioneryView
                 {
                     throw new Exception("Ошибка при создании заказа. Дополнительная информация в логах.");
                 }
-                MessageBox.Show("Сохранение прошло успешно", "Сообщение",
+                MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
-               MessageBoxButtons.OK, MessageBoxIcon.Information);
                 DialogResult = DialogResult.OK;
                 Close();
             }

Confectionery/ConfectioneryView/FormMain.Designer.cs

@@ -42,6 +42,7 @@
             this.списокКомпонентовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.компонентыПоИзделиямToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.списокЗаказовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.клиентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
             this.menuStrip1.SuspendLayout();
             this.SuspendLayout();
@@ -120,7 +121,8 @@
             // 
             this.справочникиToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.кондитерскиеИзделияToolStripMenuItem,
-            this.компонентыToolStripMenuItem});
+            this.компонентыToolStripMenuItem,
+            this.клиентыToolStripMenuItem});
             this.справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
             this.справочникиToolStripMenuItem.Size = new System.Drawing.Size(94, 20);
             this.справочникиToolStripMenuItem.Text = "Справочники";
@@ -170,6 +172,13 @@
             this.списокЗаказовToolStripMenuItem.Text = "Список заказов";
             this.списокЗаказовToolStripMenuItem.Click += new System.EventHandler(this.OrdersToolStripMenuItem_Click);
             // 
+            // клиентыToolStripMenuItem
+            // 
+            this.клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem";
+            this.клиентыToolStripMenuItem.Size = new System.Drawing.Size(198, 22);
+            this.клиентыToolStripMenuItem.Text = "Клиенты";
+            this.клиентыToolStripMenuItem.Click += new System.EventHandler(this.ClientsToolStripMenuItem_Click);
+            // 
             // FormMain
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
@@ -210,5 +219,6 @@
         private ToolStripMenuItem списокКомпонентовToolStripMenuItem;
         private ToolStripMenuItem компонентыПоИзделиямToolStripMenuItem;
         private ToolStripMenuItem списокЗаказовToolStripMenuItem;
+        private ToolStripMenuItem клиентыToolStripMenuItem;
     }
 }

Confectionery/ConfectioneryView/FormMain.cs

@@ -43,6 +43,7 @@ namespace ConfectioneryView
                 {
                     dataGridView.DataSource = list;
                     dataGridView.Columns["PastryId"].Visible = false;
+                    dataGridView.Columns["ClientId"].Visible = false;
                 }
                 _logger.LogInformation("Загрузка заказов");
             }