Фикс переменных
This commit is contained in:
parent
48027c484d
commit
130ea7cc1d
@ -0,0 +1,116 @@
|
||||
using AbstractFoodOrdersContracts.BusinessLogicsContracts;
|
||||
using AbstractFoodOrdersContracts.BindingModels;
|
||||
using AbstractFoodOrdersContracts.SearchModels;
|
||||
using AbstractFoodOrdersContracts.StoragesContracts;
|
||||
using AbstractFoodOrdersContracts.ViewModels;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace AbstractFoodOrdersBusinessLogic.BusinessLogics
|
||||
{
|
||||
public class DishLogic : IDishLogic
|
||||
{
|
||||
private readonly ILogger _logger;
|
||||
private readonly IDishStorage _dishStorage;
|
||||
public DishLogic(ILogger<DishLogic> logger, IDishStorage dishStorage)
|
||||
{
|
||||
_logger = logger;
|
||||
_dishStorage = dishStorage;
|
||||
}
|
||||
public List<DishViewModel>? ReadList(DishSearchModel? model)
|
||||
{
|
||||
_logger.LogInformation("ReadList. DishName:{DishName}.Id:{ Id}", model?.DishName, model?.Id);
|
||||
var list = model == null ? _dishStorage.GetFullList() : _dishStorage.GetFilteredList(model);
|
||||
if (list == null)
|
||||
{
|
||||
_logger.LogWarning("ReadList return null list");
|
||||
return null;
|
||||
}
|
||||
_logger.LogInformation("ReadList. Count:{Count}", list.Count);
|
||||
return list;
|
||||
}
|
||||
public DishViewModel? ReadElement(DishSearchModel model)
|
||||
{
|
||||
if (model == null)
|
||||
{
|
||||
throw new ArgumentNullException(nameof(model));
|
||||
}
|
||||
_logger.LogInformation("ReadElement. DishName:{DishName}.Id:{ Id}", model.DishName, model.Id);
|
||||
var element = _dishStorage.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(DishBindingModel model)
|
||||
{
|
||||
CheckModel(model);
|
||||
if (_dishStorage.Insert(model) == null)
|
||||
{
|
||||
_logger.LogWarning("Insert operation failed");
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
public bool Update(DishBindingModel model)
|
||||
{
|
||||
CheckModel(model);
|
||||
if (_dishStorage.Update(model) == null)
|
||||
{
|
||||
_logger.LogWarning("Update operation failed");
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
public bool Delete(DishBindingModel model)
|
||||
{
|
||||
CheckModel(model, false);
|
||||
_logger.LogInformation("Delete. Id:{Id}", model.Id);
|
||||
if (_dishStorage.Delete(model) == null)
|
||||
{
|
||||
_logger.LogWarning("Delete operation failed");
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
private void CheckModel(DishBindingModel model, bool withParams = true)
|
||||
{
|
||||
if (model == null)
|
||||
{
|
||||
throw new ArgumentNullException(nameof(model));
|
||||
}
|
||||
if (!withParams)
|
||||
{
|
||||
return;
|
||||
}
|
||||
if (string.IsNullOrEmpty(model.DishName))
|
||||
{
|
||||
throw new ArgumentNullException("Нет названия изделия", nameof(model.DishName));
|
||||
}
|
||||
if (model.Price <= 0)
|
||||
{
|
||||
throw new ArgumentNullException("Цена изделия должна быть больше 0", nameof(model.Price));
|
||||
}
|
||||
if (model.DishComponents == null || model.DishComponents.Count == 0)
|
||||
{
|
||||
throw new ArgumentNullException("Перечень компонентов не может быть пустым", nameof(model.DishComponents));
|
||||
}
|
||||
_logger.LogInformation("Dish. DishName:{DishName}.Price:{Price}.Id: { Id}", model.DishName, model.Price, model.Id);
|
||||
var element = _dishStorage.GetElement(new DishSearchModel
|
||||
{
|
||||
DishName = model.DishName
|
||||
});
|
||||
if (element != null && element.Id != model.Id)
|
||||
{
|
||||
throw new InvalidOperationException("Изделие с таким названием уже есть");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -0,0 +1,120 @@
|
||||
using AbstractFoodOrdersContracts.BindingModels;
|
||||
using AbstractFoodOrdersContracts.BusinessLogicsContracts;
|
||||
using AbstractFoodOrdersContracts.SearchModels;
|
||||
using AbstractFoodOrdersContracts.StoragesContracts;
|
||||
using AbstractFoodOrdersContracts.ViewModels;
|
||||
using AbstractFoodOrdersDataModels.Enums;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace AbstractFoodOrdersBusinessLogic.BusinessLogics
|
||||
{
|
||||
public class OrderLogic : IOrderLogic
|
||||
{
|
||||
private readonly ILogger _logger;
|
||||
private readonly IOrderStorage _orderStorage;
|
||||
public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage)
|
||||
{
|
||||
_logger = logger;
|
||||
_orderStorage = orderStorage;
|
||||
}
|
||||
public List<OrderViewModel>? ReadList(OrderSearchModel? model)
|
||||
{
|
||||
_logger.LogInformation("ReadList. OrderId:{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 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)
|
||||
{
|
||||
return ChangeStatus(model, OrderStatus.Выполняется);
|
||||
}
|
||||
public bool FinishOrder(OrderBindingModel model)
|
||||
{
|
||||
return ChangeStatus(model, OrderStatus.Готов);
|
||||
}
|
||||
public bool DeliveryOrder(OrderBindingModel model)
|
||||
{
|
||||
return ChangeStatus(model, OrderStatus.Выдан);
|
||||
}
|
||||
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("Reinforced. ReinforcedId:{ReinforcedId}.Count:{Count}.Sum:{Sum}Id:{Id}",
|
||||
model.DishId, model.Count, model.Sum, model.Id);
|
||||
}
|
||||
private bool ChangeStatus(OrderBindingModel model, OrderStatus requiredStatus)
|
||||
{
|
||||
CheckModel(model, false);
|
||||
var element = _orderStorage.GetElement(new OrderSearchModel()
|
||||
{
|
||||
Id = model.Id
|
||||
});
|
||||
if (element == null)
|
||||
{
|
||||
throw new ArgumentNullException(nameof(element));
|
||||
}
|
||||
model.DateCreate = element.DateCreate;
|
||||
model.DishId = element.DishId;
|
||||
model.DateImplement = element.DateImplement;
|
||||
model.Status = element.Status;
|
||||
model.Count = element.Count;
|
||||
model.Sum = element.Sum;
|
||||
if (requiredStatus - model.Status == 1)
|
||||
{
|
||||
model.Status = requiredStatus;
|
||||
if (model.Status == OrderStatus.Выдан)
|
||||
model.DateImplement = DateTime.Now;
|
||||
if (_orderStorage.Update(model) == null)
|
||||
{
|
||||
_logger.LogWarning("Update operation failed");
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
_logger.LogWarning("Changing status operation faled: Current-{Status}:required-{requiredStatus}.", model.Status, requiredStatus);
|
||||
throw new ArgumentException($"Невозможно приствоить статус {requiredStatus} заказу с текущим статусом {model.Status}");
|
||||
}
|
||||
}
|
||||
}
|
@ -7,7 +7,7 @@ using System.Threading.Tasks;
|
||||
|
||||
namespace AbstractFoodOrdersContracts.BindingModels
|
||||
{
|
||||
public class ProductBindingModel : IDishModel
|
||||
public class DishBindingModel : IDishModel
|
||||
{
|
||||
public int Id { get; set; }
|
||||
public string DishName { get; set; } = string.Empty;
|
||||
|
@ -11,7 +11,7 @@ namespace AbstractFoodOrdersContracts.BindingModels
|
||||
public class OrderBindingModel : IOrderModel
|
||||
{
|
||||
public int Id { get; set; }
|
||||
public int ProductId { get; set; }
|
||||
public int DishId { get; set; }
|
||||
public int Count { get; set; }
|
||||
public double Sum { get; set; }
|
||||
public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
|
||||
|
@ -13,9 +13,9 @@ namespace AbstractFoodOrdersContracts.BusinessLogicsContracts
|
||||
{
|
||||
List<DishViewModel>? ReadList(DishSearchModel? model);
|
||||
DishViewModel? ReadElement(DishSearchModel model);
|
||||
bool Create(ProductBindingModel model);
|
||||
bool Update(ProductBindingModel model);
|
||||
bool Delete(ProductBindingModel model);
|
||||
bool Create(DishBindingModel model);
|
||||
bool Update(DishBindingModel model);
|
||||
bool Delete(DishBindingModel model);
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -14,9 +14,9 @@ namespace AbstractFoodOrdersContracts.StoragesContracts
|
||||
List<DishViewModel> GetFullList();
|
||||
List<DishViewModel> GetFilteredList(DishSearchModel model);
|
||||
DishViewModel? GetElement(DishSearchModel model);
|
||||
DishViewModel? Insert(ProductBindingModel model);
|
||||
DishViewModel? Update(ProductBindingModel model);
|
||||
DishViewModel? Delete(ProductBindingModel model);
|
||||
DishViewModel? Insert(DishBindingModel model);
|
||||
DishViewModel? Update(DishBindingModel model);
|
||||
DishViewModel? Delete(DishBindingModel model);
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -13,9 +13,9 @@ namespace AbstractFoodOrdersContracts.ViewModels
|
||||
{
|
||||
[DisplayName("Номер")]
|
||||
public int Id { get; set; }
|
||||
public int ProductId { get; set; }
|
||||
public int DishId { get; set; }
|
||||
[DisplayName("Изделие")]
|
||||
public string ProductName { get; set; } = string.Empty;
|
||||
public string DishName { get; set; } = string.Empty;
|
||||
[DisplayName("Количество")]
|
||||
public int Count { get; set; }
|
||||
[DisplayName("Сумма")]
|
||||
|
@ -9,7 +9,7 @@ namespace AbstractFoodOrdersDataModels.Models
|
||||
{
|
||||
public interface IOrderModel : IId
|
||||
{
|
||||
int ProductId { get; }
|
||||
int DishId { get; }
|
||||
int Count { get; }
|
||||
double Sum { get; }
|
||||
OrderStatus Status { get; }
|
||||
|
@ -12,12 +12,12 @@ namespace AbstractFoodOrdersListImplement
|
||||
private static DataListSingleton? _instance;
|
||||
public List<Component> Components { get; set; }
|
||||
public List<Order> Orders { get; set; }
|
||||
public List<Dish> Products { get; set; }
|
||||
public List<Dish> Dishes { get; set; }
|
||||
private DataListSingleton()
|
||||
{
|
||||
Components = new List<Component>();
|
||||
Orders = new List<Order>();
|
||||
Products = new List<Product>();
|
||||
Dishes = new List<Dish>();
|
||||
}
|
||||
public static DataListSingleton GetInstance()
|
||||
{
|
||||
|
@ -19,7 +19,7 @@ namespace AbstractFoodOrdersListImplement.Models
|
||||
get;
|
||||
private set;
|
||||
} = new Dictionary<int, (IComponentModel, int)>();
|
||||
public static Dish? Create(ProductBindingModel? model)
|
||||
public static Dish? Create(DishBindingModel? model)
|
||||
{
|
||||
if (model == null)
|
||||
{
|
||||
@ -27,7 +27,7 @@ namespace AbstractFoodOrdersListImplement.Models
|
||||
}
|
||||
return new Dish(){ Id = model.Id, DishName = model.DishName, Price = model.Price, DishComponents = model.DishComponents };
|
||||
}
|
||||
public void Update(ProductBindingModel? model)
|
||||
public void Update(DishBindingModel? model)
|
||||
{
|
||||
if (model == null)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user