Дальше

PlumbingRepair/PlumbingRepair.sln

@@ -1,37 +1,43 @@
-
+
-Microsoft Visual Studio Solution File, Format Version 12.00
+Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
+# Visual Studio Version 17
-VisualStudioVersion = 17.6.33801.468
+VisualStudioVersion = 17.6.33801.468
-MinimumVisualStudioVersion = 10.0.40219.1
+MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlumbingRepair", "PlumbingRepair\PlumbingRepair.csproj", "{16CDF38C-189C-4BED-AB66-DB3C212C4047}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlumbingRepair", "PlumbingRepair\PlumbingRepair.csproj", "{16CDF38C-189C-4BED-AB66-DB3C212C4047}"
-EndProject
+EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlumbingRepairDataModels", "PlumbingRepairDataModels\PlumbingRepairDataModels.csproj", "{F62B3ADF-0FE7-4066-BEF7-5DB0AE1A53A9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlumbingRepairDataModels", "PlumbingRepairDataModels\PlumbingRepairDataModels.csproj", "{F62B3ADF-0FE7-4066-BEF7-5DB0AE1A53A9}"
-EndProject
+EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlumbingRepairContracts", "PlumbingRepairContracts\PlumbingRepairContracts.csproj", "{FD429137-A114-4447-B51A-FCC11FEF7E2C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlumbingRepairContracts", "PlumbingRepairContracts\PlumbingRepairContracts.csproj", "{FD429137-A114-4447-B51A-FCC11FEF7E2C}"
-EndProject
+EndProject
-Global
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlumbingRepairBusinessLogic", "PlumbingRepairBusinessLogic\PlumbingRepairBusinessLogic.csproj", "{B960E476-E516-4BAA-B5D7-55F29B376993}"
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+EndProject
-		Debug|Any CPU = Debug|Any CPU
+Global
-		Release|Any CPU = Release|Any CPU
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-	EndGlobalSection
+		Debug|Any CPU = Debug|Any CPU
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		Release|Any CPU = Release|Any CPU
-		{16CDF38C-189C-4BED-AB66-DB3C212C4047}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+	EndGlobalSection
-		{16CDF38C-189C-4BED-AB66-DB3C212C4047}.Debug|Any CPU.Build.0 = Debug|Any CPU
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{16CDF38C-189C-4BED-AB66-DB3C212C4047}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{16CDF38C-189C-4BED-AB66-DB3C212C4047}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{16CDF38C-189C-4BED-AB66-DB3C212C4047}.Release|Any CPU.Build.0 = Release|Any CPU
+		{16CDF38C-189C-4BED-AB66-DB3C212C4047}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F62B3ADF-0FE7-4066-BEF7-5DB0AE1A53A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{16CDF38C-189C-4BED-AB66-DB3C212C4047}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F62B3ADF-0FE7-4066-BEF7-5DB0AE1A53A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{16CDF38C-189C-4BED-AB66-DB3C212C4047}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F62B3ADF-0FE7-4066-BEF7-5DB0AE1A53A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F62B3ADF-0FE7-4066-BEF7-5DB0AE1A53A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F62B3ADF-0FE7-4066-BEF7-5DB0AE1A53A9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F62B3ADF-0FE7-4066-BEF7-5DB0AE1A53A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FD429137-A114-4447-B51A-FCC11FEF7E2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F62B3ADF-0FE7-4066-BEF7-5DB0AE1A53A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FD429137-A114-4447-B51A-FCC11FEF7E2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F62B3ADF-0FE7-4066-BEF7-5DB0AE1A53A9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FD429137-A114-4447-B51A-FCC11FEF7E2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FD429137-A114-4447-B51A-FCC11FEF7E2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FD429137-A114-4447-B51A-FCC11FEF7E2C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FD429137-A114-4447-B51A-FCC11FEF7E2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-	EndGlobalSection
+		{FD429137-A114-4447-B51A-FCC11FEF7E2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-	GlobalSection(SolutionProperties) = preSolution
+		{FD429137-A114-4447-B51A-FCC11FEF7E2C}.Release|Any CPU.Build.0 = Release|Any CPU
-		HideSolutionNode = FALSE
+		{B960E476-E516-4BAA-B5D7-55F29B376993}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-	EndGlobalSection
+		{B960E476-E516-4BAA-B5D7-55F29B376993}.Debug|Any CPU.Build.0 = Debug|Any CPU
-	GlobalSection(ExtensibilityGlobals) = postSolution
+		{B960E476-E516-4BAA-B5D7-55F29B376993}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		SolutionGuid = {1BA93531-B041-4CEC-AEAB-2877EA63E1E5}
+		{B960E476-E516-4BAA-B5D7-55F29B376993}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
+	EndGlobalSection
-EndGlobal
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {1BA93531-B041-4CEC-AEAB-2877EA63E1E5}
+	EndGlobalSection
+EndGlobal

PlumbingRepair/PlumbingRepairBusinessLogic/BusinessLogics/ComponentLogic.cs

@@ -0,0 +1,113 @@
+using PlumbingRepairContracts.BindingModels;
+using PlumbingRepairContracts.BusinessLogicsContracts;
+using PlumbingRepairContracts.SearchModels;
+using PlumbingRepairContracts.StoragesContracts;
+using PlumbingRepairContracts.ViewModels;
+using Microsoft.Extensions.Logging;
+
+namespace PlumbingRepairBusinessLogic.BusinessLogics
+{
+    public class ComponentLogic : IComponentLogic
+    {
+        private readonly ILogger _logger;
+        private readonly IComponentStorage _componentStorage;
+        public ComponentLogic(ILogger<ComponentLogic> logger, IComponentStorage
+       componentStorage)
+        {
+            _logger = logger;
+            _componentStorage = componentStorage;
+        }
+        public List<ComponentViewModel>? ReadList(ComponentSearchModel? model)
+        {
+            _logger.LogInformation("ReadList. ComponentName: {ComponentName}.Id:{Id} ", 
+                model?.ComponentName, model?.Id);
+        var list = model == null ? _componentStorage.GetFullList() : 
+                _componentStorage.GetFilteredList(model);
+            if (list == null)
+            {
+                _logger.LogWarning("ReadList return null list");
+                return null;
+            }
+            _logger.LogInformation("ReadList. Count:{Count}", list.Count);
+            return list;
+        }
+        public ComponentViewModel? ReadElement(ComponentSearchModel model)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+            _logger.LogInformation("ReadElement. ComponentName:{ComponentName}.Id:{Id}", 
+                model.ComponentName, model.Id);
+        var element = _componentStorage.GetElement(model);
+            if (element == null)
+            {
+                _logger.LogWarning("ReadElement element not found");
+                return null;
+            }
+            _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
+            return element;
+        }
+        public bool Create(ComponentBindingModel model)
+        {
+            CheckModel(model);
+            if (_componentStorage.Insert(model) == null)
+            {
+                _logger.LogWarning("Insert operation failed");
+                return false;
+            }
+            return true;
+        }
+        public bool Update(ComponentBindingModel model)
+        {
+            CheckModel(model);
+            if (_componentStorage.Update(model) == null)
+            {
+                _logger.LogWarning("Update operation failed");
+                return false;
+            }
+            return true;
+        }
+        public bool Delete(ComponentBindingModel model)
+        {
+            CheckModel(model, false);
+            _logger.LogInformation("Delete. Id:{Id}", model.Id);
+            if (_componentStorage.Delete(model) == null)
+            {
+                _logger.LogWarning("Delete operation failed");
+                return false;
+            }
+            return true;
+        }
+        private void CheckModel(ComponentBindingModel model, bool withParams = true)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+            if (!withParams)
+            {
+                return;
+            }
+            if (string.IsNullOrEmpty(model.ComponentName))
+            {
+                throw new ArgumentNullException("Нет названия компонента",
+               nameof(model.ComponentName));
+            }
+            if (model.Cost <= 0)
+            {
+                throw new ArgumentNullException("Цена компонента должна быть больше 0", nameof(model.Cost));
+            }
+            _logger.LogInformation("Component. ComponentName:{ComponentName}.Cost:{Cost}. Id: {Id}", 
+                model.ComponentName, model.Cost, model.Id);
+            var element = _componentStorage.GetElement(new ComponentSearchModel
+                 {
+                     ComponentName = model.ComponentName
+                 });
+            if (element != null && element.Id != model.Id)
+            {
+                throw new InvalidOperationException("Компонент с таким названием уже есть");
+            }
+        }
+    }
+}

PlumbingRepair/PlumbingRepairBusinessLogic/BusinessLogics/OrderLogic.cs

@@ -0,0 +1,106 @@
+using Microsoft.Extensions.Logging;
+using PlumbingRepairContracts.BindingModels;
+using PlumbingRepairContracts.BusinessLogicsContracts;
+using PlumbingRepairContracts.SearchModels;
+using PlumbingRepairContracts.StoragesContracts;
+using PlumbingRepairContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PlumbingRepairBusinessLogic.BusinessLogics
+{
+    public class OrderLogic : IOrderLogic
+    {
+        private readonly ILogger _logger;
+        private readonly IOrderStorage _orderStorage;
+        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage
+       orderStorage)
+        {
+            _logger = logger;
+            _orderStorage = orderStorage;
+        }
+        public List<OrderViewModel>? ReadList(OrderSearchModel? model)
+        {
+            _logger.LogInformation("ReadList.Id:{Id} ", model?.Id);
+            var list = model == null ? _orderStorage.GetFullList() :
+                    _orderStorage.GetFilteredList(model);
+            if (list == null)
+            {
+                _logger.LogWarning("ReadList return null list");
+                return null;
+            }
+            _logger.LogInformation("ReadList. Count:{Count}", list.Count);
+            return list;
+        }
+        public OrderViewModel? ReadElement(OrderSearchModel model)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+            _logger.LogInformation("ReadElement.Id:{Id}", model.Id);
+            var element = _orderStorage.GetElement(model);
+            if (element == null)
+            {
+                _logger.LogWarning("ReadElement element not found");
+                return null;
+            }
+            _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
+            return element;
+        }
+        public bool Create(OrderBindingModel model)
+        {
+            CheckModel(model);
+            if (_orderStorage.Insert(model) == null)
+            {
+                _logger.LogWarning("Insert operation failed");
+                return false;
+            }
+            return true;
+        }
+        public bool Update(OrderBindingModel model)
+        {
+            CheckModel(model);
+            if (_orderStorage.Update(model) == null)
+            {
+                _logger.LogWarning("Update operation failed");
+                return false;
+            }
+            return true;
+        }
+        public bool Delete(OrderBindingModel model)
+        {
+            CheckModel(model, false);
+            _logger.LogInformation("Delete. Id:{Id}", model.Id);
+            if (_orderStorage.Delete(model) == null)
+            {
+                _logger.LogWarning("Delete operation failed");
+                return false;
+            }
+            return true;
+        }
+        private void CheckModel(OrderBindingModel model, bool withParams = true)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+            if (!withParams)
+            {
+                return;
+            }
+            _logger.LogInformation("Component.Id: {Id}", model.Id);
+            var element = _orderStorage.GetElement(new OrderSearchModel
+            {
+                WorkName = model.WorkName
+            });
+            if (element != null && element.Id != model.Id)
+            {
+                throw new InvalidOperationException("Работа с таким названием уже есть");
+            }
+        }
+    }
+}

