diff --git a/GiftShop/GiftShop.sln b/GiftShop/GiftShop.sln index 0e16c7c..839dbe5 100644 --- a/GiftShop/GiftShop.sln +++ b/GiftShop/GiftShop.sln @@ -11,7 +11,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GiftShopContracts", "GiftSh EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GiftShopListImplement", "GiftShopListImplement\GiftShopListImplement.csproj", "{5B83AC94-55AC-45CA-8C44-0D0F34E17666}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GiftShopBusinessLogic", "GiftShopBusinessLogic\GiftShopBusinessLogic.csproj", "{07C14020-5905-4CCC-9DAC-53507C8F28F8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GiftShopBusinessLogic", "GiftShopBusinessLogic\GiftShopBusinessLogic.csproj", "{07C14020-5905-4CCC-9DAC-53507C8F28F8}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GiftShopFileImplement", "GiftShopFileImplement\GiftShopFileImplement.csproj", "{05AE2E86-5464-4B1F-BE91-60FA43CE69F1}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -39,6 +41,10 @@ Global {07C14020-5905-4CCC-9DAC-53507C8F28F8}.Debug|Any CPU.Build.0 = Debug|Any CPU {07C14020-5905-4CCC-9DAC-53507C8F28F8}.Release|Any CPU.ActiveCfg = Release|Any CPU {07C14020-5905-4CCC-9DAC-53507C8F28F8}.Release|Any CPU.Build.0 = Release|Any CPU + {05AE2E86-5464-4B1F-BE91-60FA43CE69F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {05AE2E86-5464-4B1F-BE91-60FA43CE69F1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {05AE2E86-5464-4B1F-BE91-60FA43CE69F1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {05AE2E86-5464-4B1F-BE91-60FA43CE69F1}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/GiftShop/GiftShopBusinessLogic/BusinessLogics/OrderLogic.cs b/GiftShop/GiftShopBusinessLogic/BusinessLogics/OrderLogic.cs index 3d0f9c0..c218de0 100644 --- a/GiftShop/GiftShopBusinessLogic/BusinessLogics/OrderLogic.cs +++ b/GiftShop/GiftShopBusinessLogic/BusinessLogics/OrderLogic.cs @@ -45,6 +45,7 @@ namespace GiftShopBusinessLogic.BusinessLogics public bool StatusUpdate(OrderBindingModel model, OrderStatus newStatus) { var viewModel = _orderStorage.GetElement(new OrderSearchModel { Id = model.Id }); + //CheckModel(model); if (model.Status + 1 != newStatus) { @@ -60,7 +61,7 @@ namespace GiftShopBusinessLogic.BusinessLogics { model.DateImplement = viewModel.DateImplement; } - CheckModel(model, false); + CheckModel(model); if (_orderStorage.Update(model) == null) { diff --git a/GiftShop/GiftShopFileImplement/DataFileSingleton.cs b/GiftShop/GiftShopFileImplement/DataFileSingleton.cs new file mode 100644 index 0000000..f80089e --- /dev/null +++ b/GiftShop/GiftShopFileImplement/DataFileSingleton.cs @@ -0,0 +1,62 @@ +using GiftShopFileImplement.Models; +using System.Xml.Linq; + +namespace GiftShopFileImplement +{ + internal class DataFileSingleton + { + private static DataFileSingleton? instance; + + private readonly string ComponentFileName = "Component.xml"; + + private readonly string OrderFileName = "Order.xml"; + + private readonly string GiftFileName = "Gift.xml"; + + public List Components { get; private set; } + + public List Orders { get; private set; } + + public List Gifts { get; private set; } + + public static DataFileSingleton GetInstance() + { + if (instance == null) + { + instance = new DataFileSingleton(); + } + return instance; + } + + public void SaveComponents() => SaveData(Components, ComponentFileName, "Components", x => x.GetXElement); + + public void SaveGifts() => SaveData(Gifts, GiftFileName, "Gifts", x => x.GetXElement); + + public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement); + + private DataFileSingleton() + { + Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!; + Gifts = LoadData(GiftFileName, "Gift", x => Gift.Create(x)!)!; + Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!; + } + + private static List? LoadData(string filename, string xmlNodeName, Func selectFunction) + { + if (File.Exists(filename)) + { + return XDocument.Load(filename)?.Root?.Elements(xmlNodeName)?.Select(selectFunction)?.ToList(); + } + return new List(); + } + + private static void SaveData(List data, string filename, + string xmlNodeName, Func selectFunction) + { + if (data != null) + { + new XDocument(new XElement(xmlNodeName, data.Select(selectFunction).ToArray())).Save(filename); + } + } + } +} diff --git a/GiftShop/GiftShopFileImplement/GiftShopFileImplement.csproj b/GiftShop/GiftShopFileImplement/GiftShopFileImplement.csproj new file mode 100644 index 0000000..ec87bae --- /dev/null +++ b/GiftShop/GiftShopFileImplement/GiftShopFileImplement.csproj @@ -0,0 +1,14 @@ + + + + net6.0 + enable + enable + + + + + + + + diff --git a/GiftShop/GiftShopFileImplement/Implements/ComponentStorage.cs b/GiftShop/GiftShopFileImplement/Implements/ComponentStorage.cs new file mode 100644 index 0000000..f915a4e --- /dev/null +++ b/GiftShop/GiftShopFileImplement/Implements/ComponentStorage.cs @@ -0,0 +1,85 @@ +using GiftShopContracts.BindingModels; +using GiftShopContracts.SearchModels; +using GiftShopContracts.StoragesContracts; +using GiftShopContracts.ViewModels; +using GiftShopFileImplement.Models; + +namespace GiftShopFileImplement.Implements +{ + public class ComponentStorage : IComponentStorage + { + private readonly DataFileSingleton source; + + public ComponentStorage() + { + source = DataFileSingleton.GetInstance(); + } + + public List GetFullList() + { + return source.Components + .Select(x => x.GetViewModel) + .ToList(); + } + + public List GetFilteredList(ComponentSearchModel model) + { + if (string.IsNullOrEmpty(model.ComponentName)) + { + return new(); + } + return source.Components + .Where(x => x.ComponentName.Contains(model.ComponentName)) + .Select(x => x.GetViewModel).ToList(); + } + + public ComponentViewModel? GetElement(ComponentSearchModel model) + { + if (string.IsNullOrEmpty(model.ComponentName) && !model.Id.HasValue) + { + return null; + } + return source.Components + .FirstOrDefault(x => (!string.IsNullOrEmpty(model.ComponentName) + && x.ComponentName == model.ComponentName) || (model.Id.HasValue + && x.Id == model.Id)) ?.GetViewModel; + } + + public ComponentViewModel? Insert(ComponentBindingModel model) + { + model.Id = source.Components.Count > 0 ? source.Components.Max(x => x.Id) + 1 : 1; + var newComponent = Component.Create(model); + if (newComponent == null) + { + return null; + } + source.Components.Add(newComponent); + source.SaveComponents(); + return newComponent.GetViewModel; + } + + public ComponentViewModel? Update(ComponentBindingModel model) + { + var component = source.Components.FirstOrDefault(x => x.Id == model.Id); + if (component == null) + { + return null; + } + component.Update(model); + source.SaveComponents(); + return component.GetViewModel; + } + + public ComponentViewModel? Delete(ComponentBindingModel model) + { + var element = source.Components.FirstOrDefault(x => x.Id == model.Id); + if (element != null) + { + source.Components.Remove(element); + source.SaveComponents(); + return element.GetViewModel; + } + return null; + } + } +} diff --git a/GiftShop/GiftShopFileImplement/Implements/GiftStorage.cs b/GiftShop/GiftShopFileImplement/Implements/GiftStorage.cs new file mode 100644 index 0000000..c654392 --- /dev/null +++ b/GiftShop/GiftShopFileImplement/Implements/GiftStorage.cs @@ -0,0 +1,92 @@ +using GiftShopContracts.BindingModels; +using GiftShopContracts.SearchModels; +using GiftShopContracts.StoragesContracts; +using GiftShopContracts.ViewModels; +using GiftShopFileImplement.Models; + +namespace GiftShopFileImplement.Implements +{ + public class GiftStorage : IGiftStorage + { + private readonly DataFileSingleton source; + + public GiftStorage() + { + source = DataFileSingleton.GetInstance(); + } + + public GiftViewModel? Delete(GiftBindingModel model) + { + var element = source.Gifts.FirstOrDefault(x => x.Id == model.Id); + + if (element != null) + { + source.Gifts.Remove(element); + source.SaveGifts(); + + return element.GetViewModel; + } + + return null; + } + + public GiftViewModel? GetElement(GiftSearchModel model) + { + if (string.IsNullOrEmpty(model.GiftName) && !model.Id.HasValue) + { + return null; + } + + return source.Gifts.FirstOrDefault(x => (!string.IsNullOrEmpty(model.GiftName) && x.GiftName == model.GiftName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; + } + + public List GetFilteredList(GiftSearchModel model) + { + if (string.IsNullOrEmpty(model.GiftName)) + { + return new(); + } + + return source.Gifts + .Where(x => x.GiftName + .Contains(model.GiftName)) + .Select(x => x.GetViewModel).ToList(); + } + + public List GetFullList() + { + return source.Gifts.Select(x => x.GetViewModel).ToList(); + } + + public GiftViewModel? Insert(GiftBindingModel model) + { + model.Id = source.Gifts.Count > 0 ? source.Gifts.Max(x => x.Id) + 1 : 1; + var newGift = Gift.Create(model); + + if (newGift == null) + { + return null; + } + + source.Gifts.Add(newGift); + source.SaveGifts(); + + return newGift.GetViewModel; + } + + public GiftViewModel? Update(GiftBindingModel model) + { + var gift = source.Gifts.FirstOrDefault(x => x.Id == model.Id); + + if (gift == null) + { + return null; + } + + gift.Update(model); + source.SaveGifts(); + + return gift.GetViewModel; + } + } +} diff --git a/GiftShop/GiftShopFileImplement/Implements/OrderStorage.cs b/GiftShop/GiftShopFileImplement/Implements/OrderStorage.cs new file mode 100644 index 0000000..3a3e103 --- /dev/null +++ b/GiftShop/GiftShopFileImplement/Implements/OrderStorage.cs @@ -0,0 +1,89 @@ +using GiftShopContracts.BindingModels; +using GiftShopContracts.SearchModels; +using GiftShopContracts.StoragesContracts; +using GiftShopContracts.ViewModels; +using GiftShopFileImplement.Models; + +namespace GiftShopFileImplement.Implements +{ + public class OrderStorage : IOrderStorage + { + private readonly DataFileSingleton source; + + public OrderStorage() + { + source = DataFileSingleton.GetInstance(); + } + + 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 element.GetViewModel; + } + + return null; + } + + public OrderViewModel? GetElement(OrderSearchModel model) + { + if (!model.Id.HasValue) + { + return null; + } + + return source.Orders.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; + } + + public List GetFilteredList(OrderSearchModel model) + { + if (!model.Id.HasValue) + { + return new(); + } + + return source.Orders.Where(x => x.Id == model.Id).Select(x => x.GetViewModel).ToList(); + } + + public List GetFullList() + { + return source.Orders.Select(x => x.GetViewModel).ToList(); + } + + 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 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 order.GetViewModel; + } + } +} diff --git a/GiftShop/GiftShopFileImplement/Models/Component.cs b/GiftShop/GiftShopFileImplement/Models/Component.cs new file mode 100644 index 0000000..df89d8e --- /dev/null +++ b/GiftShop/GiftShopFileImplement/Models/Component.cs @@ -0,0 +1,66 @@ +using GiftShopContracts.BindingModels; +using GiftShopContracts.ViewModels; +using GiftShopDataModels.Models; +using System.Xml.Linq; + +namespace GiftShopFileImplement.Models +{ + internal class Component : IComponentModel + { + public int Id { get; private set; } // 3 + + public string ComponentName { get; private set; } = string.Empty; + + public double Cost { get; set; } + + public static Component? Create(ComponentBindingModel model) + { + if (model == null) + { + return null; + } + return new Component() + { + Id = model.Id, + ComponentName = model.ComponentName, + Cost = model.Cost + }; + } + + public static Component? Create(XElement element) + { + if (element == null) + { + return null; + } + return new Component() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + ComponentName = element.Element("ComponentName")!.Value, + Cost = Convert.ToDouble(element.Element("Cost")!.Value) + }; + } + + public void Update(ComponentBindingModel? model) + { + if (model == null) + { + return; + } + ComponentName = model.ComponentName; + Cost = model.Cost; + } + + public ComponentViewModel GetViewModel => new() + { + Id = Id, + ComponentName = ComponentName, + Cost = Cost + }; + + public XElement GetXElement => new("Component", + new XAttribute("Id", Id), + new XElement("ComponentName", ComponentName), + new XElement("Cost", Cost.ToString())); + } +} diff --git a/GiftShop/GiftShopFileImplement/Models/Gift.cs b/GiftShop/GiftShopFileImplement/Models/Gift.cs new file mode 100644 index 0000000..a77ffa5 --- /dev/null +++ b/GiftShop/GiftShopFileImplement/Models/Gift.cs @@ -0,0 +1,94 @@ +using GiftShopContracts.BindingModels; +using GiftShopContracts.ViewModels; +using GiftShopDataModels.Models; +using System.Xml.Linq; + +namespace GiftShopFileImplement.Models +{ + internal class Gift : IGiftModel + { + public int Id { get; private set; } + + public string GiftName { get; private set; } = string.Empty; + + public double Price { get; private set; } + + public Dictionary Components { get; private set; } = new(); + + private Dictionary? _giftComponents = null; + + public Dictionary GiftComponents + { + get + { + if (_giftComponents == null) + { + var source = DataFileSingleton.GetInstance(); + _giftComponents = Components.ToDictionary(x => x.Key, + y => ((source.Components.FirstOrDefault(z => z.Id == y.Key) + as IComponentModel)!, y.Value)); + } + return _giftComponents; + } + } + + public static Gift? Create(GiftBindingModel? model) + { + if (model == null) + { + return null; + } + return new Gift() + { + Id = model.Id, + GiftName = model.GiftName, + Price = model.Price, + Components = model.GiftComponents.ToDictionary(x => x.Key, x => x.Value.Item2) + }; + } + + public static Gift? Create(XElement element) + { + if (element == null) + { + return null; + } + return new Gift() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + GiftName = element.Element("GiftName")!.Value, + Price = Convert.ToDouble(element.Element("Price")!.Value), + Components = element.Element("GiftComponents")!.Elements("GiftComponent").ToDictionary + (x => Convert.ToInt32(x.Element("Key")?.Value), x => Convert.ToInt32(x.Element("Value")?.Value)) + }; + } + + public void Update(GiftBindingModel? model) + { + if (model == null) + { + return; + } + GiftName = model.GiftName; + Price = model.Price; + Components = model.GiftComponents.ToDictionary(x => x.Key, x => x.Value.Item2); + _giftComponents = null; + } + + public GiftViewModel GetViewModel => new() + { + Id = Id, + GiftName = GiftName, + Price = Price, + GiftComponents = GiftComponents + }; + + public XElement GetXElement => new("Gift", + new XAttribute("Id", Id), + new XElement("GiftName", GiftName), + new XElement("Price", Price.ToString()), + new XElement("GiftComponents", Components.Select(x => new XElement("GiftComponent", + new XElement("Key", x.Key), + new XElement("Value", x.Value))).ToArray())); + } +} diff --git a/GiftShop/GiftShopFileImplement/Models/Order.cs b/GiftShop/GiftShopFileImplement/Models/Order.cs new file mode 100644 index 0000000..d617dda --- /dev/null +++ b/GiftShop/GiftShopFileImplement/Models/Order.cs @@ -0,0 +1,101 @@ +using GiftShopContracts.BindingModels; +using GiftShopContracts.ViewModels; +using GiftShopDataModels.Enums; +using GiftShopDataModels.Models; +using System.Xml.Linq; + +namespace GiftShopFileImplement.Models +{ + internal class Order : IOrderModel + { + public int GiftId { get; private set; } + + public string GiftName { get; private set; } + + public int Count { get; private set; } + + public double Sum { get; private set; } + + public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; + + public DateTime DateCreate { get; private set; } = DateTime.Now; + + public DateTime? DateImplement { get; private set; } + + public int Id { get; private set; } + + public static Order? Create(OrderBindingModel? model) + { + if (model == null) + { + return null; + } + return new Order() + { + Id = model.Id, + GiftId = model.GiftId, + GiftName = model.GiftName, + Count = model.Count, + Sum = model.Sum, + Status = model.Status, + DateCreate = model.DateCreate, + DateImplement = model.DateImplement + }; + } + + public static Order? Create(XElement element) + { + if (element == null) + { + return null; + } + var order = new Order() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + GiftId = Convert.ToInt32(element.Element("GiftId")!.Value), + GiftName = element.Element("GiftName")!.Value, + Count = Convert.ToInt32(element.Element("Count")!.Value), + Sum = Convert.ToDouble(element.Element("Sum")!.Value), + Status = (OrderStatus)Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value), + DateCreate = DateTime.ParseExact(element.Element("DateCreate")!.Value, "G", null) + }; + + DateTime.TryParse(element.Element("DateImplement")!.Value, out DateTime dateImpl); + order.DateImplement = dateImpl; + + return order; + } + + public void Update(OrderBindingModel? model) + { + if (model == null) + { + return; + } + Status = model.Status; + DateImplement = model.DateImplement; + } + + public OrderViewModel GetViewModel => new() + { + Id = Id, + GiftId = GiftId, + GiftName = GiftName, + Count = Count, + Sum = Sum, + Status = Status, + DateCreate = DateCreate, + DateImplement = DateImplement + }; + + public XElement GetXElement => new("Order", + new XAttribute("Id", Id), + new XElement("GiftName", GiftName), + new XElement("GiftId", GiftId.ToString()), + new XElement("Count", Count.ToString()), + new XElement("Sum", Sum.ToString()), + new XElement("Status", Status.ToString()), + new XElement("DateCreate", DateCreate.ToString()), + new XElement("DateImplement", DateImplement.ToString())); + } +} diff --git a/GiftShop/GiftShopListImplement/Implements/OrderStorage.cs b/GiftShop/GiftShopListImplement/Implements/OrderStorage.cs index 29c31c0..d415fa8 100644 --- a/GiftShop/GiftShopListImplement/Implements/OrderStorage.cs +++ b/GiftShop/GiftShopListImplement/Implements/OrderStorage.cs @@ -59,7 +59,7 @@ namespace GiftShopListImplement.Implements { if (model.Id.HasValue && order.Id == model.Id) { - result.Add(GetViewModelName(order)); + result.Add(order.GetViewModel); } } @@ -72,7 +72,7 @@ namespace GiftShopListImplement.Implements foreach (var order in _source.Orders) { - result.Add(GetViewModelName(order)); + result.Add(order.GetViewModel); } return result; @@ -115,18 +115,5 @@ namespace GiftShopListImplement.Implements return null; } - private OrderViewModel GetViewModelName(Order model) - { - var res = model.GetViewModel; - foreach (var package in _source.Gifts) - { - if (package.Id == model.GiftId) - { - res.GiftName = package.GiftName; - break; - } - } - return res; - } } } diff --git a/GiftShop/GiftShopView/FormMain.cs b/GiftShop/GiftShopView/FormMain.cs index 67e8bdf..a5cda2a 100644 --- a/GiftShop/GiftShopView/FormMain.cs +++ b/GiftShop/GiftShopView/FormMain.cs @@ -86,11 +86,7 @@ namespace GiftShopView { Id = id, GiftId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["GiftId"].Value), - GiftName = dataGridView.SelectedRows[0].Cells["GiftName"].Value.ToString(), - Status = Enum.Parse(dataGridView.SelectedRows[0].Cells["Status"].Value.ToString()), - Count = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Count"].Value), - Sum = double.Parse(dataGridView.SelectedRows[0].Cells["Sum"].Value.ToString()), - DateCreate = DateTime.Parse(dataGridView.SelectedRows[0].Cells["DateCreate"].Value.ToString()), + Status = Enum.Parse(dataGridView.SelectedRows[0].Cells["Status"].Value.ToString()) }); if (!operationResult) { diff --git a/GiftShop/GiftShopView/GiftShopView.csproj b/GiftShop/GiftShopView/GiftShopView.csproj index 93649a3..853b7e5 100644 --- a/GiftShop/GiftShopView/GiftShopView.csproj +++ b/GiftShop/GiftShopView/GiftShopView.csproj @@ -28,6 +28,7 @@ + diff --git a/GiftShop/GiftShopView/Program.cs b/GiftShop/GiftShopView/Program.cs index d9e281e..93b4fdf 100644 --- a/GiftShop/GiftShopView/Program.cs +++ b/GiftShop/GiftShopView/Program.cs @@ -1,7 +1,7 @@ using GiftShopBusinessLogic.BusinessLogics; using GiftShopContracts.BusinessLogicsContracts; using GiftShopContracts.StoragesContracts; -using GiftShopListImplement.Implements; +using GiftShopFileImplement.Implements; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using NLog.Extensions.Logging;