From 396f786b4f720e0a7128e5b806c796ed417f32fa Mon Sep 17 00:00:00 2001 From: Zyzf Date: Wed, 5 Apr 2023 00:13:58 +0400 Subject: [PATCH 1/2] models + contracts + init db implement + init business logic --- .../FurnitureAssembly_Worker.sln | 25 ++++++++++++ .../FurnitureAssembly_Worker/Class1.cs | 7 ++++ .../FurnitureAssembly_Worker.csproj | 9 +++++ .../BindingModels/FurnitureBindingModel.cs | 19 +++++++++ .../FurnitureModuleBindingModel.cs | 21 ++++++++++ .../BindingModels/MaterialBindingModel.cs | 18 +++++++++ .../BindingModels/OrderBindingModel.cs | 22 ++++++++++ .../BindingModels/ReportBindingModel.cs | 15 +++++++ .../BindingModels/RoleBindingModel.cs | 15 +++++++ .../BindingModels/ScopeBindingModel.cs | 16 ++++++++ .../BindingModels/SetBindingModel.cs | 21 ++++++++++ .../BindingModels/UserBindingModel.cs | 18 +++++++++ .../IFurnitureModuleLogic.cs | 20 ++++++++++ .../BusinessLogicContracts/IOrderLogic.cs | 20 ++++++++++ .../BusinessLogicContracts/IReportLogic.cs | 40 +++++++++++++++++++ .../BusinessLogicContracts/ISetLogic.cs | 20 ++++++++++ .../BusinessLogicContracts/IUserLogic.cs | 20 ++++++++++ .../FurnitureAssembly_WorkerContracts.csproj | 9 +++++ .../FurnitureModuleSearchModel.cs | 14 +++++++ .../SearchModels/FurnitureSearchModel.cs | 14 +++++++ .../SearchModels/MaterialSearchModel.cs | 14 +++++++ .../SearchModels/OrderSearchModel.cs | 15 +++++++ .../SearchModels/RoleSearchModel.cs | 14 +++++++ .../SearchModels/ScopeSearchModel.cs | 14 +++++++ .../SearchModels/SetSearchModel.cs | 14 +++++++ .../SearchModels/UserSearchModel.cs | 15 +++++++ .../IFurnitureModuleStorage.cs | 21 ++++++++++ .../StorageContracts/IFurnitureStorage.cs | 12 ++++++ .../StorageContracts/IMaterialStorage.cs | 21 ++++++++++ .../StorageContracts/IOrderStorage.cs | 21 ++++++++++ .../StorageContracts/IRoleStorage.cs | 21 ++++++++++ .../StorageContracts/IScopeStorage.cs | 21 ++++++++++ .../StorageContracts/ISetStorage.cs | 21 ++++++++++ .../StorageContracts/IUserStorage.cs | 21 ++++++++++ .../ViewModels/FurnitureModuleViewModel.cs | 24 +++++++++++ .../ViewModels/FurnitureViewModel.cs | 24 +++++++++++ .../ViewModels/MaterialViewModel.cs | 17 ++++++++ .../ViewModels/OrderViewModel.cs | 26 ++++++++++++ .../ViewModels/ReportOrdersViewModel.cs | 17 ++++++++ .../ViewModels/ReportSetMaterialViewModel.cs | 15 +++++++ .../ViewModels/RoleViewModel.cs | 15 +++++++ .../ViewModels/ScopeViewModel.cs | 15 +++++++ .../ViewModels/SetViewModel.cs | 24 +++++++++++ .../ViewModels/UserViewModel.cs | 24 +++++++++++ .../Enums/PaymentType.cs | 16 ++++++++ .../FurnitureAssembly_WorkerDataModels.csproj | 9 +++++ .../FurnitureAssembly_WorkerDataModels/IId.cs | 13 ++++++ .../Models/IFurnitureModel.cs | 17 ++++++++ .../Models/IFurnitureModuleModel.cs | 17 ++++++++ .../Models/IMaterialModel.cs | 16 ++++++++ .../Models/IOrderModel.cs | 18 +++++++++ .../Models/IRoleModel.cs | 13 ++++++ .../Models/IScopeModel.cs | 13 ++++++ .../Models/ISetModel.cs | 17 ++++++++ .../Models/IUserModel.cs | 17 ++++++++ .../FurnitureAssemblyDatabase.cs | 21 ++++++++++ ...ureAssembly_WorkerDatabaseImplement.csproj | 9 +++++ .../Models/Role.cs | 15 +++++++ 58 files changed, 1020 insertions(+) create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_Worker.sln create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_Worker/Class1.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_Worker/FurnitureAssembly_Worker.csproj create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BindingModels/FurnitureBindingModel.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BindingModels/FurnitureModuleBindingModel.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BindingModels/MaterialBindingModel.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BindingModels/OrderBindingModel.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BindingModels/ReportBindingModel.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BindingModels/RoleBindingModel.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BindingModels/ScopeBindingModel.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BindingModels/SetBindingModel.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BindingModels/UserBindingModel.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BusinessLogicContracts/IFurnitureModuleLogic.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BusinessLogicContracts/IOrderLogic.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BusinessLogicContracts/IReportLogic.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BusinessLogicContracts/ISetLogic.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BusinessLogicContracts/IUserLogic.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/FurnitureAssembly_WorkerContracts.csproj create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/SearchModels/FurnitureModuleSearchModel.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/SearchModels/FurnitureSearchModel.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/SearchModels/MaterialSearchModel.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/SearchModels/OrderSearchModel.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/SearchModels/RoleSearchModel.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/SearchModels/ScopeSearchModel.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/SearchModels/SetSearchModel.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/SearchModels/UserSearchModel.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/StorageContracts/IFurnitureModuleStorage.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/StorageContracts/IFurnitureStorage.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/StorageContracts/IMaterialStorage.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/StorageContracts/IOrderStorage.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/StorageContracts/IRoleStorage.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/StorageContracts/IScopeStorage.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/StorageContracts/ISetStorage.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/StorageContracts/IUserStorage.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/FurnitureModuleViewModel.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/FurnitureViewModel.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/MaterialViewModel.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/OrderViewModel.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/ReportOrdersViewModel.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/ReportSetMaterialViewModel.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/RoleViewModel.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/ScopeViewModel.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/SetViewModel.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/UserViewModel.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/Enums/PaymentType.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/FurnitureAssembly_WorkerDataModels.csproj create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/IId.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/Models/IFurnitureModel.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/Models/IFurnitureModuleModel.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/Models/IMaterialModel.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/Models/IOrderModel.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/Models/IRoleModel.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/Models/IScopeModel.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/Models/ISetModel.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/Models/IUserModel.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerDatabaseImplement/FurnitureAssemblyDatabase.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerDatabaseImplement/FurnitureAssembly_WorkerDatabaseImplement.csproj create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerDatabaseImplement/Models/Role.cs diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_Worker.sln b/FurnitureAssembly_Worker/FurnitureAssembly_Worker.sln new file mode 100644 index 0000000..3d81c6b --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_Worker.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.5.33516.290 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FurnitureAssembly_Worker", "FurnitureAssembly_Worker\FurnitureAssembly_Worker.csproj", "{71143C15-D5B7-4E84-8E41-4C6476363EDE}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {71143C15-D5B7-4E84-8E41-4C6476363EDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {71143C15-D5B7-4E84-8E41-4C6476363EDE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {71143C15-D5B7-4E84-8E41-4C6476363EDE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {71143C15-D5B7-4E84-8E41-4C6476363EDE}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {F82F42E4-4E97-4C91-A78D-D9213CECC6B6} + EndGlobalSection +EndGlobal diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_Worker/Class1.cs b/FurnitureAssembly_Worker/FurnitureAssembly_Worker/Class1.cs new file mode 100644 index 0000000..1b8c31f --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_Worker/Class1.cs @@ -0,0 +1,7 @@ +namespace FurnitureAssembly_Worker +{ + public class Class1 + { + + } +} \ No newline at end of file diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_Worker/FurnitureAssembly_Worker.csproj b/FurnitureAssembly_Worker/FurnitureAssembly_Worker/FurnitureAssembly_Worker.csproj new file mode 100644 index 0000000..132c02c --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_Worker/FurnitureAssembly_Worker.csproj @@ -0,0 +1,9 @@ + + + + net6.0 + enable + enable + + + diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BindingModels/FurnitureBindingModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BindingModels/FurnitureBindingModel.cs new file mode 100644 index 0000000..7c4bb1a --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BindingModels/FurnitureBindingModel.cs @@ -0,0 +1,19 @@ +using FurnitureAssembly_WorkerDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerContracts.BindingModels +{ + public class FurnitureBindingModel : IFurnitureModel + { + public string Name { get; set; } = string.Empty; + public double Cost { get; set; } + public DateTime DateCreate { get; set; } = DateTime.Now; + public Dictionary FurnitureMaterials { get; set; } = new(); + public IUserModel User { get; set; } = new UserBindingModel(); + public int Id { get; set; } + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BindingModels/FurnitureModuleBindingModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BindingModels/FurnitureModuleBindingModel.cs new file mode 100644 index 0000000..9e99ca5 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BindingModels/FurnitureModuleBindingModel.cs @@ -0,0 +1,21 @@ +using FurnitureAssembly_WorkerContracts.ViewModels; +using FurnitureAssembly_WorkerDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerContracts.BindingModels +{ + public class FurnitureModuleBindingModel : IFurnitureModuleModel + { + public int Id { get; set; } + public string Name { get; set; } = string.Empty; + public double Cost { get; set; } + public DateTime DateCreate { get; set; } + public IUserModel User { get; set; } = new UserViewModel(); + public Dictionary FurnitureFurnitureModules { get; set; } = new(); + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BindingModels/MaterialBindingModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BindingModels/MaterialBindingModel.cs new file mode 100644 index 0000000..ae1d37c --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BindingModels/MaterialBindingModel.cs @@ -0,0 +1,18 @@ +using FurnitureAssembly_WorkerDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using static System.Formats.Asn1.AsnWriter; + +namespace FurnitureAssembly_WorkerContracts.BindingModels +{ + public class MaterialBindingModel : IMaterialModel + { + public string Name { get; set; } = string.Empty; + public double Cost { get; set; } + public IScopeModel scope { get; set; } = new ScopeBindingModel(); + public int Id { get; set; } + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BindingModels/OrderBindingModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BindingModels/OrderBindingModel.cs new file mode 100644 index 0000000..50f5fea --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BindingModels/OrderBindingModel.cs @@ -0,0 +1,22 @@ +using FurnitureAssembly_WorkerContracts.ViewModels; +using FurnitureAssembly_WorkerDataModels.Enums; +using FurnitureAssembly_WorkerDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerContracts.BindingModels +{ + public class OrderBindingModel : IOrderModel + { + public int Id { get; set; } + public string CustomerName { get; set; } = string.Empty; + public PaymentType PaymentType { get; set; } = PaymentType.Неизвестен; + public Dictionary OrderSets { get; set; } = new(); + public DateTime DateCreate { get; set; } + public IUserModel User { get; set; } = new UserViewModel(); + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BindingModels/ReportBindingModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BindingModels/ReportBindingModel.cs new file mode 100644 index 0000000..a068632 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BindingModels/ReportBindingModel.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerContracts.BindingModels +{ + public class ReportBindingModel + { + public string FileName { get; set; } = string.Empty; + public DateTime? DateFrom { get; set; } + public DateTime? DateTo { get; set; } + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BindingModels/RoleBindingModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BindingModels/RoleBindingModel.cs new file mode 100644 index 0000000..1d71e9d --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BindingModels/RoleBindingModel.cs @@ -0,0 +1,15 @@ +using FurnitureAssembly_WorkerDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerContracts.BindingModels +{ + public class RoleBindingModel : IRoleModel + { + public int Id { get; set; } + public string Name { get; set; } = string.Empty; + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BindingModels/ScopeBindingModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BindingModels/ScopeBindingModel.cs new file mode 100644 index 0000000..7232e75 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BindingModels/ScopeBindingModel.cs @@ -0,0 +1,16 @@ +using FurnitureAssembly_WorkerDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using static System.Formats.Asn1.AsnWriter; + +namespace FurnitureAssembly_WorkerContracts.BindingModels +{ + public class ScopeBindingModel : IScopeModel + { + public int Id { get; set; } + public string Name { get; set; } = string.Empty; + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BindingModels/SetBindingModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BindingModels/SetBindingModel.cs new file mode 100644 index 0000000..1af316c --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BindingModels/SetBindingModel.cs @@ -0,0 +1,21 @@ +using FurnitureAssembly_WorkerContracts.ViewModels; +using FurnitureAssembly_WorkerDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerContracts.BindingModels +{ + public class SetBindingModel : ISetModel + { + public int Id { get; set; } + public string Name { get; set; } = string.Empty; + public double Cost { get; set; } + public DateTime DateCreate { get; set; } + public IUserModel User { get; set; } = new UserViewModel(); + public Dictionary SetFurnitureModules { get; set; } = new(); + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BindingModels/UserBindingModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BindingModels/UserBindingModel.cs new file mode 100644 index 0000000..3c55843 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BindingModels/UserBindingModel.cs @@ -0,0 +1,18 @@ +using FurnitureAssembly_WorkerDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerContracts.BindingModels +{ + public class UserBindingModel : IUserModel + { + public int Id { get; set; } + public string Login { get; set; } = string.Empty; + public string Password { get; set; } = string.Empty; + public string Name { get; set; } = string.Empty; + public IRoleModel Role { get; set; } = new RoleBindingModel(); + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BusinessLogicContracts/IFurnitureModuleLogic.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BusinessLogicContracts/IFurnitureModuleLogic.cs new file mode 100644 index 0000000..a283f6e --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BusinessLogicContracts/IFurnitureModuleLogic.cs @@ -0,0 +1,20 @@ +using FurnitureAssembly_WorkerContracts.BindingModels; +using FurnitureAssembly_WorkerContracts.SearchModels; +using FurnitureAssembly_WorkerContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerContracts.BusinessLogicContracts +{ + public interface IFurnitureModuleLogic + { + List? ReadList(FurnitureModuleSearchModel? model); + FurnitureModuleViewModel? ReadElement(FurnitureModuleSearchModel model); + bool Create(FurnitureModuleBindingModel model); + bool Update(FurnitureModuleBindingModel model); + bool Delete(FurnitureModuleBindingModel model); + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BusinessLogicContracts/IOrderLogic.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BusinessLogicContracts/IOrderLogic.cs new file mode 100644 index 0000000..752cb22 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BusinessLogicContracts/IOrderLogic.cs @@ -0,0 +1,20 @@ +using FurnitureAssembly_WorkerContracts.BindingModels; +using FurnitureAssembly_WorkerContracts.SearchModels; +using FurnitureAssembly_WorkerContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerContracts.BusinessLogicContracts +{ + public interface IOrderLogic + { + List? ReadList(OrderSearchModel? model); + OrderViewModel? ReadElement(OrderSearchModel model); + bool Create(OrderBindingModel model); + bool Update(OrderBindingModel model); + bool Delete(OrderBindingModel model); + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BusinessLogicContracts/IReportLogic.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BusinessLogicContracts/IReportLogic.cs new file mode 100644 index 0000000..dc9e020 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BusinessLogicContracts/IReportLogic.cs @@ -0,0 +1,40 @@ +using FurnitureAssembly_WorkerContracts.BindingModels; +using FurnitureAssembly_WorkerContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerContracts.BusinessLogicContracts +{ + public interface IReportLogic + { + /// + /// Получение списка материалов с указанием, в каких мебельных модулей используются + /// + /// + List GetSetMaterial(); + /// + /// Получение списка заказов за определенный период + /// + /// + /// + List GetOrders(ReportBindingModel model); + /// + /// Сохранение материалов в файл-Word + /// + /// + void SaveMaterialToWordFile(ReportBindingModel model); + /// + /// Сохранение материалов с указаеним мебельных модулей в файл-Excel + /// + /// + void SaveSetMaterialToExcelFile(ReportBindingModel model); + /// + /// Сохранение заказов в файл-Pdf + /// + /// + void SaveOrdersToPdfFile(ReportBindingModel model); + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BusinessLogicContracts/ISetLogic.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BusinessLogicContracts/ISetLogic.cs new file mode 100644 index 0000000..1783a73 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BusinessLogicContracts/ISetLogic.cs @@ -0,0 +1,20 @@ +using FurnitureAssembly_WorkerContracts.BindingModels; +using FurnitureAssembly_WorkerContracts.SearchModels; +using FurnitureAssembly_WorkerContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerContracts.BusinessLogicContracts +{ + public interface ISetLogic + { + List? ReadList(SetSearchModel? model); + SetViewModel? ReadElement(SetSearchModel model); + bool Create(SetBindingModel model); + bool Update(SetBindingModel model); + bool Delete(SetBindingModel model); + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BusinessLogicContracts/IUserLogic.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BusinessLogicContracts/IUserLogic.cs new file mode 100644 index 0000000..2262173 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BusinessLogicContracts/IUserLogic.cs @@ -0,0 +1,20 @@ +using FurnitureAssembly_WorkerContracts.BindingModels; +using FurnitureAssembly_WorkerContracts.SearchModels; +using FurnitureAssembly_WorkerContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerContracts.BusinessLogicContracts +{ + public interface IUserLogic + { + List? ReadList(UserSearchModel? model); + UserViewModel? ReadElement(UserSearchModel model); + bool Create(UserBindingModel model); + bool Update(UserBindingModel model); + bool Delete(UserBindingModel model); + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/FurnitureAssembly_WorkerContracts.csproj b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/FurnitureAssembly_WorkerContracts.csproj new file mode 100644 index 0000000..132c02c --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/FurnitureAssembly_WorkerContracts.csproj @@ -0,0 +1,9 @@ + + + + net6.0 + enable + enable + + + diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/SearchModels/FurnitureModuleSearchModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/SearchModels/FurnitureModuleSearchModel.cs new file mode 100644 index 0000000..e647abf --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/SearchModels/FurnitureModuleSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerContracts.SearchModels +{ + public class FurnitureModuleSearchModel + { + public int? Id { get; set; } + public string? Name { get; set; } + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/SearchModels/FurnitureSearchModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/SearchModels/FurnitureSearchModel.cs new file mode 100644 index 0000000..7eba1d9 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/SearchModels/FurnitureSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerContracts.SearchModels +{ + public class FurnitureSearchModel + { + public int? Id { get; set; } + public string? Name { get; set; } + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/SearchModels/MaterialSearchModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/SearchModels/MaterialSearchModel.cs new file mode 100644 index 0000000..c1431f0 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/SearchModels/MaterialSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerContracts.SearchModels +{ + public class MaterialSearchModel + { + public int? Id { get; set; } + public string? Name { get; set; } + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/SearchModels/OrderSearchModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/SearchModels/OrderSearchModel.cs new file mode 100644 index 0000000..7b1bf55 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/SearchModels/OrderSearchModel.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerContracts.SearchModels +{ + public class OrderSearchModel + { + public int? Id { get; set; } + public DateTime? DateFrom { get; set; } + public DateTime? DateTo { get; set; } + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/SearchModels/RoleSearchModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/SearchModels/RoleSearchModel.cs new file mode 100644 index 0000000..11c90d2 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/SearchModels/RoleSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerContracts.SearchModels +{ + public class RoleSearchModel + { + public int? Id { get; set; } + public string? Name { get; set; } + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/SearchModels/ScopeSearchModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/SearchModels/ScopeSearchModel.cs new file mode 100644 index 0000000..70143c5 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/SearchModels/ScopeSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerContracts.SearchModels +{ + public class ScopeSearchModel + { + public int? Id { get; set; } + public string? Name { get; set; } + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/SearchModels/SetSearchModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/SearchModels/SetSearchModel.cs new file mode 100644 index 0000000..311870b --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/SearchModels/SetSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerContracts.SearchModels +{ + public class SetSearchModel + { + public int? Id { get; set; } + public string? Name { get; set; } + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/SearchModels/UserSearchModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/SearchModels/UserSearchModel.cs new file mode 100644 index 0000000..4221edf --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/SearchModels/UserSearchModel.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerContracts.SearchModels +{ + public class UserSearchModel + { + public int? Id { get; set; } + public string? Login { get; set; } + public string? Password { get; set; } + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/StorageContracts/IFurnitureModuleStorage.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/StorageContracts/IFurnitureModuleStorage.cs new file mode 100644 index 0000000..441cb65 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/StorageContracts/IFurnitureModuleStorage.cs @@ -0,0 +1,21 @@ +using FurnitureAssembly_WorkerContracts.BindingModels; +using FurnitureAssembly_WorkerContracts.SearchModels; +using FurnitureAssembly_WorkerContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerContracts.StorageContracts +{ + public interface IFurnitureModuleStorage + { + List GetFullList(); + List GetFilteredList(FurnitureModuleSearchModel model); + FurnitureModuleViewModel? GetElement(FurnitureModuleSearchModel model); + FurnitureModuleViewModel? Insert(FurnitureModuleBindingModel model); + FurnitureModuleViewModel? Update(FurnitureModuleBindingModel model); + FurnitureModuleViewModel? Delete(FurnitureModuleBindingModel model); + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/StorageContracts/IFurnitureStorage.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/StorageContracts/IFurnitureStorage.cs new file mode 100644 index 0000000..ab779eb --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/StorageContracts/IFurnitureStorage.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerContracts.StorageContracts +{ + internal interface IFurnitureStorage + { + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/StorageContracts/IMaterialStorage.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/StorageContracts/IMaterialStorage.cs new file mode 100644 index 0000000..4228d90 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/StorageContracts/IMaterialStorage.cs @@ -0,0 +1,21 @@ +using FurnitureAssembly_WorkerContracts.BindingModels; +using FurnitureAssembly_WorkerContracts.SearchModels; +using FurnitureAssembly_WorkerContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerContracts.StorageContracts +{ + public interface IMaterialStorage + { + List GetFullList(); + List GetFilteredList(MaterialSearchModel model); + MaterialViewModel? GetElement(MaterialSearchModel model); + MaterialViewModel? Insert(MaterialBindingModel model); + MaterialViewModel? Update(MaterialBindingModel model); + MaterialViewModel? Delete(MaterialBindingModel model); + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/StorageContracts/IOrderStorage.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/StorageContracts/IOrderStorage.cs new file mode 100644 index 0000000..440bfba --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/StorageContracts/IOrderStorage.cs @@ -0,0 +1,21 @@ +using FurnitureAssembly_WorkerContracts.BindingModels; +using FurnitureAssembly_WorkerContracts.SearchModels; +using FurnitureAssembly_WorkerContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerContracts.StorageContracts +{ + public interface IOrderStorage + { + List GetFullList(); + List GetFilteredList(OrderSearchModel model); + OrderViewModel? GetElement(OrderSearchModel model); + OrderViewModel? Insert(OrderBindingModel model); + OrderViewModel? Update(OrderBindingModel model); + OrderViewModel? Delete(OrderBindingModel model); + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/StorageContracts/IRoleStorage.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/StorageContracts/IRoleStorage.cs new file mode 100644 index 0000000..fdb659f --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/StorageContracts/IRoleStorage.cs @@ -0,0 +1,21 @@ +using FurnitureAssembly_WorkerContracts.BindingModels; +using FurnitureAssembly_WorkerContracts.SearchModels; +using FurnitureAssembly_WorkerContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerContracts.StorageContracts +{ + public interface IRoleStorage + { + List GetFullList(); + List GetFilteredList(RoleSearchModel model); + RoleViewModel? GetElement(RoleSearchModel model); + RoleViewModel? Insert(RoleBindingModel model); + RoleViewModel? Update(RoleBindingModel model); + RoleViewModel? Delete(RoleBindingModel model); + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/StorageContracts/IScopeStorage.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/StorageContracts/IScopeStorage.cs new file mode 100644 index 0000000..a988da8 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/StorageContracts/IScopeStorage.cs @@ -0,0 +1,21 @@ +using FurnitureAssembly_WorkerContracts.BindingModels; +using FurnitureAssembly_WorkerContracts.SearchModels; +using FurnitureAssembly_WorkerContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerContracts.StorageContracts +{ + public interface IScopeStorage + { + List GetFullList(); + List GetFilteredList(ScopeSearchModel model); + ScopeViewModel? GetElement(ScopeSearchModel model); + ScopeViewModel? Insert(ScopeBindingModel model); + ScopeViewModel? Update(ScopeBindingModel model); + ScopeViewModel? Delete(ScopeBindingModel model); + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/StorageContracts/ISetStorage.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/StorageContracts/ISetStorage.cs new file mode 100644 index 0000000..f14bb11 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/StorageContracts/ISetStorage.cs @@ -0,0 +1,21 @@ +using FurnitureAssembly_WorkerContracts.BindingModels; +using FurnitureAssembly_WorkerContracts.SearchModels; +using FurnitureAssembly_WorkerContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerContracts.StorageContracts +{ + public interface ISetStorage + { + List GetFullList(); + List GetFilteredList(SetSearchModel model); + SetViewModel? GetElement(SetSearchModel model); + SetViewModel? Insert(SetBindingModel model); + SetViewModel? Update(SetBindingModel model); + SetViewModel? Delete(SetBindingModel model); + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/StorageContracts/IUserStorage.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/StorageContracts/IUserStorage.cs new file mode 100644 index 0000000..7c487e0 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/StorageContracts/IUserStorage.cs @@ -0,0 +1,21 @@ +using FurnitureAssembly_WorkerContracts.BindingModels; +using FurnitureAssembly_WorkerContracts.SearchModels; +using FurnitureAssembly_WorkerContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerContracts.StorageContracts +{ + public interface IUserStorage + { + List GetFullList(); + List GetFilteredList(UserSearchModel model); + UserViewModel? GetElement(UserSearchModel model); + UserViewModel? Insert(UserBindingModel model); + UserViewModel? Update(UserBindingModel model); + UserViewModel? Delete(UserBindingModel model); + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/FurnitureModuleViewModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/FurnitureModuleViewModel.cs new file mode 100644 index 0000000..16e65c4 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/FurnitureModuleViewModel.cs @@ -0,0 +1,24 @@ +using FurnitureAssembly_WorkerDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.ComponentModel; + +namespace FurnitureAssembly_WorkerContracts.ViewModels +{ + public class FurnitureModuleViewModel : IFurnitureModuleModel + { + public int Id { get; set; } + [DisplayName("Название модуля")] + public string Name { get; set; } = string.Empty; + [DisplayName("Цена модуля")] + public double Cost { get; set; } + [DisplayName("Дата создания")] + public DateTime DateCreate { get; set; } + [DisplayName("Изготовитель")] + public IUserModel User { get; set; } = new UserViewModel(); + public Dictionary FurnitureFurnitureModules { get; set; } = new(); + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/FurnitureViewModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/FurnitureViewModel.cs new file mode 100644 index 0000000..d190f70 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/FurnitureViewModel.cs @@ -0,0 +1,24 @@ +using FurnitureAssembly_WorkerDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerContracts.ViewModels +{ + public class FurnitureViewModel : IFurnitureModel + { + public int Id { get; set; } + [DisplayName("Название изделия")] + public string Name { get; set; } = string.Empty; + [DisplayName("Цена изделия")] + public double Cost { get; set; } + [DisplayName("Дата создания")] + public DateTime DateCreate { get; set; } + public Dictionary FurnitureMaterials { get; set; } = new(); + [DisplayName("Менеджер")] + public IUserModel User { get; set; } = new UserViewModel(); + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/MaterialViewModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/MaterialViewModel.cs new file mode 100644 index 0000000..cbc1c8a --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/MaterialViewModel.cs @@ -0,0 +1,17 @@ +using FurnitureAssembly_WorkerDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerContracts.ViewModels +{ + public class MaterialViewModel : IMaterialModel + { + public string Name { get; set; } = string.Empty; + public double Cost { get; set; } + public IScopeModel scope { get; set; } = new ScopeViewModel(); + public int Id { get; set; } + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/OrderViewModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/OrderViewModel.cs new file mode 100644 index 0000000..7273ab3 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/OrderViewModel.cs @@ -0,0 +1,26 @@ +using FurnitureAssembly_WorkerDataModels.Enums; +using FurnitureAssembly_WorkerDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerContracts.ViewModels +{ + public class OrderViewModel : IOrderModel + { + [DisplayName("Номер")] + public int Id { get; set; } + [DisplayName("Имя заказчика")] + public string CustomerName { get; set; } = string.Empty; + [DisplayName("Тип оплаты")] + public PaymentType PaymentType { get; set; } = PaymentType.Неизвестен; + public Dictionary OrderSets { get; set; } = new(); + [DisplayName("Дата создания")] + public DateTime DateCreate { get; set; } + [DisplayName("Менеджер")] + public IUserModel User { get; set; } = new UserViewModel(); + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/ReportOrdersViewModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/ReportOrdersViewModel.cs new file mode 100644 index 0000000..283dfd9 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/ReportOrdersViewModel.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerContracts.ViewModels +{ + public class ReportOrdersViewModel + { + public int Id { get; set; } + public DateTime DateCreate { get; set; } + public string ManufactureName { get; set; } = string.Empty; + public double Sum { get; set; } + public string Status { get; set; } = string.Empty; + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/ReportSetMaterialViewModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/ReportSetMaterialViewModel.cs new file mode 100644 index 0000000..518b94d --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/ReportSetMaterialViewModel.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerContracts.ViewModels +{ + public class ReportSetMaterialViewModel + { + public string SetName { get; set; } = string.Empty; + public int TotalCount { get; set; } + public List<(string Material, int Count)> Materials { get; set; } = new(); + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/RoleViewModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/RoleViewModel.cs new file mode 100644 index 0000000..01ac196 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/RoleViewModel.cs @@ -0,0 +1,15 @@ +using FurnitureAssembly_WorkerDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerContracts.ViewModels +{ + public class RoleViewModel : IRoleModel + { + public int Id { get; set; } + public string Name { get; set; } = string.Empty; + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/ScopeViewModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/ScopeViewModel.cs new file mode 100644 index 0000000..70c0b6e --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/ScopeViewModel.cs @@ -0,0 +1,15 @@ +using FurnitureAssembly_WorkerDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerContracts.ViewModels +{ + public class ScopeViewModel : IScopeModel + { + public int Id { get; set; } + public string Name { get; set; } = string.Empty; + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/SetViewModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/SetViewModel.cs new file mode 100644 index 0000000..d57f31a --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/SetViewModel.cs @@ -0,0 +1,24 @@ +using FurnitureAssembly_WorkerDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerContracts.ViewModels +{ + public class SetViewModel : ISetModel + { + public int Id { get; set; } + [DisplayName("Название гарнитура")] + public string Name { get; set; } = string.Empty; + [DisplayName("Стоимость гарнитура")] + public double Cost { get; set; } + [DisplayName("Дата создания")] + public DateTime DateCreate { get; set; } + [DisplayName("Менеджер")] + public IUserModel User { get; set; } = new UserViewModel(); + public Dictionary SetFurnitureModules { get; set; } = new(); + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/UserViewModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/UserViewModel.cs new file mode 100644 index 0000000..69d3d68 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/UserViewModel.cs @@ -0,0 +1,24 @@ +using FurnitureAssembly_WorkerDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerContracts.ViewModels +{ + public class UserViewModel : IUserModel + { + public int Id { get; set; } + [DisplayName("Пароль")] + public string Password { get; set; } = string.Empty; + [DisplayName("Логин (эл. почта)")] + public string Login { get; set; } = string.Empty; + [DisplayName("ФИО пользователя")] + public string Name { get; set; } = string.Empty; + [DisplayName("Роль пользоватеоя")] + public IRoleModel Role { get; set; } = new RoleViewModel(); + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/Enums/PaymentType.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/Enums/PaymentType.cs new file mode 100644 index 0000000..1ab5819 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/Enums/PaymentType.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerDataModels.Enums +{ + public enum PaymentType + { + Неизвестен = -1, + Наличными = 0, + Картой = 1, + Смешанный = 2 + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/FurnitureAssembly_WorkerDataModels.csproj b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/FurnitureAssembly_WorkerDataModels.csproj new file mode 100644 index 0000000..132c02c --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/FurnitureAssembly_WorkerDataModels.csproj @@ -0,0 +1,9 @@ + + + + net6.0 + enable + enable + + + diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/IId.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/IId.cs new file mode 100644 index 0000000..d2520b9 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/IId.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerDataModels +{ + public interface IId + { + int Id { get; } + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/Models/IFurnitureModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/Models/IFurnitureModel.cs new file mode 100644 index 0000000..e724573 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/Models/IFurnitureModel.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerDataModels.Models +{ + public interface IFurnitureModel : IId + { + string Name { get; } + double Cost { get; } + DateTime DateCreate { get; } + Dictionary FurnitureMaterials { get; } + IUserModel User { get; } + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/Models/IFurnitureModuleModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/Models/IFurnitureModuleModel.cs new file mode 100644 index 0000000..ec473e6 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/Models/IFurnitureModuleModel.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerDataModels.Models +{ + public interface IFurnitureModuleModel : IId + { + string Name { get; } + double Cost { get; } + DateTime DateCreate { get; } + IUserModel User { get; } + Dictionary FurnitureFurnitureModules { get; } + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/Models/IMaterialModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/Models/IMaterialModel.cs new file mode 100644 index 0000000..78adfc7 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/Models/IMaterialModel.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using static System.Formats.Asn1.AsnWriter; + +namespace FurnitureAssembly_WorkerDataModels.Models +{ + public interface IMaterialModel : IId + { + string Name { get; } + double Cost { get; } + IScopeModel scope { get; } + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/Models/IOrderModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/Models/IOrderModel.cs new file mode 100644 index 0000000..62c8adf --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/Models/IOrderModel.cs @@ -0,0 +1,18 @@ +using FurnitureAssembly_WorkerDataModels.Enums; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerDataModels.Models +{ + public interface IOrderModel : IId + { + string CustomerName { get; } + PaymentType PaymentType { get; } + Dictionary OrderSets { get; } + DateTime DateCreate { get; } + IUserModel User { get; } + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/Models/IRoleModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/Models/IRoleModel.cs new file mode 100644 index 0000000..0670727 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/Models/IRoleModel.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerDataModels.Models +{ + public interface IRoleModel : IId + { + string Name { get; } + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/Models/IScopeModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/Models/IScopeModel.cs new file mode 100644 index 0000000..2508bb6 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/Models/IScopeModel.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerDataModels.Models +{ + public interface IScopeModel : IId + { + string Name { get; } + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/Models/ISetModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/Models/ISetModel.cs new file mode 100644 index 0000000..ef58075 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/Models/ISetModel.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerDataModels.Models +{ + public interface ISetModel : IId + { + string Name { get; } + double Cost { get; } + DateTime DateCreate { get; } + IUserModel User { get; } + Dictionary SetFurnitureModules { get; } + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/Models/IUserModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/Models/IUserModel.cs new file mode 100644 index 0000000..699dd82 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/Models/IUserModel.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerDataModels.Models +{ + public interface IUserModel : IId + { + string Login { get; } + string Password { get; } + string Name { get; } + IRoleModel Role { get; } + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDatabaseImplement/FurnitureAssemblyDatabase.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDatabaseImplement/FurnitureAssemblyDatabase.cs new file mode 100644 index 0000000..20d70e7 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDatabaseImplement/FurnitureAssemblyDatabase.cs @@ -0,0 +1,21 @@ +using Microsoft.EntityFrameworkCore; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerDatabaseImplement +{ + internal class FurnitureAssemblyDatabase : DbContext + { + protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) + { + if (optionsBuilder.IsConfigured == false) + { + optionsBuilder.UseNpgsql("Host=zyzf.space;Port=5434;Database=kursach;Username=postgres;Password=kursach"); + } + base.OnConfiguring(optionsBuilder); + } + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDatabaseImplement/FurnitureAssembly_WorkerDatabaseImplement.csproj b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDatabaseImplement/FurnitureAssembly_WorkerDatabaseImplement.csproj new file mode 100644 index 0000000..132c02c --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDatabaseImplement/FurnitureAssembly_WorkerDatabaseImplement.csproj @@ -0,0 +1,9 @@ + + + + net6.0 + enable + enable + + + diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDatabaseImplement/Models/Role.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDatabaseImplement/Models/Role.cs new file mode 100644 index 0000000..76000e6 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDatabaseImplement/Models/Role.cs @@ -0,0 +1,15 @@ +using FurnitureAssembly_WorkerDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerDatabaseImplement.Models +{ + public class Role : IRoleModel + { + public int Id { get; set; } + public string Name => throw new NotImplementedException(); + } +} From c972dbfe34662eba1b8ffe3190effefe3fd858d9 Mon Sep 17 00:00:00 2001 From: Zyzf Date: Wed, 5 Apr 2023 00:15:02 +0400 Subject: [PATCH 2/2] some done --- .../FurnitureAssembly_Worker.sln | 18 ++++++++++++++++++ .../FurnitureAssembly_WorkerContracts.csproj | 4 ++++ .../StorageContracts/IFurnitureStorage.cs | 13 +++++++++++-- ...tureAssembly_WorkerDatabaseImplement.csproj | 14 ++++++++++++++ 4 files changed, 47 insertions(+), 2 deletions(-) diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_Worker.sln b/FurnitureAssembly_Worker/FurnitureAssembly_Worker.sln index 3d81c6b..9f22fba 100644 --- a/FurnitureAssembly_Worker/FurnitureAssembly_Worker.sln +++ b/FurnitureAssembly_Worker/FurnitureAssembly_Worker.sln @@ -5,6 +5,12 @@ VisualStudioVersion = 17.5.33516.290 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FurnitureAssembly_Worker", "FurnitureAssembly_Worker\FurnitureAssembly_Worker.csproj", "{71143C15-D5B7-4E84-8E41-4C6476363EDE}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FurnitureAssembly_WorkerDataModels", "FurnitureAssembly_WorkerDataModels\FurnitureAssembly_WorkerDataModels.csproj", "{2DA5196A-E6D9-496C-A373-FD18176DC908}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FurnitureAssembly_WorkerDatabaseImplement", "FurnitureAssembly_WorkerDatabaseImplement\FurnitureAssembly_WorkerDatabaseImplement.csproj", "{FE719511-094C-4CAB-A308-1AF7EF29ACFA}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FurnitureAssembly_WorkerContracts", "FurnitureAssembly_WorkerContracts\FurnitureAssembly_WorkerContracts.csproj", "{7DA16540-5534-4F8E-8C0E-8444811E4F9C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -15,6 +21,18 @@ Global {71143C15-D5B7-4E84-8E41-4C6476363EDE}.Debug|Any CPU.Build.0 = Debug|Any CPU {71143C15-D5B7-4E84-8E41-4C6476363EDE}.Release|Any CPU.ActiveCfg = Release|Any CPU {71143C15-D5B7-4E84-8E41-4C6476363EDE}.Release|Any CPU.Build.0 = Release|Any CPU + {2DA5196A-E6D9-496C-A373-FD18176DC908}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2DA5196A-E6D9-496C-A373-FD18176DC908}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2DA5196A-E6D9-496C-A373-FD18176DC908}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2DA5196A-E6D9-496C-A373-FD18176DC908}.Release|Any CPU.Build.0 = Release|Any CPU + {FE719511-094C-4CAB-A308-1AF7EF29ACFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FE719511-094C-4CAB-A308-1AF7EF29ACFA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FE719511-094C-4CAB-A308-1AF7EF29ACFA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FE719511-094C-4CAB-A308-1AF7EF29ACFA}.Release|Any CPU.Build.0 = Release|Any CPU + {7DA16540-5534-4F8E-8C0E-8444811E4F9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7DA16540-5534-4F8E-8C0E-8444811E4F9C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7DA16540-5534-4F8E-8C0E-8444811E4F9C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7DA16540-5534-4F8E-8C0E-8444811E4F9C}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/FurnitureAssembly_WorkerContracts.csproj b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/FurnitureAssembly_WorkerContracts.csproj index 132c02c..a69ec19 100644 --- a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/FurnitureAssembly_WorkerContracts.csproj +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/FurnitureAssembly_WorkerContracts.csproj @@ -6,4 +6,8 @@ enable + + + + diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/StorageContracts/IFurnitureStorage.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/StorageContracts/IFurnitureStorage.cs index ab779eb..1682164 100644 --- a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/StorageContracts/IFurnitureStorage.cs +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/StorageContracts/IFurnitureStorage.cs @@ -1,4 +1,7 @@ -using System; +using FurnitureAssembly_WorkerContracts.BindingModels; +using FurnitureAssembly_WorkerContracts.SearchModels; +using FurnitureAssembly_WorkerContracts.ViewModels; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -6,7 +9,13 @@ using System.Threading.Tasks; namespace FurnitureAssembly_WorkerContracts.StorageContracts { - internal interface IFurnitureStorage + public interface IFurnitureStorage { + List GetFullList(); + List GetFilteredList(FurnitureSearchModel model); + FurnitureViewModel? GetElement(FurnitureSearchModel model); + FurnitureViewModel? Insert(FurnitureBindingModel model); + FurnitureViewModel? Update(FurnitureBindingModel model); + FurnitureViewModel? Delete(FurnitureBindingModel model); } } diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDatabaseImplement/FurnitureAssembly_WorkerDatabaseImplement.csproj b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDatabaseImplement/FurnitureAssembly_WorkerDatabaseImplement.csproj index 132c02c..d1c89a0 100644 --- a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDatabaseImplement/FurnitureAssembly_WorkerDatabaseImplement.csproj +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDatabaseImplement/FurnitureAssembly_WorkerDatabaseImplement.csproj @@ -6,4 +6,18 @@ enable + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + +