diff --git a/Confectionery/Confectionery.sln b/Confectionery/Confectionery.sln
index 5b7648e..b3a2288 100644
--- a/Confectionery/Confectionery.sln
+++ b/Confectionery/Confectionery.sln
@@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConfectioneryBusinessLogic"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConfectioneryListImplement", "ConfectioneryListImplement\ConfectioneryListImplement.csproj", "{EE30482F-8998-4178-8412-421A02F6A6B4}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConfectioneryFileImplement", "ConfectioneryFileImplement\ConfectioneryFileImplement.csproj", "{0607BCF8-D685-49A9-9C16-76BD0E8BAAA7}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -39,6 +41,10 @@ Global
{EE30482F-8998-4178-8412-421A02F6A6B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EE30482F-8998-4178-8412-421A02F6A6B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EE30482F-8998-4178-8412-421A02F6A6B4}.Release|Any CPU.Build.0 = Release|Any CPU
+ {0607BCF8-D685-49A9-9C16-76BD0E8BAAA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {0607BCF8-D685-49A9-9C16-76BD0E8BAAA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {0607BCF8-D685-49A9-9C16-76BD0E8BAAA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {0607BCF8-D685-49A9-9C16-76BD0E8BAAA7}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Confectionery/ConfectioneryFileImplement/ConfectioneryFileImplement.csproj b/Confectionery/ConfectioneryFileImplement/ConfectioneryFileImplement.csproj
new file mode 100644
index 0000000..54e27de
--- /dev/null
+++ b/Confectionery/ConfectioneryFileImplement/ConfectioneryFileImplement.csproj
@@ -0,0 +1,14 @@
+
+
+
+ net6.0
+ enable
+ enable
+
+
+
+
+
+
+
+
diff --git a/Confectionery/ConfectioneryFileImplement/DataFileSingleton.cs b/Confectionery/ConfectioneryFileImplement/DataFileSingleton.cs
new file mode 100644
index 0000000..85ba816
--- /dev/null
+++ b/Confectionery/ConfectioneryFileImplement/DataFileSingleton.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ConfectioneryFileImplement.Models;
+using System.Xml.Linq;
+
+
+namespace ConfectioneryFileImplement
+{
+ internal class DataFileSingleton
+ {
+ private static DataFileSingleton? instance;
+ private readonly string ComponentFileName = "Component.xml";
+ private readonly string OrderFileName = "Order.xml";
+ private readonly string PastryFileName = "Pastry.xml";
+ public List Components { get; private set; }
+ public List Orders { get; private set; }
+ public List Pastries { 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 SavePastries() => SaveData(Pastries, PastryFileName, "Pastries", x => x.GetXElement);
+ public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
+ private DataFileSingleton()
+ {
+ Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!;
+ Pastries = LoadData(PastryFileName, "Pastry", x => Pastry.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);
+ }
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/Confectionery/ConfectioneryFileImplement/Implements/ComponentStorage.cs b/Confectionery/ConfectioneryFileImplement/Implements/ComponentStorage.cs
new file mode 100644
index 0000000..acfeca7
--- /dev/null
+++ b/Confectionery/ConfectioneryFileImplement/Implements/ComponentStorage.cs
@@ -0,0 +1,90 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.SearchModels;
+using ConfectioneryContracts.StoragesContracts;
+using ConfectioneryContracts.ViewModels;
+using ConfectioneryFileImplement.Models;
+
+
+namespace ConfectioneryFileImplement.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;
+ }
+ }
+}
\ No newline at end of file
diff --git a/Confectionery/ConfectioneryFileImplement/Implements/OrderStorage.cs b/Confectionery/ConfectioneryFileImplement/Implements/OrderStorage.cs
new file mode 100644
index 0000000..55fada2
--- /dev/null
+++ b/Confectionery/ConfectioneryFileImplement/Implements/OrderStorage.cs
@@ -0,0 +1,103 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.SearchModels;
+using ConfectioneryContracts.StoragesContracts;
+using ConfectioneryContracts.ViewModels;
+using ConfectioneryFileImplement.Models;
+
+namespace ConfectioneryFileImplement.Implements
+{
+ public class OrderStorage : IOrderStorage
+ {
+ private readonly DataFileSingleton source;
+
+ public OrderStorage()
+ {
+ source = DataFileSingleton.GetInstance();
+ }
+
+ public List GetFullList()
+ {
+ return source.Orders
+ .Select(x => AddPastryName(x.GetViewModel))
+ .ToList();
+ }
+
+ public List GetFilteredList(OrderSearchModel model)
+ {
+ if (!model.Id.HasValue)
+ {
+ return new();
+ }
+ return source.Orders
+ .Where(x => x.Id == model.Id)
+ .Select(x => AddPastryName(x.GetViewModel))
+ .ToList();
+ }
+
+ public OrderViewModel? GetElement(OrderSearchModel model)
+ {
+ if (!model.Id.HasValue)
+ {
+ return null;
+ }
+ var order = source.Orders.FirstOrDefault(x => x.Id == model.Id);
+ if (order == null)
+ {
+ return null;
+ }
+ return AddPastryName(order.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 AddPastryName(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 AddPastryName(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 AddPastryName(element.GetViewModel);
+ }
+ return null;
+ }
+
+ private OrderViewModel AddPastryName(OrderViewModel model)
+ {
+ var selectedPastry = source.Pastries.FirstOrDefault(x => x.Id == model.PastryId);
+ if (selectedPastry != null)
+ {
+ model.PastryName = selectedPastry.PastryName;
+ }
+ return model;
+ }
+ }
+}
\ No newline at end of file
diff --git a/Confectionery/ConfectioneryFileImplement/Implements/PastryStorage.cs b/Confectionery/ConfectioneryFileImplement/Implements/PastryStorage.cs
new file mode 100644
index 0000000..94657af
--- /dev/null
+++ b/Confectionery/ConfectioneryFileImplement/Implements/PastryStorage.cs
@@ -0,0 +1,91 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.SearchModels;
+using ConfectioneryContracts.StoragesContracts;
+using ConfectioneryContracts.ViewModels;
+using ConfectioneryFileImplement.Models;
+
+namespace ConfectioneryFileImplement.Implements
+{
+ public class PastryStorage : IPastryStorage
+ {
+ private readonly DataFileSingleton source;
+
+ public PastryStorage()
+ {
+ source = DataFileSingleton.GetInstance();
+ }
+
+ public List GetFullList()
+ {
+ return source.Pastries
+ .Select(x => x.GetViewModel)
+ .ToList();
+ }
+
+ public List GetFilteredList(PastrySearchModel model)
+ {
+ if (string.IsNullOrEmpty(model.PastryName))
+ {
+ return new();
+ }
+ return source.Pastries
+ .Where(x => x.PastryName.Contains(model.PastryName))
+ .Select(x => x.GetViewModel)
+ .ToList();
+ }
+
+ public PastryViewModel? GetElement(PastrySearchModel model)
+ {
+ if (string.IsNullOrEmpty(model.PastryName) && !model.Id.HasValue)
+ {
+ return null;
+ }
+ return source.Pastries
+ .FirstOrDefault(x => (!string.IsNullOrEmpty(model.PastryName) && x.PastryName == model.PastryName) ||
+ (model.Id.HasValue && x.Id == model.Id))
+ ?.GetViewModel;
+ }
+
+ public PastryViewModel? Insert(PastryBindingModel model)
+ {
+ model.Id = source.Pastries.Count > 0 ? source.Pastries.Max(x => x.Id) + 1 : 1;
+ var newPastry = Pastry.Create(model);
+ if (newPastry == null)
+ {
+ return null;
+ }
+ source.Pastries.Add(newPastry);
+ source.SavePastries();
+ return newPastry.GetViewModel;
+ }
+
+ public PastryViewModel? Update(PastryBindingModel model)
+ {
+ var pastry = source.Pastries.FirstOrDefault(x => x.Id == model.Id);
+ if (pastry == null)
+ {
+ return null;
+ }
+ pastry.Update(model);
+ source.SavePastries();
+ return pastry.GetViewModel;
+ }
+
+ public PastryViewModel? Delete(PastryBindingModel model)
+ {
+ var element = source.Pastries.FirstOrDefault(x => x.Id == model.Id);
+ if (element != null)
+ {
+ source.Pastries.Remove(element);
+ source.SavePastries();
+ return element.GetViewModel;
+ }
+ return null;
+ }
+ }
+}
\ No newline at end of file
diff --git a/Confectionery/ConfectioneryFileImplement/Models/Component.cs b/Confectionery/ConfectioneryFileImplement/Models/Component.cs
new file mode 100644
index 0000000..3abe6ea
--- /dev/null
+++ b/Confectionery/ConfectioneryFileImplement/Models/Component.cs
@@ -0,0 +1,63 @@
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.ViewModels;
+using ConfectioneryDataModels.Models;
+using System.Xml.Linq;
+
+namespace ConfectioneryFileImplement.Models
+{
+ public class Component : IComponentModel
+ {
+ public int Id { get; private set; }
+ 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()));
+ }
+}
\ No newline at end of file
diff --git a/Confectionery/ConfectioneryFileImplement/Models/Order.cs b/Confectionery/ConfectioneryFileImplement/Models/Order.cs
new file mode 100644
index 0000000..1bee80c
--- /dev/null
+++ b/Confectionery/ConfectioneryFileImplement/Models/Order.cs
@@ -0,0 +1,92 @@
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.ViewModels;
+using ConfectioneryDataModels.Enums;
+using ConfectioneryDataModels.Models;
+using System.Xml.Linq;
+
+namespace ConfectioneryFileImplement.Models
+{
+ public class Order : IOrderModel
+ {
+ public int Id { get; private set; }
+
+ public int PastryId { get; private set; }
+
+ public int Count { get; private set; }
+
+ public double Sum { get; private set; }
+
+ public OrderStatus Status { get; private set; }
+
+ public DateTime DateCreate { get; private set; }
+
+ public DateTime? DateImplement { get; private set; }
+
+ public static Order? Create(OrderBindingModel? model)
+ {
+ if (model == null)
+ {
+ return null;
+ }
+ return new Order()
+ {
+ Id = model.Id,
+ PastryId = model.PastryId,
+ 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;
+ }
+ return new Order()
+ {
+ Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+ PastryId = Convert.ToInt32(element.Element("PastryId")!.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 = Convert.ToDateTime(element.Element("DateCreate")!.Value),
+ DateImplement = string.IsNullOrEmpty(element.Element("DateImplement")!.Value) ? null
+ : Convert.ToDateTime(element.Element("DateImplement")!.Value)
+ };
+ }
+
+ public void Update(OrderBindingModel? model)
+ {
+ if (model == null)
+ {
+ return;
+ }
+ Status = model.Status;
+ DateImplement = model.DateImplement;
+ }
+
+ public OrderViewModel GetViewModel => new()
+ {
+ Id = Id,
+ PastryId = PastryId,
+ Count = Count,
+ Sum = Sum,
+ Status = Status,
+ DateCreate = DateCreate,
+ DateImplement = DateImplement
+ };
+
+ public XElement GetXElement => new("Order",
+ new XAttribute("Id", Id),
+ new XElement("PastryId", PastryId),
+ 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()));
+ }
+}
\ No newline at end of file
diff --git a/Confectionery/ConfectioneryFileImplement/Models/Pastry.cs b/Confectionery/ConfectioneryFileImplement/Models/Pastry.cs
new file mode 100644
index 0000000..9929761
--- /dev/null
+++ b/Confectionery/ConfectioneryFileImplement/Models/Pastry.cs
@@ -0,0 +1,95 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.ViewModels;
+using ConfectioneryDataModels.Models;
+using System.Xml.Linq;
+
+namespace ConfectioneryFileImplement.Models
+{
+ internal class Pastry : IPastryModel
+ {
+ public int Id { get; private set; }
+ public string PastryName { get; private set; } = string.Empty;
+ public double Price { get; private set; }
+ public Dictionary Components { get; private set; } = new();
+ private Dictionary? _pastryComponents = null;
+
+ public Dictionary PastryComponents
+ {
+ get
+ {
+ if (_pastryComponents == null)
+ {
+ var source = DataFileSingleton.GetInstance();
+ _pastryComponents = Components.ToDictionary(x => x.Key, y =>
+ ((source.Components.FirstOrDefault(z => z.Id == y.Key) as IComponentModel)!,
+ y.Value));
+ }
+ return _pastryComponents;
+ }
+ }
+
+ public static Pastry? Create(PastryBindingModel model)
+ {
+ if (model == null)
+ {
+ return null;
+ }
+ return new Pastry()
+ {
+ Id = model.Id,
+ PastryName = model.PastryName,
+ Price = model.Price,
+ Components = model.PastryComponents.ToDictionary(x => x.Key, x => x.Value.Item2)
+ };
+ }
+
+ public static Pastry? Create(XElement element)
+ {
+ if (element == null)
+ {
+ return null;
+ }
+ return new Pastry()
+ {
+ Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+ PastryName = element.Element("PastryName")!.Value,
+ Price = Convert.ToDouble(element.Element("Price")!.Value),
+ Components = element.Element("PastryComponents")!.Elements("PastryComponent").ToDictionary(x =>
+ Convert.ToInt32(x.Element("Key")?.Value), x =>
+ Convert.ToInt32(x.Element("Value")?.Value))
+ };
+ }
+ public void Update(PastryBindingModel model)
+ {
+ if (model == null)
+ {
+ return;
+ }
+ PastryName = model.PastryName;
+ Price = model.Price;
+ Components = model.PastryComponents.ToDictionary(x => x.Key, x =>
+ x.Value.Item2);
+ _pastryComponents = null;
+ }
+ public PastryViewModel GetViewModel => new()
+ {
+ Id = Id,
+ PastryName = PastryName,
+ Price = Price,
+ PastryComponents = PastryComponents
+ };
+ public XElement GetXElement => new("Pastry",
+ new XAttribute("Id", Id),
+ new XElement("PastryName", PastryName),
+ new XElement("Price", Price.ToString()),
+ new XElement("PastryComponents", Components.Select(x =>
+ new XElement("PastryComponent",
+ new XElement("Key", x.Key),
+ new XElement("Value", x.Value))).ToArray()));
+ }
+}
\ No newline at end of file
diff --git a/Confectionery/ConfectioneryView/ConfectioneryView.csproj b/Confectionery/ConfectioneryView/ConfectioneryView.csproj
index 0c70544..c9f4ff9 100644
--- a/Confectionery/ConfectioneryView/ConfectioneryView.csproj
+++ b/Confectionery/ConfectioneryView/ConfectioneryView.csproj
@@ -26,6 +26,7 @@
+
diff --git a/Confectionery/ConfectioneryView/FormCreateOrder.cs b/Confectionery/ConfectioneryView/FormCreateOrder.cs
index a448d9b..b903b1b 100644
--- a/Confectionery/ConfectioneryView/FormCreateOrder.cs
+++ b/Confectionery/ConfectioneryView/FormCreateOrder.cs
@@ -29,7 +29,7 @@ namespace ConfectioneryView
private void FormCreateOrder_Load(object sender, EventArgs e)
{
- _logger.LogInformation("Loading ice cream for order");
+ _logger.LogInformation("Loading pastry for order");
try
{
var pastryList = _logicP.ReadList(null);
@@ -43,7 +43,7 @@ namespace ConfectioneryView
}
catch (Exception ex)
{
- _logger.LogError(ex, "Error during loading ice cream for order");
+ _logger.LogError(ex, "Error during loading pastry for order");
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
diff --git a/Confectionery/ConfectioneryView/FormPastries.Designer.cs b/Confectionery/ConfectioneryView/FormPastries.Designer.cs
index 0fa90d8..d89b93e 100644
--- a/Confectionery/ConfectioneryView/FormPastries.Designer.cs
+++ b/Confectionery/ConfectioneryView/FormPastries.Designer.cs
@@ -98,6 +98,7 @@
this.Controls.Add(this.dataGridView);
this.Name = "FormPastries";
this.Text = "Выпечка";
+ this.Load += new System.EventHandler(this.FormPastrys_Load);
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
this.ResumeLayout(false);
diff --git a/Confectionery/ConfectioneryView/FormPastries.cs b/Confectionery/ConfectioneryView/FormPastries.cs
index 7932f5b..508f6cc 100644
--- a/Confectionery/ConfectioneryView/FormPastries.cs
+++ b/Confectionery/ConfectioneryView/FormPastries.cs
@@ -86,7 +86,7 @@ namespace ConfectioneryView
if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
{
int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
- _logger.LogInformation("Deletion of ice cream");
+ _logger.LogInformation("Deletion of pastry");
try
{
if (!_logic.Delete(new PastryBindingModel { Id = id }))
@@ -97,7 +97,7 @@ namespace ConfectioneryView
}
catch (Exception ex)
{
- _logger.LogError(ex, "Ice cream deletion error");
+ _logger.LogError(ex, "Pastry deletion error");
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
diff --git a/Confectionery/ConfectioneryView/Program.cs b/Confectionery/ConfectioneryView/Program.cs
index cebaeea..22cffa1 100644
--- a/Confectionery/ConfectioneryView/Program.cs
+++ b/Confectionery/ConfectioneryView/Program.cs
@@ -1,7 +1,7 @@
using ConfectioneryBusinessLogic.BusinessLogics;
using ConfectioneryContracts.BusinessLogicsContracts;
using ConfectioneryContracts.StoragesContracts;
-using ConfectioneryListImplement.Implements;
+using ConfectioneryFileImplement.Implements;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using NLog.Extensions.Logging;