PrecastConcretePlant/PrecastConcretePlant.sln

@@ -13,8 +13,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PrecastConcretePlantBusines
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PrecastConcretePlantListImplement", "PrecastConcretePlantListImplement\PrecastConcretePlantListImplement.csproj", "{CF73527C-9003-4A88-AFBB-58272DFB6859}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PrecastConcretePlantFileImplement", "PrecastConcretePlantFileImplement\PrecastConcretePlantFileImplement.csproj", "{EBD137D3-EB6D-4CE4-9A03-357373300240}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -41,10 +39,6 @@ Global
 		{CF73527C-9003-4A88-AFBB-58272DFB6859}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CF73527C-9003-4A88-AFBB-58272DFB6859}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CF73527C-9003-4A88-AFBB-58272DFB6859}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EBD137D3-EB6D-4CE4-9A03-357373300240}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EBD137D3-EB6D-4CE4-9A03-357373300240}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EBD137D3-EB6D-4CE4-9A03-357373300240}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EBD137D3-EB6D-4CE4-9A03-357373300240}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

PrecastConcretePlant/PrecastConcretePlantFileImplement/DataFileSingleton.cs

@@ -1,53 +0,0 @@
-using PrecastConcretePlantFileImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-
-namespace PrecastConcretePlantFileImplement
-{
-    public class DataFileSingleton
-    {
-        private static DataFileSingleton? instance;
-        private readonly string ComponentFileName = "Component.xml";
-        private readonly string OrderFileName = "Order.xml";
-        private readonly string ReinforcedFileName = "Reinforced.xml";
-        public List<Component> Components { get; private set; }
-        public List<Order> Orders { get; private set; }
-        public List<Reinforced> Reinforceds { 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 SaveReinforceds() => SaveData(Reinforceds, ReinforcedFileName, "Reinforceds", x => x.GetXElement);
-        public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
-        private DataFileSingleton()
-        {
-            Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!;
-            Reinforceds = LoadData(ReinforcedFileName, "Reinforced", x => Reinforced.Create(x)!)!;
-            Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!;
-        }
-        private static List<T>? LoadData<T>(string filename, string xmlNodeName, Func<XElement, T> selectFunction)
-        {
-            if (File.Exists(filename))
-            {
-                return XDocument.Load(filename)?.Root?.Elements(xmlNodeName)?.Select(selectFunction)?.ToList();
-            }
-            return new List<T>();
-        }
-        private static void SaveData<T>(List<T> data, string filename, string xmlNodeName, Func<T, XElement> selectFunction)
-        {
-            if (data != null)
-            {
-                new XDocument(new XElement(xmlNodeName, data.Select(selectFunction).ToArray())).Save(filename);
-            }
-        }
-    }
-}

PrecastConcretePlant/PrecastConcretePlantFileImplement/Implements/ComponentStorage.cs

@@ -1,79 +0,0 @@
-using PrecastConcretePlantContracts.BindingModels;
-using PrecastConcretePlantContracts.SearchModels;
-using PrecastConcretePlantContracts.StoragesContracts;
-using PrecastConcretePlantContracts.ViewModels;
-using PrecastConcretePlantFileImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PrecastConcretePlantFileImplement.Implements
-{
-    public class ComponentStorage : IComponentStorage
-    {
-        private readonly DataFileSingleton source;
-        public ComponentStorage()
-        {
-            source = DataFileSingleton.GetInstance();
-        }
-        public List<ComponentViewModel> GetFullList()
-        {
-            return source.Components.Select(x => x.GetViewModel).ToList();
-        }
-        public List<ComponentViewModel> 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;
-        }
-    }
-}

PrecastConcretePlant/PrecastConcretePlantFileImplement/Implements/OrderStorage.cs

