LawFirm/LawFirm.sln

@@ -11,9 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LawFirmContracts", "LawFirm
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LawFirmBusinessLogic", "LawFirmBusinessLogic\LawFirmBusinessLogic.csproj", "{1A498224-4BAC-48FF-B6BC-E829BF86C5E4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LawFirmListImplements", "LawFirmListImplements\LawFirmListImplements.csproj", "{43B2BE7C-83F0-4A91-B2F1-F2F2A2BE5CAE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LawFirmListImplements", "LawFirmListImplements\LawFirmListImplements.csproj", "{43B2BE7C-83F0-4A91-B2F1-F2F2A2BE5CAE}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LawFirmFileImplement", "LawFirmFileImplement\LawFirmFileImplement.csproj", "{E75AF81D-A466-470A-A3F7-EC0E6F33C866}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -41,10 +39,6 @@ Global
 		{43B2BE7C-83F0-4A91-B2F1-F2F2A2BE5CAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{43B2BE7C-83F0-4A91-B2F1-F2F2A2BE5CAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{43B2BE7C-83F0-4A91-B2F1-F2F2A2BE5CAE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E75AF81D-A466-470A-A3F7-EC0E6F33C866}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E75AF81D-A466-470A-A3F7-EC0E6F33C866}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E75AF81D-A466-470A-A3F7-EC0E6F33C866}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E75AF81D-A466-470A-A3F7-EC0E6F33C866}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

LawFirm/LawFirm/LawFirmView.csproj

@@ -17,7 +17,6 @@
   <ItemGroup>
     <ProjectReference Include="..\LawFirmBusinessLogic\LawFirmBusinessLogic.csproj" />
     <ProjectReference Include="..\LawFirmContracts\LawFirmContracts.csproj" />
-    <ProjectReference Include="..\LawFirmFileImplement\LawFirmFileImplement.csproj" />
     <ProjectReference Include="..\LawFirmListImplements\LawFirmListImplements.csproj" />
   </ItemGroup>
 

LawFirm/LawFirm/Program.cs

@@ -1,7 +1,7 @@
 using LawFirmBusinessLogic.BusinessLogics;
 using LawFirmContracts.BusinessLogicContracts;
 using LawFirmContracts.StorageContracts;
-using LawFirmFileImplement.Implements;
+using LawFirmListImplements.Implements;
 using LawFirmView;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -41,11 +41,9 @@ namespace LawFirm
             services.AddTransient<IBlankStorage, BlankStorage>();
             services.AddTransient<IOrderStorage, OrderStorage>();
             services.AddTransient<IDocumentStorage, DocumentStorage>();
-
             services.AddTransient<IBlankLogic, BlankLogic>();
             services.AddTransient<IOrderLogic, OrderLogic>();
             services.AddTransient<IDocumentLogic, DocumentLogic>();
-
             services.AddTransient<FormMain>();
             services.AddTransient<FormBlank>();
             services.AddTransient<FormBlanks>();

LawFirm/LawFirmFileImplement/DataFileSingleton.cs

@@ -1,55 +0,0 @@
-using LawFirmFileImplement.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 LawFirmFileImplement
-{
-    public class DataFileSingleton
-    {
-        private static DataFileSingleton? instance;
-        private readonly string BlankFileName = "Blank.xml";
-        private readonly string OrderFileName = "Order.xml";
-        private readonly string DocumentFileName = "Document.xml";
-        public List<Blank> Blanks { get; private set; }
-        public List<Order> Orders { get; private set; }
-        public List<Document> Documents { get; private set; }
-        public static DataFileSingleton GetInstance()
-        {
-            if (instance == null)
-            {
-                instance = new DataFileSingleton();
-            }
-            return instance;
-        }
-        public void SaveBlanks() => SaveData(Blanks, BlankFileName, "Blanks", x => x.GetXElement);
-        public void SaveDocuments() => SaveData(Documents, DocumentFileName, "Documents", x => x.GetXElement);
-        public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
-        private DataFileSingleton()
-        {
-            Blanks = LoadData(BlankFileName, "Blank", x => Blank.Create(x)!)!;
-            Documents = LoadData(DocumentFileName, "Document", x => Document.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);
-            }
-        }
-    }
-}

