20 changed files with 6 additions and 312 deletions
--- a/Confectionery/Confectionery.sln
+++ b/Confectionery/Confectionery.sln
@ -3,11 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.5.33424.131
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Confectionery", "Confectionery\Confectionery.csproj", "{3FBA3531-D080-42B2-869B-AF42CCF9C770}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Confectionery", "Confectionery\Confectionery.csproj", "{3FBA3531-D080-42B2-869B-AF42CCF9C770}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConfectioneryDataModels", "ConfectioneryDataModels\ConfectioneryDataModels.csproj", "{B1066AB3-A781-49D8-9629-DAEEB7AEB926}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConfectioneryContracts", "ConfectioneryContracts\ConfectioneryContracts.csproj", "{6FFC8BF0-172F-4A99-AF4E-8FCEC210FF36}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConfectioneryDataModels", "ConfectioneryDataModels\ConfectioneryDataModels.csproj", "{B1066AB3-A781-49D8-9629-DAEEB7AEB926}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -23,10 +21,6 @@ Global
 		{B1066AB3-A781-49D8-9629-DAEEB7AEB926}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B1066AB3-A781-49D8-9629-DAEEB7AEB926}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B1066AB3-A781-49D8-9629-DAEEB7AEB926}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6FFC8BF0-172F-4A99-AF4E-8FCEC210FF36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6FFC8BF0-172F-4A99-AF4E-8FCEC210FF36}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6FFC8BF0-172F-4A99-AF4E-8FCEC210FF36}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6FFC8BF0-172F-4A99-AF4E-8FCEC210FF36}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/Confectionery/ConfectioneryContracts/BindingModels/ComponentBindingModel.cs
