diff --git a/Bank/BankContracts/BindingModels/CashWithdrawalBindingModel.cs b/Bank/BankContracts/BindingModels/CashWithdrawalBindingModel.cs deleted file mode 100644 index d94f290..0000000 --- a/Bank/BankContracts/BindingModels/CashWithdrawalBindingModel.cs +++ /dev/null @@ -1,24 +0,0 @@ -using BankDataModels.Models; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BankContracts.BindingModels -{ - public class CashWithdrawalBindingModel: ICashWithdrawalModel - { - public int Id { get; set; } - - public int CashierId { get; set; } - - public int DebitingId { get; set; } - - public int AccountId { get; set; } - - public double Sum { get; set; } - - public DateTime DateWithdrawal { get; set; } - } -} diff --git a/Bank/BankContracts/BindingModels/AccountBindingModel.cs b/Bank/BankContracts/BindingModels/Cashier/AccountBindingModel.cs similarity index 88% rename from Bank/BankContracts/BindingModels/AccountBindingModel.cs rename to Bank/BankContracts/BindingModels/Cashier/AccountBindingModel.cs index 8d43ad7..9307e90 100644 --- a/Bank/BankContracts/BindingModels/AccountBindingModel.cs +++ b/Bank/BankContracts/BindingModels/Cashier/AccountBindingModel.cs @@ -1,12 +1,12 @@ using BankDataModels.Enums; -using BankDataModels.Models; +using BankDataModels.Models.Cashier; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BankContracts.BindingModels +namespace BankContracts.BindingModels.Cashier { // Реализация сущности "Счёт" public class AccountBindingModel : IAccountModel diff --git a/Bank/BankContracts/BindingModels/Cashier/CashWithdrawalBindingModel.cs b/Bank/BankContracts/BindingModels/Cashier/CashWithdrawalBindingModel.cs new file mode 100644 index 0000000..41af20a --- /dev/null +++ b/Bank/BankContracts/BindingModels/Cashier/CashWithdrawalBindingModel.cs @@ -0,0 +1,24 @@ +using BankDataModels.Models.Cashier; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankContracts.BindingModels.Cashier +{ + public class CashWithdrawalBindingModel : ICashWithdrawalModel + { + public int Id { get; set; } + + public int CashierId { get; set; } + + public int DebitingId { get; set; } + + public int AccountId { get; set; } + + public double Sum { get; set; } + + public DateTime DateWithdrawal { get; set; } + } +} diff --git a/Bank/BankContracts/BindingModels/CashierBindingModel.cs b/Bank/BankContracts/BindingModels/Cashier/CashierBindingModel.cs similarity index 88% rename from Bank/BankContracts/BindingModels/CashierBindingModel.cs rename to Bank/BankContracts/BindingModels/Cashier/CashierBindingModel.cs index 71add75..1867823 100644 --- a/Bank/BankContracts/BindingModels/CashierBindingModel.cs +++ b/Bank/BankContracts/BindingModels/Cashier/CashierBindingModel.cs @@ -1,11 +1,11 @@ -using BankDataModels.Models; +using BankDataModels.Models.Cashier; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BankContracts.BindingModels +namespace BankContracts.BindingModels.Cashier { // Реализация сущности "Кассир" public class CashierBindingModel : ICashierModel diff --git a/Bank/BankContracts/BindingModels/Cashier/MoneyTransferBindingModel.cs b/Bank/BankContracts/BindingModels/Cashier/MoneyTransferBindingModel.cs new file mode 100644 index 0000000..743bf60 --- /dev/null +++ b/Bank/BankContracts/BindingModels/Cashier/MoneyTransferBindingModel.cs @@ -0,0 +1,28 @@ +using BankDataModels.Models.Cashier; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankContracts.BindingModels.Cashier +{ + public class MoneyTransferBindingModel : IMoneyTransferModel + { + public int Id { get; set; } + //сменили int на double + public double Sum { get; set; } + + public int CashierId { get; set; } + + public DateTime DateTransfer { get; set; } = DateTime.Now; + + public int? CreditingId { get; set; } + + // для реализации между двумя клиента, аккаунтами + public int? AccountSenderId { get; set; } + + public int AccountPayeeId { get; set; } + + } +} diff --git a/Bank/BankContracts/BindingModels/CardBindingModel.cs b/Bank/BankContracts/BindingModels/Client/CardBindingModel.cs similarity index 89% rename from Bank/BankContracts/BindingModels/CardBindingModel.cs rename to Bank/BankContracts/BindingModels/Client/CardBindingModel.cs index ffc2643..0318a76 100644 --- a/Bank/BankContracts/BindingModels/CardBindingModel.cs +++ b/Bank/BankContracts/BindingModels/Client/CardBindingModel.cs @@ -1,12 +1,12 @@ using BankDataModels.Enums; -using BankDataModels.Models; +using BankDataModels.Models.Client; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BankContracts.BindingModels +namespace BankContracts.BindingModels.Client { // Реализация сущности "Карта" public class CardBindingModel : ICardModel diff --git a/Bank/BankContracts/BindingModels/ClientBindingModel.cs b/Bank/BankContracts/BindingModels/Client/ClientBindingModel.cs similarity index 88% rename from Bank/BankContracts/BindingModels/ClientBindingModel.cs rename to Bank/BankContracts/BindingModels/Client/ClientBindingModel.cs index 20a7ab6..37781e0 100644 --- a/Bank/BankContracts/BindingModels/ClientBindingModel.cs +++ b/Bank/BankContracts/BindingModels/Client/ClientBindingModel.cs @@ -1,11 +1,11 @@ -using BankDataModels.Models; +using BankDataModels.Models.Client; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BankContracts.BindingModels +namespace BankContracts.BindingModels.Client { // Реализация сущности "Клиент" public class ClientBindingModel : IClientModel diff --git a/Bank/BankContracts/BindingModels/Client/CreditingBindingModel.cs b/Bank/BankContracts/BindingModels/Client/CreditingBindingModel.cs new file mode 100644 index 0000000..aab1694 --- /dev/null +++ b/Bank/BankContracts/BindingModels/Client/CreditingBindingModel.cs @@ -0,0 +1,20 @@ +using BankDataModels.Models.Client; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankContracts.BindingModels.Client +{ + public class CreditingBindingModel : ICreditingModel + { + public int Id { get; set; } + + public double Sum { get; set; } + + public DateTime DateCredit { get; set; } + + public int ClientId { get; set; } + } +} diff --git a/Bank/BankContracts/BindingModels/DebitingBindingModel.cs b/Bank/BankContracts/BindingModels/Client/DebitingBindingModel.cs similarity index 79% rename from Bank/BankContracts/BindingModels/DebitingBindingModel.cs rename to Bank/BankContracts/BindingModels/Client/DebitingBindingModel.cs index de5893e..dc7fcb8 100644 --- a/Bank/BankContracts/BindingModels/DebitingBindingModel.cs +++ b/Bank/BankContracts/BindingModels/Client/DebitingBindingModel.cs @@ -1,11 +1,11 @@ -using BankDataModels.Models; +using BankDataModels.Models.Client; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BankContracts.BindingModels +namespace BankContracts.BindingModels.Client { public class DebitingBindingModel : IDebitingModel { @@ -13,7 +13,7 @@ namespace BankContracts.BindingModels public int CardId { get; set; } // и тут я понял почему ты задавался вопросом про id, надо подумать - public int ClientId { get; set; } + public int ClientId { get; set; } public double Sum { get; set; } diff --git a/Bank/BankContracts/BindingModels/CreditingBindingModel.cs b/Bank/BankContracts/BindingModels/CreditingBindingModel.cs deleted file mode 100644 index 6232db3..0000000 --- a/Bank/BankContracts/BindingModels/CreditingBindingModel.cs +++ /dev/null @@ -1,20 +0,0 @@ -using BankDataModels.Models; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BankContracts.BindingModels -{ - public class CreditingBindingModel : ICreditingModel - { - public int Id { get; set; } - - public double Sum { get; set; } - - public DateTime DateCredit { get; set; } - - public int ClientId { get; set; } - } -} diff --git a/Bank/BankContracts/BindingModels/MoneyTransferBindingModel.cs b/Bank/BankContracts/BindingModels/MoneyTransferBindingModel.cs deleted file mode 100644 index aa38d79..0000000 --- a/Bank/BankContracts/BindingModels/MoneyTransferBindingModel.cs +++ /dev/null @@ -1,28 +0,0 @@ -using BankDataModels.Models; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BankContracts.BindingModels -{ - public class MoneyTransferBindingModel : IMoneyTransferModel - { - public int Id { get; set; } - //сменили int на double - public double Sum { get; set; } - - public int CashierId { get; set; } - - public DateTime DateTransfer { get; set; } = DateTime.Now; - - public int? CreditingId { get; set; } - - // для реализации между двумя клиента, аккаунтами - public int? AccountSenderId { get; set; } - - public int AccountPayeeId { get; set; } - - } -} diff --git a/Bank/BankContracts/BusinessLogicsContracts/Cashier/IAccountLogic.cs b/Bank/BankContracts/BusinessLogicsContracts/Cashier/IAccountLogic.cs new file mode 100644 index 0000000..d465b2a --- /dev/null +++ b/Bank/BankContracts/BusinessLogicsContracts/Cashier/IAccountLogic.cs @@ -0,0 +1,26 @@ +using BankContracts.BindingModels.Cashier; +using BankContracts.SearchModels.Cashier; +using BankContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankContracts.BusinessLogicsContracts.Cashier +{ + public interface IAccountLogic + { + List? ReadList(AccountSearchModel? model); + + AccountViewModel? ReadElement(AccountSearchModel model); + + bool ChangeBalance(AccountSearchModel? model, int sum); + + bool Create(AccountBindingModel model); + + bool Update(AccountBindingModel model); + + bool Delete(AccountBindingModel model); + } +} diff --git a/Bank/BankContracts/BusinessLogicsContracts/ICashWithdrawalLogic.cs b/Bank/BankContracts/BusinessLogicsContracts/Cashier/ICashWithdrawalLogic.cs similarity index 79% rename from Bank/BankContracts/BusinessLogicsContracts/ICashWithdrawalLogic.cs rename to Bank/BankContracts/BusinessLogicsContracts/Cashier/ICashWithdrawalLogic.cs index 9ca9ff9..d1c0d80 100644 --- a/Bank/BankContracts/BusinessLogicsContracts/ICashWithdrawalLogic.cs +++ b/Bank/BankContracts/BusinessLogicsContracts/Cashier/ICashWithdrawalLogic.cs @@ -1,5 +1,5 @@ -using BankContracts.BindingModels; -using BankContracts.SearchModels; +using BankContracts.BindingModels.Cashier; +using BankContracts.SearchModels.Cashier; using BankContracts.ViewModels.Cashier.ViewModels; using System; using System.Collections.Generic; @@ -7,7 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BankContracts.BusinessLogicsContracts +namespace BankContracts.BusinessLogicsContracts.Cashier { public interface ICashWithdrawalLogic { diff --git a/Bank/BankContracts/BusinessLogicsContracts/Cashier/ICashierLogic.cs b/Bank/BankContracts/BusinessLogicsContracts/Cashier/ICashierLogic.cs new file mode 100644 index 0000000..db442ca --- /dev/null +++ b/Bank/BankContracts/BusinessLogicsContracts/Cashier/ICashierLogic.cs @@ -0,0 +1,24 @@ +using BankContracts.BindingModels.Cashier; +using BankContracts.SearchModels.Cashier; +using BankContracts.ViewModels.Cashier.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankContracts.BusinessLogicsContracts.Cashier +{ + public interface ICashierLogic + { + List? ReadList(CashierSearchModel? model); + + CashierViewModel? ReadElement(CashierSearchModel model); + + bool Create(CashierBindingModel model); + + bool Update(CashierBindingModel model); + + bool Delete(CashierBindingModel model); + } +} diff --git a/Bank/BankContracts/BusinessLogicsContracts/IMoneyTransferLogic.cs b/Bank/BankContracts/BusinessLogicsContracts/Cashier/IMoneyTransferLogic.cs similarity index 79% rename from Bank/BankContracts/BusinessLogicsContracts/IMoneyTransferLogic.cs rename to Bank/BankContracts/BusinessLogicsContracts/Cashier/IMoneyTransferLogic.cs index 2389c5c..be098a6 100644 --- a/Bank/BankContracts/BusinessLogicsContracts/IMoneyTransferLogic.cs +++ b/Bank/BankContracts/BusinessLogicsContracts/Cashier/IMoneyTransferLogic.cs @@ -1,5 +1,5 @@ -using BankContracts.BindingModels; -using BankContracts.SearchModels; +using BankContracts.BindingModels.Cashier; +using BankContracts.SearchModels.Cashier; using BankContracts.ViewModels.Cashier.ViewModels; using System; using System.Collections.Generic; @@ -7,7 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BankContracts.BusinessLogicsContracts +namespace BankContracts.BusinessLogicsContracts.Cashier { public interface IMoneyTransferLogic { diff --git a/Bank/BankContracts/BusinessLogicsContracts/Client/ICardLogic.cs b/Bank/BankContracts/BusinessLogicsContracts/Client/ICardLogic.cs new file mode 100644 index 0000000..07dc9a2 --- /dev/null +++ b/Bank/BankContracts/BusinessLogicsContracts/Client/ICardLogic.cs @@ -0,0 +1,24 @@ +using BankContracts.BindingModels.Client; +using BankContracts.SearchModels.Client; +using BankContracts.ViewModels.Client.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankContracts.BusinessLogicsContracts.Client +{ + public interface ICardLogic + { + List? ReadList(CardSearchModel? model); + + CardViewModel? ReadElement(CardSearchModel model); + + bool Create(CardBindingModel model); + + bool Update(CardBindingModel model); + + bool Delete(CardBindingModel model); + } +} diff --git a/Bank/BankContracts/BusinessLogicsContracts/Client/IClientLogic.cs b/Bank/BankContracts/BusinessLogicsContracts/Client/IClientLogic.cs new file mode 100644 index 0000000..60c7def --- /dev/null +++ b/Bank/BankContracts/BusinessLogicsContracts/Client/IClientLogic.cs @@ -0,0 +1,24 @@ +using BankContracts.BindingModels.Client; +using BankContracts.SearchModels.Client; +using BankContracts.ViewModels.Client.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankContracts.BusinessLogicsContracts.Client +{ + public interface IClientLogic + { + List? ReadList(ClientSearchModel? model); + + ClientViewModel? ReadElement(ClientSearchModel model); + + bool Create(ClientBindingModel model); + + bool Update(ClientBindingModel model); + + bool Delete(ClientBindingModel model); + } +} diff --git a/Bank/BankContracts/BusinessLogicsContracts/ICreditingLogic.cs b/Bank/BankContracts/BusinessLogicsContracts/Client/ICreditingLogic.cs similarity index 78% rename from Bank/BankContracts/BusinessLogicsContracts/ICreditingLogic.cs rename to Bank/BankContracts/BusinessLogicsContracts/Client/ICreditingLogic.cs index efef74c..7653ca9 100644 --- a/Bank/BankContracts/BusinessLogicsContracts/ICreditingLogic.cs +++ b/Bank/BankContracts/BusinessLogicsContracts/Client/ICreditingLogic.cs @@ -1,5 +1,5 @@ -using BankContracts.BindingModels; -using BankContracts.SearchModels; +using BankContracts.BindingModels.Client; +using BankContracts.SearchModels.Client; using BankContracts.ViewModels.Client.ViewModels; using System; using System.Collections.Generic; @@ -7,7 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BankContracts.BusinessLogicsContracts +namespace BankContracts.BusinessLogicsContracts.Client { public interface ICreditingLogic { diff --git a/Bank/BankContracts/BusinessLogicsContracts/IDebitingLogic.cs b/Bank/BankContracts/BusinessLogicsContracts/Client/IDebitingLogic.cs similarity index 78% rename from Bank/BankContracts/BusinessLogicsContracts/IDebitingLogic.cs rename to Bank/BankContracts/BusinessLogicsContracts/Client/IDebitingLogic.cs index 3c26e2d..3c4d18f 100644 --- a/Bank/BankContracts/BusinessLogicsContracts/IDebitingLogic.cs +++ b/Bank/BankContracts/BusinessLogicsContracts/Client/IDebitingLogic.cs @@ -1,5 +1,5 @@ -using BankContracts.BindingModels; -using BankContracts.SearchModels; +using BankContracts.BindingModels.Client; +using BankContracts.SearchModels.Client; using BankContracts.ViewModels.Client.ViewModels; using System; using System.Collections.Generic; @@ -7,7 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BankContracts.BusinessLogicsContracts +namespace BankContracts.BusinessLogicsContracts.Client { public interface IDebitingLogic { diff --git a/Bank/BankContracts/BusinessLogicsContracts/IAccountLogic.cs b/Bank/BankContracts/BusinessLogicsContracts/IAccountLogic.cs deleted file mode 100644 index 6883508..0000000 --- a/Bank/BankContracts/BusinessLogicsContracts/IAccountLogic.cs +++ /dev/null @@ -1,26 +0,0 @@ -using BankContracts.BindingModels; -using BankContracts.SearchModels; -using BankContracts.ViewModels; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BankContracts.BusinessLogicsContracts -{ - public interface IAccountLogic - { - List? ReadList(AccountSearchModel? model); - - AccountViewModel? ReadElement(AccountSearchModel model); - - bool ChangeBalance(AccountSearchModel? model, int sum); - - bool Create(AccountBindingModel model); - - bool Update(AccountBindingModel model); - - bool Delete(AccountBindingModel model); - } -} diff --git a/Bank/BankContracts/BusinessLogicsContracts/ICardLogic.cs b/Bank/BankContracts/BusinessLogicsContracts/ICardLogic.cs deleted file mode 100644 index 094fec9..0000000 --- a/Bank/BankContracts/BusinessLogicsContracts/ICardLogic.cs +++ /dev/null @@ -1,24 +0,0 @@ -using BankContracts.BindingModels; -using BankContracts.SearchModels; -using BankContracts.ViewModels.Client.ViewModels; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BankContracts.BusinessLogicsContracts -{ - public interface ICardLogic - { - List? ReadList(CardSearchModel? model); - - CardViewModel? ReadElement(CardSearchModel model); - - bool Create(CardBindingModel model); - - bool Update(CardBindingModel model); - - bool Delete(CardBindingModel model); - } -} diff --git a/Bank/BankContracts/BusinessLogicsContracts/ICashierLogic.cs b/Bank/BankContracts/BusinessLogicsContracts/ICashierLogic.cs deleted file mode 100644 index c9a5651..0000000 --- a/Bank/BankContracts/BusinessLogicsContracts/ICashierLogic.cs +++ /dev/null @@ -1,24 +0,0 @@ -using BankContracts.BindingModels; -using BankContracts.SearchModels; -using BankContracts.ViewModels.Cashier.ViewModels; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BankContracts.BusinessLogicsContracts -{ - public interface ICashierLogic - { - List? ReadList(CashierSearchModel? model); - - CashierViewModel? ReadElement(CashierSearchModel model); - - bool Create(CashierBindingModel model); - - bool Update(CashierBindingModel model); - - bool Delete(CashierBindingModel model); - } -} diff --git a/Bank/BankContracts/BusinessLogicsContracts/IClientLogic.cs b/Bank/BankContracts/BusinessLogicsContracts/IClientLogic.cs deleted file mode 100644 index 72fd694..0000000 --- a/Bank/BankContracts/BusinessLogicsContracts/IClientLogic.cs +++ /dev/null @@ -1,24 +0,0 @@ -using BankContracts.BindingModels; -using BankContracts.SearchModels; -using BankContracts.ViewModels.Client.ViewModels; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BankContracts.BusinessLogicsContracts -{ - public interface IClientLogic - { - List? ReadList(ClientSearchModel? model); - - ClientViewModel? ReadElement(ClientSearchModel model); - - bool Create(ClientBindingModel model); - - bool Update(ClientBindingModel model); - - bool Delete(ClientBindingModel model); - } -} diff --git a/Bank/BankContracts/SearchModels/AccountSearchModel.cs b/Bank/BankContracts/SearchModels/AccountSearchModel.cs deleted file mode 100644 index 35dbc06..0000000 --- a/Bank/BankContracts/SearchModels/AccountSearchModel.cs +++ /dev/null @@ -1,27 +0,0 @@ -using BankDataModels.Enums; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BankContracts.SearchModels -{ - // Для поиска сущности "Счёт" - public class AccountSearchModel - { - public int Id { get; set; } - - public int CashierId { get; set; } - - public int ClientId { get; set; } - - public string AccountNumber { get; set; } = string.Empty; - - public double Balance { get; set; } - - public DateTime DateOpen { get; set; } - - public StatusAccount StatusAccount { get; set; } - } -} diff --git a/Bank/BankContracts/SearchModels/CardSearchModel.cs b/Bank/BankContracts/SearchModels/CardSearchModel.cs deleted file mode 100644 index 7d2aa52..0000000 --- a/Bank/BankContracts/SearchModels/CardSearchModel.cs +++ /dev/null @@ -1,28 +0,0 @@ -using BankDataModels.Enums; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BankContracts.SearchModels -{ - // Для поиска сущности "Банковская карта" - public class CardSearchModel - { - public int? Id { get; set; } - - public int? ClientID { get; set; } - - public int? AccountId { get; set; } - - // Номер банковской карты - public string? Number { get; set; } - - public double Balance { get; set; } - - public DateTime Period { get; set; } - - public StatusCard StatusCard { get; set; } - } -} diff --git a/Bank/BankContracts/SearchModels/CashWithdrawalSearchModel.cs b/Bank/BankContracts/SearchModels/CashWithdrawalSearchModel.cs deleted file mode 100644 index 968c42d..0000000 --- a/Bank/BankContracts/SearchModels/CashWithdrawalSearchModel.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BankContracts.SearchModels -{ - // Для поиска сущности "Выдача наличных" - public class CashWithdrawalSearchModel - { - public int? Id { get; set; } - - public int? AccountId { get; set; } - - public int? CashierId { get; set; } - - public int? Sum { get; set; } - - public DateTime? DateWithdrawal { get; set; } - - public int? DebitingId { get; set; } // выдача ведь связана со снятием??? - //выдача связана с заявкой на получение, вроде все верно, если что потом чекем - - public int? ClientId { get; set; } // А надо добавлять клиента - } -} diff --git a/Bank/BankContracts/SearchModels/Cashier/AccountSearchModel.cs b/Bank/BankContracts/SearchModels/Cashier/AccountSearchModel.cs new file mode 100644 index 0000000..523f7c7 --- /dev/null +++ b/Bank/BankContracts/SearchModels/Cashier/AccountSearchModel.cs @@ -0,0 +1,27 @@ +using BankDataModels.Enums; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankContracts.SearchModels.Cashier +{ + // Для поиска сущности "Счёт" + public class AccountSearchModel + { + public int Id { get; set; } + + public int CashierId { get; set; } + + public int ClientId { get; set; } + + public string AccountNumber { get; set; } = string.Empty; + + public double Balance { get; set; } + + public DateTime DateOpen { get; set; } + + public StatusAccount StatusAccount { get; set; } + } +} diff --git a/Bank/BankContracts/SearchModels/Cashier/CashWithdrawalSearchModel.cs b/Bank/BankContracts/SearchModels/Cashier/CashWithdrawalSearchModel.cs new file mode 100644 index 0000000..5e36e52 --- /dev/null +++ b/Bank/BankContracts/SearchModels/Cashier/CashWithdrawalSearchModel.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankContracts.SearchModels.Cashier +{ + // Для поиска сущности "Выдача наличных" + public class CashWithdrawalSearchModel + { + public int? Id { get; set; } + + public int? AccountId { get; set; } + + public int? CashierId { get; set; } + + public int? Sum { get; set; } + + public DateTime? DateWithdrawal { get; set; } + + public int? DebitingId { get; set; } // выдача ведь связана со снятием??? + //выдача связана с заявкой на получение, вроде все верно, если что потом чекем + + public int? ClientId { get; set; } // А надо добавлять клиента + } +} diff --git a/Bank/BankContracts/SearchModels/Cashier/CashierSearchModel.cs b/Bank/BankContracts/SearchModels/Cashier/CashierSearchModel.cs new file mode 100644 index 0000000..6571d9b --- /dev/null +++ b/Bank/BankContracts/SearchModels/Cashier/CashierSearchModel.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankContracts.SearchModels.Cashier +{ + // Для поиска сущности "Кассир" + public class CashierSearchModel + { + public int Id { get; set; } + + public string Name { get; set; } = string.Empty; + + public string Surname { get; set; } = string.Empty; + + public string Patronymic { get; set; } = string.Empty; + + public string Email { get; set; } = string.Empty; + + public string Password { get; set; } = string.Empty; + + public string MobilePhone { get; set; } = string.Empty; + } +} diff --git a/Bank/BankContracts/SearchModels/Cashier/MoneyTransferSearchModel.cs b/Bank/BankContracts/SearchModels/Cashier/MoneyTransferSearchModel.cs new file mode 100644 index 0000000..06c8d26 --- /dev/null +++ b/Bank/BankContracts/SearchModels/Cashier/MoneyTransferSearchModel.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankContracts.SearchModels.Cashier +{ + // Для поиска сущности "Перевод денег" + public class MoneyTransferSearchModel + { + public int? Id { get; set; } + + public int? Sum { get; set; } + + public int? CashierId { get; set; } + + public int? AccountId { get; set; } + + public DateTime? DateTransfer { get; set; } + + public int? Crediting { get; set; } + + public int? ClientId { get; set; } // ТОТ ЖЕ НАСУЩНЫЙ ВОПРОС, А НАДО? тут у меня тоже вопрос , по идеи надо, потому что, как я понял можно перевод со счета на карту можно + + // Навский случай типа два аккаунта, один отправитель, другой получатель + public int? AccountSenderId { get; set; } + + public int? AccountPayeeId { get; set; } + } +} diff --git a/Bank/BankContracts/SearchModels/CashierSearchModel.cs b/Bank/BankContracts/SearchModels/CashierSearchModel.cs deleted file mode 100644 index 411676f..0000000 --- a/Bank/BankContracts/SearchModels/CashierSearchModel.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BankContracts.SearchModels -{ - // Для поиска сущности "Кассир" - public class CashierSearchModel - { - public int Id { get; set; } - - public string Name { get; set; } = string.Empty; - - public string Surname { get; set; } = string.Empty; - - public string Patronymic { get; set; } = string.Empty; - - public string Email { get; set; } = string.Empty; - - public string Password { get; set; } = string.Empty; - - public string MobilePhone { get; set; } = string.Empty; - } -} diff --git a/Bank/BankContracts/SearchModels/Client/CardSearchModel.cs b/Bank/BankContracts/SearchModels/Client/CardSearchModel.cs new file mode 100644 index 0000000..9add75c --- /dev/null +++ b/Bank/BankContracts/SearchModels/Client/CardSearchModel.cs @@ -0,0 +1,28 @@ +using BankDataModels.Enums; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankContracts.SearchModels.Client +{ + // Для поиска сущности "Банковская карта" + public class CardSearchModel + { + public int? Id { get; set; } + + public int? ClientID { get; set; } + + public int? AccountId { get; set; } + + // Номер банковской карты + public string? Number { get; set; } + + public double Balance { get; set; } + + public DateTime Period { get; set; } + + public StatusCard StatusCard { get; set; } + } +} diff --git a/Bank/BankContracts/SearchModels/Client/ClientSearchModel.cs b/Bank/BankContracts/SearchModels/Client/ClientSearchModel.cs new file mode 100644 index 0000000..6b19a4c --- /dev/null +++ b/Bank/BankContracts/SearchModels/Client/ClientSearchModel.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankContracts.SearchModels.Client +{ + // Для поиска сущности "Клиент" + public class ClientSearchModel + { + public int Id { get; set; } + + public string Name { get; set; } = string.Empty; + + public string Surname { get; set; } = string.Empty; + + public string Patronymic { get; set; } = string.Empty; + + public string Email { get; set; } = string.Empty; + + public string Password { get; set; } = string.Empty; + + public string MobilePhone { get; set; } = string.Empty; + } +} diff --git a/Bank/BankContracts/SearchModels/Client/CreditingSearchModel.cs b/Bank/BankContracts/SearchModels/Client/CreditingSearchModel.cs new file mode 100644 index 0000000..338d584 --- /dev/null +++ b/Bank/BankContracts/SearchModels/Client/CreditingSearchModel.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankContracts.SearchModels.Client +{ + // Для поиска сущности "Пополнение карты" + public class CreditingSearchModel + { + public int? Id { get; set; } + + public int? CardId { get; set; } + + public int? Sum { get; set; } + + public DateTime? DateCrediting { get; set; } + + public int? UserId { get; set; } // ИЛИ лучше CLientId, правильнее будет юзер + } +} diff --git a/Bank/BankContracts/SearchModels/Client/DebitingSearchModel.cs b/Bank/BankContracts/SearchModels/Client/DebitingSearchModel.cs new file mode 100644 index 0000000..9229551 --- /dev/null +++ b/Bank/BankContracts/SearchModels/Client/DebitingSearchModel.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankContracts.SearchModels.Client +{ + // Для поиска сущности "Получение наличных" + public class DebitingSearchModel + { + public int? Id { get; set; } + + public int? CardId { get; set; } + + public int? UserId { get; set; } // Возможно лишнюю фигню делаю и лучше ClientId , по нашей бд именно к пользователю относятся операции по пополнению + + public int? Sum { get; set; } + + public DateTime? DateDebit { get; set; } + } +} diff --git a/Bank/BankContracts/SearchModels/ClientSearchModel.cs b/Bank/BankContracts/SearchModels/ClientSearchModel.cs deleted file mode 100644 index e97c522..0000000 --- a/Bank/BankContracts/SearchModels/ClientSearchModel.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BankContracts.SearchModels -{ - // Для поиска сущности "Клиент" - public class ClientSearchModel - { - public int Id { get; set; } - - public string Name { get; set; } = string.Empty; - - public string Surname { get; set; } = string.Empty; - - public string Patronymic { get; set; } = string.Empty; - - public string Email { get; set; } = string.Empty; - - public string Password { get; set; } = string.Empty; - - public string MobilePhone { get; set; } = string.Empty; - } -} diff --git a/Bank/BankContracts/SearchModels/CreditingSearchModel.cs b/Bank/BankContracts/SearchModels/CreditingSearchModel.cs deleted file mode 100644 index 8c171fa..0000000 --- a/Bank/BankContracts/SearchModels/CreditingSearchModel.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BankContracts.SearchModels -{ - // Для поиска сущности "Пополнение карты" - public class CreditingSearchModel - { - public int? Id { get; set; } - - public int? CardId { get; set; } - - public int? Sum { get; set; } - - public DateTime? DateCrediting { get; set; } - - public int? UserId { get; set; } // ИЛИ лучше CLientId, правильнее будет юзер - } -} diff --git a/Bank/BankContracts/SearchModels/DebitingSearchModel.cs b/Bank/BankContracts/SearchModels/DebitingSearchModel.cs deleted file mode 100644 index 6a7eefb..0000000 --- a/Bank/BankContracts/SearchModels/DebitingSearchModel.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BankContracts.SearchModels -{ - // Для поиска сущности "Получение наличных" - public class DebitingSearchModel - { - public int? Id { get; set; } - - public int? CardId { get; set; } - - public int? UserId { get; set; } // Возможно лишнюю фигню делаю и лучше ClientId , по нашей бд именно к пользователю относятся операции по пополнению - - public int? Sum { get; set; } - - public DateTime? DateDebit { get; set; } - } -} diff --git a/Bank/BankContracts/SearchModels/MoneyTransferSearchModel.cs b/Bank/BankContracts/SearchModels/MoneyTransferSearchModel.cs deleted file mode 100644 index a0cd506..0000000 --- a/Bank/BankContracts/SearchModels/MoneyTransferSearchModel.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BankContracts.SearchModels -{ - // Для поиска сущности "Перевод денег" - public class MoneyTransferSearchModel - { - public int? Id { get; set; } - - public int? Sum { get; set; } - - public int? CashierId { get; set; } - - public int? AccountId { get; set; } - - public DateTime? DateTransfer { get; set; } - - public int? Crediting { get; set; } - - public int? ClientId { get; set; } // ТОТ ЖЕ НАСУЩНЫЙ ВОПРОС, А НАДО? тут у меня тоже вопрос , по идеи надо, потому что, как я понял можно перевод со счета на карту можно - - // Навский случай типа два аккаунта, один отправитель, другой получатель - public int? AccountSenderId { get; set; } - - public int? AccountPayeeId { get; set; } - } -} diff --git a/Bank/BankContracts/StoragesModels/Cashier/IAccountStorage.cs b/Bank/BankContracts/StoragesModels/Cashier/IAccountStorage.cs new file mode 100644 index 0000000..e2c95e5 --- /dev/null +++ b/Bank/BankContracts/StoragesModels/Cashier/IAccountStorage.cs @@ -0,0 +1,27 @@ +using BankContracts.BindingModels.Cashier; +using BankContracts.SearchModels.Cashier; +using BankContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankContracts.StoragesModels.Cashier +{ + // Интерфейс для хранилища счетов + public interface IAccountStorage + { + List GetFullList(); + + List GetFilteredList(AccountSearchModel model); + + AccountViewModel? GetElement(AccountSearchModel model); + + AccountViewModel? Insert(AccountBindingModel model); + + AccountViewModel? Update(AccountBindingModel model); + + AccountViewModel? Delete(AccountBindingModel model); + } +} diff --git a/Bank/BankContracts/StoragesModels/Cashier/ICashWithdrawalStorage.cs b/Bank/BankContracts/StoragesModels/Cashier/ICashWithdrawalStorage.cs new file mode 100644 index 0000000..08a516f --- /dev/null +++ b/Bank/BankContracts/StoragesModels/Cashier/ICashWithdrawalStorage.cs @@ -0,0 +1,27 @@ +using BankContracts.BindingModels.Cashier; +using BankContracts.SearchModels.Cashier; +using BankContracts.ViewModels.Cashier.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankContracts.StoragesModels.Cashier +{ + // Интерфейс для хранилища выдачи наличных + public interface ICashWithdrawalStorage + { + List GetFullList(); + + List GetFilteredList(CashWithdrawalSearchModel model); + + CashWithdrawalViewModel? GetElement(CashWithdrawalSearchModel model); + + CashWithdrawalViewModel? Insert(CashWithdrawalBindingModel model); + + CashWithdrawalViewModel? Update(CashWithdrawalBindingModel model); + + CashWithdrawalViewModel? Delete(CashWithdrawalBindingModel model); + } +} diff --git a/Bank/BankContracts/StoragesModels/Cashier/ICashierStorage.cs b/Bank/BankContracts/StoragesModels/Cashier/ICashierStorage.cs new file mode 100644 index 0000000..c2337db --- /dev/null +++ b/Bank/BankContracts/StoragesModels/Cashier/ICashierStorage.cs @@ -0,0 +1,27 @@ +using BankContracts.BindingModels.Cashier; +using BankContracts.SearchModels.Cashier; +using BankContracts.ViewModels.Cashier.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankContracts.StoragesModels.Cashier +{ + // Интерфейс для хранилища кассиров + public interface ICashierStorage + { + List GetFullList(); + + List GetFilteredList(CashierSearchModel model); + + CashierViewModel? GetElement(CashierSearchModel model); + + CashierViewModel? Insert(CashierBindingModel model); + + CashierViewModel? Update(CashierBindingModel model); + + CashierViewModel? Delete(CashierBindingModel model); + } +} diff --git a/Bank/BankContracts/StoragesModels/Cashier/IMoneyTransferStorage.cs b/Bank/BankContracts/StoragesModels/Cashier/IMoneyTransferStorage.cs new file mode 100644 index 0000000..1d4270b --- /dev/null +++ b/Bank/BankContracts/StoragesModels/Cashier/IMoneyTransferStorage.cs @@ -0,0 +1,27 @@ +using BankContracts.BindingModels.Cashier; +using BankContracts.SearchModels.Cashier; +using BankContracts.ViewModels.Cashier.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankContracts.StoragesModels.Cashier +{ + // Интерфейс для хранилища переводов денег + public interface IMoneyTransferStorage + { + List GetFullList(); + + List GetFilteredList(MoneyTransferSearchModel model); + + MoneyTransferViewModel? GetElement(MoneyTransferSearchModel model); + + MoneyTransferViewModel? Insert(MoneyTransferBindingModel model); + + MoneyTransferViewModel? Update(MoneyTransferBindingModel model); + + MoneyTransferViewModel? Delete(MoneyTransferBindingModel model); + } +} diff --git a/Bank/BankContracts/StoragesModels/Client/ICardStorage.cs b/Bank/BankContracts/StoragesModels/Client/ICardStorage.cs new file mode 100644 index 0000000..62d3906 --- /dev/null +++ b/Bank/BankContracts/StoragesModels/Client/ICardStorage.cs @@ -0,0 +1,27 @@ +using BankContracts.BindingModels.Client; +using BankContracts.SearchModels.Client; +using BankContracts.ViewModels.Client.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankContracts.StoragesModels.Client +{ + // Интерфейс для хранилища банковских карт + public interface ICardStorage + { + List GetFullList(); + + List GetFilteredList(CardSearchModel model); + + CardViewModel? GetElement(CardSearchModel model); + + CardViewModel? Insert(CardBindingModel model); + + CardViewModel? Update(CardBindingModel model); + + CardViewModel? Delete(CardBindingModel model); + } +} diff --git a/Bank/BankContracts/StoragesModels/Client/IClientStorage.cs b/Bank/BankContracts/StoragesModels/Client/IClientStorage.cs new file mode 100644 index 0000000..646a7b8 --- /dev/null +++ b/Bank/BankContracts/StoragesModels/Client/IClientStorage.cs @@ -0,0 +1,27 @@ +using BankContracts.BindingModels.Client; +using BankContracts.SearchModels.Client; +using BankContracts.ViewModels.Client.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankContracts.StoragesModels.Client +{ + // Интерфейс для хранилища клиентов + public interface IClientStorage + { + List GetFullList(); + + List GetFilteredList(ClientSearchModel model); + + ClientViewModel? GetElement(ClientSearchModel model); + + ClientViewModel? Insert(ClientBindingModel model); + + ClientViewModel? Update(ClientBindingModel model); + + ClientViewModel? Delete(ClientBindingModel model); + } +} diff --git a/Bank/BankContracts/StoragesModels/Client/ICreditingStorage.cs b/Bank/BankContracts/StoragesModels/Client/ICreditingStorage.cs new file mode 100644 index 0000000..56aa50e --- /dev/null +++ b/Bank/BankContracts/StoragesModels/Client/ICreditingStorage.cs @@ -0,0 +1,27 @@ +using BankContracts.BindingModels.Client; +using BankContracts.SearchModels.Client; +using BankContracts.ViewModels.Client.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankContracts.StoragesModels.Client +{ + // Интерфейс для хранилища пополнения карты + public interface ICreditingStorage + { + List GetFullList(); + + List GetFilteredList(CreditingSearchModel model); + + CreditingViewModel? GetElement(CreditingSearchModel model); + + CreditingViewModel? Insert(CreditingBindingModel model); + + CreditingViewModel? Update(CreditingBindingModel model); + + CreditingViewModel? Delete(CreditingBindingModel model); + } +} diff --git a/Bank/BankContracts/StoragesModels/Client/IDebitingStorage.cs b/Bank/BankContracts/StoragesModels/Client/IDebitingStorage.cs new file mode 100644 index 0000000..3a744ff --- /dev/null +++ b/Bank/BankContracts/StoragesModels/Client/IDebitingStorage.cs @@ -0,0 +1,27 @@ +using BankContracts.BindingModels.Client; +using BankContracts.SearchModels.Client; +using BankContracts.ViewModels.Client.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankContracts.StoragesModels.Client +{ + // Интерфейс для хранилища получения наличных + public interface IDebitingStorage + { + List GetFullList(); + + List GetFilteredList(DebitingSearchModel model); + + DebitingViewModel? GetElement(DebitingSearchModel model); + + DebitingViewModel? Insert(DebitingBindingModel model); + + DebitingViewModel? Update(DebitingBindingModel model); + + DebitingViewModel? Delete(DebitingBindingModel model); + } +} diff --git a/Bank/BankContracts/StoragesModels/IAccountStorage.cs b/Bank/BankContracts/StoragesModels/IAccountStorage.cs deleted file mode 100644 index 9bb8f34..0000000 --- a/Bank/BankContracts/StoragesModels/IAccountStorage.cs +++ /dev/null @@ -1,27 +0,0 @@ -using BankContracts.BindingModels; -using BankContracts.SearchModels; -using BankContracts.ViewModels; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BankContracts.StoragesModels -{ - // Интерфейс для хранилища счетов - public interface IAccountStorage - { - List GetFullList(); - - List GetFilteredList(AccountSearchModel model); - - AccountViewModel? GetElement(AccountSearchModel model); - - AccountViewModel? Insert(AccountBindingModel model); - - AccountViewModel? Update(AccountBindingModel model); - - AccountViewModel? Delete(AccountBindingModel model); - } -} diff --git a/Bank/BankContracts/StoragesModels/ICardStorage.cs b/Bank/BankContracts/StoragesModels/ICardStorage.cs deleted file mode 100644 index dba9072..0000000 --- a/Bank/BankContracts/StoragesModels/ICardStorage.cs +++ /dev/null @@ -1,27 +0,0 @@ -using BankContracts.BindingModels; -using BankContracts.SearchModels; -using BankContracts.ViewModels.Client.ViewModels; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BankContracts.StoragesModels -{ - // Интерфейс для хранилища банковских карт - public interface ICardStorage - { - List GetFullList(); - - List GetFilteredList(CardSearchModel model); - - CardViewModel? GetElement(CardSearchModel model); - - CardViewModel? Insert(CardBindingModel model); - - CardViewModel? Update(CardBindingModel model); - - CardViewModel? Delete(CardBindingModel model); - } -} diff --git a/Bank/BankContracts/StoragesModels/ICashWithdrawalStorage.cs b/Bank/BankContracts/StoragesModels/ICashWithdrawalStorage.cs deleted file mode 100644 index cb6c952..0000000 --- a/Bank/BankContracts/StoragesModels/ICashWithdrawalStorage.cs +++ /dev/null @@ -1,27 +0,0 @@ -using BankContracts.BindingModels; -using BankContracts.SearchModels; -using BankContracts.ViewModels.Cashier.ViewModels; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BankContracts.StoragesModels -{ - // Интерфейс для хранилища выдачи наличных - public interface ICashWithdrawalStorage - { - List GetFullList(); - - List GetFilteredList(CashWithdrawalSearchModel model); - - CashWithdrawalViewModel? GetElement(CashWithdrawalSearchModel model); - - CashWithdrawalViewModel? Insert(CashWithdrawalBindingModel model); - - CashWithdrawalViewModel? Update(CashWithdrawalBindingModel model); - - CashWithdrawalViewModel? Delete(CashWithdrawalBindingModel model); - } -} diff --git a/Bank/BankContracts/StoragesModels/ICashierStorage.cs b/Bank/BankContracts/StoragesModels/ICashierStorage.cs deleted file mode 100644 index 3a57b29..0000000 --- a/Bank/BankContracts/StoragesModels/ICashierStorage.cs +++ /dev/null @@ -1,27 +0,0 @@ -using BankContracts.BindingModels; -using BankContracts.SearchModels; -using BankContracts.ViewModels.Cashier.ViewModels; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BankContracts.StoragesModels -{ - // Интерфейс для хранилища кассиров - public interface ICashierStorage - { - List GetFullList(); - - List GetFilteredList(CashierSearchModel model); - - CashierViewModel? GetElement(CashierSearchModel model); - - CashierViewModel? Insert(CashierBindingModel model); - - CashierViewModel? Update(CashierBindingModel model); - - CashierViewModel? Delete(CashierBindingModel model); - } -} diff --git a/Bank/BankContracts/StoragesModels/IClientStorage.cs b/Bank/BankContracts/StoragesModels/IClientStorage.cs deleted file mode 100644 index 6191d02..0000000 --- a/Bank/BankContracts/StoragesModels/IClientStorage.cs +++ /dev/null @@ -1,27 +0,0 @@ -using BankContracts.BindingModels; -using BankContracts.SearchModels; -using BankContracts.ViewModels.Client.ViewModels; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BankContracts.StoragesModels -{ - // Интерфейс для хранилища клиентов - public interface IClientStorage - { - List GetFullList(); - - List GetFilteredList(ClientSearchModel model); - - ClientViewModel? GetElement(ClientSearchModel model); - - ClientViewModel? Insert(ClientBindingModel model); - - ClientViewModel? Update(ClientBindingModel model); - - ClientViewModel? Delete(ClientBindingModel model); - } -} diff --git a/Bank/BankContracts/StoragesModels/ICreditingStorage.cs b/Bank/BankContracts/StoragesModels/ICreditingStorage.cs deleted file mode 100644 index 9b5bb08..0000000 --- a/Bank/BankContracts/StoragesModels/ICreditingStorage.cs +++ /dev/null @@ -1,27 +0,0 @@ -using BankContracts.BindingModels; -using BankContracts.SearchModels; -using BankContracts.ViewModels.Client.ViewModels; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BankContracts.StoragesModels -{ - // Интерфейс для хранилища пополнения карты - public interface ICreditingStorage - { - List GetFullList(); - - List GetFilteredList(CreditingSearchModel model); - - CreditingViewModel? GetElement(CreditingSearchModel model); - - CreditingViewModel? Insert(CreditingBindingModel model); - - CreditingViewModel? Update(CreditingBindingModel model); - - CreditingViewModel? Delete(CreditingBindingModel model); - } -} diff --git a/Bank/BankContracts/StoragesModels/IDebitingStorage.cs b/Bank/BankContracts/StoragesModels/IDebitingStorage.cs deleted file mode 100644 index 1d9aee8..0000000 --- a/Bank/BankContracts/StoragesModels/IDebitingStorage.cs +++ /dev/null @@ -1,27 +0,0 @@ -using BankContracts.BindingModels; -using BankContracts.SearchModels; -using BankContracts.ViewModels.Client.ViewModels; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BankContracts.StoragesModels -{ - // Интерфейс для хранилища получения наличных - public interface IDebitingStorage - { - List GetFullList(); - - List GetFilteredList(DebitingSearchModel model); - - DebitingViewModel? GetElement(DebitingSearchModel model); - - DebitingViewModel? Insert(DebitingBindingModel model); - - DebitingViewModel? Update(DebitingBindingModel model); - - DebitingViewModel? Delete(DebitingBindingModel model); - } -} diff --git a/Bank/BankContracts/StoragesModels/IMoneyTransferStorage.cs b/Bank/BankContracts/StoragesModels/IMoneyTransferStorage.cs deleted file mode 100644 index 5897d1d..0000000 --- a/Bank/BankContracts/StoragesModels/IMoneyTransferStorage.cs +++ /dev/null @@ -1,27 +0,0 @@ -using BankContracts.BindingModels; -using BankContracts.SearchModels; -using BankContracts.ViewModels.Cashier.ViewModels; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BankContracts.StoragesModels -{ - // Интерфейс для хранилища переводов денег - public interface IMoneyTransferStorage - { - List GetFullList(); - - List GetFilteredList(MoneyTransferSearchModel model); - - MoneyTransferViewModel? GetElement(MoneyTransferSearchModel model); - - MoneyTransferViewModel? Insert(MoneyTransferBindingModel model); - - MoneyTransferViewModel? Update(MoneyTransferBindingModel model); - - MoneyTransferViewModel? Delete(MoneyTransferBindingModel model); - } -} diff --git a/Bank/BankContracts/ViewModels/Cashier/ViewModels/AccountViewModel.cs b/Bank/BankContracts/ViewModels/Cashier/ViewModels/AccountViewModel.cs index 44697bb..59aa9e1 100644 --- a/Bank/BankContracts/ViewModels/Cashier/ViewModels/AccountViewModel.cs +++ b/Bank/BankContracts/ViewModels/Cashier/ViewModels/AccountViewModel.cs @@ -1,5 +1,5 @@ using BankDataModels.Enums; -using BankDataModels.Models; +using BankDataModels.Models.Cashier; using System; using System.Collections.Generic; using System.ComponentModel; @@ -9,7 +9,7 @@ using System.Threading.Tasks; namespace BankContracts.ViewModels { - public class AccountViewModel : IAccountModel + public class AccountViewModel : IAccountModel { public int Id { get; set; } diff --git a/Bank/BankContracts/ViewModels/Cashier/ViewModels/CashWithdrawalViewModel.cs b/Bank/BankContracts/ViewModels/Cashier/ViewModels/CashWithdrawalViewModel.cs index 55dea43..711b650 100644 --- a/Bank/BankContracts/ViewModels/Cashier/ViewModels/CashWithdrawalViewModel.cs +++ b/Bank/BankContracts/ViewModels/Cashier/ViewModels/CashWithdrawalViewModel.cs @@ -1,4 +1,4 @@ -using BankDataModels.Models; +using BankDataModels.Models.Cashier; using System; using System.Collections.Generic; using System.ComponentModel; diff --git a/Bank/BankContracts/ViewModels/Cashier/ViewModels/CashierViewModel.cs b/Bank/BankContracts/ViewModels/Cashier/ViewModels/CashierViewModel.cs index f637f8a..370223c 100644 --- a/Bank/BankContracts/ViewModels/Cashier/ViewModels/CashierViewModel.cs +++ b/Bank/BankContracts/ViewModels/Cashier/ViewModels/CashierViewModel.cs @@ -1,4 +1,4 @@ -using BankDataModels.Models; +using BankDataModels.Models.Cashier; using System; using System.Collections.Generic; using System.ComponentModel; diff --git a/Bank/BankContracts/ViewModels/Cashier/ViewModels/MoneyTransferViewModel.cs b/Bank/BankContracts/ViewModels/Cashier/ViewModels/MoneyTransferViewModel.cs index 0f55358..b23613e 100644 --- a/Bank/BankContracts/ViewModels/Cashier/ViewModels/MoneyTransferViewModel.cs +++ b/Bank/BankContracts/ViewModels/Cashier/ViewModels/MoneyTransferViewModel.cs @@ -1,4 +1,4 @@ -using BankDataModels.Models; +using BankDataModels.Models.Cashier; using System; using System.Collections.Generic; using System.ComponentModel; diff --git a/Bank/BankContracts/ViewModels/Client/ViewModels/CardViewModel.cs b/Bank/BankContracts/ViewModels/Client/ViewModels/CardViewModel.cs index 8884b6d..22f23c9 100644 --- a/Bank/BankContracts/ViewModels/Client/ViewModels/CardViewModel.cs +++ b/Bank/BankContracts/ViewModels/Client/ViewModels/CardViewModel.cs @@ -1,5 +1,5 @@ using BankDataModels.Enums; -using BankDataModels.Models; +using BankDataModels.Models.Client; using System; using System.Collections.Generic; using System.ComponentModel; diff --git a/Bank/BankContracts/ViewModels/Client/ViewModels/ClientViewModel.cs b/Bank/BankContracts/ViewModels/Client/ViewModels/ClientViewModel.cs index b90ee22..641e7e4 100644 --- a/Bank/BankContracts/ViewModels/Client/ViewModels/ClientViewModel.cs +++ b/Bank/BankContracts/ViewModels/Client/ViewModels/ClientViewModel.cs @@ -1,4 +1,4 @@ -using BankDataModels.Models; +using BankDataModels.Models.Client; using System; using System.Collections.Generic; using System.ComponentModel; diff --git a/Bank/BankContracts/ViewModels/Client/ViewModels/CreditingViewModel.cs b/Bank/BankContracts/ViewModels/Client/ViewModels/CreditingViewModel.cs index fd94a67..2e4e17e 100644 --- a/Bank/BankContracts/ViewModels/Client/ViewModels/CreditingViewModel.cs +++ b/Bank/BankContracts/ViewModels/Client/ViewModels/CreditingViewModel.cs @@ -1,4 +1,4 @@ -using BankDataModels.Models; +using BankDataModels.Models.Client; using System; using System.Collections.Generic; using System.ComponentModel; diff --git a/Bank/BankContracts/ViewModels/Client/ViewModels/DebitingViewModel.cs b/Bank/BankContracts/ViewModels/Client/ViewModels/DebitingViewModel.cs index 3ae6121..a904cc3 100644 --- a/Bank/BankContracts/ViewModels/Client/ViewModels/DebitingViewModel.cs +++ b/Bank/BankContracts/ViewModels/Client/ViewModels/DebitingViewModel.cs @@ -1,4 +1,4 @@ -using BankDataModels.Models; +using BankDataModels.Models.Client; using System; using System.Collections.Generic; using System.ComponentModel; diff --git a/Bank/BankDataModels/Models/IAccountModel.cs b/Bank/BankDataModels/Models/Cashier/IAccountModel.cs similarity index 93% rename from Bank/BankDataModels/Models/IAccountModel.cs rename to Bank/BankDataModels/Models/Cashier/IAccountModel.cs index 58f3fa7..1a70c98 100644 --- a/Bank/BankDataModels/Models/IAccountModel.cs +++ b/Bank/BankDataModels/Models/Cashier/IAccountModel.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BankDataModels.Models +namespace BankDataModels.Models.Cashier { // Интерфейс, отвечающий за cчёт public interface IAccountModel : IId diff --git a/Bank/BankDataModels/Models/ICashWithdrawalModel.cs b/Bank/BankDataModels/Models/Cashier/ICashWithdrawalModel.cs similarity index 93% rename from Bank/BankDataModels/Models/ICashWithdrawalModel.cs rename to Bank/BankDataModels/Models/Cashier/ICashWithdrawalModel.cs index f850bc5..0562f6c 100644 --- a/Bank/BankDataModels/Models/ICashWithdrawalModel.cs +++ b/Bank/BankDataModels/Models/Cashier/ICashWithdrawalModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BankDataModels.Models +namespace BankDataModels.Models.Cashier { // Интерфейс, отвечающий за выдачу наличных public interface ICashWithdrawalModel : IId diff --git a/Bank/BankDataModels/Models/ICashierModel.cs b/Bank/BankDataModels/Models/Cashier/ICashierModel.cs similarity index 94% rename from Bank/BankDataModels/Models/ICashierModel.cs rename to Bank/BankDataModels/Models/Cashier/ICashierModel.cs index 9bbaf5c..25f46a0 100644 --- a/Bank/BankDataModels/Models/ICashierModel.cs +++ b/Bank/BankDataModels/Models/Cashier/ICashierModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BankDataModels.Models +namespace BankDataModels.Models.Cashier { // Интерфейс, отвечающий за кассира public interface ICashierModel : IId diff --git a/Bank/BankDataModels/Models/IMoneyTransferModel.cs b/Bank/BankDataModels/Models/Cashier/IMoneyTransferModel.cs similarity index 93% rename from Bank/BankDataModels/Models/IMoneyTransferModel.cs rename to Bank/BankDataModels/Models/Cashier/IMoneyTransferModel.cs index a6f92e4..bd40359 100644 --- a/Bank/BankDataModels/Models/IMoneyTransferModel.cs +++ b/Bank/BankDataModels/Models/Cashier/IMoneyTransferModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BankDataModels.Models +namespace BankDataModels.Models.Cashier { // Интерфейс, отвечающий за перевод денег public interface IMoneyTransferModel : IId diff --git a/Bank/BankDataModels/Models/ICardModel.cs b/Bank/BankDataModels/Models/Client/ICardModel.cs similarity index 94% rename from Bank/BankDataModels/Models/ICardModel.cs rename to Bank/BankDataModels/Models/Client/ICardModel.cs index 1a58865..bc631b2 100644 --- a/Bank/BankDataModels/Models/ICardModel.cs +++ b/Bank/BankDataModels/Models/Client/ICardModel.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BankDataModels.Models +namespace BankDataModels.Models.Client { // Интерфейс, отвечающий за банковскую карту public interface ICardModel : IId @@ -19,7 +19,7 @@ namespace BankDataModels.Models // Сумма на карте double Balance { get; } - + // Период пользования картой DateTime Period { get; } diff --git a/Bank/BankDataModels/Models/IClientModel.cs b/Bank/BankDataModels/Models/Client/IClientModel.cs similarity index 95% rename from Bank/BankDataModels/Models/IClientModel.cs rename to Bank/BankDataModels/Models/Client/IClientModel.cs index 9b2c480..fb99a29 100644 --- a/Bank/BankDataModels/Models/IClientModel.cs +++ b/Bank/BankDataModels/Models/Client/IClientModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BankDataModels.Models +namespace BankDataModels.Models.Client { // Интерфейс, отвечающий за клиента public interface IClientModel : IId diff --git a/Bank/BankDataModels/Models/ICreditingModel.cs b/Bank/BankDataModels/Models/Client/ICreditingModel.cs similarity index 86% rename from Bank/BankDataModels/Models/ICreditingModel.cs rename to Bank/BankDataModels/Models/Client/ICreditingModel.cs index bafbae7..9254554 100644 --- a/Bank/BankDataModels/Models/ICreditingModel.cs +++ b/Bank/BankDataModels/Models/Client/ICreditingModel.cs @@ -4,12 +4,12 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BankDataModels.Models +namespace BankDataModels.Models.Client { // Интерфейс, отвечающий за пополнение карты public interface ICreditingModel : IId { - int CardId { get; } + int CardId { get; } // Сумма на пополнение карты double Sum { get; } diff --git a/Bank/BankDataModels/Models/IDebitingModel.cs b/Bank/BankDataModels/Models/Client/IDebitingModel.cs similarity index 92% rename from Bank/BankDataModels/Models/IDebitingModel.cs rename to Bank/BankDataModels/Models/Client/IDebitingModel.cs index 1f5a0ab..ec97412 100644 --- a/Bank/BankDataModels/Models/IDebitingModel.cs +++ b/Bank/BankDataModels/Models/Client/IDebitingModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BankDataModels.Models +namespace BankDataModels.Models.Client { // Интерфейс, отвечающий за получение наличных по карте public interface IDebitingModel : IId diff --git a/Bank/BankDatabaseImplement/BankDatabase.cs b/Bank/BankDatabaseImplement/BankDatabase.cs index a36dcf0..e35e745 100644 --- a/Bank/BankDatabaseImplement/BankDatabase.cs +++ b/Bank/BankDatabaseImplement/BankDatabase.cs @@ -1,4 +1,5 @@ -using BankDatabaseImplement.Models; +using BankDatabaseImplement.Models.Cashier; +using BankDatabaseImplement.Models.Client; using Microsoft.EntityFrameworkCore; using System; using System.Collections.Generic; @@ -8,7 +9,7 @@ using System.Threading.Tasks; namespace BankDatabaseImplement { - public class BankDatabase : DbContext + public class BankDatabase : DbContext { protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { diff --git a/Bank/BankDatabaseImplement/Models/Card.cs b/Bank/BankDatabaseImplement/Models/Card.cs deleted file mode 100644 index 3d22ede..0000000 --- a/Bank/BankDatabaseImplement/Models/Card.cs +++ /dev/null @@ -1,84 +0,0 @@ -using BankContracts.BindingModels; -using BankContracts.ViewModels.Client.ViewModels; -using BankDataModels.Enums; -using BankDataModels.Models; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BankDatabaseImplement.Models -{ - public class Card : ICardModel - { - public int Id { get; set; } - - [Required] - public int ClientId { get; set; } - - public virtual Client Client { get; set; } - - [Required] - public int AccountId { get; set; } - - public virtual Account Account { get; set; } - - [Required] - public string Number { get; set; } = string.Empty; - - [Required] - public double Balance { get; set; } - - [Required] - public DateTime Period { get; set; } = DateTime.Now; - - [Required] - public StatusCard StatusCard { get; set; } = StatusCard.Закрыта; - - [Required] - public string? ClientSurname { get; set; } - - //[ForeignKey("CardId")] - //public virtual List Creditings { get; set; } = new(); - - //[ForeignKey("CardId")] - //public virtual List Debitings { get; set; } = new(); - - public CardViewModel GetViewModel => new() - { - Id = Id, - AccountId = AccountId, - ClientId = ClientId, - Number = Number, - Balance = Balance, - Period = Period, - StatusCard = StatusCard, - ClientSurname = ClientSurname - }; - - public static Card Create(BankDatabase context, CardBindingModel model) - { - return new Card() - { - Id = model.Id, - AccountId = model.AccountId, - Account = context.Accounts.First(x => x.Id == model.AccountId), - ClientId = model.ClientId, - Client = context.Clients.First(x => x.Id == model.ClientId), - Number = model.Number, - Balance = model.Balance, - Period = model.Period, - StatusCard = model.StatusCard, - }; - } - - public void Update(CardBindingModel model) - { - Period = model.Period; - } - } -} diff --git a/Bank/BankDatabaseImplement/Models/Account.cs b/Bank/BankDatabaseImplement/Models/Cashier/Account.cs similarity index 90% rename from Bank/BankDatabaseImplement/Models/Account.cs rename to Bank/BankDatabaseImplement/Models/Cashier/Account.cs index b29a2d4..14a0ea4 100644 --- a/Bank/BankDatabaseImplement/Models/Account.cs +++ b/Bank/BankDatabaseImplement/Models/Cashier/Account.cs @@ -1,5 +1,5 @@ using BankDataModels.Enums; -using BankDataModels.Models; +using BankDataModels.Models.Cashier; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; @@ -8,7 +8,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BankDatabaseImplement.Models +namespace BankDatabaseImplement.Models.Cashier.Cashier { //реализация аккаунта public class Account : IAccountModel @@ -22,7 +22,7 @@ namespace BankDatabaseImplement.Models public int ClientId { get; set; } //чтобы передать ФИО клиета public virtual Client Client { get; set; } - [Required] + [Required] public double Balance { get; set; } [Required] public DateTime DateOpen { get; set; } diff --git a/Bank/BankDatabaseImplement/Models/CashWithdrawal.cs b/Bank/BankDatabaseImplement/Models/Cashier/CashWithdrawal.cs similarity index 92% rename from Bank/BankDatabaseImplement/Models/CashWithdrawal.cs rename to Bank/BankDatabaseImplement/Models/Cashier/CashWithdrawal.cs index 289fbc4..efb7252 100644 --- a/Bank/BankDatabaseImplement/Models/CashWithdrawal.cs +++ b/Bank/BankDatabaseImplement/Models/Cashier/CashWithdrawal.cs @@ -1,7 +1,8 @@ -using BankContracts.BindingModels; +using BankContracts.BindingModels.Cashier; using BankContracts.StoragesModels; using BankContracts.ViewModels.Cashier.ViewModels; -using BankDataModels.Models; +using BankDatabaseImplement.Models.Client; +using BankDataModels.Models.Cashier; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; @@ -9,7 +10,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BankDatabaseImplement.Models +namespace BankDatabaseImplement.Models.Cashier { public class CashWithdrawal : ICashWithdrawalModel { diff --git a/Bank/BankDatabaseImplement/Models/Cashier.cs b/Bank/BankDatabaseImplement/Models/Cashier/Cashier.cs similarity index 94% rename from Bank/BankDatabaseImplement/Models/Cashier.cs rename to Bank/BankDatabaseImplement/Models/Cashier/Cashier.cs index 0b44e72..b5cb60d 100644 --- a/Bank/BankDatabaseImplement/Models/Cashier.cs +++ b/Bank/BankDatabaseImplement/Models/Cashier/Cashier.cs @@ -1,6 +1,4 @@ -using BankContracts.BindingModels; -using BankDataModels.Models; -using System; +using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations; @@ -8,8 +6,10 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using BankContracts.ViewModels.Cashier.ViewModels; +using BankContracts.BindingModels.Cashier; +using BankDataModels.Models.Cashier; -namespace BankDatabaseImplement.Models +namespace BankDatabaseImplement.Models.Cashier { public class Cashier : ICashierModel { diff --git a/Bank/BankDatabaseImplement/Models/MoneyTransfer.cs b/Bank/BankDatabaseImplement/Models/Cashier/MoneyTransfer.cs similarity index 91% rename from Bank/BankDatabaseImplement/Models/MoneyTransfer.cs rename to Bank/BankDatabaseImplement/Models/Cashier/MoneyTransfer.cs index 730e5f3..52a0ff4 100644 --- a/Bank/BankDatabaseImplement/Models/MoneyTransfer.cs +++ b/Bank/BankDatabaseImplement/Models/Cashier/MoneyTransfer.cs @@ -1,6 +1,6 @@ -using BankContracts.BindingModels; +using BankContracts.BindingModels.Cashier; using BankContracts.ViewModels.Cashier.ViewModels; -using BankDataModels.Models; +using BankDataModels.Models.Cashier; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; @@ -8,7 +8,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BankDatabaseImplement.Models +namespace BankDatabaseImplement.Models.Cashier { public class MoneyTransfer : IMoneyTransferModel { diff --git a/Bank/BankDatabaseImplement/Models/Client.cs b/Bank/BankDatabaseImplement/Models/Client.cs deleted file mode 100644 index 176a9d1..0000000 --- a/Bank/BankDatabaseImplement/Models/Client.cs +++ /dev/null @@ -1,74 +0,0 @@ -using BankContracts.BindingModels; -using BankContracts.ViewModels.Client.ViewModels; -using BankDataModels.Models; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BankDatabaseImplement.Models -{ - public class Client : IClientModel - { - public int Id { get; set; } - - [Required] - public string Name { get; set; } = string.Empty; - - [Required] - public string Surname { get; set; } = string.Empty; - - [Required] - public string Patronymic { get; set; } = string.Empty; - - [Required] - public string Email { get; set; } = string.Empty; - - [Required] - public string Password { get; set; } = string.Empty; - - [Required] - public string MobilePhone { get; set; } = string.Empty; - - [ForeignKey("ClientId")] - public virtual List Cards { get; set; } = new(); - - public ClientViewModel GetViewModel => new() - { - Id = Id, - Name = Name, - Surname = Surname, - Patronymic = Patronymic, - Email = Email, - Password = Password, - MobilePhone = MobilePhone - }; - - public static Client Create(ClientBindingModel model) - { - return new Client() - { - Id = model.Id, - Name = model.Name, - Surname = model.Surname, - Patronymic = model.Patronymic, - Email = model.Email, - Password = model.Password, - MobilePhone = model.MobilePhone, - }; - } - - public void Update(ClientBindingModel model) - { - Name = model.Name; - Surname = model.Surname; - Patronymic = model.Patronymic; - Email = model.Email; - Password = model.Password; - MobilePhone = model.MobilePhone; - } - } -} diff --git a/Bank/BankDatabaseImplement/Models/Client/Card.cs b/Bank/BankDatabaseImplement/Models/Client/Card.cs new file mode 100644 index 0000000..8334e03 --- /dev/null +++ b/Bank/BankDatabaseImplement/Models/Client/Card.cs @@ -0,0 +1,84 @@ +using BankContracts.BindingModels.Client; +using BankContracts.ViewModels.Client.ViewModels; +using BankDataModels.Enums; +using BankDataModels.Models.Client; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankDatabaseImplement.Models.Client.Client +{ + public class Card : ICardModel + { + public int Id { get; set; } + + [Required] + public int ClientId { get; set; } + + public virtual Client Client { get; set; } + + [Required] + public int AccountId { get; set; } + + public virtual Account Account { get; set; } + + [Required] + public string Number { get; set; } = string.Empty; + + [Required] + public double Balance { get; set; } + + [Required] + public DateTime Period { get; set; } = DateTime.Now; + + [Required] + public StatusCard StatusCard { get; set; } = StatusCard.Закрыта; + + [Required] + public string? ClientSurname { get; set; } + + //[ForeignKey("CardId")] + //public virtual List Creditings { get; set; } = new(); + + //[ForeignKey("CardId")] + //public virtual List Debitings { get; set; } = new(); + + public CardViewModel GetViewModel => new() + { + Id = Id, + AccountId = AccountId, + ClientId = ClientId, + Number = Number, + Balance = Balance, + Period = Period, + StatusCard = StatusCard, + ClientSurname = ClientSurname + }; + + public static Card Create(BankDatabase context, CardBindingModel model) + { + return new Card() + { + Id = model.Id, + AccountId = model.AccountId, + Account = context.Accounts.First(x => x.Id == model.AccountId), + ClientId = model.ClientId, + Client = context.Clients.First(x => x.Id == model.ClientId), + Number = model.Number, + Balance = model.Balance, + Period = model.Period, + StatusCard = model.StatusCard, + }; + } + + public void Update(CardBindingModel model) + { + Period = model.Period; + } + } +} diff --git a/Bank/BankDatabaseImplement/Models/Client/Client.cs b/Bank/BankDatabaseImplement/Models/Client/Client.cs new file mode 100644 index 0000000..2985146 --- /dev/null +++ b/Bank/BankDatabaseImplement/Models/Client/Client.cs @@ -0,0 +1,74 @@ +using BankContracts.BindingModels.Client; +using BankContracts.ViewModels.Client.ViewModels; +using BankDataModels.Models.Client; +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankDatabaseImplement.Models.Client +{ + public class Client : IClientModel + { + public int Id { get; set; } + + [Required] + public string Name { get; set; } = string.Empty; + + [Required] + public string Surname { get; set; } = string.Empty; + + [Required] + public string Patronymic { get; set; } = string.Empty; + + [Required] + public string Email { get; set; } = string.Empty; + + [Required] + public string Password { get; set; } = string.Empty; + + [Required] + public string MobilePhone { get; set; } = string.Empty; + + [ForeignKey("ClientId")] + public virtual List Cards { get; set; } = new(); + + public ClientViewModel GetViewModel => new() + { + Id = Id, + Name = Name, + Surname = Surname, + Patronymic = Patronymic, + Email = Email, + Password = Password, + MobilePhone = MobilePhone + }; + + public static Client Create(ClientBindingModel model) + { + return new Client() + { + Id = model.Id, + Name = model.Name, + Surname = model.Surname, + Patronymic = model.Patronymic, + Email = model.Email, + Password = model.Password, + MobilePhone = model.MobilePhone, + }; + } + + public void Update(ClientBindingModel model) + { + Name = model.Name; + Surname = model.Surname; + Patronymic = model.Patronymic; + Email = model.Email; + Password = model.Password; + MobilePhone = model.MobilePhone; + } + } +} diff --git a/Bank/BankDatabaseImplement/Models/Crediting.cs b/Bank/BankDatabaseImplement/Models/Client/Crediting.cs similarity index 87% rename from Bank/BankDatabaseImplement/Models/Crediting.cs rename to Bank/BankDatabaseImplement/Models/Client/Crediting.cs index 766f98b..d2d96b7 100644 --- a/Bank/BankDatabaseImplement/Models/Crediting.cs +++ b/Bank/BankDatabaseImplement/Models/Client/Crediting.cs @@ -1,6 +1,4 @@ -using BankContracts.BindingModels; -using BankContracts.ViewModels.Client.ViewModels; -using BankDataModels.Models; +using BankContracts.ViewModels.Client.ViewModels; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; @@ -8,8 +6,11 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Text; using System.Threading.Tasks; +using BankContracts.BindingModels.Client; +using BankDatabaseImplement.Models.Cashier; +using BankDataModels.Models.Client; -namespace BankDatabaseImplement.Models +namespace BankDatabaseImplement.Models.Client { public class Crediting : ICreditingModel { diff --git a/Bank/BankDatabaseImplement/Models/Debiting.cs b/Bank/BankDatabaseImplement/Models/Client/Debiting.cs similarity index 91% rename from Bank/BankDatabaseImplement/Models/Debiting.cs rename to Bank/BankDatabaseImplement/Models/Client/Debiting.cs index 1046c83..bca88e2 100644 --- a/Bank/BankDatabaseImplement/Models/Debiting.cs +++ b/Bank/BankDatabaseImplement/Models/Client/Debiting.cs @@ -1,6 +1,6 @@ -using BankContracts.BindingModels; +using BankContracts.BindingModels.Client; using BankContracts.ViewModels.Client.ViewModels; -using BankDataModels.Models; +using BankDataModels.Models.Client; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; @@ -8,7 +8,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BankDatabaseImplement.Models +namespace BankDatabaseImplement.Models.Client { public class Debiting : IDebitingModel {