From cf2ac97d20388c01f5cf5c366d482c9b5862fa8e Mon Sep 17 00:00:00 2001 From: Alenka Date: Fri, 21 Jun 2024 00:32:29 +0400 Subject: [PATCH] 1!1!1!1!1! --- .../Enums/OrderStatus.cs | 5 +- .../JewelryStore/Program.cs | 12 +- .../BusinessLogics/ImplementerLogic.cs | 193 +++++------ .../BusinessLogics/OrderLogic.cs | 309 +++++++++-------- .../BusinessLogics/WorkModeling.cs | 288 +++++++++------- .../BusinessLogicsContracts/IWorkProcess.cs | 3 - .../Implements/ImplementerStorage.cs | 141 ++++---- .../Implements/OrderStorage.cs | 86 ++--- .../JewelryStoreDatabase.cs | 1 + .../20230513055059_AddImplementer.cs | 106 +++--- .../JewelryStoreDatabaseModelSnapshot.cs | 45 ++- .../Models/Order.cs | 144 ++++---- .../DataFileSingleton.cs | 4 + .../Implements/ImplementerStorage.cs | 163 +++++---- .../Implements/OrderStorage.cs | 211 ++++++------ .../DataListSingleton.cs | 8 +- .../Implements/ImplementerStorage.cs | 208 ++++++------ .../Implements/OrderStorage.cs | 318 +++++++++--------- .../JewelryStoreRestApi/Program.cs | 3 + 19 files changed, 1182 insertions(+), 1066 deletions(-) diff --git a/PIbd-23_Panina.A.D_JewelryStore/JewelryShopDataModels/Enums/OrderStatus.cs b/PIbd-23_Panina.A.D_JewelryStore/JewelryShopDataModels/Enums/OrderStatus.cs index fed7b40..21e22a3 100644 --- a/PIbd-23_Panina.A.D_JewelryStore/JewelryShopDataModels/Enums/OrderStatus.cs +++ b/PIbd-23_Panina.A.D_JewelryStore/JewelryShopDataModels/Enums/OrderStatus.cs @@ -6,6 +6,7 @@ Принят = 0, Выполняется = 1, Готов = 2, - Выдан = 3 - } + Ожидает = 3, + Выдан = 4 + } } \ No newline at end of file diff --git a/PIbd-23_Panina.A.D_JewelryStore/JewelryStore/Program.cs b/PIbd-23_Panina.A.D_JewelryStore/JewelryStore/Program.cs index 0e71b88..7271730 100644 --- a/PIbd-23_Panina.A.D_JewelryStore/JewelryStore/Program.cs +++ b/PIbd-23_Panina.A.D_JewelryStore/JewelryStore/Program.cs @@ -40,22 +40,28 @@ namespace JewelryStore services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); diff --git a/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreBusinessLogic/BusinessLogics/ImplementerLogic.cs b/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreBusinessLogic/BusinessLogics/ImplementerLogic.cs index 2c5e01c..89e87e1 100644 --- a/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreBusinessLogic/BusinessLogics/ImplementerLogic.cs +++ b/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreBusinessLogic/BusinessLogics/ImplementerLogic.cs @@ -23,105 +23,106 @@ namespace JewelryStoreBusinessLogic.BusinessLogics _implementerStorage = implementerStorage; } - public bool Create(ImplementerBindingModel model) - { - CheckModel(model); - if (_implementerStorage.Insert(model) == null) - { - _logger.LogWarning("Insert operation failed"); - return false; - } - return true; - } + public List? ReadList(ImplementerSearchModel? model) + { + _logger.LogInformation("ReadList. ImplementerFIO:{ImplementerFIO}.Password:{Password}.Id:{ Id}", model?.ImplementerFIO, model?.Password?.Length, model?.Id); + var list = model == null ? _implementerStorage.GetFullList() : _implementerStorage.GetFilteredList(model); + if (list == null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } + _logger.LogInformation("ReadList. Count:{Count}", list.Count); + return list; + } - public bool Delete(ImplementerBindingModel model) - { - CheckModel(model, false); - _logger.LogInformation("Delete. Id:{Id}", model.Id); - if (_implementerStorage.Delete(model) == null) - { - _logger.LogWarning("Delete operation failed"); - return false; - } - return true; - } + public ImplementerViewModel? ReadElement(ImplementerSearchModel model) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + _logger.LogInformation("ReadElement. ImplementerFIO:{ImplementerFIO}.Password:{Password}.Id:{ Id}", model?.ImplementerFIO, model?.Password?.Length, model?.Id); + var element = _implementerStorage.GetElement(model); + if (element == null) + { + _logger.LogWarning("ReadElement element not found"); + return null; + } + _logger.LogInformation("ReadElement find. Id:{Id}", element.Id); + return element; + } - public ImplementerViewModel? ReadElement(ImplementerSearchModel model) - { - if (model == null) - { - throw new ArgumentNullException(nameof(model)); - } - _logger.LogInformation("ReadElement. FIO:{FIO}.Id:{ Id}", model.ImplementerFIO, model.Id); - var element = _implementerStorage.GetElement(model); - if (element == null) - { - _logger.LogWarning("ReadElement element not found"); - return null; - } - _logger.LogInformation("ReadElement find. Id:{Id}", element.Id); - return element; - } + public bool Create(ImplementerBindingModel model) + { + CheckModel(model); + if (_implementerStorage.Insert(model) == null) + { + _logger.LogWarning("Insert operation failed"); + return false; + } + return true; + } - public List? ReadList(ImplementerSearchModel? model) - { - _logger.LogInformation("ReadList. FIO:{FIO}.Id:{ Id} ", model?.ImplementerFIO, model?.Id); - var list = (model == null) ? _implementerStorage.GetFullList() : _implementerStorage.GetFilteredList(model); - if (list == null) - { - _logger.LogWarning("ReadList return null list"); - return null; - } - _logger.LogInformation("ReadList. Count:{Count}", list.Count); - return list; - } + public bool Update(ImplementerBindingModel model) + { + CheckModel(model); + if (_implementerStorage.Update(model) == null) + { + _logger.LogWarning("Update operation failed"); + return false; + } + return true; + } - public bool Update(ImplementerBindingModel model) - { - CheckModel(model); - if (_implementerStorage.Update(model) == null) - { - _logger.LogWarning("Update operation failed"); - return false; - } - return true; - } + public bool Delete(ImplementerBindingModel model) + { + CheckModel(model, false); + _logger.LogInformation("Delete. Id:{Id}", model.Id); + if (_implementerStorage.Delete(model) == null) + { + _logger.LogWarning("Delete operation failed"); + return false; + } + return true; + } - private void CheckModel(ImplementerBindingModel model, bool withParams = true) - { - if (model == null) - { - throw new ArgumentNullException(nameof(model)); - } - if (!withParams) - { - return; - } - if (model.WorkExperience < 0) - { - throw new ArgumentException("Опыт работы не должен быть отрицательным", nameof(model.WorkExperience)); - } - if (model.Qualification < 0) - { - throw new ArgumentException("Квалификация не должна быть отрицательной", nameof(model.Qualification)); - } - if (string.IsNullOrEmpty(model.Password)) - { - throw new ArgumentNullException("Нет пароля исполнителя", nameof(model.ImplementerFIO)); - } - if (string.IsNullOrEmpty(model.ImplementerFIO)) - { - throw new ArgumentNullException("Нет ФИО исполнителя", nameof(model.ImplementerFIO)); - } - _logger.LogInformation("Implementer. Id: {Id}, FIO: {FIO}", model.Id, model.ImplementerFIO); - var element = _implementerStorage.GetElement(new ImplementerSearchModel - { - ImplementerFIO = model.ImplementerFIO, - }); - if (element != null && element.Id != model.Id) - { - throw new InvalidOperationException("Исполнитель с таким ФИО уже есть"); - } - } - } + private void CheckModel(ImplementerBindingModel model, bool withParams = true) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + if (!withParams) + { + return; + } + if (string.IsNullOrEmpty(model.ImplementerFIO)) + { + throw new ArgumentNullException("Нет ФИО исполнителя", nameof(model.ImplementerFIO)); + } + if (string.IsNullOrEmpty(model.Password)) + { + throw new ArgumentNullException("Нет пароля исполнителя", nameof(model.Password)); + } + if (model.WorkExperience < 0) + { + throw new ArgumentNullException("Стаж должен быть больше 0", nameof(model.WorkExperience)); + } + if (model.Qualification < 0) + { + throw new ArgumentNullException("Квалификация должна быть положительной", nameof(model.Qualification)); + } + _logger.LogInformation("Implementer. ImplementerFIO:{ImplementerFIO}.Password:{Password}.WorkExperience:{WorkExperience}.Qualification:{Qualification}.Id: { Id}", + model.ImplementerFIO, model.Password, model.WorkExperience, model.Qualification, model.Id); + var element = _implementerStorage.GetElement(new ImplementerSearchModel + { + ImplementerFIO = model.ImplementerFIO + }); + if (element != null && element.Id != model.Id) + { + throw new InvalidOperationException("Исполнитель с таким ФИО уже есть"); + } + } + } } diff --git a/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreBusinessLogic/BusinessLogics/OrderLogic.cs b/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreBusinessLogic/BusinessLogics/OrderLogic.cs index ec25d96..51a7098 100644 --- a/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreBusinessLogic/BusinessLogics/OrderLogic.cs +++ b/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreBusinessLogic/BusinessLogics/OrderLogic.cs @@ -1,153 +1,194 @@ -using JewelryStoreContracts.BindingModels; +using JewelryStoreDataModels.Enums; +using Microsoft.Extensions.Logging; +using JewelryStoreContracts.BindingModels; +using JewelryStoreContracts.BusinessLogicsContracts; +using JewelryStoreContracts.SearchModels; +using JewelryStoreContracts.StoragesContracts; +using JewelryStoreContracts.ViewModels; +using JewelryStoreContracts.BindingModels; using JewelryStoreContracts.BusinessLogicsContracts; using JewelryStoreContracts.SearchModels; using JewelryStoreContracts.StoragesContracts; -using JewelryStoreContracts.StoragesModels; using JewelryStoreContracts.ViewModels; using JewelryStoreDataModels.Enums; -using Microsoft.Extensions.Logging; namespace JewelryStoreBusinessLogic.BusinessLogics { - public class OrderLogic : IOrderLogic - { - private readonly ILogger _logger; - private readonly IOrderStorage _orderStorage; - private readonly IStoreStorage _shopStorage; + public class OrderLogic : IOrderLogic + { + private readonly ILogger _logger; + private readonly IOrderStorage _orderStorage; + static readonly object _locker = new object(); + private readonly IShopStorage _shopStorage; - public OrderLogic(ILogger logger, IOrderStorage orderStorage, IStoreStorage shopStorage) - { - _logger = logger; - _orderStorage = orderStorage; + public OrderLogic(ILogger logger, IOrderStorage orderStorage, IShopStorage shopStorage) + { + _logger = logger; + _orderStorage = orderStorage; _shopStorage = shopStorage; } - public bool CreateOrder(OrderBindingModel model) - { - CheckModel(model); - if (model.Status != OrderStatus.Неизвестен) return false; - model.Status = OrderStatus.Принят; - if (_orderStorage.Insert(model) == null) - { - _logger.LogWarning("Insert operation failed"); - return false; - } - return true; - } - - public bool StatusUpdate(OrderBindingModel model, OrderStatus newStatus) - { - var order = _orderStorage.GetElement(new OrderSearchModel + public OrderViewModel? ReadElement(OrderSearchModel model) + { + if (model == null) { - Id = model.Id, + throw new ArgumentNullException(nameof(model)); + } + _logger.LogInformation("ReadElement. ClientId:{ClientId}.Status:{Status}.ImplementerId:{ImplementerId}.DateFrom:{DateFrom}.DateTo:{DateTo}OrderId:{Id}", + model.ClientId, model.Status, model.ImplementerId, model.DateFrom, model.DateTo, model.Id); + var element = _orderStorage.GetElement(model); + if (element == null) + { + _logger.LogWarning("ReadElement element not found"); + return null; + } + _logger.LogInformation("ReadElement find. Id:{Id}", element.Id); + return element; + } + + public List? ReadList(OrderSearchModel? model) + { + _logger.LogInformation("ReadList. ClientId:{ClientId}.Status:{Status}.ImplementerId:{ImplementerId}.DateFrom:{DateFrom}.DateTo:{DateTo}OrderId:{Id}", + model?.ClientId, model?.Status, model?.ImplementerId, model?.DateFrom, model?.DateTo, model?.Id); + var list = model == null ? _orderStorage.GetFullList() : _orderStorage.GetFilteredList(model); + if (list == null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } + _logger.LogInformation("ReadList. Count:{Count}", list.Count); + return list; + } + + public bool CreateOrder(OrderBindingModel model) + { + CheckModel(model); + if (model.Status != OrderStatus.Неизвестен) + return false; + model.Status = OrderStatus.Принят; + if (_orderStorage.Insert(model) == null) + { + _logger.LogWarning("Insert operation failed"); + return false; + } + return true; + } + + public bool TakeOrderInWork(OrderBindingModel model) + { + lock (_locker) + { + return ChangeStatus(model, OrderStatus.Выполняется); + } + } + + public bool FinishOrder(OrderBindingModel model) + { + return ChangeStatus(model, OrderStatus.Готов); + } + + public bool DeliveryOrder(OrderBindingModel model) + { + lock (_locker) + { + model = FillOrderBindingModel(model); + if (model.Status != OrderStatus.Готов && model.Status != OrderStatus.Ожидает) + { + _logger.LogWarning("Changing status operation faled: Current-{Status}:required-Выдан.", model.Status); + throw new InvalidOperationException($"Невозможно приствоить статус выдан заказу с текущим статусом {model.Status}"); + } + if (!_shopStorage.RestockingShops(new SupplyBindingModel + { + JewelId = model.JewelId, + Count = model.Count + })) + { + if (model.Status == OrderStatus.Готов || model.Status == OrderStatus.Ожидает) + { + model.Status = OrderStatus.Ожидает; + return UpdateOrder(model); + } + } + model.Status = OrderStatus.Выдан; + return UpdateOrder(model); + } + } + + private void CheckModel(OrderBindingModel model, bool withParams = true) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + if (!withParams) + { + return; + } + if (model.Count <= 0) + { + throw new ArgumentException("Колличество украшения в заказе не может быть меньше 1", nameof(model.Count)); + } + if (model.Sum <= 0) + { + throw new ArgumentException("Стоимость заказа на может быть меньше 1", nameof(model.Sum)); + } + if (model.DateImplement.HasValue && model.DateImplement < model.DateCreate) + { + throw new ArithmeticException($"Дата выдачи заказа {model.DateImplement} не может быть раньше даты его создания {model.DateCreate}"); + } + _logger.LogInformation("Jewel. JewelId:{JewelId}.Count:{Count}.Sum:{Sum}Id:{Id}", + model.JewelId, model.Count, model.Sum, model.Id); + } + private bool ChangeStatus(OrderBindingModel model, OrderStatus requiredStatus) + { + model = FillOrderBindingModel(model); + + if (requiredStatus - model.Status == 1) + { + model.Status = requiredStatus; + if (model.Status == OrderStatus.Готов) + model.DateImplement = DateTime.Now; + return UpdateOrder(model); + } + _logger.LogWarning("Changing status operation faled: Current-{Status}:required-{requiredStatus}.", model.Status, requiredStatus); + throw new InvalidOperationException($"Невозможно приствоить статус {requiredStatus} заказу с текущим статусом {model.Status}"); + } + + private OrderBindingModel FillOrderBindingModel(OrderBindingModel model) + { + CheckModel(model, false); + var element = _orderStorage.GetElement(new OrderSearchModel() + { + Id = model.Id }); - if (order == null) + if (element == null) { - throw new ArgumentNullException(nameof(order)); + throw new InvalidOperationException(nameof(element)); } - if (!_shopStorage.RestockingShops(new SupplyBindingModel + model.Id = element.Id; + model.DateCreate = element.DateCreate; + model.JewelId = element.JewelId; + model.DateImplement = element.DateImplement; + model.ClientId = element.ClientId; + model.Status = element.Status; + model.Count = element.Count; + model.Sum = element.Sum; + if (!model.ImplementerId.HasValue) { - JewelId = order.JewelId, - Count = order.Count - })) - { - throw new ArgumentException("Недостаточно места"); + model.ImplementerId = element.ImplementerId; } + return model; + } - model.Status = OrderStatus.Выдан; - model.DateImplement = DateTime.Now; - _orderStorage.Update(model); - return true; - } - - model.Status = newStatus; - model.DateCreate = vmodel.DateCreate; - if (model.DateImplement == null) - { - model.DateImplement = vmodel.DateImplement; - } - if (vmodel.ImplementerId.HasValue) - { - model.ImplementerId = vmodel.ImplementerId; - } - model.JewelId = vmodel.JewelId; - model.Sum = vmodel.Sum; - model.Count = vmodel.Count; - if (_orderStorage.Update(model) == null) - { - model.Status--; - _logger.LogWarning("Update operation failed"); - - return false; - } - return true; - } - - public bool DeliveryOrder(OrderBindingModel model) - { - model.DateImplement = DateTime.Now; - return StatusUpdate(model, OrderStatus.Готов); - } - - public bool FinishOrder(OrderBindingModel model) - { - return StatusUpdate(model, OrderStatus.Выдан); - } - - public List? ReadList(OrderSearchModel? model) - { - _logger.LogInformation("ReadList. Id:{Id}", model?.Id); - var list = model == null ? _orderStorage.GetFullList() : _orderStorage.GetFilteredList(model); - if (list == null) - { - _logger.LogWarning("ReadList return null list"); - return null; - } - _logger.LogInformation("ReadList. Count:{Count}", list.Count); - return list; - } - - public bool TakeOrderInWork(OrderBindingModel model) - { - return StatusUpdate(model, OrderStatus.Выполняется); - } - - private bool CheckModel(OrderBindingModel model) - { - if (model == null) - { - throw new ArgumentNullException(nameof(model)); - } - if (model.Count <= 0) - { - throw new ArgumentException("Количество изделий в заказе должно быть больше 0", nameof(model.Count)); - } - if (model.Sum <= 0) - { - throw new ArgumentException("Суммарная стоимость заказа должна быть больше 0", nameof(model.Sum)); - } - if (model.DateCreate > model.DateImplement) - { - throw new ArgumentException("Время создания заказа не может быть больше времени его выполнения", nameof(model.DateImplement)); - } - return true; - } - - public OrderViewModel? ReadElement(OrderSearchModel model) - { - if (model == null) - { - throw new ArgumentNullException(nameof(model)); - } - _logger.LogInformation("ReadElement. Id:{ Id}", model.Id); - var element = _orderStorage.GetElement(model); - if (element == null) - { - _logger.LogWarning("ReadElement element not found"); - return null; - } - _logger.LogInformation("ReadElement find. Id:{Id}", element.Id); - return element; - } - } -} \ No newline at end of file + private bool UpdateOrder(OrderBindingModel model) + { + if (_orderStorage.Update(model) == null) + { + _logger.LogWarning("Update operation failed"); + return false; + } + _logger.LogWarning("Update operation sucsess"); + return true; + } + } +} diff --git a/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreBusinessLogic/BusinessLogics/WorkModeling.cs b/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreBusinessLogic/BusinessLogics/WorkModeling.cs index bd5dfb0..ac3eb35 100644 --- a/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreBusinessLogic/BusinessLogics/WorkModeling.cs +++ b/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreBusinessLogic/BusinessLogics/WorkModeling.cs @@ -4,137 +4,183 @@ using JewelryStoreContracts.SearchModels; using JewelryStoreContracts.ViewModels; using JewelryStoreDataModels.Enums; using Microsoft.Extensions.Logging; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using JewelryStoreContracts.BindingModels; +using JewelryStoreContracts.BusinessLogicsContracts; +using JewelryStoreContracts.SearchModels; +using JewelryStoreContracts.ViewModels; +using JewelryStoreDataModels.Enums; namespace JewelryStoreBusinessLogic.BusinessLogics { - public class WorkModeling : IWorkProcess - { - private readonly ILogger _logger; + public class WorkModeling : IWorkProcess + { + private readonly ILogger _logger; - private readonly Random _rnd; + private readonly Random _rnd; - private IOrderLogic? _orderLogic; + private IOrderLogic? _orderLogic; - public WorkModeling(ILogger logger) - { - _logger = logger; - _rnd = new Random(1000); - } + public WorkModeling(ILogger logger) + { + _logger = logger; + _rnd = new Random(1000); + } - public void DoWork(IImplementerLogic implementerLogic, IOrderLogic orderLogic) - { - _orderLogic = orderLogic; - var implementers = implementerLogic.ReadList(null); - if (implementers == null) - { - _logger.LogWarning("DoWork. Implementers is null"); - return; - } + public void DoWork(IImplementerLogic implementerLogic, IOrderLogic orderLogic) + { + _orderLogic = orderLogic; + var implementers = implementerLogic.ReadList(null); + if (implementers == null) + { + _logger.LogWarning("DoWork. Implementers is null"); + return; + } + var orders = _orderLogic.ReadList(new OrderSearchModel { Status = OrderStatus.Выдан }); + int count = _orderLogic.ReadList(null).Count; + if (orders == null || count == orders.Count) + { + _logger.LogWarning("DoWork. Orders is null or empty"); + return; + } + orders = _orderLogic.ReadList(null); + _logger.LogDebug("DoWork for {Count} orders", orders.Count); + foreach (var implementer in implementers) + { + Task.Run(() => WorkerWorkAsync(implementer, orders)); + } + } - var orders = _orderLogic.ReadList(new OrderSearchModel { Statuses = new() { OrderStatus.Принят, OrderStatus.Выполняется } }); - if (orders == null || orders.Count == 0) - { - _logger.LogWarning("DoWork. Orders is null or empty"); - return; - } + private async Task WorkerWorkAsync(ImplementerViewModel implementer, List orders) + { + if (_orderLogic == null || implementer == null) + { + return; + } + await DeliverWaitingOrder(implementer); + await RunOrderInWork(implementer); - _logger.LogDebug("DoWork for {Count} orders", orders.Count); + await Task.Run(() => + { + foreach (var order in orders) + { + try + { + _logger.LogDebug("DoWork. Worker {Id} try get order {Order}", implementer.Id, order.Id); + // пытаемся назначить заказ на исполнителя + _orderLogic.TakeOrderInWork(new OrderBindingModel + { + Id = order.Id, + ImplementerId = implementer.Id + }); + // делаем работу + Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 1000) * order.Count); + _logger.LogDebug("DoWork. Worker {Id} finish order {Order}", implementer.Id, order.Id); + _orderLogic.FinishOrder(new OrderBindingModel + { + Id = order.Id + }); + _orderLogic.DeliveryOrder(new OrderBindingModel { Id = order.Id }); + } + // кто-то мог уже перехватить заказ, игнорируем ошибку + catch (InvalidOperationException ex) + { + _logger.LogWarning(ex, "Error try get work"); + } + // заканчиваем выполнение имитации в случае иной ошибки + catch (Exception ex) + { + _logger.LogError(ex, "Error while do work"); + throw; + } + // отдыхаем + Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100)); + } + }); + } - foreach (var implementer in implementers) - { - Task.Run(() => WorkerWorkAsync(implementer, orders)); - } - } + private async Task RunOrderInWork(ImplementerViewModel implementer) + { + if (_orderLogic == null || implementer == null) + { + return; + } + try + { + var runOrder = await Task.Run(() => _orderLogic.ReadElement(new OrderSearchModel + { + ImplementerId = implementer.Id, + Status = OrderStatus.Выполняется + })); + if (runOrder == null) + { + return; + } - private async Task WorkerWorkAsync(ImplementerViewModel implementer, List orders) - { - if (_orderLogic == null || implementer == null) - { - return; - } - await RunOrderInWork(implementer, orders); + _logger.LogDebug("DoWork. Worker {Id} back to order {Order}", implementer.Id, runOrder.Id); + // доделываем работу + Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 300) * runOrder.Count); + _logger.LogDebug("DoWork. Worker {Id} finish order {Order}", implementer.Id, runOrder.Id); + _orderLogic.FinishOrder(new OrderBindingModel + { + Id = runOrder.Id + }); + _orderLogic.DeliveryOrder(new OrderBindingModel { Id = runOrder.Id }); + // отдыхаем + Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100)); + } + // заказа может не быть, просто игнорируем ошибку + catch (InvalidOperationException ex) + { + _logger.LogWarning(ex, "Error try get work"); + } + // а может возникнуть иная ошибка, тогда просто заканчиваем выполнение имитации + catch (Exception ex) + { + _logger.LogError(ex, "Error while do work"); + throw; + } + } - await Task.Run(() => - { - foreach (var order in orders) - { - try - { - _logger.LogDebug("DoWork. Worker {Id} try get order {Order}", implementer.Id, order.Id); - - _orderLogic.TakeOrderInWork(new OrderBindingModel - { - Id = order.Id, - ImplementerId = implementer.Id - }); - - Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 1000) * order.Count); - _logger.LogDebug("DoWork. Worker {Id} finish order {Order}", implementer.Id, order.Id); - - _orderLogic.DeliveryOrder(new OrderBindingModel - { - Id = order.Id - }); - - Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100)); - } - - catch (InvalidOperationException ex) - { - _logger.LogWarning(ex, "Error try get work"); - } - - catch (Exception ex) - { - _logger.LogError(ex, "Error while do work"); - throw; - } - } - }); - } - - private async Task RunOrderInWork(ImplementerViewModel implementer, List allOrders) - { - if (_orderLogic == null || implementer == null || allOrders == null || allOrders.Count == 0) - { - return; - } - try - { - var runOrder = await Task.Run(() => allOrders.FirstOrDefault(x => x.ImplementerId == implementer.Id && x.Status == OrderStatus.Выполняется)); - if (runOrder == null) - { - return; - } - - _logger.LogDebug("DoWork. Worker {Id} back to order {Order}", implementer.Id, runOrder.Id); - - Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 300) * runOrder.Count); - _logger.LogDebug("DoWork. Worker {Id} finish order {Order}", implementer.Id, runOrder.Id); - _orderLogic.DeliveryOrder(new OrderBindingModel - { - Id = runOrder.Id - }); - - Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100)); - } - - catch (InvalidOperationException ex) - { - _logger.LogWarning(ex, "Error try get work"); - } - - catch (Exception ex) - { - _logger.LogError(ex, "Error while do work"); - throw; - } - } - } + private async Task DeliverWaitingOrder(ImplementerViewModel implementer) + { + if (_orderLogic == null || implementer == null) + { + return; + } + var waitingOrders = await Task.Run(() => _orderLogic.ReadList(new OrderSearchModel + { + ImplementerId = implementer.Id, + Status = OrderStatus.Ожидает + })); + if (waitingOrders == null || waitingOrders.Count == 0) + { + return; + } + _logger.LogInformation("DeliverWaitingOrder. Find some waitig order for implementer:{id}.Count:{count}", implementer.Id, waitingOrders.Count); + foreach (var waitingOrder in waitingOrders) + { + try + { + _logger.LogInformation("DeliverWaitingOrder. Trying to deliver order id:{id}", waitingOrder.Id); + var res = _orderLogic.DeliveryOrder(new OrderBindingModel + { + Id = waitingOrder.Id + }); + } + catch (ArgumentException ex) + { + _logger.LogWarning(ex, "DeliverWaitingOrder. Fault"); + } + catch (InvalidOperationException ex) + { + _logger.LogWarning(ex, "Error try deliver order"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Error while do work"); + throw; + } + } + } + } } - diff --git a/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreContracts/BusinessLogicsContracts/IWorkProcess.cs b/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreContracts/BusinessLogicsContracts/IWorkProcess.cs index bae0fa7..c74ede3 100644 --- a/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreContracts/BusinessLogicsContracts/IWorkProcess.cs +++ b/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreContracts/BusinessLogicsContracts/IWorkProcess.cs @@ -8,9 +8,6 @@ namespace JewelryStoreContracts.BusinessLogicsContracts { public interface IWorkProcess { - /// - /// Запуск работ - /// void DoWork(IImplementerLogic implementerLogic, IOrderLogic orderLogic); } } diff --git a/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreDatabaseImplement/Implements/ImplementerStorage.cs b/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreDatabaseImplement/Implements/ImplementerStorage.cs index a3fc2d9..82cfb95 100644 --- a/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreDatabaseImplement/Implements/ImplementerStorage.cs +++ b/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreDatabaseImplement/Implements/ImplementerStorage.cs @@ -13,87 +13,72 @@ namespace JewelryStoreDatabaseImplement.Implements { public class ImplementerStorage : IImplementerStorage { - public ImplementerViewModel? Delete(ImplementerBindingModel model) - { - using var context = new JewelryStoreDatabase(); - var res = context.Implementers.FirstOrDefault(x => x.Id == model.Id); - if (res != null) - { - context.Implementers.Remove(res); - context.SaveChanges(); - } - return res?.GetViewModel; - } + public List GetFullList() + { + using var context = new JewelryStoreDatabase(); + return context.Implementers.Select(x => x.GetViewModel).ToList(); + } - public ImplementerViewModel? GetElement(ImplementerSearchModel model) - { - using var context = new JewelryStoreDatabase(); + public List GetFilteredList(ImplementerSearchModel model) + { + if (string.IsNullOrEmpty(model.ImplementerFIO)) + { + return new(); + } + using var context = new JewelryStoreDatabase(); + return context.Implementers.Where(x => x.ImplementerFIO.Contains(model.ImplementerFIO)).Select(x => x.GetViewModel).ToList(); + } - if (model.Id.HasValue) - { - return context.Implementers.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel; - } - if (model.ImplementerFIO != null && model.Password != null) - { - return context.Implementers.FirstOrDefault(x => x.ImplementerFIO.Equals(model.ImplementerFIO)&&x.Password.Equals(model.Password)) - ?.GetViewModel; - } - if (model.ImplementerFIO != null) - { - return context.Implementers.FirstOrDefault(x => x.ImplementerFIO.Equals(model.ImplementerFIO))?.GetViewModel; - } - return null; - } + public ImplementerViewModel? GetElement(ImplementerSearchModel model) + { + if (string.IsNullOrEmpty(model.ImplementerFIO) && !model.Id.HasValue) + { + return null; + } + using var context = new JewelryStoreDatabase(); + return context.Implementers.FirstOrDefault(x => + (!string.IsNullOrEmpty(model.ImplementerFIO) && x.ImplementerFIO == model.ImplementerFIO && (!string.IsNullOrEmpty(model.Password) ? x.Password == model.Password : true)) || + (model.Id.HasValue && x.Id == model.Id)) + ?.GetViewModel; + } - public List GetFilteredList(ImplementerSearchModel model) - { - if (model == null) - { - return new(); - } - if (model.Id.HasValue) - { - var res = GetElement(model); - return res != null ? new() { res } : new(); - } - if (model.ImplementerFIO != null) - { - using var context = new JewelryStoreDatabase(); - return context.Implementers.Where(x => x.ImplementerFIO.Equals(model.ImplementerFIO)) - .Select(x => x.GetViewModel).ToList(); - } - return new(); - } + public ImplementerViewModel? Insert(ImplementerBindingModel model) + { + var newImplementer = Implementer.Create(model); + if (newImplementer == null) + { + return null; + } + using var context = new JewelryStoreDatabase(); + context.Implementers.Add(newImplementer); + context.SaveChanges(); + return newImplementer.GetViewModel; + } - public List GetFullList() - { - using var context = new JewelryStoreDatabase(); - return context.Implementers.Select(x => x.GetViewModel).ToList(); - } + public ImplementerViewModel? Update(ImplementerBindingModel model) + { + using var context = new JewelryStoreDatabase(); + var implementer = context.Implementers.FirstOrDefault(x => x.Id == model.Id); + if (implementer == null) + { + return null; + } + implementer.Update(model); + context.SaveChanges(); + return implementer.GetViewModel; + } - public ImplementerViewModel? Insert(ImplementerBindingModel model) - { - using var context = new JewelryStoreDatabase(); - var res = Implementer.Create(model); - if (res != null) - { - context.Implementers.Add(res); - context.SaveChanges(); - } - - return res?.GetViewModel; - } - - public ImplementerViewModel? Update(ImplementerBindingModel model) - { - using var context = new JewelryStoreDatabase(); - var res = context.Implementers.FirstOrDefault(x => x.Id == model.Id); - if (res != null) - { - res.Update(model); - context.SaveChanges(); - } - return res?.GetViewModel; - } - } + public ImplementerViewModel? Delete(ImplementerBindingModel model) + { + using var context = new JewelryStoreDatabase(); + var implementer = context.Implementers.FirstOrDefault(rec => rec.Id == model.Id); + if (implementer != null) + { + context.Implementers.Remove(implementer); + context.SaveChanges(); + return implementer.GetViewModel; + } + return null; + } + } } diff --git a/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreDatabaseImplement/Implements/OrderStorage.cs b/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreDatabaseImplement/Implements/OrderStorage.cs index fa592ac..defc615 100644 --- a/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreDatabaseImplement/Implements/OrderStorage.cs +++ b/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreDatabaseImplement/Implements/OrderStorage.cs @@ -17,46 +17,34 @@ namespace JewelryStoreDatabaseImplement.Implements public List GetFullList() { using var context = new JewelryStoreDatabase(); - return context.Orders.Include(x => x.Jewel).Include(x => x.Client).Include(x => x.Implementer).Select(x => x.GetViewModel).ToList(); - } - public List GetFilteredList(OrderSearchModel model) - { - if (!model.DateFrom.HasValue || !model.DateTo.HasValue ||!model.Id.HasValue) - { - var result = GetElement(model); - return result != null ? new() { result } : new(); - } - using var context = new JewelryStoreDatabase(); - IQueryable? queryWhere = null; - if (model.DateFrom.HasValue && model.DateTo.HasValue) - { - queryWhere = context.Orders.Where(x => model.DateFrom <= x.DateCreate.Date && x.DateCreate.Date <= model.DateTo); - } - else if (model.Statuses != null) - { - queryWhere = context.Orders.Where(x => model.Statuses.Contains(x.Status)); - } - else if (model.ClientId.HasValue) - { - queryWhere = context.Orders.Where(x => x.ClientId == model.ClientId); - } - else - { - return new(); - } - return queryWhere.Include(x => x.Client).Include(x => x.Implementer).Select(x => x.GetViewModel).ToList(); - } - public OrderViewModel? GetElement(OrderSearchModel model) - { - if (!model.Id.HasValue) - { - return new(); - } - using var context = new JewelryStoreDatabase(); - return AccessJewelStorage(context.Orders.Include(x => x.Client).Include(x => x.Implementer).FirstOrDefault(x =>(model.Statuses == null || model.Statuses != null && model.Statuses.Contains(x.Status)) && - model.ImplementerId.HasValue && x.ImplementerId == model.ImplementerId || model.Id.HasValue && x.Id == model.Id)?.GetViewModel, context); - } - public OrderViewModel? Insert(OrderBindingModel model) + return context.Orders.Include(x => x.Jewel).Include(x => x.Client).Include(y => y.Implementer).Select(x => x.GetViewModel).ToList(); + } + public List GetFilteredList(OrderSearchModel model) + { + using var context = new JewelryStoreDatabase(); + if ((!model.DateFrom.HasValue || !model.DateTo.HasValue) && !model.ClientId.HasValue && !model.Status.HasValue) + { + return new(); + } + return context.Orders.Include(x => x.Jewel).Include(x => x.Client).Include(x => x.Implementer).Where(x => + (model.DateFrom.HasValue && model.DateTo.HasValue && x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo) || + (model.ClientId.HasValue && x.ClientId == model.ClientId) || + (model.Status.HasValue && x.Status == model.Status)) + .Select(x => x.GetViewModel).ToList(); + } + public OrderViewModel? GetElement(OrderSearchModel model) + { + if (!model.Id.HasValue && (!model.ImplementerId.HasValue || !model.Status.HasValue)) + { + return new(); + } + using var context = new JewelryStoreDatabase(); + return context.Orders.Include(x => x.Jewel).Include(x => x.Client).Include(x => x.Implementer).FirstOrDefault(x => + (model.Id.HasValue && x.Id == model.Id) || + (model.ImplementerId.HasValue && x.ImplementerId == model.ImplementerId && x.Status == model.Status)) + ?.GetViewModel; + } + public OrderViewModel? Insert(OrderBindingModel model) { var newOrder = Order.Create(model); if (newOrder == null) @@ -71,15 +59,15 @@ namespace JewelryStoreDatabaseImplement.Implements public OrderViewModel? Update(OrderBindingModel model) { using var context = new JewelryStoreDatabase(); - var order = context.Orders.Include(x => x.Jewel).Include(x => x.Client).Include(x => x.Implementer).FirstOrDefault(x => x.Id == model.Id); - if (order == null) - { - return null; - } - order.Update(model); - context.SaveChanges(); - return AccessJewelStorage(order.GetViewModel, context); - } + var order = context.Orders.FirstOrDefault(x => x.Id == model.Id); + if (order == null) + { + return null; + } + order.Update(context, model); + context.SaveChanges(); + return order.GetViewModel; + } public OrderViewModel? Delete(OrderBindingModel model) { using var context = new JewelryStoreDatabase(); diff --git a/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreDatabaseImplement/JewelryStoreDatabase.cs b/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreDatabaseImplement/JewelryStoreDatabase.cs index 3faa4d1..9f93f61 100644 --- a/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreDatabaseImplement/JewelryStoreDatabase.cs +++ b/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreDatabaseImplement/JewelryStoreDatabase.cs @@ -25,6 +25,7 @@ namespace JewelryStoreDatabaseImplement public virtual DbSet Orders { set; get; } public virtual DbSet Shops { get; set; } public virtual DbSet ShopJewels { get; set; } + public virtual DbSet Implementers { set; get; } } } diff --git a/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreDatabaseImplement/Migrations/20230513055059_AddImplementer.cs b/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreDatabaseImplement/Migrations/20230513055059_AddImplementer.cs index 2ba9600..ff22146 100644 --- a/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreDatabaseImplement/Migrations/20230513055059_AddImplementer.cs +++ b/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreDatabaseImplement/Migrations/20230513055059_AddImplementer.cs @@ -4,64 +4,64 @@ namespace JewelryStoreDatabaseImplement.Migrations { - /// - public partial class AddImplementer : Migration - { - /// - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AddColumn( - name: "ImplementerId", - table: "Orders", - type: "int", - nullable: true); + /// + public partial class implementors : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "ImplementerId", + table: "Orders", + type: "int", + nullable: true); - migrationBuilder.CreateTable( - name: "Implementers", - columns: table => new - { - Id = table.Column(type: "int", nullable: false) - .Annotation("SqlServer:Identity", "1, 1"), - ImplementerFIO = table.Column(type: "nvarchar(max)", nullable: false), - Password = table.Column(type: "nvarchar(max)", nullable: false), - WorkExperience = table.Column(type: "int", nullable: false), - Qualification = table.Column(type: "int", nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_Implementers", x => x.Id); - }); + migrationBuilder.CreateTable( + name: "Implementers", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("SqlServer:Identity", "1, 1"), + ImplementerFIO = table.Column(type: "nvarchar(max)", nullable: false), + Password = table.Column(type: "nvarchar(max)", nullable: false), + WorkExperience = table.Column(type: "int", nullable: false), + Qualification = table.Column(type: "int", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Implementers", x => x.Id); + }); - migrationBuilder.CreateIndex( - name: "IX_Orders_ImplementerId", - table: "Orders", - column: "ImplementerId"); + migrationBuilder.CreateIndex( + name: "IX_Orders_ImplementerId", + table: "Orders", + column: "ImplementerId"); - migrationBuilder.AddForeignKey( - name: "FK_Orders_Implementers_ImplementerId", - table: "Orders", - column: "ImplementerId", - principalTable: "Implementers", - principalColumn: "Id"); - } + migrationBuilder.AddForeignKey( + name: "FK_Orders_Implementers_ImplementerId", + table: "Orders", + column: "ImplementerId", + principalTable: "Implementers", + principalColumn: "Id"); + } - /// - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropForeignKey( - name: "FK_Orders_Implementers_ImplementerId", - table: "Orders"); + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropForeignKey( + name: "FK_Orders_Implementers_ImplementerId", + table: "Orders"); - migrationBuilder.DropTable( - name: "Implementers"); + migrationBuilder.DropTable( + name: "Implementers"); - migrationBuilder.DropIndex( - name: "IX_Orders_ImplementerId", - table: "Orders"); + migrationBuilder.DropIndex( + name: "IX_Orders_ImplementerId", + table: "Orders"); - migrationBuilder.DropColumn( - name: "ImplementerId", - table: "Orders"); - } - } + migrationBuilder.DropColumn( + name: "ImplementerId", + table: "Orders"); + } + } } diff --git a/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreDatabaseImplement/Migrations/JewelryStoreDatabaseModelSnapshot.cs b/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreDatabaseImplement/Migrations/JewelryStoreDatabaseModelSnapshot.cs index deaa3dd..87b737e 100644 --- a/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreDatabaseImplement/Migrations/JewelryStoreDatabaseModelSnapshot.cs +++ b/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreDatabaseImplement/Migrations/JewelryStoreDatabaseModelSnapshot.cs @@ -1,10 +1,10 @@ // using System; -using JewelryStoreDatabaseImplement; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using JewelryStoreDatabaseImplement; #nullable disable @@ -67,6 +67,33 @@ namespace JewelryStoreDatabaseImplement.Migrations b.ToTable("Components"); }); + modelBuilder.Entity("JewelryStoreDatabaseImplement.Models.Implementer", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ImplementerFIO") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Password") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Qualification") + .HasColumnType("int"); + + b.Property("WorkExperience") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("Implementers"); + }); + modelBuilder.Entity("JewelryStoreDatabaseImplement.Models.Order", b => { b.Property("Id") @@ -87,6 +114,9 @@ namespace JewelryStoreDatabaseImplement.Migrations b.Property("DateImplement") .HasColumnType("datetime2"); + b.Property("ImplementerId") + .HasColumnType("int"); + b.Property("JewelId") .HasColumnType("int"); @@ -100,6 +130,8 @@ namespace JewelryStoreDatabaseImplement.Migrations b.HasIndex("ClientId"); + b.HasIndex("ImplementerId"); + b.HasIndex("JewelId"); b.ToTable("Orders"); @@ -212,6 +244,10 @@ namespace JewelryStoreDatabaseImplement.Migrations .OnDelete(DeleteBehavior.Cascade) .IsRequired(); + b.HasOne("JewelryStoreDatabaseImplement.Models.Implementer", "Implementer") + .WithMany("Order") + .HasForeignKey("ImplementerId"); + b.HasOne("JewelryStoreDatabaseImplement.Models.Jewel", "Jewel") .WithMany("Orders") .HasForeignKey("JewelId") @@ -220,6 +256,8 @@ namespace JewelryStoreDatabaseImplement.Migrations b.Navigation("Client"); + b.Navigation("Implementer"); + b.Navigation("Jewel"); }); @@ -271,6 +309,11 @@ namespace JewelryStoreDatabaseImplement.Migrations b.Navigation("JewelComponents"); }); + modelBuilder.Entity("JewelryStoreDatabaseImplement.Models.Implementer", b => + { + b.Navigation("Order"); + }); + modelBuilder.Entity("JewelryStoreDatabaseImplement.Models.Jewel", b => { b.Navigation("Components"); diff --git a/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreDatabaseImplement/Models/Order.cs b/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreDatabaseImplement/Models/Order.cs index b488724..f06dab0 100644 --- a/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreDatabaseImplement/Models/Order.cs +++ b/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreDatabaseImplement/Models/Order.cs @@ -14,77 +14,81 @@ namespace JewelryStoreDatabaseImplement.Models { public class Order : IOrderModel { - public int Id { get; private set; } - [Required] - public int JewelId { get; set; } - [Required] - public int Count { get; set; } - [Required] - public double Sum { get; set; } - [Required] - public OrderStatus Status { get; set; } - [Required] - public int ClientId { get; set; } - [Required] - public DateTime DateCreate { get; set; } - public DateTime? DateImplement { get; set; } - public Jewel Jewel { get; set; } - public Client Client { get; set; } - public int? ImplementerId { get; private set; } - public Implementer? Implementer { get; set; } + public int Id { get; private set; } + [Required] + public int ClientId { get; private set; } - public static Order? Create(OrderBindingModel? model) - { - if (model == null) - { - return null; - } - return new Order() - { - Id = model.Id, - JewelId = model.JewelId, - ClientId = model.ClientId, - ImplementerId = model.ImplementerId, - Count = model.Count, - Sum = model.Sum, - Status = model.Status, - DateCreate = model.DateCreate, - DateImplement = model.DateImplement - }; - } - public void Update(OrderBindingModel? model) - { - if (model == null) - { - return; - } - Status = model.Status; - ImplementerId = model.ImplementerId; - DateImplement = model.DateImplement; - } - public OrderViewModel GetViewModel - { - get - { - using var context = new JewelryStoreDatabase(); - return new OrderViewModel - { - Id = Id, - JewelId = JewelId, - ClientId = ClientId, - ClientFIO = context.Clients.FirstOrDefault(x => x.Id == ClientId)?.ClientFIO ?? string.Empty, - ImplementerId = ImplementerId, - ImplementerFIO = Implementer?.ImplementerFIO ?? string.Empty, - JewelName = context.Jewels.FirstOrDefault(x => x.Id == JewelId)?.JewelName ?? string.Empty, - Count = Count, - Sum = Sum, - Status = Status, - DateCreate = DateCreate, - DateImplement = DateImplement - }; - } + public virtual Client Client { get; private set; } = new(); - } - } + [Required] + public int JewelId { get; private set; } + + public virtual Jewel Jewel { get; set; } = new(); + + public int? ImplementerId { get; private set; } + + public virtual Implementer? Implementer { get; set; } = new(); + + [Required] + public int Count { get; private set; } + + [Required] + public double Sum { get; private set; } + + [Required] + public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; + + [Required] + public DateTime DateCreate { get; private set; } = DateTime.Now; + + public DateTime? DateImplement { get; private set; } + + public static Order Create(JewelryStoreDatabase context, OrderBindingModel model) + { + return new Order() + { + Id = model.Id, + ClientId = model.ClientId, + Client = context.Clients.First(x => x.Id == model.ClientId), + JewelId = model.JewelId, + Jewel = context.Jewels.First(x => x.Id == model.JewelId), + ImplementerId = model.ImplementerId, + Implementer = model.ImplementerId.HasValue ? context.Implementers.First(x => x.Id == model.ImplementerId) : null, + Count = model.Count, + Sum = model.Sum, + Status = model.Status, + DateCreate = model.DateCreate, + DateImplement = model.DateImplement, + }; + } + + public void Update(JewelryStoreDatabase context, OrderBindingModel? model) + { + if (model == null) + { + return; + } + Status = model.Status; + DateImplement = model.DateImplement; + ImplementerId = model.ImplementerId; + Implementer = model.ImplementerId.HasValue ? context.Implementers.First(x => x.Id == model.ImplementerId) : null; + } + + public OrderViewModel GetViewModel => new() + { + Id = Id, + ClientId = ClientId, + ClientFIO = Client.ClientFIO, + JewelId = JewelId, + JewelName = Jewel.JewelName, + ImplementerId = ImplementerId, + ImplementerFIO = Implementer != null ? Implementer.ImplementerFIO : null, + Count = Count, + Sum = Sum, + Status = Status, + DateCreate = DateCreate, + DateImplement = DateImplement, + }; + } } diff --git a/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreFileImplement/DataFileSingleton.cs b/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreFileImplement/DataFileSingleton.cs index 8f3de86..bf7c14e 100644 --- a/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreFileImplement/DataFileSingleton.cs +++ b/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreFileImplement/DataFileSingleton.cs @@ -11,11 +11,13 @@ namespace JewelryStoreFileImplement private readonly string JewelFileName = "Jewel.xml"; private readonly string ClientFileName = "Client.xml"; private readonly string ShopFileName = "Shop.xml"; + private readonly string ImplementerFileName = "Implementer.xml"; public List Components { get; private set; } public List Orders { get; private set; } public List Jewels { get; private set; } public List Clients { get; private set; } public List Shops { get; private set; } + public List Implementers { get; private set; } public static DataFileSingleton GetInstance() { @@ -34,6 +36,7 @@ namespace JewelryStoreFileImplement public void SaveClients() => SaveData(Clients, OrderFileName, "Clients", x => x.GetXElement); public void SaveShops() => SaveData(Shops, ShopFileName, "Shops", x => x.GetXElement); + public void SaveImplementers() => SaveData(Implementers, ImplementerFileName, "Implementers", x => x.GetXElement); private DataFileSingleton() { @@ -42,6 +45,7 @@ namespace JewelryStoreFileImplement Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!; Clients = LoadData(ClientFileName, "Client", x => Client.Create(x)!)!; Shops = LoadData(ShopFileName, "Shop", x => Shop.Create(x)!)!; + Implementers = LoadData(ImplementerFileName, "Implementer", x => Implementer.Create(x)!)!; } private static List? LoadData(string filename, string xmlNodeName, Func selectFunction) diff --git a/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreFileImplement/Implements/ImplementerStorage.cs b/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreFileImplement/Implements/ImplementerStorage.cs index ba1dd16..ead8aed 100644 --- a/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreFileImplement/Implements/ImplementerStorage.cs +++ b/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreFileImplement/Implements/ImplementerStorage.cs @@ -13,96 +13,87 @@ namespace JewelryStoreFileImplement.Implements { public class ImplementerStorage : IImplementerStorage { - private readonly DataFileSingleton _source; - public ImplementerStorage() - { - _source = DataFileSingleton.GetInstance(); - } - public ImplementerViewModel? Delete(ImplementerBindingModel model) - { - var res = _source.Implementers.FirstOrDefault(x => x.Id == model.Id); + private readonly DataFileSingleton _source; + public ImplementerStorage() + { + _source = DataFileSingleton.GetInstance(); + } - if (res != null) - { - _source.Implementers.Remove(res); - _source.SaveImplementers(); - } - return res?.GetViewModel; - } + public List GetFullList() + { + return _source.Implementers.Select(x => x.GetViewModel).ToList(); + } - public ImplementerViewModel? GetElement(ImplementerSearchModel model) - { - if (model.Id.HasValue) - return _source.Implementers.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel; + public List GetFilteredList(ImplementerSearchModel model) + { + if (model == null) + { + return new(); + } + if (model.Id.HasValue) + { + var res = GetElement(model); + return res != null ? new() { res } : new(); + } + if (model.ImplementerFIO != null) + { + return _source.Implementers + .Where(x => x.ImplementerFIO.Equals(model.ImplementerFIO)) + .Select(x => x.GetViewModel) + .ToList(); + } + return new(); + } - if (model.ImplementerFIO != null && model.Password != null) - return _source.Implementers - .FirstOrDefault(x => x.ImplementerFIO.Equals(model.ImplementerFIO) - && x.Password.Equals(model.Password)) - ?.GetViewModel; + public ImplementerViewModel? GetElement(ImplementerSearchModel model) + { + if (model.Id.HasValue) + { + return _source.Implementers.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel; + } + if (model.ImplementerFIO != null && model.Password != null) + { + return _source.Implementers.FirstOrDefault(x => x.ImplementerFIO.Equals(model.ImplementerFIO) && x.Password.Equals(model.Password))?.GetViewModel; + } + if (model.ImplementerFIO != null) + { + return _source.Implementers.FirstOrDefault(x => x.ImplementerFIO.Equals(model.ImplementerFIO))?.GetViewModel; + } + return null; + } - if (model.ImplementerFIO != null) - return _source.Implementers.FirstOrDefault(x => x.ImplementerFIO.Equals(model.ImplementerFIO))?.GetViewModel; + public ImplementerViewModel? Insert(ImplementerBindingModel model) + { + model.Id = _source.Implementers.Count > 0 ? _source.Implementers.Max(x => x.Id) + 1 : 1; + var res = Implementer.Create(model); + if (res != null) + { + _source.Implementers.Add(res); + _source.SaveImplementers(); + } + return res?.GetViewModel; + } - return null; - } + public ImplementerViewModel? Update(ImplementerBindingModel model) + { + var res = _source.Implementers.FirstOrDefault(x => x.Id == model.Id); + if (res != null) + { + res.Update(model); + _source.SaveImplementers(); + } + return res?.GetViewModel; + } - public List GetFilteredList(ImplementerSearchModel model) - { - if (model == null) - { - return new(); - } - - if (model.Id.HasValue) - { - var res = GetElement(model); - - return res != null ? new() { res } : new(); - } - - if (model.ImplementerFIO != null) - { - return _source.Implementers - .Where(x => x.ImplementerFIO.Equals(model.ImplementerFIO)) - .Select(x => x.GetViewModel) - .ToList(); - } - - return new(); - } - - public List GetFullList() - { - return _source.Implementers.Select(x => x.GetViewModel).ToList(); - } - - public ImplementerViewModel? Insert(ImplementerBindingModel model) - { - model.Id = _source.Implementers.Count > 0 ? _source.Implementers.Max(x => x.Id) + 1 : 1; - - var res = Implementer.Create(model); - - if (res != null) - { - _source.Implementers.Add(res); - _source.SaveImplementers(); - } - - return res?.GetViewModel; - } - - public ImplementerViewModel? Update(ImplementerBindingModel model) - { - var res = _source.Implementers.FirstOrDefault(x => x.Id == model.Id); - - if (res != null) - { - res.Update(model); - _source.SaveImplementers(); - } - - return res?.GetViewModel; - } - } + public ImplementerViewModel? Delete(ImplementerBindingModel model) + { + var res = _source.Implementers.FirstOrDefault(x => x.Id == model.Id); + if (res != null) + { + _source.Implementers.Remove(res); + _source.SaveImplementers(); + } + return res?.GetViewModel; + } + } } diff --git a/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreFileImplement/Implements/OrderStorage.cs b/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreFileImplement/Implements/OrderStorage.cs index 04c48c2..87f64f6 100644 --- a/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreFileImplement/Implements/OrderStorage.cs +++ b/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreFileImplement/Implements/OrderStorage.cs @@ -14,105 +14,122 @@ namespace JewelryStoreFileImplement.Implements { public class OrderStorage : IOrderStorage { - private readonly DataFileSingleton _source; - public OrderStorage() - { - _source = DataFileSingleton.GetInstance(); - } - public List GetFullList() - { - return _source.Orders.Select(x => SAddJewelName(x.GetViewModel)).ToList(); - } - public List GetFilteredList(OrderSearchModel model) - { - if (model.DateFrom.HasValue) - { - return _source.Orders.Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo) .Select(x => GetViewModel(x)).ToList(); - } - if (model.ClientId.HasValue && !model.Id.HasValue) - { - return _source.Orders.Where(x => x.ClientId == model.ClientId).Select(x => x.GetViewModel).ToList(); - } - if (model.Id.HasValue) - { - return _source.Orders.Where(x => x.Id.Equals(model.Id)).Select(x => GetViewModel(x)).ToList(); - } - return new(); - } - public OrderViewModel? GetElement(OrderSearchModel model) - { - if (model.ImplementerId.HasValue && model.Statuses != null) - { - return _source.Orders .FirstOrDefault(x => x.ImplementerId == model.ImplementerId &&model.Statuses.Contains(x.Status))?.GetViewModel; - } - if (model.ImplementerId.HasValue) - { - return _source.Orders.FirstOrDefault(x => x.ImplementerId == model.ImplementerId)?.GetViewModel; - } + private readonly DataFileSingleton source; - if (!model.Id.HasValue) - { - return null; - } - return SAddJewelName(_source.Orders.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel); - } - public OrderViewModel? Insert(OrderBindingModel model) - { - model.Id = _source.Orders.Count > 0 ? _source.Orders.Max(x => x.Id) + 1 : 1; - var newOrder = Order.Create(model); - if (newOrder == null) - { - return null; - } - _source.Orders.Add(newOrder); - _source.SaveOrders(); - return SAddJewelName(newOrder.GetViewModel); - } - public OrderViewModel? Update(OrderBindingModel model) - { - var order = _source.Orders.FirstOrDefault(x => x.Id == model.Id); - if (order == null) - { - return null; - } - order.Update(model); - _source.SaveOrders(); - return SAddJewelName(order.GetViewModel); - } - public OrderViewModel? Delete(OrderBindingModel model) - { - var element = _source.Orders.FirstOrDefault(x => x.Id == model.Id); - if (element != null) - { - _source.Orders.Remove(element); - _source.SaveOrders(); - return SAddJewelName(element.GetViewModel); - } - return null; - } + public OrderStorage() + { + source = DataFileSingleton.GetInstance(); + } - public OrderViewModel SAddJewelName(OrderViewModel fullModel) - { - string? jewelName = _source.Jewels.FirstOrDefault(x => x.Id == fullModel?.JewelId)?.JewelName; - if (jewelName != null) fullModel.JewelName = jewelName; - return fullModel; - } + public List GetFullList() => source.Orders.Select(x => AttachJewelName(x.GetViewModel)).ToList(); - private OrderViewModel GetViewModel(Order order) - { - var viewModel = order.GetViewModel; + public List GetFilteredList(OrderSearchModel model) + { + if (model.DateFrom.HasValue) + { + return source.Orders.Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo) + .Select(x => GetViewModel(x)).ToList(); + } + + if (model.ClientId.HasValue && !model.Id.HasValue) + { + return source.Orders.Where(x => x.ClientId == model.ClientId).Select(x => x.GetViewModel).ToList(); + } + + if (!model.ImplementerId.HasValue && !model.Id.HasValue) + { + return source.Orders.Where(x => x.ImplementerId == model.ImplementerId).Select(x => x.GetViewModel).ToList(); + + } + + if (model.Id.HasValue) + { + return source.Orders.Where(x => x.Id.Equals(model.Id)).Select(x => GetViewModel(x)).ToList(); + } + return new(); + } + + public OrderViewModel? GetElement(OrderSearchModel model) + { + if (model.ImplementerId.HasValue) + { + return source.Orders.FirstOrDefault(x => x.ImplementerId == model.ImplementerId)?.GetViewModel; + } + if (!model.Id.HasValue) + { + return new(); + } + return AttachJewelName(source.Orders.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel); + } + + private OrderViewModel GetViewModel(Order order) + { + var viewModel = order.GetViewModel; + + var Jewel = source.Jewels.FirstOrDefault(x => x.Id == order.JewelId); + var client = source.Clients.FirstOrDefault(x => x.Id == order.ClientId); + + if (Jewel != null) + { + viewModel.JewelName = Jewel.JewelName; + } + if (client != null) + { + viewModel.ClientFIO = client.ClientFIO; + } + return viewModel; + } + + public OrderViewModel? Insert(OrderBindingModel model) + { + model.Id = source.Orders.Count > 0 ? source.Orders.Max(x => x.Id) + 1 : 1; + var newOrder = Order.Create(model); + if (newOrder == null) + { + return null; + } + source.Orders.Add(newOrder); + source.SaveOrders(); + return AttachJewelName(newOrder.GetViewModel); + } + + public OrderViewModel? Update(OrderBindingModel model) + { + var order = source.Orders.FirstOrDefault(x => x.Id == model.Id); + if (order == null) + { + return null; + } + order.Update(model); + source.SaveOrders(); + return AttachJewelName(order.GetViewModel); + } + + public OrderViewModel? Delete(OrderBindingModel model) + { + var order = source.Orders.FirstOrDefault(x => x.Id == model.Id); + if (order != null) + { + source.Orders.Remove(order); + source.SaveOrders(); + return AttachJewelName(order.GetViewModel); + } + return null; + } + + private OrderViewModel? AttachJewelName(OrderViewModel? model) + { + if (model == null) + { + return null; + } + var Jewel = source.Jewels.FirstOrDefault(x => x.Id == model.JewelId); + if (Jewel != null) + { + model.JewelName = Jewel.JewelName; + } + return model; + } + } - var jewel = _source.Jewels.FirstOrDefault(x => x.Id == order.JewelId); - var client = _source.Clients.FirstOrDefault(x => x.Id == order.ClientId); - if (jewel != null) - { - viewModel.JewelName = jewel.JewelName; - } - if (client != null) - { - viewModel.ClientFIO = client.ClientFIO; - } - return viewModel; - } - } } diff --git a/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreListImplement/DataListSingleton.cs b/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreListImplement/DataListSingleton.cs index 896f93f..364e5b9 100644 --- a/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreListImplement/DataListSingleton.cs +++ b/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreListImplement/DataListSingleton.cs @@ -9,14 +9,16 @@ namespace JewelryStoreListImplement public List Orders { get; set; } public List Jewels { get; set; } public List Stores { get; set; } + public List Implementers { get; set; } - private DataListSingleton() + private DataListSingleton() { Components = new List(); Orders = new List(); Jewels = new List(); - Stores = new List(); - } + Stores = new List(); + Implementers = new List(); + } public static DataListSingleton GetInstance() { diff --git a/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreListImplement/Implements/ImplementerStorage.cs b/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreListImplement/Implements/ImplementerStorage.cs index c0f22fc..abcc623 100644 --- a/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreListImplement/Implements/ImplementerStorage.cs +++ b/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreListImplement/Implements/ImplementerStorage.cs @@ -13,119 +13,111 @@ namespace JewelryStoreListImplement.Implements { public class ImplementerStorage : IImplementerStorage { - private readonly DataListSingleton _source; - public ImplementerStorage() - { - _source = DataListSingleton.GetInstance(); - } + private readonly DataListSingleton _source; + public ImplementerStorage() + { + _source = DataListSingleton.GetInstance(); + } - public ImplementerViewModel? Delete(ImplementerBindingModel model) - { - for (int i = 0; i < _source.Implementers.Count; ++i) - { - if (_source.Implementers[i].Id == model.Id) - { - var element = _source.Implementers[i]; - _source.Implementers.RemoveAt(i); + public ImplementerViewModel? Delete(ImplementerBindingModel model) + { + for (int i = 0; i < _source.Implementers.Count; ++i) + { + if (_source.Implementers[i].Id == model.Id) + { + var element = _source.Implementers[i]; + _source.Implementers.RemoveAt(i); + return element.GetViewModel; + } + } + return null; + } - return element.GetViewModel; - } - } - return null; - } + public ImplementerViewModel? GetElement(ImplementerSearchModel model) + { + foreach (var x in _source.Implementers) + { + if (model.Id.HasValue && x.Id == model.Id) + { + return x.GetViewModel; + } + if (model.ImplementerFIO != null && model.Password != null && x.ImplementerFIO.Equals(model.ImplementerFIO) && x.Password.Equals(model.Password)) + { + return x.GetViewModel; + } + if (model.ImplementerFIO != null && x.ImplementerFIO.Equals(model.ImplementerFIO)) + { + return x.GetViewModel; + } + } + return null; + } - public ImplementerViewModel? GetElement(ImplementerSearchModel model) - { - foreach (var x in _source.Implementers) - { - if (model.Id.HasValue && x.Id == model.Id) - return x.GetViewModel; + public List GetFilteredList(ImplementerSearchModel model) + { + if (model == null) + { + return new(); + } + if (model.Id.HasValue) + { + var res = GetElement(model); + return res != null ? new() { res } : new(); + } - if (model.ImplementerFIO != null && model.Password != null && - x.ImplementerFIO.Equals(model.ImplementerFIO) && - x.Password.Equals(model.Password)) - return x.GetViewModel; + List result = new(); + if (model.ImplementerFIO != null) + { + foreach (var implementer in _source.Implementers) + { + if (implementer.ImplementerFIO.Equals(model.ImplementerFIO)) + { + result.Add(implementer.GetViewModel); + } + } + } + return result; + } - if (model.ImplementerFIO != null && x.ImplementerFIO.Equals(model.ImplementerFIO)) - return x.GetViewModel; - } - return null; - } + public List GetFullList() + { + var result = new List(); + foreach (var implementer in _source.Implementers) + { + result.Add(implementer.GetViewModel); + } + return result; + } - public List GetFilteredList(ImplementerSearchModel model) - { - if (model == null) - { - return new(); - } + public ImplementerViewModel? Insert(ImplementerBindingModel model) + { + model.Id = 1; + foreach (var implementer in _source.Implementers) + { + if (model.Id <= implementer.Id) + { + model.Id = implementer.Id + 1; + } + } + var res = Implementer.Create(model); + if (res != null) + { + _source.Implementers.Add(res); + } + return res?.GetViewModel; + } - if (model.Id.HasValue) - { - var res = GetElement(model); - - return res != null ? new() { res } : new(); - } - - List result = new(); - - if (model.ImplementerFIO != null) - { - foreach (var implementer in _source.Implementers) - { - if (implementer.ImplementerFIO.Equals(model.ImplementerFIO)) - { - result.Add(implementer.GetViewModel); - } - } - } - return result; - } - - public List GetFullList() - { - var result = new List(); - - foreach (var implementer in _source.Implementers) - { - result.Add(implementer.GetViewModel); - } - - return result; - } - - public ImplementerViewModel? Insert(ImplementerBindingModel model) - { - model.Id = 1; - - foreach (var implementer in _source.Implementers) - { - if (model.Id <= implementer.Id) - { - model.Id = implementer.Id + 1; - } - } - - var res = Implementer.Create(model); - - if (res != null) - { - _source.Implementers.Add(res); - } - return res?.GetViewModel; - } - - public ImplementerViewModel? Update(ImplementerBindingModel model) - { - foreach (var implementer in _source.Implementers) - { - if (implementer.Id == model.Id) - { - implementer.Update(model); - - return implementer.GetViewModel; - } - } - return null; - } - } + public ImplementerViewModel? Update(ImplementerBindingModel model) + { + foreach (var implementer in _source.Implementers) + { + if (implementer.Id == model.Id) + { + implementer.Update(model); + return implementer.GetViewModel; + } + } + return null; + } + } } diff --git a/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreListImplement/Implements/OrderStorage.cs b/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreListImplement/Implements/OrderStorage.cs index 0a0b12c..15eba32 100644 --- a/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreListImplement/Implements/OrderStorage.cs +++ b/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreListImplement/Implements/OrderStorage.cs @@ -8,174 +8,168 @@ namespace JewelryStoreListImplement.Implements { public class OrderStorage : IOrderStorage { - private readonly DataListSingleton _source; + private readonly DataListSingleton _source; - public OrderStorage() - { - _source = DataListSingleton.GetInstance(); - } + public OrderStorage() + { + _source = DataListSingleton.GetInstance(); + } - public List GetFullList() - { - var result = new List(); - foreach (var order in _source.Orders) - { - result.Add(AccessJewelStorage(order.GetViewModel)); - } - return result; - } + public List GetFullList() + { + var result = new List(); + foreach (var order in _source.Orders) + { + result.Add(AttachJewelName(order.GetViewModel)); + } + return result; + } - public List GetFilteredList(OrderSearchModel model) - { - var result = new List(); - if (model.DateFrom.HasValue) - { - return result; - foreach (var order in _source.Orders) - { - if (order.DateCreate >= model.DateFrom && order.DateCreate <= model.DateTo) - { - result.Add(GetViewModel(order)); - } - } - } - else if (model.ClientId.HasValue && !model.Id.HasValue) - { - foreach (var order in _source.Orders) - { - if (order.ClientId == model.ClientId) - { - result.Add(GetViewModel(order)); - } - } - } - else if (model.Id.HasValue) - { - foreach (var order in _source.Orders) - { - if (order.Id == model.Id) - { - result.Add(GetViewModel(order)); - } - else if (model.ImplementerId.HasValue && order.ImplementerId == model.ImplementerId) - { - result.Add(GetViewModel(order)); - } + public List GetFilteredList(OrderSearchModel model) + { + var result = new List(); + if (model.DateFrom.HasValue) + { + foreach (var order in _source.Orders) + { + if (order.DateCreate >= model.DateFrom && order.DateCreate <= model.DateTo) + { + result.Add(GetViewModel(order)); + } + } + } + else if (model.ClientId.HasValue && !model.Id.HasValue) + { + foreach (var order in _source.Orders) + { + if (order.ClientId == model.ClientId) + { + result.Add(GetViewModel(order)); + } + } + } + else if (model.ImplementerId.HasValue && !model.Id.HasValue) + { + foreach (var order in _source.Orders) + { + if (order.ImplementerId == model.ImplementerId) + { + result.Add(GetViewModel(order)); + } + } + } + else if (model.Id.HasValue) + { + foreach (var order in _source.Orders) + { + if (order.Id == model.Id) + { + result.Add(GetViewModel(order)); + } + } + } + return result; + } - else if (model.Statuses != null && model.Statuses.Contains(order.Status)) - { - result.Add(GetViewModel(order)); - } - } - } - return result; - } + private OrderViewModel GetViewModel(Order order) + { + var viewModel = order.GetViewModel; + foreach (var package in _source.Jewels) + { + if (package.Id == order.JewelId) + { + viewModel.JewelName = package.JewelName; + break; + } + } + foreach (var client in _source.Clients) + { + if (client.Id == order.ClientId) + { + viewModel.ClientFIO = client.ClientFIO; + break; + } + } + return viewModel; + } - public OrderViewModel? GetElement(OrderSearchModel model) - { - if (!model.Id.HasValue) - { - return null; - } - foreach (var order in _source.Orders) - { - if (model.Id.HasValue && order.Id == model.Id) - { - return AccessJewelStorage(order.GetViewModel); - } - else if (model.ImplementerId.HasValue && model.Statuses != null && order.ImplementerId == model.ImplementerId && - model.Statuses.Contains(order.Status)) - { - return GetViewModel(order); - } + public OrderViewModel? GetElement(OrderSearchModel model) + { + if (!model.Id.HasValue) + { + return null; + } + foreach (var order in _source.Orders) + { + if (model.Id.HasValue && order.Id == model.Id) + { + return AttachJewelName(order.GetViewModel); + } + else if (model.ImplementerId.HasValue && model.ImplementerId == order.ImplementerId) + { + return GetViewModel(order); + } + } + return null; + } - else if (model.ImplementerId.HasValue && model.ImplementerId == order.ImplementerId) - { - return GetViewModel(order); - } - } - return null; - } + public OrderViewModel? Insert(OrderBindingModel model) + { + model.Id = 1; + foreach (var order in _source.Orders) + { + if (model.Id <= order.Id) + { + model.Id = order.Id + 1; + } + } + var newOrder = Order.Create(model); + if (newOrder == null) + { + return null; + } + _source.Orders.Add(newOrder); + return AttachJewelName(newOrder.GetViewModel); + } - public OrderViewModel? Insert(OrderBindingModel model) - { - model.Id = 1; - foreach (var order in _source.Orders) - { - if (model.Id <= order.Id) - { - model.Id = order.Id + 1; - } - } - var newOrder = Order.Create(model); - if (newOrder == null) - { - return null; - } - _source.Orders.Add(newOrder); - return AccessJewelStorage(newOrder.GetViewModel); - } + public OrderViewModel? Update(OrderBindingModel model) + { + foreach (var order in _source.Orders) + { + if (order.Id == model.Id) + { + order.Update(model); + return AttachJewelName(order.GetViewModel); + } + } + return null; + } - public OrderViewModel? Update(OrderBindingModel model) - { - foreach (var order in _source.Orders) - { - if (order.Id == model.Id) - { - order.Update(model); - return AccessJewelStorage(order.GetViewModel); - } - } - return null; - } + public OrderViewModel? Delete(OrderBindingModel model) + { + for (int i = 0; i < _source.Orders.Count; ++i) + { + if (_source.Orders[i].Id == model.Id) + { + var element = _source.Orders[i]; + _source.Orders.RemoveAt(i); + return AttachJewelName(element.GetViewModel); + } + } + return null; + } - public OrderViewModel? Delete(OrderBindingModel model) - { - for (int i = 0; i < _source.Orders.Count; ++i) - { - if (_source.Orders[i].Id == model.Id) - { - var element = _source.Orders[i]; - _source.Orders.RemoveAt(i); - return AccessJewelStorage(element.GetViewModel); - } - } - return null; - } - - public OrderViewModel AccessJewelStorage(OrderViewModel model) - { - foreach (var jewel in _source.Jewels) - { - if (jewel.Id == model.JewelId) - { - model.JewelName = jewel.JewelName; - break; - } - } - return model; - } - - private OrderViewModel GetViewModel(Order order) - { - var viewModel = order.GetViewModel; - foreach (var jewel in _source.Jewels) - { - if (jewel.Id == order.JewelId) - { - viewModel.JewelName = jewel.JewelName; - break; - } - } - foreach (var client in _source.Clients) - { - if (client.Id == order.ClientId) - { - viewModel.ClientFIO = client.ClientFIO; - break; - } - } - return viewModel; - } - } -} \ No newline at end of file + private OrderViewModel AttachJewelName(OrderViewModel model) + { + foreach (var Jewel in _source.Jewels) + { + if (Jewel.Id == model.JewelId) + { + model.JewelName = Jewel.JewelName; + return model; + } + } + return model; + } + } +} diff --git a/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreRestApi/Program.cs b/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreRestApi/Program.cs index 447f0e9..9f468a3 100644 --- a/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreRestApi/Program.cs +++ b/PIbd-23_Panina.A.D_JewelryStore/JewelryStoreRestApi/Program.cs @@ -16,10 +16,13 @@ builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); +builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); +builder.Services.AddTransient(); + builder.Services.AddControllers();