@@ -1,93 +0,0 @@
-using PrecastConcretePlantContracts.BindingModels;
-using PrecastConcretePlantContracts.SearchModels;
-using PrecastConcretePlantContracts.StoragesContracts;
-using PrecastConcretePlantContracts.ViewModels;
-using PrecastConcretePlantFileImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PrecastConcretePlantFileImplement.Implements
-{
-    public class OrderStorage : IOrderStorage
-    {
-        private readonly DataFileSingleton source;
-        public OrderStorage()
-        {
-            source = DataFileSingleton.GetInstance();
-        }
-        public List<OrderViewModel> GetFullList()
-        {
-            return source.Orders.Select(x => AttachReinforcedName(x.GetViewModel)).ToList();
-        }
-        public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
-        {
-            //Метод полностью может быть заменён следующим. Практическая польза незначительна
-            if (!model.Id.HasValue)
-            {
-                return new();
-            }
-            return source.Orders.Where(x => x.Id == model.Id).Select(x => AttachReinforcedName(x.GetViewModel)).ToList();
-        }
-        public OrderViewModel? GetElement(OrderSearchModel model)
-        {
-            if (!model.Id.HasValue)
-            {
-                return new();
-            }
-            return AttachReinforcedName(source.Orders.FirstOrDefault(x => 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 AttachReinforcedName(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 AttachReinforcedName(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 AttachReinforcedName(order.GetViewModel);
-            }
-            return null;
-        }
-        private OrderViewModel AttachReinforcedName(OrderViewModel? model)
-        {
-            //Из всех мест, это выглядит наиболее подходящим, для данной манипуляции.
-            //При расположении ниже нарушится целостность данных
-            //При расположении выше будет нарушен принцип разделения уровней
-            if (model == null)
-            {
-                return null;
-            }
-            var reinforced = source.Reinforceds.FirstOrDefault(x => x.Id == model.ReinforcedId);
-            if (reinforced != null)
-            {
-                model.ReinforcedName = reinforced.ReinforcedName;
-            }
-            return model;
-        }
-    }
-}

PrecastConcretePlant/PrecastConcretePlantFileImplement/Implements/ReinforcedStorage.cs

@@ -1,79 +0,0 @@
-using PrecastConcretePlantContracts.BindingModels;
-using PrecastConcretePlantContracts.SearchModels;
-using PrecastConcretePlantContracts.StoragesContracts;
-using PrecastConcretePlantContracts.ViewModels;
-using PrecastConcretePlantFileImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PrecastConcretePlantFileImplement.Implements
-{
-    public class ReinforcedStorage : IReinforcedStorage
-    {
-        private readonly DataFileSingleton source;
-        public ReinforcedStorage()
-        {
-            source = DataFileSingleton.GetInstance();
-        }
-        public List<ReinforcedViewModel> GetFullList()
-        {
-            return source.Reinforceds.Select(x => x.GetViewModel).ToList();
-        }
-        public List<ReinforcedViewModel> GetFilteredList(ReinforcedSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.ReinforcedName))
-            {
-                return new();
-            }
-            return source.Reinforceds.Where(x => x.ReinforcedName.Contains(model.ReinforcedName)).Select(x => x.GetViewModel).ToList();
-        }
-        public ReinforcedViewModel? GetElement(ReinforcedSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.ReinforcedName) && !model.Id.HasValue)
-            {
-                return null;
-            }
-            return source.Reinforceds.FirstOrDefault(x =>
-            (!string.IsNullOrEmpty(model.ReinforcedName) && x.ReinforcedName == model.ReinforcedName) ||
-            (model.Id.HasValue && x.Id == model.Id))
-                ?.GetViewModel;
-        }
-        public ReinforcedViewModel? Insert(ReinforcedBindingModel model)
-        {
-            model.Id = source.Reinforceds.Count > 0 ? source.Reinforceds.Max(x => x.Id) + 1 : 1;
-            var newReinforced = Reinforced.Create(model);
-            if (newReinforced == null)
-            {
-                return null;
-            }
-            source.Reinforceds.Add(newReinforced);
-            source.SaveReinforceds();
-            return newReinforced.GetViewModel;
-        }
-        public ReinforcedViewModel? Update(ReinforcedBindingModel model)
-        {
-            var reinforced = source.Reinforceds.FirstOrDefault(x => x.Id == model.Id);
-            if (reinforced == null)
-            {
-                return null;
-            }
-            reinforced.Update(model);
-            source.SaveReinforceds();
-            return reinforced.GetViewModel;
-        }
-        public ReinforcedViewModel? Delete(ReinforcedBindingModel model)
-        {
-            var reinforced = source.Reinforceds.FirstOrDefault(x => x.Id == model.Id);
-            if (reinforced != null)
-            {
-                source.Reinforceds.Remove(reinforced);
-                source.SaveReinforceds();
-                return reinforced.GetViewModel;
-            }
-            return null;
-        }
-    }
-}