PlumbingRepair/PlumbingRepairBusinessLogic/BusinessLogics/WorkLogic.cs

@@ -0,0 +1,118 @@
+using Microsoft.Extensions.Logging;
+using PlumbingRepairContracts.BindingModels;
+using PlumbingRepairContracts.BusinessLogicsContracts;
+using PlumbingRepairContracts.SearchModels;
+using PlumbingRepairContracts.StoragesContracts;
+using PlumbingRepairContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PlumbingRepairBusinessLogic.BusinessLogics
+{
+    public class WorkLogic : IWorkLogic
+    {
+        private readonly ILogger _logger;
+        private readonly IWorkStorage _workStorage;
+        public WorkLogic(ILogger<WorkLogic> logger, IWorkStorage
+       workStorage)
+        {
+            _logger = logger;
+            _workStorage = workStorage;
+        }
+        public List<WorkViewModel>? ReadList(WorkSearchModel? model)
+        {
+            _logger.LogInformation("ReadList. WorkName: {WorkName}.Id:{Id} ",
+                model?.WorkName, model?.Id);
+            var list = model == null ? _workStorage.GetFullList() :
+                    _workStorage.GetFilteredList(model);
+            if (list == null)
+            {
+                _logger.LogWarning("ReadList return null list");
+                return null;
+            }
+            _logger.LogInformation("ReadList. Count:{Count}", list.Count);
+            return list;
+        }
+        public WorkViewModel? ReadElement(WorkSearchModel model)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+            _logger.LogInformation("ReadElement. WorkName:{WorkName}.Id:{Id}",
+                model.WorkName, model.Id);
+            var element = _workStorage.GetElement(model);
+            if (element == null)
+            {
+                _logger.LogWarning("ReadElement element not found");
+                return null;
+            }
+            _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
+            return element;
+        }
+        public bool Create(WorkBindingModel model)
+        {
+            CheckModel(model);
+            if (_workStorage.Insert(model) == null)
+            {
+                _logger.LogWarning("Insert operation failed");
+                return false;
+            }
+            return true;
+        }
+        public bool Update(WorkBindingModel model)
+        {
+            CheckModel(model);
+            if (_workStorage.Update(model) == null)
+            {
+                _logger.LogWarning("Update operation failed");
+                return false;
+            }
+            return true;
+        }
+        public bool Delete(WorkBindingModel model)
+        {
+            CheckModel(model, false);
+            _logger.LogInformation("Delete. Id:{Id}", model.Id);
+            if (_workStorage.Delete(model) == null)
+            {
+                _logger.LogWarning("Delete operation failed");
+                return false;
+            }
+            return true;
+        }
+        private void CheckModel(WorkBindingModel model, bool withParams = true)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+            if (!withParams)
+            {
+                return;
+            }
+            if (string.IsNullOrEmpty(model.WorkName))
+            {
+                throw new ArgumentNullException("Нет названия работы",
+               nameof(model.WorkName));
+            }
+            if (model.Price <= 0)
+            {
+                throw new ArgumentNullException("Цена работы должна быть больше 0", nameof(model.Price));
+            }
+            _logger.LogInformation("Work. WorkName:{WorkName}.Price:{Price}. Id: {Id}",
+                model.WorkName, model.Price, model.Id);
+            var element = _workStorage.GetElement(new WorkSearchModel
+            {
+                WorkName = model.WorkName
+            });
+            if (element != null && element.Id != model.Id)
+            {
+                throw new InvalidOperationException("Работа с таким названием уже есть");
+            }
+        }
+    }
+}