+++ b/Confectionery/ConfectioneryContracts/BindingModels/ComponentBindingModel.cs
@ -1,16 +0,0 @@
-using ConfectioneryDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ConfectioneryContracts.BindingModels
-{
-    public class ComponentBindingModel : IComponentModel
-    {
-        public int Id { get; set; }
-        public string ComponentName { get; set; } = string.Empty;
-        public double Cost { get; set; }
-    }
-}
--- a/Confectionery/ConfectioneryContracts/BindingModels/OrderBindingModel.cs
+++ b/Confectionery/ConfectioneryContracts/BindingModels/OrderBindingModel.cs
@ -1,21 +0,0 @@
-using ConfectioneryDataModels.Enums;
-using ConfectioneryDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ConfectioneryContracts.BindingModels
-{
-    public class OrderBindingModel : IOrderModel
-    {
-        public int Id { get; set; }
-        public int PastryId { get; set; }
-        public int Count { get; set; }
-        public double Sum { get; set; }
-        public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
-        public DateTime DateCreate { get; set; } = DateTime.Now;
-        public DateTime? DateImplement { get; set; }
-    }
-}
--- a/Confectionery/ConfectioneryContracts/BindingModels/PastryBindingModel.cs
+++ b/Confectionery/ConfectioneryContracts/BindingModels/PastryBindingModel.cs
@ -1,17 +0,0 @@
-using ConfectioneryDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ConfectioneryContracts.BindingModels
-{
-    public class PastryBindingModel : IPastryModel
-    {
-        public int Id { get; set; }
-        public string PastryName { get; set; } = string.Empty;
-        public double Price { get; set; }
-        public Dictionary<int, (IComponentModel, int)> PastryComponents { get; set; } = new();
-    }
-}
--- a/Confectionery/ConfectioneryContracts/BusinessLogicsContracts/IComponentLogic.cs
+++ b/Confectionery/ConfectioneryContracts/BusinessLogicsContracts/IComponentLogic.cs
@ -1,20 +0,0 @@
-using ConfectioneryContracts.BindingModels;
-using ConfectioneryContracts.SearchModels;
-using ConfectioneryContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ConfectioneryContracts.BusinessLogicsContracts
-{
-    public interface IComponentLogic
-    {
-        List<ComponentViewModel>? ReadList(ComponentSearchModel? model);
-        ComponentViewModel? ReadElement(ComponentSearchModel model);
-        bool Create(ComponentBindingModel model);
-        bool Update(ComponentBindingModel model);
-        bool Delete(ComponentBindingModel model);
-    }
-}
--- a/Confectionery/ConfectioneryContracts/BusinessLogicsContracts/IOrderLogic.cs
+++ b/Confectionery/ConfectioneryContracts/BusinessLogicsContracts/IOrderLogic.cs
@ -1,20 +0,0 @@
-using ConfectioneryContracts.BindingModels;
-using ConfectioneryContracts.SearchModels;
-using ConfectioneryContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ConfectioneryContracts.BusinessLogicsContracts
-{
-    public interface IOrderLogic
-    {
-        List<OrderViewModel>? ReadList(OrderSearchModel? model);
-        bool CreateOrder(OrderBindingModel model);
-        bool TakeOrderInWork(OrderBindingModel model);
-        bool FinishOrder(OrderBindingModel model);
-        bool DeliveryOrder(OrderBindingModel model);
-    }
-}
--- a/Confectionery/ConfectioneryContracts/BusinessLogicsContracts/IPastryLogic.cs
+++ b/Confectionery/ConfectioneryContracts/BusinessLogicsContracts/IPastryLogic.cs
@ -1,20 +0,0 @@
-using ConfectioneryContracts.BindingModels;
-using ConfectioneryContracts.SearchModels;
-using ConfectioneryContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ConfectioneryContracts.BusinessLogicsContracts
-{
-    public interface IPastryLogic
-    {
-        List<PastryViewModel>? ReadList(PastrySearchModel? model);
-        PastryViewModel? ReadElement(PastrySearchModel model);
-        bool Create(PastryBindingModel model);
-        bool Update(PastryBindingModel model);
-        bool Delete(PastryBindingModel model);
-    }
-}
--- a/Confectionery/ConfectioneryContracts/ConfectioneryContracts.csproj
+++ b/Confectionery/ConfectioneryContracts/ConfectioneryContracts.csproj
@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\ConfectioneryDataModels\ConfectioneryDataModels.csproj" />
-  </ItemGroup>
-
-</Project>
--- a/Confectionery/ConfectioneryContracts/SearchModels/ComponentSearchModel.cs
+++ b/Confectionery/ConfectioneryContracts/SearchModels/ComponentSearchModel.cs
@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ConfectioneryContracts.SearchModels
-{
-    public class ComponentSearchModel
-    {
-        public int? Id { get; set; }
-        public string? ComponentName { get; set; }
-    }
-}
--- a/Confectionery/ConfectioneryContracts/SearchModels/OrderSearchModel.cs
+++ b/Confectionery/ConfectioneryContracts/SearchModels/OrderSearchModel.cs
@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ConfectioneryContracts.SearchModels
-{
-    public class OrderSearchModel
-    {
-        public int? Id { get; set; }
-    }
-}
--- a/Confectionery/ConfectioneryContracts/SearchModels/PastrySearchModel.cs
+++ b/Confectionery/ConfectioneryContracts/SearchModels/PastrySearchModel.cs
@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ConfectioneryContracts.SearchModels
-{
-    public class PastrySearchModel
-    {
-        public int? Id { get; set; }
-        public string? PastryName { get; set; }
-    }
-}
--- a/Confectionery/ConfectioneryContracts/StoragesContracts/IComponentStorage.cs
+++ b/Confectionery/ConfectioneryContracts/StoragesContracts/IComponentStorage.cs
@ -1,21 +0,0 @@
-using ConfectioneryContracts.BindingModels;
-using ConfectioneryContracts.SearchModels;
-using ConfectioneryContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ConfectioneryContracts.StoragesContracts
-{
-    public interface IComponentStorage
-    {
-        List<ComponentViewModel> GetFullList();
-        List<ComponentViewModel> GetFilteredList(ComponentSearchModel model);
-        ComponentViewModel? GetElement(ComponentSearchModel model);
-        ComponentViewModel? Insert(ComponentBindingModel model);
-        ComponentViewModel? Update(ComponentBindingModel model);
-        ComponentViewModel? Delete(ComponentBindingModel model);
-    }
-}
--- a/Confectionery/ConfectioneryContracts/StoragesContracts/IOrderStorage.cs
+++ b/Confectionery/ConfectioneryContracts/StoragesContracts/IOrderStorage.cs
@ -1,21 +0,0 @@
-using ConfectioneryContracts.BindingModels;
-using ConfectioneryContracts.SearchModels;
-using ConfectioneryContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ConfectioneryContracts.StoragesContracts
-{
-    public interface IOrderStorage
-    {
-        List<OrderViewModel> GetFullList();
-        List<OrderViewModel> GetFilteredList(OrderSearchModel model);
-        OrderViewModel? GetElement(OrderSearchModel model);
-        OrderViewModel? Insert(OrderBindingModel model);
-        OrderViewModel? Update(OrderBindingModel model);
-        OrderViewModel? Delete(OrderBindingModel model);
-    }
-}
--- a/Confectionery/ConfectioneryContracts/StoragesContracts/IPastryStorage.cs
+++ b/Confectionery/ConfectioneryContracts/StoragesContracts/IPastryStorage.cs
@ -1,21 +0,0 @@
-using ConfectioneryContracts.BindingModels;
-using ConfectioneryContracts.SearchModels;
-using ConfectioneryContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ConfectioneryContracts.StoragesContracts
-{
-    internal interface IPastryStorage
-    {
-        List<PastryViewModel> GetFullList();
-        List<PastryViewModel> GetFilteredList(PastrySearchModel model);
-        PastryViewModel? GetElement(PastrySearchModel model);
-        PastryViewModel? Insert(PastryBindingModel model);
-        PastryViewModel? Update(PastryBindingModel model);
-        PastryViewModel? Delete(PastryBindingModel model);
-    }
-}
--- a/Confectionery/ConfectioneryContracts/ViewModels/ComponentViewModel.cs
+++ b/Confectionery/ConfectioneryContracts/ViewModels/ComponentViewModel.cs
@ -1,19 +0,0 @@
-using ConfectioneryDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ConfectioneryContracts.ViewModels
-{
-    public class ComponentViewModel : IComponentModel
-    {
-        public int Id { get; set; }
-        [DisplayName("Название компонента")]
-        public string ComponentName { get; set; } = string.Empty;
-        [DisplayName("Цена")]
-        public double Cost { get; set; }
-    }
-}
--- a/Confectionery/ConfectioneryContracts/ViewModels/OrderViewModel.cs
+++ b/Confectionery/ConfectioneryContracts/ViewModels/OrderViewModel.cs
@ -1,30 +0,0 @@
-using ConfectioneryDataModels.Enums;
-using ConfectioneryDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ConfectioneryContracts.ViewModels
-{
-    public class OrderViewModel : IOrderModel
-    {
-        [DisplayName("Номер")]
-        public int Id { get; set; }
-        public int PastryId { get; set; }
-        [DisplayName("Изделие")]
-        public string PastryName { get; set; } = string.Empty;
-        [DisplayName("Количество")]
-        public int Count { get; set; }
-        [DisplayName("Сумма")]
-        public double Sum { get; set; }
-        [DisplayName("Статус")]
-        public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
-        [DisplayName("Дата создания")]
-        public DateTime DateCreate { get; set; } = DateTime.Now;
-        [DisplayName("Дата выполнения")]
-        public DateTime? DateImplement { get; set; }
-    }
-}
--- a/Confectionery/ConfectioneryContracts/ViewModels/PastryViewModel.cs
+++ b/Confectionery/ConfectioneryContracts/ViewModels/PastryViewModel.cs
@ -1,20 +0,0 @@
-using ConfectioneryDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ConfectioneryContracts.ViewModels
-{
-    public class PastryViewModel : IPastryModel
-    {
-        public int Id { get; set; }
-        [DisplayName("Название изделия")]
-        public string PastryName { get; set; } = string.Empty;
-        [DisplayName("Цена")]
-        public double Price { get; set; }
-        public Dictionary<int, (IComponentModel, int)> PastryComponents { get; set; } = new();
-    }
-}
--- a/Confectionery/ConfectioneryDataModels/Class1.cs
+++ b/Confectionery/ConfectioneryDataModels/Class1.cs
@ -1,4 +1,4 @@
-namespace ConfectioneryContracts
+namespace ConfectioneryDataModels
 {
    public class Class1
    {
--- a/Confectionery/ConfectioneryDataModels/IOrderModel.cs
+++ b/Confectionery/ConfectioneryDataModels/IOrderModel.cs
@ -9,7 +9,7 @@ namespace ConfectioneryDataModels.Models
 {
    public interface IOrderModel : IId
    {
-        int PastryId { get; }
+        int ProductId { get; }
        int Count { get; }
        double Sum { get; }
        OrderStatus Status { get; }
--- a/Confectionery/ConfectioneryDataModels/IPastryModel.cs
+++ b/Confectionery/ConfectioneryDataModels/IPastryModel.cs
@ -6,10 +6,10 @@ using System.Threading.Tasks;

 namespace ConfectioneryDataModels.Models
 {
-    public interface IPastryModel : IId
+    internal interface IPastryModel : IId
    {
        string PastryName { get; }
        double Price { get; }
-        Dictionary<int, (IComponentModel, int)> PastryComponents { get; }
+        Dictionary<int, (IComponentModel, int)> ProductComponents { get; }
    }
 }