LawFirm/LawFirmFileImplement/Implements/BlankStorage.cs

@@ -1,88 +0,0 @@
-using LawFirmContracts.BindingModels;
-using LawFirmContracts.SearchModels;
-using LawFirmContracts.StorageContracts;
-using LawFirmContracts.ViewModels;
-using LawFirmFileImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace LawFirmFileImplement.Implements
-{
-    public class BlankStorage : IBlankStorage
-    {
-        private readonly DataFileSingleton source;
-
-        public BlankStorage()
-        {
-            source = DataFileSingleton.GetInstance();
-        }
-
-        public BlankViewModel? GetElement(BlankSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.BlankName) && !model.Id.HasValue)
-            {
-                return null;
-            }
-            return source.Blanks
-            .FirstOrDefault(x => (!string.IsNullOrEmpty(model.BlankName) && x.BlankName == model.BlankName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
-        }
-
-        public List<BlankViewModel> GetFilteredList(BlankSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.BlankName))
-            {
-                return new();
-            }
-            return source.Blanks
-                .Where(x => x.BlankName.Contains(model.BlankName))
-                .Select(x => x.GetViewModel)
-                .ToList();
-        }
-
-        public List<BlankViewModel> GetFullList()
-        {
-            return source.Blanks.Select(x => x.GetViewModel).ToList();
-        }
-
-        public BlankViewModel? Insert(BlankBindingModel model)
-        {
-            model.Id = source.Blanks.Count > 0 ? source.Blanks.Max(x => x.Id) + 1 : 1;
-            var newBlank = Blank.Create(model);
-            if (newBlank == null)
-            {
-                return null;
-            }
-            source.Blanks.Add(newBlank);
-            source.SaveBlanks();
-            return newBlank.GetViewModel;
-        }
-
-        public BlankViewModel? Update(BlankBindingModel model)
-        {
-            var blank = source.Blanks.FirstOrDefault(x => x.Id == model.Id);
-            if (blank == null)
-            {
-                return null;
-            }
-            blank.Update(model);
-            source.SaveBlanks();
-            return blank.GetViewModel;
-        }
-        public BlankViewModel? Delete(BlankBindingModel model)
-        {
-            var blank = source.Blanks.FirstOrDefault(x => x.Id == model.Id);
-            if (blank == null)
-            {
-                return null;
-            }
-            blank.Update(model);
-            source.SaveBlanks();
-            return blank.GetViewModel;
-        }
-
-    }
-}

LawFirm/LawFirmFileImplement/Implements/DocumentStorage.cs

@@ -1,87 +0,0 @@
-using LawFirmContracts.BindingModels;
-using LawFirmContracts.SearchModels;
-using LawFirmContracts.StorageContracts;
-using LawFirmContracts.ViewModels;
-using LawFirmFileImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace LawFirmFileImplement.Implements
-{
-    public class DocumentStorage : IDocumentStorage
-    {
-        private readonly DataFileSingleton source;
-
-        public DocumentStorage()
-        {
-            source = DataFileSingleton.GetInstance();
-        }
-
-        public DocumentViewModel? GetElement(DocumentSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.DocumentName) && !model.Id.HasValue)
-            {
-                return null;
-            }
-            return source.Documents
-            .FirstOrDefault(x => (!string.IsNullOrEmpty(model.DocumentName) && x.DocumentName == model.DocumentName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
-        }
-
-        public List<DocumentViewModel> GetFilteredList(DocumentSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.DocumentName))
-            {
-                return new();
-            }
-            return source.Documents
-                .Where(x => x.DocumentName.Contains(model.DocumentName))
-                .Select(x => x.GetViewModel)
-                .ToList();
-        }
-
-        public List<DocumentViewModel> GetFullList()
-        {
-            return source.Documents.Select(x => x.GetViewModel).ToList();
-        }
-
-        public DocumentViewModel? Insert(DocumentBindingModel model)
-        {
-            model.Id = source.Documents.Count > 0 ? source.Documents.Max(x => x.Id) + 1 : 1;
-            var newDoc = Document.Create(model);
-            if (newDoc == null)
-            {
-                return null;
-            }
-            source.Documents.Add(newDoc);
-            source.SaveDocuments();
-            return newDoc.GetViewModel;
-        }
-
-        public DocumentViewModel? Update(DocumentBindingModel model)
-        {
-            var document = source.Documents.FirstOrDefault(x => x.Id == model.Id);
-            if (document == null)
-            {
-                return null;
-            }
-            document.Update(model);
-            source.SaveDocuments();
-            return document.GetViewModel;
-        }
-        public DocumentViewModel? Delete(DocumentBindingModel model)
-        {
-            var document = source.Documents.FirstOrDefault(x => x.Id == model.Id);
-            if (document == null)
-            {
-                return null;
-            }
-            document.Update(model);
-            source.SaveDocuments();
-            return document.GetViewModel;
-        }
-
-    }
-}

