diff --git a/Bank/BankContracts/BindingModels/CostBindingModel.cs b/Bank/BankContracts/BindingModels/CostBindingModel.cs index 524533d..eb83225 100644 --- a/Bank/BankContracts/BindingModels/CostBindingModel.cs +++ b/Bank/BankContracts/BindingModels/CostBindingModel.cs @@ -3,10 +3,20 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using BankDataModels.ProxyModels; +using BankDataModels; namespace BankContracts.BindingModels { - internal class CostBindingModel + public class CostBindingModel : ICostModel { + public int EmployeeId { get; set; } + + public string NameOfCost { get; set; } = string.Empty; + + public double Price { get; set; } + public Dictionary PurchasesModels { get; set; } = new(); + + public int Id { get; set; } } } diff --git a/Bank/BankContracts/BindingModels/EmployeeBindingModel.cs b/Bank/BankContracts/BindingModels/EmployeeBindingModel.cs index 82bd3e6..2ddde34 100644 --- a/Bank/BankContracts/BindingModels/EmployeeBindingModel.cs +++ b/Bank/BankContracts/BindingModels/EmployeeBindingModel.cs @@ -3,10 +3,27 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using BankDataModels; namespace BankContracts.BindingModels { - internal class EmployeeBindingModel + public class EmployeeBindingModel : IEmployeeModel { + public string Post { get; set; } = string.Empty; + + public string FirstName { get; set; } = string.Empty; + + public string LastName { get; set; } = string.Empty; + + public string? MiddleName { get; set; } + + public string PhoneNumber { get; set; } = string.Empty; + + public string Password { get; set; } = string.Empty; + + public int Id { get; set; } + + public string Email { get; set; } = string.Empty; } } + diff --git a/Bank/BankContracts/BindingModels/OperationBindingModel.cs b/Bank/BankContracts/BindingModels/OperationBindingModel.cs index 9675c4a..89700ad 100644 --- a/Bank/BankContracts/BindingModels/OperationBindingModel.cs +++ b/Bank/BankContracts/BindingModels/OperationBindingModel.cs @@ -3,10 +3,20 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using BankDataModels; namespace BankContracts.BindingModels { - internal class OperationBindingModel + public class OperationBindingModel : IOperationModel { + public string Model { get; set; } = string.Empty; + + public string Mark { get; set; } = string.Empty; + + public double Price { get; set; } + + public int Id { get; set; } + + public int EmployeeId { get; set; } } } diff --git a/Bank/BankContracts/BusinessLogicContracts/IEmployeeLogic.cs b/Bank/BankContracts/BusinessLogicContracts/IEmployeeLogic.cs index 85a25d2..15b18ec 100644 --- a/Bank/BankContracts/BusinessLogicContracts/IEmployeeLogic.cs +++ b/Bank/BankContracts/BusinessLogicContracts/IEmployeeLogic.cs @@ -3,10 +3,15 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using BankContracts.BindingModels; +using BankContracts.SearchModels; +using BankContracts.ViewModels; namespace BankContracts.BusinessLogicContracts { - internal class IEmployeeLogic + public interface IEmployeeLogic { + EmployeeViewModel ReadElement(EmployeeSearchModel model); + bool Create(EmployeeBindingModel model); } } diff --git a/Bank/BankContracts/SearchModels/CostSearchModel.cs b/Bank/BankContracts/SearchModels/CostSearchModel.cs index e8bff6f..81b6e65 100644 --- a/Bank/BankContracts/SearchModels/CostSearchModel.cs +++ b/Bank/BankContracts/SearchModels/CostSearchModel.cs @@ -3,10 +3,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; - namespace BankContracts.SearchModels { - internal class CostSearchModel + public class CostSearchModel { + public int? Id { get; set; } + public int? EmployeeId { get; set; } } } diff --git a/Bank/BankContracts/SearchModels/EmployeeSearchModel.cs b/Bank/BankContracts/SearchModels/EmployeeSearchModel.cs index e504660..6d83017 100644 --- a/Bank/BankContracts/SearchModels/EmployeeSearchModel.cs +++ b/Bank/BankContracts/SearchModels/EmployeeSearchModel.cs @@ -3,10 +3,13 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; - namespace BankContracts.SearchModels { - internal class EmployeeSearchModel + public class EmployeeSearchModel { + public int? Id { get; set; } + public string? PhoneNumber { get; set; } + public string? Password { get; set; } } } + diff --git a/Bank/BankContracts/SearchModels/OperationSearchModel.cs b/Bank/BankContracts/SearchModels/OperationSearchModel.cs index 3d39742..9843a41 100644 --- a/Bank/BankContracts/SearchModels/OperationSearchModel.cs +++ b/Bank/BankContracts/SearchModels/OperationSearchModel.cs @@ -3,10 +3,15 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; - namespace BankContracts.SearchModels { - internal class OperationSearchModel + public class OperationSearchModel { + public int? Id { get; set; } + public int? EmployeeId { get; set; } + public string Model { get; set; } = string.Empty; + public string Mark { get; set; } = string.Empty; + public int Price { get; set; } + public List? PurchasesIds { get; set; } } } diff --git a/Bank/BankContracts/StoragesContracts/IEmployeeStorage.cs b/Bank/BankContracts/StoragesContracts/IEmployeeStorage.cs index 5a343c0..7b03445 100644 --- a/Bank/BankContracts/StoragesContracts/IEmployeeStorage.cs +++ b/Bank/BankContracts/StoragesContracts/IEmployeeStorage.cs @@ -3,10 +3,16 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using BankContracts.BindingModels; +using BankContracts.SearchModels; +using BankContracts.ViewModels; namespace BankContracts.StoragesContracts { - internal class IEmployeeStorage + public interface IEmployeeStorage { + EmployeeViewModel? GetElement(EmployeeSearchModel model); + EmployeeViewModel? Insert(EmployeeBindingModel model); } } + diff --git a/Bank/BankContracts/ViewModels/EmployeeViewModel.cs b/Bank/BankContracts/ViewModels/EmployeeViewModel.cs index 8ffef4f..902f2ca 100644 --- a/Bank/BankContracts/ViewModels/EmployeeViewModel.cs +++ b/Bank/BankContracts/ViewModels/EmployeeViewModel.cs @@ -3,10 +3,26 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using BankDataModels; +using System.ComponentModel; namespace BankContracts.ViewModels { - internal class EmployeeViewModel + public class EmployeeViewModel : IEmployeeModel { + public int Id { get; set; } + [DisplayName("Фамилия")] + public string LastName { get; set; } = string.Empty; + [DisplayName("Имя")] + public string FirstName { get; set; } = string.Empty; + [DisplayName("Отчество")] + public string? MiddleName { get; set; } = string.Empty; + [DisplayName("Номер телефона")] + public string PhoneNumber { get; set; } = string.Empty; + [DisplayName("Пароль")] + public string Password { get; set; } = string.Empty; + [DisplayName("Должность")] + public string Post { get; set; } = string.Empty; + public string Email { get; set; } = string.Empty; } }