PrecastConcretePlant/PrecastConcretePlantFileImplement/Models/Component.cs

@@ -1,65 +0,0 @@
-using PrecastConcretePlantContracts.BindingModels;
-using PrecastConcretePlantContracts.ViewModels;
-using PrecastConcretePlantDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-
-namespace PrecastConcretePlantFileImplement.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()));
-    }
-}

PrecastConcretePlant/PrecastConcretePlantFileImplement/Models/Order.cs

@@ -1,88 +0,0 @@
-using PrecastConcretePlantContracts.BindingModels;
-using PrecastConcretePlantContracts.ViewModels;
-using PrecastConcretePlantDataModels.Enums;
-using PrecastConcretePlantDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-
-namespace PrecastConcretePlantFileImplement.Models
-{
-    public class Order : IOrderModel
-    {
-        public int Id { get; private set; }
-        public int ReinforcedId { 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 static Order? Create(OrderBindingModel? model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Order()
-            {
-                Id = model.Id,
-                ReinforcedId = model.ReinforcedId,
-                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;
-            }
-            string dateImplement = element.Element("DateImplement")!.Value;
-            return new Order()
-            {
-                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
-                ReinforcedId = Convert.ToInt32(element.Element("ReinforcedId")!.Value),
-                Count = Convert.ToInt32(element.Element("Count")!.Value),
-                Sum = Convert.ToInt32(element.Element("Sum")!.Value),
-                Status = (OrderStatus)(Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value)),
-                DateCreate = Convert.ToDateTime(element.Element("DateCreate")!.Value),
-                DateImplement = string.IsNullOrEmpty(dateImplement) ? null : Convert.ToDateTime(dateImplement)
-            };
-
-        }
-        public void Update(OrderBindingModel model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            Status = model.Status;
-            DateImplement = model.DateImplement;
-        }
-        public OrderViewModel GetViewModel => new()
-        {
-            //ReinforcedName ,будет определено далее, в классе хранилища, так как это более рационально
-            Id = Id,
-            ReinforcedId = ReinforcedId,
-            Count = Count,
-            Sum = Sum,
-            Status = Status,
-            DateCreate = DateCreate,
-            DateImplement = DateImplement,
-        };
-        public XElement GetXElement => new("Order",
-            new XAttribute("Id", Id),
-            new XElement("ReinforcedId", ReinforcedId.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()));
-    }
-}

PrecastConcretePlant/PrecastConcretePlantFileImplement/Models/Reinforced.cs