LawFirm/LawFirmFileImplement/Implements/OrderStorage.cs

@@ -1,87 +0,0 @@
-using LawFirmContracts.BindingModels;
-using LawFirmContracts.SearchModels;
-using LawFirmContracts.StorageContracts;
-using LawFirmContracts.ViewModels;
-using LawFirmFileImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace LawFirmFileImplement.Implements
-{
-    public class OrderStorage : IOrderStorage
-    {
-        private readonly DataFileSingleton source;
-
-        public OrderStorage()
-        {
-            source = DataFileSingleton.GetInstance();
-        }
-
-        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<OrderViewModel> 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<OrderViewModel> 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;
-        }
-        public OrderViewModel? Delete(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;
-        }
-
-    }
-}

LawFirm/LawFirmFileImplement/LawFirmFileImplement.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="..\LawFirmContracts\LawFirmContracts.csproj" />
-    <ProjectReference Include="..\LawFirmDataModels\LawFirmDataModels.csproj" />
-  </ItemGroup>
-
-</Project>

LawFirm/LawFirmFileImplement/Models/Blank.cs

@@ -1,74 +0,0 @@
-using LawFirmContracts.BindingModels;
-using LawFirmContracts.ViewModels;
-using LawFirmDataModels.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 LawFirmFileImplement.Models
-{
-    public class Blank : IBlankModel
-    {
-        public string BlankName { get; private set; } = String.Empty;
-
-        public double Cost { get; set; }
-
-        public int Id { get; private set; }
-
-        public static Blank? Create(BlankBindingModel? model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Blank()
-            {
-                Id = model.Id,
-                BlankName = model.BlankName,
-                Cost = model.Cost
-            };
-        }
-
-        public static Blank? Create(XElement element)
-        {
-            if (element == null)
-            {
-                return null;
-            }
-            return new Blank()
-            {
-                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
-                BlankName = element.Element("BlankName")!.Value,
-                Cost = Convert.ToDouble(element.Element("Cost")!.Value)
-            };
-        }
-
-        public void Update(BlankBindingModel? model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            BlankName = model.BlankName;
-            Cost = model.Cost;
-        }
-        public BlankViewModel GetViewModel => new()
-        {
-            Id = Id,
-            BlankName = BlankName,
-            Cost = Cost
-        };
-
-        public XElement GetXElement => new(
-            "Blank",
-             new XAttribute("Id", Id),
-             new XElement("BlankName", BlankName),
-             new XElement("Cost", Cost.ToString())
-        );
-
-    }
-}

LawFirm/LawFirmFileImplement/Models/Document.cs

