From 95b789ee162898625b4056bbd97579fb4d34592b Mon Sep 17 00:00:00 2001 From: "nikbel2004@outlook.com" Date: Sun, 12 May 2024 00:27:31 +0400 Subject: [PATCH] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0=D1=8F=20?= =?UTF-8?q?=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80=D0=BD?= =?UTF-8?q?=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=206=20(?= =?UTF-8?q?=D1=83=D1=81=D0=BB=D0=BE=D0=B6=D0=BD=D1=91=D0=BD=D0=BA=D0=B0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BussinessLogic/OrderLogic.cs | 2 +- .../SearchModels/ClientSearchModel.cs | 4 +-- .../SearchModels/OrderSearchModel.cs | 4 ++- .../Models/IClientModel.cs | 1 + .../Models/IImplementerModel.cs | 2 +- .../Models/Client.cs | 6 ++-- .../Models/Furniture.cs | 6 ++-- .../Models/Implementer.cs | 2 +- .../DataFileSingleton.cs | 2 +- .../Implements/OrderStorage.cs | 2 +- .../Models/Order.cs | 2 +- .../DataListSingleton.cs | 2 +- .../Implements/OrderStorage.cs | 2 +- .../Models/Order.cs | 1 + .../FurnitureAssemblyRestApi.csproj | 28 +++++++++---------- 15 files changed, 36 insertions(+), 30 deletions(-) diff --git a/FurnitureAssembly/FurnitureAssemblyBusinessLogic/BussinessLogic/OrderLogic.cs b/FurnitureAssembly/FurnitureAssemblyBusinessLogic/BussinessLogic/OrderLogic.cs index 459f1a8..cb1e5a3 100644 --- a/FurnitureAssembly/FurnitureAssemblyBusinessLogic/BussinessLogic/OrderLogic.cs +++ b/FurnitureAssembly/FurnitureAssemblyBusinessLogic/BussinessLogic/OrderLogic.cs @@ -158,7 +158,7 @@ namespace FurnitureAssemblyBusinessLogic.BussinessLogic throw new InvalidOperationException("Дата создания должна быть более ранней, нежели дата завершения"); } - _logger.LogInformation("Order. OrderId:{Id}, Sum:{Sum}. FurnitureId:{Id}. Sum:{Sum}", model.Id, model.Sum, model.FurnitureId, model.Sum); + _logger.LogInformation("Order. OrderId:{Id}, Sum:{Sum}. ClientId:{ClientId}. FurnitureId:{Id}", model.Id, model.Sum, model.ClientId, model.FurnitureId); } // Обновление статуса заказа diff --git a/FurnitureAssembly/FurnitureAssemblyContracts/SearchModels/ClientSearchModel.cs b/FurnitureAssembly/FurnitureAssemblyContracts/SearchModels/ClientSearchModel.cs index 99ce6de..2fddaab 100644 --- a/FurnitureAssembly/FurnitureAssemblyContracts/SearchModels/ClientSearchModel.cs +++ b/FurnitureAssembly/FurnitureAssemblyContracts/SearchModels/ClientSearchModel.cs @@ -11,10 +11,10 @@ namespace FurnitureAssemblyContracts.SearchModels { public int? Id { get; set; } - public string? ClientFIO { get; set; } - public string? Email { get; set; } + public string? ClientFIO { get; set; } + public string? Password { get; set; } } } diff --git a/FurnitureAssembly/FurnitureAssemblyContracts/SearchModels/OrderSearchModel.cs b/FurnitureAssembly/FurnitureAssemblyContracts/SearchModels/OrderSearchModel.cs index 3ec423b..74973e7 100644 --- a/FurnitureAssembly/FurnitureAssemblyContracts/SearchModels/OrderSearchModel.cs +++ b/FurnitureAssembly/FurnitureAssemblyContracts/SearchModels/OrderSearchModel.cs @@ -16,13 +16,15 @@ namespace FurnitureAssemblyContracts.SearchModels // для поиска по клиенту public int? ClientId { get; set; } - // для поиска по исполнителю + // Для поиска по исполнителю public int? ImplementerId { get; set; } + // Два поля для возможности производить выборку public DateTime? DateFrom { get; set; } public DateTime? DateTo { get; set; } + // Для статуса заказа public OrderStatus? Status { get; set; } } } diff --git a/FurnitureAssembly/FurnitureAssemblyDataModels/Models/IClientModel.cs b/FurnitureAssembly/FurnitureAssemblyDataModels/Models/IClientModel.cs index 58b5610..13bb7ee 100644 --- a/FurnitureAssembly/FurnitureAssemblyDataModels/Models/IClientModel.cs +++ b/FurnitureAssembly/FurnitureAssemblyDataModels/Models/IClientModel.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; namespace FurnitureAssemblyDataModels.Models { + // Интерфейс, отвечающий за клиента public interface IClientModel : IId { string ClientFIO { get; } diff --git a/FurnitureAssembly/FurnitureAssemblyDataModels/Models/IImplementerModel.cs b/FurnitureAssembly/FurnitureAssemblyDataModels/Models/IImplementerModel.cs index 7706635..b20edc0 100644 --- a/FurnitureAssembly/FurnitureAssemblyDataModels/Models/IImplementerModel.cs +++ b/FurnitureAssembly/FurnitureAssemblyDataModels/Models/IImplementerModel.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace FurnitureAssemblyDataModels.Models { - // Модель исполнителя + // Интерфейс, отвечающий за исполнителя public interface IImplementerModel : IId { string ImplementerFIO { get; } diff --git a/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/Client.cs b/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/Client.cs index 9d1b822..7b5b1e7 100644 --- a/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/Client.cs +++ b/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/Client.cs @@ -34,7 +34,8 @@ namespace FurnitureAssemblyDatabaseImplement.Models { return null; } - return new() + + return new Client() { Id = model.Id, ClientFIO = model.ClientFIO, @@ -49,6 +50,7 @@ namespace FurnitureAssemblyDatabaseImplement.Models { return; } + ClientFIO = model.ClientFIO; Email = model.Email; Password = model.Password; @@ -59,7 +61,7 @@ namespace FurnitureAssemblyDatabaseImplement.Models Id = Id, ClientFIO = ClientFIO, Email = Email, - Password = Password, + Password = Password }; } } diff --git a/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/Furniture.cs b/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/Furniture.cs index f9d5968..6c2e16c 100644 --- a/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/Furniture.cs +++ b/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/Furniture.cs @@ -101,13 +101,13 @@ namespace FurnitureAssemblyDatabaseImplement.Models var furniture = context.Furnitures.First(x => x.Id == Id); - foreach(var mwp in model.FurnitureWorkPieces) + foreach(var fwp in model.FurnitureWorkPieces) { context.FurnitureWorkPieces.Add(new FurnitureWorkPiece { Furniture = furniture, - WorkPiece = context.WorkPieces.First(x => x.Id == mwp.Key), - Count = mwp.Value.Item2 + WorkPiece = context.WorkPieces.First(x => x.Id == fwp.Key), + Count = fwp.Value.Item2 }); context.SaveChanges(); diff --git a/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/Implementer.cs b/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/Implementer.cs index aeb81c8..1aca5cf 100644 --- a/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/Implementer.cs +++ b/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/Implementer.cs @@ -27,7 +27,7 @@ namespace FurnitureAssemblyDatabaseImplement.Models [Required] public int Qualification { get; set; } - //для реализации связи один ко многим с заказами + // Для реализации связи один ко многим с заказами [ForeignKey("ImplementerId")] public virtual List Order { get; set; } = new(); diff --git a/FurnitureAssembly/FurnitureAssemblyFileImplement/DataFileSingleton.cs b/FurnitureAssembly/FurnitureAssemblyFileImplement/DataFileSingleton.cs index 390547a..39c9f42 100644 --- a/FurnitureAssembly/FurnitureAssemblyFileImplement/DataFileSingleton.cs +++ b/FurnitureAssembly/FurnitureAssemblyFileImplement/DataFileSingleton.cs @@ -81,7 +81,7 @@ namespace FurnitureAssemblyFileImplement private static void SaveData(List data, string filename, string xmlNodeName, Func selectFunction) { - if(data != null) + if (data != null) { new XDocument(new XElement(xmlNodeName, data.Select(selectFunction).ToArray())).Save(filename); } diff --git a/FurnitureAssembly/FurnitureAssemblyFileImplement/Implements/OrderStorage.cs b/FurnitureAssembly/FurnitureAssemblyFileImplement/Implements/OrderStorage.cs index 8acf46c..8640a59 100644 --- a/FurnitureAssembly/FurnitureAssemblyFileImplement/Implements/OrderStorage.cs +++ b/FurnitureAssembly/FurnitureAssemblyFileImplement/Implements/OrderStorage.cs @@ -63,7 +63,7 @@ namespace FurnitureAssemblyFileImplement.Implements return source.Orders.Select(x => GetViewModel(x)).ToList(); } - // Для загрузки названий изделия в заказе + // Для загрузки названий изделия и исполнителя в заказе private OrderViewModel GetViewModel(Order order) { var viewModel = order.GetViewModel; diff --git a/FurnitureAssembly/FurnitureAssemblyFileImplement/Models/Order.cs b/FurnitureAssembly/FurnitureAssemblyFileImplement/Models/Order.cs index e0f8bf4..79a6dde 100644 --- a/FurnitureAssembly/FurnitureAssemblyFileImplement/Models/Order.cs +++ b/FurnitureAssembly/FurnitureAssemblyFileImplement/Models/Order.cs @@ -20,7 +20,7 @@ namespace FurnitureAssemblyFileImplement.Models public int ClientId { get; private set; } - public int? ImplementerId { get; set; } + public int? ImplementerId { get; private set; } public int Count { get; private set; } diff --git a/FurnitureAssembly/FurnitureAssemblyListImplement/DataListSingleton.cs b/FurnitureAssembly/FurnitureAssemblyListImplement/DataListSingleton.cs index 1a49db9..62e93fd 100644 --- a/FurnitureAssembly/FurnitureAssemblyListImplement/DataListSingleton.cs +++ b/FurnitureAssembly/FurnitureAssemblyListImplement/DataListSingleton.cs @@ -42,7 +42,7 @@ namespace FurnitureAssemblyListImplement public static DataListSingleton GetInstance() { - if(_instance == null) + if (_instance == null) { _instance = new DataListSingleton(); } diff --git a/FurnitureAssembly/FurnitureAssemblyListImplement/Implements/OrderStorage.cs b/FurnitureAssembly/FurnitureAssemblyListImplement/Implements/OrderStorage.cs index 4b68564..9845cad 100644 --- a/FurnitureAssembly/FurnitureAssemblyListImplement/Implements/OrderStorage.cs +++ b/FurnitureAssembly/FurnitureAssemblyListImplement/Implements/OrderStorage.cs @@ -107,7 +107,7 @@ namespace FurnitureAssemblyListImplement.Implements return null; } - // Метод для записи названия изделия на форме с заказами + // Метод для записи названия изделия на форме с заказами и исполнителя private OrderViewModel GetViewModel(Order order) { var viewModel = order.GetViewModel; diff --git a/FurnitureAssembly/FurnitureAssemblyListImplement/Models/Order.cs b/FurnitureAssembly/FurnitureAssemblyListImplement/Models/Order.cs index c57823a..4be1f57 100644 --- a/FurnitureAssembly/FurnitureAssemblyListImplement/Models/Order.cs +++ b/FurnitureAssembly/FurnitureAssemblyListImplement/Models/Order.cs @@ -61,6 +61,7 @@ namespace FurnitureAssemblyListImplement.Models { return; } + Status = model.Status; DateImplement = model.DateImplement; } diff --git a/FurnitureAssembly/FurnitureAssemblyRestApi/FurnitureAssemblyRestApi.csproj b/FurnitureAssembly/FurnitureAssemblyRestApi/FurnitureAssemblyRestApi.csproj index a58e291..2cd37ee 100644 --- a/FurnitureAssembly/FurnitureAssemblyRestApi/FurnitureAssemblyRestApi.csproj +++ b/FurnitureAssembly/FurnitureAssemblyRestApi/FurnitureAssemblyRestApi.csproj @@ -1,20 +1,20 @@ - - net6.0 - enable - enable - + + net6.0 + enable + enable + - - - - + + + + - - - - - + + + + +