diff --git a/RenovationWork/RenovationWork.sln b/RenovationWork/RenovationWork.sln
index 62abf84..4aeae29 100644
--- a/RenovationWork/RenovationWork.sln
+++ b/RenovationWork/RenovationWork.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.8.34330.188
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RenovationWorkView", "RenovationWork\RenovationWorkView.csproj", "{0CB24AB4-7DB9-4B3B-B178-A5866CAB684D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RenovationWorkView", "RenovationWork\RenovationWorkView.csproj", "{0CB24AB4-7DB9-4B3B-B178-A5866CAB684D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RenovationWorkDataModels", "RenovationWorkDataModels\RenovationWorkDataModels.csproj", "{82B84205-6A94-434F-8A60-DD5EE186CF18}"
EndProject
@@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RenovationWorkBusinessLogic
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RenovationWorkListImplement", "RenovationWorkListImplement\RenovationWorkListImplement.csproj", "{CBEF7964-AEB9-4FE9-B85F-9FBDEE198EED}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RenovationWorkFileImplement", "RenovationWorkFileImplement\RenovationWorkFileImplement.csproj", "{C52182B7-2CA7-4D36-BC9F-81F165A4539A}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -39,6 +41,10 @@ Global
{CBEF7964-AEB9-4FE9-B85F-9FBDEE198EED}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CBEF7964-AEB9-4FE9-B85F-9FBDEE198EED}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CBEF7964-AEB9-4FE9-B85F-9FBDEE198EED}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C52182B7-2CA7-4D36-BC9F-81F165A4539A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C52182B7-2CA7-4D36-BC9F-81F165A4539A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C52182B7-2CA7-4D36-BC9F-81F165A4539A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C52182B7-2CA7-4D36-BC9F-81F165A4539A}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/RenovationWork/RenovationWork/Program.cs b/RenovationWork/RenovationWork/Program.cs
index 419c2af..632e3c8 100644
--- a/RenovationWork/RenovationWork/Program.cs
+++ b/RenovationWork/RenovationWork/Program.cs
@@ -1,7 +1,7 @@
using RenovationWorkBusinessLogic.BusinessLogics;
using RenovationWorkContracts.BusinessLogicsContracts;
using RenovationWorkContracts.StoragesContracts;
-using RenovationWorkListImplement.Implements;
+using RenovationWorkFileImplement.Implements;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using NLog.Extensions.Logging;
diff --git a/RenovationWork/RenovationWork/RenovationWorkView.csproj b/RenovationWork/RenovationWork/RenovationWorkView.csproj
index 9a90fc6..709081e 100644
--- a/RenovationWork/RenovationWork/RenovationWorkView.csproj
+++ b/RenovationWork/RenovationWork/RenovationWorkView.csproj
@@ -16,6 +16,7 @@
+
diff --git a/RenovationWork/RenovationWorkFileImplement/DataFileSingleton.cs b/RenovationWork/RenovationWorkFileImplement/DataFileSingleton.cs
new file mode 100644
index 0000000..e2f06f6
--- /dev/null
+++ b/RenovationWork/RenovationWorkFileImplement/DataFileSingleton.cs
@@ -0,0 +1,55 @@
+using RenovationWorkFileImplement.Models;
+using System.Xml.Linq;
+
+namespace RenovationWorkFileImplement
+{
+ public class DataFileSingleton
+ {
+ private static DataFileSingleton? instance;
+ private readonly string ComponentFileName = "Component.xml";
+ private readonly string OrderFileName = "Order.xml";
+ private readonly string RepairFileName = "Repair.xml";
+ public List Components { get; private set; }
+ public List Orders { get; private set; }
+ public List Repairs { 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 SaveRepairs() => SaveData(Repairs, RepairFileName, "Repairs", x => x.GetXElement);
+ public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
+ private DataFileSingleton()
+ {
+ Components = LoadData(ComponentFileName, "Component", x =>
+ Component.Create(x)!)!;
+ Repairs = LoadData(RepairFileName, "Repair", x =>
+ Repair.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/RenovationWork/RenovationWorkFileImplement/Implements/ComponentStorage.cs b/RenovationWork/RenovationWorkFileImplement/Implements/ComponentStorage.cs
new file mode 100644
index 0000000..80bf56a
--- /dev/null
+++ b/RenovationWork/RenovationWorkFileImplement/Implements/ComponentStorage.cs
@@ -0,0 +1,84 @@
+using RenovationWorkContracts.BindingModels;
+using RenovationWorkContracts.SearchModels;
+using RenovationWorkContracts.StoragesContracts;
+using RenovationWorkContracts.ViewModels;
+using RenovationWorkFileImplement.Models;
+
+namespace RenovationWorkFileImplement.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;
+ //вызывается для найденного элемента вернуть представление модели ComponentViewModel
+ }
+ 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/RenovationWork/RenovationWorkFileImplement/Implements/OrderStorage.cs b/RenovationWork/RenovationWorkFileImplement/Implements/OrderStorage.cs
new file mode 100644
index 0000000..ab570f3
--- /dev/null
+++ b/RenovationWork/RenovationWorkFileImplement/Implements/OrderStorage.cs
@@ -0,0 +1,81 @@
+using RenovationWorkContracts.BindingModels;
+using RenovationWorkContracts.SearchModels;
+using RenovationWorkContracts.StoragesContracts;
+using RenovationWorkContracts.ViewModels;
+using RenovationWorkFileImplement.Models;
+using System.Reflection;
+
+namespace RenovationWorkFileImplement.Implements
+{
+ public class OrderStorage: IOrderStorage
+ {
+ private readonly DataFileSingleton source;
+ public OrderStorage()
+ {
+ source = DataFileSingleton.GetInstance();
+ }
+ public List GetFullList()
+ {
+ return source.Orders.Select(x => AccessRepairStorage(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 => AccessRepairStorage(x.GetViewModel)).ToList();
+ }
+ public OrderViewModel? GetElement(OrderSearchModel model)
+ {
+ if (!model.Id.HasValue)
+ {
+ return null;
+ }
+ return AccessRepairStorage(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 AccessRepairStorage(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 AccessRepairStorage(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 AccessRepairStorage(element.GetViewModel);
+ }
+ return null;
+ }
+ public OrderViewModel? AccessRepairStorage(OrderViewModel model)
+ {
+ var SelectedRepair = source.Repairs.FirstOrDefault(x => x.Id == model.RepairId);
+
+ model.RepairName = SelectedRepair?.RepairName ?? string.Empty;
+ return model;
+ }
+ }
+}
diff --git a/RenovationWork/RenovationWorkFileImplement/Implements/RepairStorage.cs b/RenovationWork/RenovationWorkFileImplement/Implements/RepairStorage.cs
new file mode 100644
index 0000000..dba34a8
--- /dev/null
+++ b/RenovationWork/RenovationWorkFileImplement/Implements/RepairStorage.cs
@@ -0,0 +1,81 @@
+using RenovationWorkContracts.BindingModels;
+using RenovationWorkContracts.SearchModels;
+using RenovationWorkContracts.StoragesContracts;
+using RenovationWorkContracts.ViewModels;
+using RenovationWorkFileImplement.Models;
+
+namespace RenovationWorkFileImplement.Implements
+{
+ public class RepairStorage: IRepairStorage
+ {
+ private readonly DataFileSingleton source;
+ public RepairStorage()
+ {
+ source = DataFileSingleton.GetInstance();
+ }
+ public List GetFullList()
+ {
+ return source.Repairs
+ .Select(x => x.GetViewModel)
+ .ToList();
+ }
+
+ public List GetFilteredList(RepairSearchModel model)
+ {
+ if (string.IsNullOrEmpty(model.RepairName))
+ {
+ return new();
+ }
+ return source.Repairs
+ .Where(x => x.RepairName.Contains(model.RepairName))
+ .Select(x => x.GetViewModel)
+ .ToList();
+ }
+ public RepairViewModel? GetElement(RepairSearchModel model)
+ {
+ if (string.IsNullOrEmpty(model.RepairName) && !model.Id.HasValue)
+ {
+ return null;
+ }
+ return source.Repairs
+ .FirstOrDefault(x =>
+ (!string.IsNullOrEmpty(model.RepairName) && x.RepairName == model.RepairName) ||
+ (model.Id.HasValue && x.Id == model.Id))
+ ?.GetViewModel;
+ }
+ public RepairViewModel? Insert(RepairBindingModel model)
+ {
+ model.Id = source.Repairs.Count > 0 ? source.Repairs.Max(x => x.Id) + 1 : 1;
+ var newRepair = Repair.Create(model);
+ if (newRepair == null)
+ {
+ return null;
+ }
+ source.Repairs.Add(newRepair);
+ source.SaveRepairs();
+ return newRepair.GetViewModel;
+ }
+ public RepairViewModel? Update(RepairBindingModel model)
+ {
+ var Repair = source.Repairs.FirstOrDefault(x => x.Id == model.Id);
+ if (Repair == null)
+ {
+ return null;
+ }
+ Repair.Update(model);
+ source.SaveRepairs();
+ return Repair.GetViewModel;
+ }
+ public RepairViewModel? Delete(RepairBindingModel model)
+ {
+ var Repair = source.Repairs.FirstOrDefault(x => x.Id == model.Id);
+ if (Repair != null)
+ {
+ source.Repairs.Remove(Repair);
+ source.SaveRepairs();
+ return Repair.GetViewModel;
+ }
+ return null;
+ }
+ }
+}
diff --git a/RenovationWork/RenovationWorkFileImplement/Models/Component.cs b/RenovationWork/RenovationWorkFileImplement/Models/Component.cs
new file mode 100644
index 0000000..7b797ed
--- /dev/null
+++ b/RenovationWork/RenovationWorkFileImplement/Models/Component.cs
@@ -0,0 +1,60 @@
+using RenovationWorkContracts.BindingModels;
+using RenovationWorkContracts.ViewModels;
+using RenovationWorkDataModels.Models;
+using System.Xml.Linq;
+
+
+namespace RenovationWorkFileImplement.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()));
+ }
+}
diff --git a/RenovationWork/RenovationWorkFileImplement/Models/Order.cs b/RenovationWork/RenovationWorkFileImplement/Models/Order.cs
new file mode 100644
index 0000000..1361e13
--- /dev/null
+++ b/RenovationWork/RenovationWorkFileImplement/Models/Order.cs
@@ -0,0 +1,82 @@
+using RenovationWorkContracts.BindingModels;
+using RenovationWorkContracts.ViewModels;
+using RenovationWorkDataModels.Enums;
+using RenovationWorkDataModels.Models;
+using System.Xml.Linq;
+
+namespace RenovationWorkFileImplement.Models
+{
+ public class Order: IOrderModel
+ {
+ public int Id { get; private set; }
+ public int RepairId { 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,
+ RepairId = model.RepairId,
+ 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),
+ RepairId = Convert.ToInt32(element.Element("RepairId")!.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.ToString()),
+ 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,
+ RepairId = RepairId,
+ Count = Count,
+ Sum = Sum,
+ Status = Status,
+ DateCreate = DateCreate,
+ DateImplement = DateImplement,
+ };
+ public XElement GetXElement => new("Order",
+ new XAttribute("Id", Id),
+ new XElement("RepairId", RepairId),
+ new XElement("Sum", Sum.ToString()),
+ new XElement("Count", Count),
+ new XElement("Status", Status.ToString()),
+ new XElement("DateCreate", DateCreate.ToString()),
+ new XElement("DateImplement", DateImplement.ToString())
+ );
+ }
+}
diff --git a/RenovationWork/RenovationWorkFileImplement/Models/Repair.cs b/RenovationWork/RenovationWorkFileImplement/Models/Repair.cs
new file mode 100644
index 0000000..14f8c07
--- /dev/null
+++ b/RenovationWork/RenovationWorkFileImplement/Models/Repair.cs
@@ -0,0 +1,84 @@
+using RenovationWorkContracts.BindingModels;
+using RenovationWorkContracts.ViewModels;
+using RenovationWorkDataModels.Models;
+using System.Xml.Linq;
+
+namespace RenovationWorkFileImplement.Models
+{
+ public class Repair : IRepairModel
+ {
+ public int Id { get; private set; }
+ public string RepairName { get; private set; } = string.Empty;
+ public double Price { get; private set; }
+ public Dictionary Components { get; private set; } = new();
+ private Dictionary? _repairComponents = null;
+ public Dictionary RepairComponents
+ {
+ get
+ {
+ if (_repairComponents == null)
+ {
+ var source = DataFileSingleton.GetInstance();
+ _repairComponents = Components.ToDictionary(x => x.Key, y =>
+ ((source.Components.FirstOrDefault(z => z.Id == y.Key) as IComponentModel)!, y.Value));
+ }
+ return _repairComponents;
+ }
+ }
+ public static Repair? Create(RepairBindingModel model)
+ {
+ if (model == null)
+ {
+ return null;
+ }
+ return new Repair()
+ {
+ Id = model.Id,
+ RepairName = model.RepairName,
+ Price = model.Price,
+ Components = model.RepairComponents.ToDictionary(x => x.Key, x => x.Value.Item2)
+ };
+ }
+ public static Repair? Create(XElement element)
+ {
+ if (element == null)
+ {
+ return null;
+ }
+ return new Repair()
+ {
+ Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+ RepairName = element.Element("RepairName")!.Value,
+ Price = Convert.ToDouble(element.Element("Price")!.Value),
+ Components = element.Element("RepairComponents")!.Elements("RepairComponent").ToDictionary(x =>
+ Convert.ToInt32(x.Element("Key")?.Value), x => Convert.ToInt32(x.Element("Value")?.Value))
+ };
+ }
+ public void Update(RepairBindingModel model)
+ {
+ if (model == null)
+ {
+ return;
+ }
+ RepairName = model.RepairName;
+ Price = model.Price;
+ Components = model.RepairComponents.ToDictionary(x => x.Key, x => x.Value.Item2);
+ _repairComponents = null;
+ }
+ public RepairViewModel GetViewModel => new()
+ {
+ Id = Id,
+ RepairName = RepairName,
+ Price = Price,
+ RepairComponents = RepairComponents
+ };
+ public XElement GetXElement => new("Repair",
+ new XAttribute("Id", Id),
+ new XElement("RepairName", RepairName),
+ new XElement("Price", Price.ToString()),
+ new XElement("RepairComponents", Components.Select(x =>
+ new XElement("RepairComponent",
+ new XElement("Key", x.Key),
+ new XElement("Value", x.Value))).ToArray()));
+ }
+}
\ No newline at end of file
diff --git a/RenovationWork/RenovationWorkFileImplement/RenovationWorkFileImplement.csproj b/RenovationWork/RenovationWorkFileImplement/RenovationWorkFileImplement.csproj
new file mode 100644
index 0000000..2d896a8
--- /dev/null
+++ b/RenovationWork/RenovationWorkFileImplement/RenovationWorkFileImplement.csproj
@@ -0,0 +1,14 @@
+
+
+
+ net6.0
+ enable
+ enable
+
+
+
+
+
+
+
+