@@ -1,105 +0,0 @@
-using LawFirmContracts.BindingModels;
-using LawFirmContracts.ViewModels;
-using LawFirmDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-
-namespace LawFirmFileImplement.Models
-{
-    public class Document : IDocumentModel
-    {
-        public string DocumentName { get; private set; } = string.Empty;
-
-        public double Price { get; private set; }
-
-        public int Id { get; private set; }
-
-        public Dictionary<int, int> Blanks { get; private set; } = new();
-
-        private Dictionary<int, (IBlankModel, int)>? _documentBlanks = null;
-        public Dictionary<int, (IBlankModel, int)> DocumentBlanks
-        {
-            get
-            {
-                if (_documentBlanks == null)
-                {
-                    var source = DataFileSingleton.GetInstance();
-                    _documentBlanks = Blanks.ToDictionary(
-                        x => x.Key, 
-                        y => ((source.Blanks.FirstOrDefault(z => z.Id == y.Key) as IBlankModel)!, y.Value)
-                    );
-                }
-                return _documentBlanks;
-            }
-        }
-
-
-        public static Document? Create(DocumentBindingModel? model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Document()
-            {
-                Id = model.Id,
-                DocumentName = model.DocumentName,
-                Price = model.Price,
-                Blanks = model.DocumentBlanks.ToDictionary(x => x.Key, x => x.Value.Item2)
-            };
-        }
-
-        public static Document? Create(XElement element)
-        {
-            if (element == null)
-            {
-                return null;
-            }
-            return new Document()
-            {
-                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
-                DocumentName = element.Element("DocumentName")!.Value,
-                Price = Convert.ToDouble(element.Element("Price")!.Value),
-                Blanks = element.Element("DocumentBlanks")!.Elements("DocumentBlank").ToDictionary(
-                    x => Convert.ToInt32(x.Element("Key")?.Value), 
-                    x => Convert.ToInt32(x.Element("Value")?.Value)
-                )
-            };
-        }
-
-
-        public void Update(DocumentBindingModel? model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            DocumentName = model.DocumentName;
-            Price = model.Price;
-            Blanks = model.DocumentBlanks.ToDictionary(x => x.Key, x => x.Value.Item2);
-            _documentBlanks = null;
-        }
-        public DocumentViewModel GetViewModel => new()
-        {
-            Id = Id,
-            DocumentName = DocumentName,
-            Price = Price,
-            DocumentBlanks = DocumentBlanks
-        };
-
-        public XElement GetXElement => new(
-            "Document",
-             new XAttribute("Id", Id),
-             new XElement("DocumentName", DocumentName),
-             new XElement("Price", Price.ToString()),
-             new XElement("DocumentBlanks", Blanks.Select(x =>
-             new XElement("DocumentBlank",
-             new XElement("Key", x.Key),
-             new XElement("Value", x.Value)))
-            .ToArray()));
-    }
-}

LawFirm/LawFirmFileImplement/Models/Order.cs

@@ -1,110 +0,0 @@
-using LawFirmContracts.BindingModels;
-using LawFirmContracts.ViewModels;
-using LawFirmDataModels.Enums;
-using LawFirmDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-
-namespace LawFirmFileImplement.Models
-{
-    public class Order : IOrderModel
-    {
-        public int DocumentId { get; private set; }
-
-        public string DocumentName { get; private set; } = string.Empty;
-
-        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
-            {
-                DocumentId = model.DocumentId,
-                DocumentName = model.DocumentName,
-                Count = model.Count,
-                Sum = model.Sum,
-                Status = model.Status,
-                DateCreate = model.DateCreate,
-                DateImplement = model.DateImplement,
-                Id = model.Id,
-            };
-        }
-
-        public static Order? Create(XElement element)
-        {
-            if (element == null)
-            {
-                return null;
-            }
-            return new Order()
-            {
-                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
-                DocumentName = element.Element("DocumentName")!.Value,
-                DocumentId = Convert.ToInt32(element.Element("DocumentId")!.Value),
-                Sum = Convert.ToDouble(element.Element("Sum")!.Value),
-                Count = Convert.ToInt32(element.Element("Count")!.Value),
-                Status = (OrderStatus)Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value),
-                DateCreate = Convert.ToDateTime(element.Element("DateCreate")!.Value),
-                DateImplement = Convert.ToDateTime(element.Element("DateCreate")!.Value)
-            };
-        }
-
-        public void Update(OrderBindingModel? model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            DocumentId = model.DocumentId;
-            DocumentName = model.DocumentName;
-            Count = model.Count;
-            Sum = model.Sum;
-            Status = model.Status;
-            DateCreate = model.DateCreate;
-            DateImplement = model.DateImplement;
-            Id = model.Id;
-        }
-
-        public OrderViewModel GetViewModel => new()
-        {
-            DocumentId = DocumentId,
-            DocumentName = DocumentName,
-            Count = Count,
-            Sum = Sum,
-            DateCreate = DateCreate,
-            DateImplement = DateImplement,
-            Id = Id,
-            Status = Status,
-        };
-
-        public XElement GetXElement => new(
-            "Order",
-             new XAttribute("Id", Id),
-             new XElement("DocumentName", DocumentName),
-             new XElement("DocumentId", DocumentId.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())
-        );
-    }
-}