PlumbingRepair/PlumbingRepairBusinessLogic/PlumbingRepairBusinessLogic.csproj

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

PlumbingRepair/PlumbingRepairContracts/BindingModels/OrderBindingModel.cs

@@ -11,7 +11,7 @@ namespace PlumbingRepairContracts.BindingModels
     public class OrderBindingModel : IOrderModel
     {
         public int Id { get; set; }
-        public int ProductId { get; set; }
+        public int WorkId { get; set; }
         public int Count { get; set; }
         public double Sum { get; set; }
         public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;

PlumbingRepair/PlumbingRepairContracts/BindingModels/WorkBindingModel.cs

@@ -7,10 +7,10 @@ using PlumbingRepairDataModels.Models;
 
 namespace PlumbingRepairContracts.BindingModels
 {
-    public class ProductBindingModel : IProductModel
+    public class WorkBindingModel : IWorkModel
     {
         public int Id { get; set; }
-        public string ProductName { get; set; } = string.Empty;
+        public string WorkName { get; set; } = string.Empty;
         public double Price { get; set; }
         public Dictionary<int, (IComponentModel, int)> ProductComponents
             { get; set; } = new();

PlumbingRepair/PlumbingRepairContracts/BusinesLogicsContracts/IProductLogic.cs

@@ -1,20 +0,0 @@
-using PlumbingRepairContracts.BindingModels;
-using PlumbingRepairContracts.SearchModels;
-using PlumbingRepairContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PlumbingRepairContracts.BusinesLogicsContracts
-{
-    public interface IProductLogic
-    {
-        List<ProductViewModel>? ReadList(ProductSearchModel? model);
-        ProductViewModel? ReadElement(ProductSearchModel model);
-        bool Create(ProductBindingModel model);
-        bool Update(ProductBindingModel model);
-        bool Delete(ProductBindingModel model);
-    }
-}

PlumbingRepair/PlumbingRepairContracts/BusinessLogicsContracts/IComponentLogic.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PlumbingRepairContracts.BusinesLogicsContracts
+namespace PlumbingRepairContracts.BusinessLogicsContracts
 {
     public interface IComponentLogic
     {

PlumbingRepair/PlumbingRepairContracts/BusinessLogicsContracts/IOrderLogic.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PlumbingRepairContracts.BusinesLogicsContracts
+namespace PlumbingRepairContracts.BusinessLogicsContracts
 {
     public interface IOrderLogic
     {

PlumbingRepair/PlumbingRepairContracts/BusinessLogicsContracts/IWorkLogic.cs

@@ -0,0 +1,20 @@
+using PlumbingRepairContracts.BindingModels;
+using PlumbingRepairContracts.SearchModels;
+using PlumbingRepairContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PlumbingRepairContracts.BusinessLogicsContracts
+{
+    public interface IWorkLogic
+    {
+        List<WorkViewModel>? ReadList(WorkSearchModel? model);
+        WorkViewModel? ReadElement(WorkSearchModel model);
+        bool Create(WorkBindingModel model);
+        bool Update(WorkBindingModel model);
+        bool Delete(WorkBindingModel model);
+    }
+}

PlumbingRepair/PlumbingRepairContracts/PlumbingRepairContracts.csproj

@@ -6,4 +6,8 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\PlumbingRepairDataModels\PlumbingRepairDataModels.csproj" />
+  </ItemGroup>
+
 </Project>

PlumbingRepair/PlumbingRepairContracts/SearchModels/OrderSearchModel.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 namespace PlumbingRepairContracts.SearchModels
 {
     public class OrderSearchModel
-    {
+    {   
         public int? Id { get; set; }
     }
 }

PlumbingRepair/PlumbingRepairContracts/StoragesContracts/IProductStorage.cs

@@ -1,21 +0,0 @@
-using PlumbingRepairContracts.BindingModels;
-using PlumbingRepairContracts.SearchModels;
-using PlumbingRepairContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PlumbingRepairContracts.StoragesContracts
-{
-    public interface IProductStorage
-    {
-        List<ProductViewModel> GetFullList();
-        List<ProductViewModel> GetFilteredList(ProductSearchModel model);
-        ProductViewModel? GetElement(ProductSearchModel model);
-        ProductViewModel? Insert(ProductBindingModel model);
-        ProductViewModel? Update(ProductBindingModel model);
-        ProductViewModel? Delete(ProductBindingModel model);
-    }
-}

PlumbingRepair/PlumbingRepairContracts/StoragesContracts/IWorkStorage.cs

@@ -0,0 +1,21 @@
+using PlumbingRepairContracts.BindingModels;
+using PlumbingRepairContracts.SearchModels;
+using PlumbingRepairContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PlumbingRepairContracts.StoragesContracts
+{
+    public interface IWorkStorage
+    {
+        List<WorkViewModel> GetFullList();
+        List<WorkViewModel> GetFilteredList(WorkSearchModel model);
+        WorkViewModel? GetElement(WorkSearchModel model);
+        WorkViewModel? Insert(WorkBindingModel model);
+        WorkViewModel? Update(WorkBindingModel model);
+        WorkViewModel? Delete(WorkBindingModel model);
+    }
+}

PlumbingRepair/PlumbingRepairContracts/ViewModels/OrderViewModel.cs

@@ -12,9 +12,9 @@ namespace PlumbingRepairContracts.ViewModels
     {
         [DisplayName("Номер")]
         public int Id { get; set; }
-        public int ProductId { get; set; }
+        public int WorkId { get; set; }
         [DisplayName("Изделие")]
-        public string ProductName { get; set; } = string.Empty;
+        public string WorkName { get; set; } = string.Empty;
         [DisplayName("Количество")]
         public int Count { get; set; }
         [DisplayName("Сумма")]

PlumbingRepair/PlumbingRepairContracts/ViewModels/WorkViewModel.cs

@@ -8,14 +8,14 @@ using System.Threading.Tasks;
 
 namespace PlumbingRepairContracts.ViewModels
 {
-    public class ProductViewModel : IProductModel
+    public class WorkViewModel : IWorkModel
     {
         public int Id { get; set; }
         [DisplayName("Название изделия")]
-        public string ProductName { get; set; } = string.Empty;
+        public string WorkName { get; set; } = string.Empty;
         [DisplayName("Цена")]
         public double Price { get; set; }
-        public Dictionary<int, (IComponentModel, int)> ProductComponents
+        public Dictionary<int, (IComponentModel, int)> WorkComponents
             { get; set; } = new();
     }
 }

PlumbingRepair/PlumbingRepairDataModels/Enums/IOrderModel.cs

@@ -8,7 +8,7 @@ namespace PlumbingRepairDataModels.Enums
 {
     public interface IOrderModel : IId
     {
-        int ProductId { get; }
+        int WorkId { get; }
         int Count { get; }
         double Sum { get; }
         OrderStatus Status { get; }

PlumbingRepair/PlumbingRepairDataModels/Models/IOrderModel.cs

@@ -0,0 +1,20 @@
+using PlumbingRepairDataModels.Enums;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PlumbingRepairDataModels.Models
+{
+    public interface IOrderModel : IId
+    {
+        int WorkId { get; }
+        int Count { get; }
+        double Sum { get; }
+        OrderStatus Status { get; }
+        DateTime DateCreate { get; }
+        DateTime? DateImplement { get; }
+
+    }
+}

PlumbingRepair/PlumbingRepairDataModels/Models/IWorkModel.cs

@@ -6,11 +6,11 @@ using System.Threading.Tasks;
 
 namespace PlumbingRepairDataModels.Models
 {
-    public interface IProductModel
+    public interface IWorkModel : IId
     {
-        string ProductName { get; }
+        string WorkName { get; }
         double Price { get; }
-        Dictionary<int, (IComponentModel, int)> ProductComponents { get; }
+        Dictionary<int, (IComponentModel, int)> WorkComponents { get; }
 
     }
 }