diff --git a/Bank/BankContracts/BankContracts.csproj b/Bank/BankContracts/BankContracts.csproj index b3f6eb7..c49df50 100644 --- a/Bank/BankContracts/BankContracts.csproj +++ b/Bank/BankContracts/BankContracts.csproj @@ -7,11 +7,12 @@ - - - + + + + diff --git a/Bank/BankContracts/BindingModels/AccountBindingModel.cs b/Bank/BankContracts/BindingModels/AccountBindingModel.cs new file mode 100644 index 0000000..b2bab64 --- /dev/null +++ b/Bank/BankContracts/BindingModels/AccountBindingModel.cs @@ -0,0 +1,18 @@ +using BankDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankContracts.BindingModels +{ + public class AccountBindingModel : IAccountModel + { + public int Id { get; set; } + public string Number { get; set; } = string.Empty; + public int Money { get; set; } + public DateOnly ReleaseDate { get; set; } = DateOnly.FromDateTime(DateTime.Now); + public int ManagerId { get; set; } + } +} diff --git a/Bank/BankContracts/BindingModels/ManagerBindingModel.cs b/Bank/BankContracts/BindingModels/ManagerBindingModel.cs new file mode 100644 index 0000000..58aa4c8 --- /dev/null +++ b/Bank/BankContracts/BindingModels/ManagerBindingModel.cs @@ -0,0 +1,17 @@ +using BankDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankContracts.BindingModels +{ + public class ManagerBindingModel : IManagerModel + { + public int Id { get; set; } + public string Fio { get; set; } = string.Empty; + public string Email { get; set; } = string.Empty; + public string Password { get; set; } = string.Empty; + } +} diff --git a/Bank/BankContracts/BindingModels/TransferBindingModel.cs b/Bank/BankContracts/BindingModels/TransferBindingModel.cs new file mode 100644 index 0000000..ba15134 --- /dev/null +++ b/Bank/BankContracts/BindingModels/TransferBindingModel.cs @@ -0,0 +1,19 @@ +using BankDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankContracts.BindingModels +{ + public class TransferBindingModel : ITransferModel + { + public int Id { get; set; } + public int Sum { get; set; } + public DateTime TransferTime { get; set; } = DateTime.Now; + public int? OperationId { get; set; } + public int SenderAccountId { get; set; } + public int RecipientAccountId { get; set; } + } +} diff --git a/Bank/BankContracts/BindingModels/WithdrawalBindingModel.cs b/Bank/BankContracts/BindingModels/WithdrawalBindingModel.cs new file mode 100644 index 0000000..ca6b48c --- /dev/null +++ b/Bank/BankContracts/BindingModels/WithdrawalBindingModel.cs @@ -0,0 +1,16 @@ +using BankDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankContracts.BindingModels +{ + public class WithdrawalBindingModel : IWithdrawalModel + { + public int Id { get; set; } + public DateTime WithdrawalTime { get; set; } = DateTime.Now; + public int? RequestId { get; set; } + } +} diff --git a/Bank/BankContracts/SearchModels/AccountSearchModel.cs b/Bank/BankContracts/SearchModels/AccountSearchModel.cs new file mode 100644 index 0000000..e4553b4 --- /dev/null +++ b/Bank/BankContracts/SearchModels/AccountSearchModel.cs @@ -0,0 +1,16 @@ +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 string? Number { get; set; } + public DateOnly? ReleaseDate { get; set; } + public int? ManagerId { get; set; } + } +} diff --git a/Bank/BankContracts/SearchModels/ManagerSearchModel.cs b/Bank/BankContracts/SearchModels/ManagerSearchModel.cs new file mode 100644 index 0000000..0c8e2e5 --- /dev/null +++ b/Bank/BankContracts/SearchModels/ManagerSearchModel.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankContracts.SearchModels +{ + public class ManagerSearchModel + { + public int? Id { get; set; } + public string? Fio { get; set; } + public string? Email { get; set; } + public string? Password { get; set; } + } +} diff --git a/Bank/BankContracts/SearchModels/TransferSearchModel.cs b/Bank/BankContracts/SearchModels/TransferSearchModel.cs new file mode 100644 index 0000000..9c8438a --- /dev/null +++ b/Bank/BankContracts/SearchModels/TransferSearchModel.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankContracts.SearchModels +{ + public class TransferSearchModel + { + public int? Id { get; set; } + public DateTime? TransferTime { get; set; } + public int? OperationId { get; set; } + public int? SenderAccountId { get; set; } + public int? RecipientAccountId { get; set; } + } +} diff --git a/Bank/BankContracts/SearchModels/WithdrawalSearchModel.cs b/Bank/BankContracts/SearchModels/WithdrawalSearchModel.cs new file mode 100644 index 0000000..6dddf98 --- /dev/null +++ b/Bank/BankContracts/SearchModels/WithdrawalSearchModel.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankContracts.SearchModels +{ + public class WithdrawalSearchModel + { + public int? Id { get; set; } + public DateTime? WithdrawalTime { get; set; } + public int? RequestId { get; set; } + } +} diff --git a/Bank/BankContracts/ViewModels/AccountViewModel.cs b/Bank/BankContracts/ViewModels/AccountViewModel.cs new file mode 100644 index 0000000..fafb0a9 --- /dev/null +++ b/Bank/BankContracts/ViewModels/AccountViewModel.cs @@ -0,0 +1,22 @@ +using BankDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankContracts.ViewModels +{ + public class AccountViewModel : IAccountModel + { + public int Id { get; set; } + [DisplayName("Номер счёта")] + public string Number { get; set; } = string.Empty; + [DisplayName("Деньги на счёте")] + public int Money { get; set; } + [DisplayName("Дата открытия")] + public DateOnly ReleaseDate { get; set; } = DateOnly.FromDateTime(DateTime.Now); + public int ManagerId { get; set; } + } +} diff --git a/Bank/BankContracts/ViewModels/ManagerViewModel.cs b/Bank/BankContracts/ViewModels/ManagerViewModel.cs new file mode 100644 index 0000000..0e93c59 --- /dev/null +++ b/Bank/BankContracts/ViewModels/ManagerViewModel.cs @@ -0,0 +1,22 @@ +using BankDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankContracts.ViewModels +{ + public class ManagerViewModel : IManagerModel + { + public int Id { get; set; } + [DisplayName("ФИО менеджера")] + public string Fio { get; set; } = string.Empty; + [DisplayName("Email")] + + public string Email { get; set; } = string.Empty; + + public string Password { get; set; } = string.Empty; + } +} diff --git a/Bank/BankContracts/ViewModels/TransferViewModel.cs b/Bank/BankContracts/ViewModels/TransferViewModel.cs new file mode 100644 index 0000000..5748b60 --- /dev/null +++ b/Bank/BankContracts/ViewModels/TransferViewModel.cs @@ -0,0 +1,28 @@ +using BankDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankContracts.ViewModels +{ + public class TransferViewModel : ITransferModel + { + [DisplayName("Номер перевода")] + public int Id { get; set; } + [DisplayName("Сумма")] + public int Sum { get; set; } + [DisplayName("Время")] + public DateTime TransferTime { get; set; } = DateTime.Now; + [DisplayName("Номер операции")] + public int? OperationId { get; set; } + public int SenderAccountId { get; set; } + public int RecipientAccountId { get; set; } + [DisplayName("Номер счёта отправителя")] + public string SenderAccountNumber { get; set; } = string.Empty; + [DisplayName("Номер счёта получателя")] + public string RecipientAccountNumber { get; set; } = string.Empty; + } +} diff --git a/Bank/BankContracts/ViewModels/WithdrawalViewModel.cs b/Bank/BankContracts/ViewModels/WithdrawalViewModel.cs new file mode 100644 index 0000000..8f9b26c --- /dev/null +++ b/Bank/BankContracts/ViewModels/WithdrawalViewModel.cs @@ -0,0 +1,20 @@ +using BankDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankContracts.ViewModels +{ + public class WithdrawalViewModel : IWithdrawalModel + { + [DisplayName("Номер выдачи")] + public int Id { get; set; } + [DisplayName("Время")] + public DateTime WithdrawalTime { get; set; } = DateTime.Now; + [DisplayName("Номер заявки")] + public int? RequestId { get; set; } + } +} diff --git a/Bank/BankDataModels/Models/IOperationModel.cs b/Bank/BankDataModels/Models/IOperationModel.cs index 2d0b393..a8efd01 100644 --- a/Bank/BankDataModels/Models/IOperationModel.cs +++ b/Bank/BankDataModels/Models/IOperationModel.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace BankDataModels.Models { - public interface IOperationModel + public interface IOperationModel : IId { int sum { get; set; } DateTime OperationTime { get; set; } diff --git a/Bank/BankDataModels/Models/ITransferModel.cs b/Bank/BankDataModels/Models/ITransferModel.cs index 2f245df..5932972 100644 --- a/Bank/BankDataModels/Models/ITransferModel.cs +++ b/Bank/BankDataModels/Models/ITransferModel.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace BankDataModels.Models { - public interface ITransferModel + public interface ITransferModel : IId { int Sum { get; set; } DateTime TransferTime { get; set; } diff --git a/Bank/BankDataModels/Models/IWithdrawalModel.cs b/Bank/BankDataModels/Models/IWithdrawalModel.cs index 72c9194..221735c 100644 --- a/Bank/BankDataModels/Models/IWithdrawalModel.cs +++ b/Bank/BankDataModels/Models/IWithdrawalModel.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace BankDataModels.Models { - public interface IWithdrawalModel + public interface IWithdrawalModel : IId { DateTime WithdrawalTime { get; set; } int? RequestId { get; set; }