@@ -1,88 +0,0 @@
-using PrecastConcretePlantContracts.BindingModels;
-using PrecastConcretePlantContracts.ViewModels;
-using PrecastConcretePlantDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-
-namespace PrecastConcretePlantFileImplement.Models
-{
-    public class Reinforced : IReinforcedModel
-    {
-        public int Id { get; private set; }
-        public string ReinforcedName { get; private set; } = string.Empty;
-        public double Price { get; private set; }
-        public Dictionary<int, int> Components { get; private set; } = new();
-        private Dictionary<int, (IComponentModel, int)>? _reinforcedComponents = null;
-        public Dictionary<int, (IComponentModel, int)> ReinforcedComponents
-        {
-            get
-            {
-                if (_reinforcedComponents == null)
-                {
-                    var source = DataFileSingleton.GetInstance();
-                    _reinforcedComponents = Components.ToDictionary(x => x.Key, y => ((source.Components.FirstOrDefault(z => z.Id == y.Key) as IComponentModel)!, y.Value));
-                }
-                return _reinforcedComponents;
-            }
-        }
-        public static Reinforced? Create(ReinforcedBindingModel model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Reinforced()
-            {
-                Id = model.Id,
-                ReinforcedName = model.ReinforcedName,
-                Price = model.Price,
-                Components = model.ReinforcedComponents.ToDictionary(x => x.Key, x => x.Value.Item2)
-            };
-        }
-        public static Reinforced? Create(XElement element)
-        {
-            if (element == null)
-            {
-                return null;
-            }
-            return new Reinforced()
-            {
-                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
-                ReinforcedName = element.Element("ReinforcedName")!.Value,
-                Price = Convert.ToDouble(element.Element("Price")!.Value),
-                Components = element.Element("ReinforcedComponents")!.Elements("ReinforcedComponent").ToDictionary(x => Convert.ToInt32(x.Element("Key")?.Value),
-                x => Convert.ToInt32(x.Element("Value")?.Value))
-            };
-        }
-        public void Update(ReinforcedBindingModel model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            ReinforcedName = model.ReinforcedName;
-            Price = model.Price;
-            Components = model.ReinforcedComponents.ToDictionary(x => x.Key, x => x.Value.Item2);
-            _reinforcedComponents = null;
-        }
-        public ReinforcedViewModel GetViewModel => new()
-        {
-            Id = Id,
-            ReinforcedName = ReinforcedName,
-            Price = Price,
-            ReinforcedComponents = ReinforcedComponents
-        };
-        public XElement GetXElement => new("Reinforced",
-                new XAttribute("Id", Id),
-                new XElement("ReinforcedName", ReinforcedName),
-                new XElement("Price", Price.ToString()),
-                new XElement("ReinforcedComponents", Components.Select(
-                    x => new XElement("ReinforcedComponent", new XElement("Key", x.Key), new XElement("Value", x.Value))).ToArray()));
-    }
-
-
-}

PrecastConcretePlant/PrecastConcretePlantFileImplement/PrecastConcretePlantFileImplement.csproj

@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\PrecastConcretePlantContracts\PrecastConcretePlantContracts.csproj" />
-    <ProjectReference Include="..\PrecastConcretePlantDataModels\PrecastConcretePlantDataModels.csproj" />
-  </ItemGroup>
-
-</Project>

PrecastConcretePlant/PrecastConcretePlantView/PrecastConcretePlantView.csproj

@@ -15,7 +15,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\PrecastConcretePlantBusinessLogic\PrecastConcretePlantBusinessLogic.csproj" />
-    <ProjectReference Include="..\PrecastConcretePlantFileImplement\PrecastConcretePlantFileImplement.csproj" />
     <ProjectReference Include="..\PrecastConcretePlantListImplement\PrecastConcretePlantListImplement.csproj" />
   </ItemGroup>
 

PrecastConcretePlant/PrecastConcretePlantView/Program.cs

@@ -4,7 +4,7 @@ using NLog.Extensions.Logging;
 using PrecastConcretePlantBusinessLogic.BusinessLogics;
 using PrecastConcretePlantContracts.BusinessLogicsContracts;
 using PrecastConcretePlantContracts.StoragesContracts;
-using PrecastConcretePlantFileImplement.Implements;
+using PrecastConcretePlantListImplement.Implements;
 using PrecastConcretePlantView;
 using System;
 using System.Drawing;
@@ -40,12 +40,10 @@ namespace PrecastConcretePlant
             services.AddTransient<IComponentStorage, ComponentStorage>();
             services.AddTransient<IOrderStorage, OrderStorage>();
             services.AddTransient<IReinforcedStorage, ReinforcedStorage>();
-
             services.AddTransient<IComponentLogic, ComponentLogic>();
+            services.AddTransient<FormMain>();
             services.AddTransient<IOrderLogic, OrderLogic>();
             services.AddTransient<IReinforcedLogic, ReinforcedLogic>();
-
-            services.AddTransient<FormMain>();
             services.AddTransient<FormComponent>();
             services.AddTransient<FormComponents>();
             services.AddTransient<FormCreateOrder>();