Правки сущностей "Кассир" и "Выдача наличных со счёта".

BankYouBankrupt/BankYouBankruptContracts/BindingModels/CashWithdrawalBindingModel.cs

@@ -11,8 +11,12 @@ namespace BankYouBankruptContracts.BindingModels
 	{
 		public int Id { get; set; }
 
+		public int DebitingId { get; set; }
+
 		public int AccountId { get; set; }
 
+		public int CashierId { get; set; }
+
 		public int Sum { get; set; }
 
 		public DateTime DateOperation { get; set; } = DateTime.Now;

BankYouBankrupt/BankYouBankruptContracts/SearchModels/CashWithdrawalSearchModel.cs

@@ -10,8 +10,12 @@ namespace BankYouBankruptContracts.SearchModels
 	{
 		public int? Id { get; set; }
 
+		public int? DebitingId { get; set; }
+
 		public int? AccountId { get; set; }
 
+		public int? CashierId { get; set; }
+
 		public int? Sum { get; set; }
 
 		public DateTime? DateFrom { get; set; }

BankYouBankrupt/BankYouBankruptContracts/ViewModels/CashWithdrawalViewModel.cs

@@ -12,11 +12,21 @@ namespace BankYouBankruptContracts.ViewModels
 	{
 		public int Id { get; set; }
 
+		public int DebitingId { get; set; }
+
+		[DisplayName("Номер заявки на снятие средств")]
+		public int DebbitingNumber { get; set; }
+
 		public int AccountId { get; set; }
 
 		[DisplayName("Номер счёта")]
 		public int AccountNumber { get; set; }
 
+		public int CashierId { get; set; }
+
+		[DisplayName("Кассир")]
+		public string SurmaneCashier { get; set; } = string.Empty;
+
 		[DisplayName("Сумма выданных наличных")]
 		public int Sum { get; set; }
 

BankYouBankrupt/BankYouBankruptDataModels/Models/ICashWithdrawalModel.cs

@@ -9,8 +9,12 @@ namespace BankYouBankruptDataModels.Models
 	//выдача наличных
 	public interface ICashWithdrawalModel : IId
 	{
+		int DebitingId { get; }
+
 		int AccountId { get; }
 
+		int CashierId { get; }
+
 		int Sum { get; }
 
 		DateTime DateOperation { get; }

BankYouBankrupt/BankYouBankruptDatabaseImplement/Implements/AccountStorage.cs

@@ -19,6 +19,7 @@ namespace BankYouBankruptDatabaseImplement.Implements
 			using var context = new BankYouBancruptDatabase();
 
 			return context.Accounts
+					.Include(x => x.Client)
 					.Select(x => x.GetViewModel)
 					.ToList();
 		}
@@ -70,6 +71,7 @@ namespace BankYouBankruptDatabaseImplement.Implements
 			using var context = new BankYouBancruptDatabase();
 
 			return context.Accounts
+					.Include(x => x.Client)
 					.FirstOrDefault(x => (!string.IsNullOrEmpty(model.AccountNumber) && x.AccountNumber == model.AccountNumber) ||
 										(model.Id.HasValue && x.Id == model.Id))
 					?.GetViewModel;

BankYouBankrupt/BankYouBankruptDatabaseImplement/Implements/CardStorage.cs

@@ -37,6 +37,7 @@ namespace BankYouBankruptDatabaseImplement.Implements
             using var context = new BankYouBancruptDatabase();
 
             return context.Cards
+				    .Include(x => x.Client)
 					.FirstOrDefault(x => (!string.IsNullOrEmpty(model.Number) && x.Number == model.Number) ||
                                         (model.Id.HasValue && x.Id == model.Id))
                     ?.GetViewModel;
@@ -75,6 +76,7 @@ namespace BankYouBankruptDatabaseImplement.Implements
             using var context = new BankYouBancruptDatabase();
 
             return context.Cards
+				    .Include(x => x.Client)
 					.Select(x => x.GetViewModel)
                     .ToList();
         }

BankYouBankrupt/BankYouBankruptDatabaseImplement/Implements/CashWithdrawalStorage.cs

@@ -19,6 +19,8 @@ namespace BankYouBankruptDatabaseImplement.Implements
 			using var context = new BankYouBancruptDatabase();
 
 			return context.CashWithdrawals
+					.Include(x => x.Cashier)
+					.Include(x => x.Debiting)
 					.Select(x => x.GetViewModel)
 					.ToList();
 		}
@@ -32,7 +34,19 @@ namespace BankYouBankruptDatabaseImplement.Implements
 
 			using var context = new BankYouBancruptDatabase();
 
+			if (model.CashierId.HasValue)
+			{
 				return context.CashWithdrawals
+					.Include(x => x.Cashier)
+					.Include(x => x.Debiting)
+					.Where(x => x.CashierId == model.CashierId)
+					.Select(x => x.GetViewModel)
+					.ToList();
+			}
+
+			return context.CashWithdrawals
+					.Include(x => x.Cashier)
+					.Include(x => x.Debiting)
 					.Where(x => x.AccountId == model.AccountId)
 					.Select(x => x.GetViewModel)
 					.ToList();
@@ -48,6 +62,8 @@ namespace BankYouBankruptDatabaseImplement.Implements
 			using var context = new BankYouBancruptDatabase();
 
 			return context.CashWithdrawals
+					.Include(x => x.Cashier)
+					.Include(x => x.Debiting)
 					.FirstOrDefault(x => (!(model.AccountId < 0) && x.AccountId == model.AccountId) ||
 										(model.Id.HasValue && x.Id == model.Id))
 					?.GetViewModel;

BankYouBankrupt/BankYouBankruptDatabaseImplement/Models/CashWithdrawal.cs

@@ -15,12 +15,24 @@ namespace BankYouBankruptDatabaseImplement.Models
     {
 		public int Id { get; set; }
 
+		[Required]
+		public int DebitingId { get; set; }
+
+		//для передачи номера заявки
+		public virtual Debiting Debiting { get; set; }
+
 		[Required]
 		public int AccountId { get; set; }
 
 		//для передачи названия изделия
 		public virtual Account Account { get; set; }
 
+		[Required]
+		public int CashierId { get; set; }
+
+		//для передачи фамилии кассира
+		public virtual Cashier Cashier { get; set; }
+
 		[Required]
 		public int Sum { get; set; }
 
@@ -33,7 +45,6 @@ namespace BankYouBankruptDatabaseImplement.Models
 			{
 				Id = model.Id,
 				AccountId = model.AccountId,
-				Account = context.Accounts.First(x => x.Id == model.AccountId),
 				Sum = model.Sum,
 				DateOperation = model.DateOperation
 			};

BankYouBankrupt/BankYouBankruptDatabaseImplement/Models/Cashier.cs

@@ -38,6 +38,10 @@ namespace BankYouBankruptDatabaseImplement.Models
 		[ForeignKey("CashierId")]
 		public virtual List<Account> Accounts { get; set; } = new();
 
+		//для реализации связи один ко многим с заявками на снятие наличных со счёта
+		[ForeignKey("CashierId")]
+		public virtual List<CashWithdrawal> CashWithdrawals { get; set; } = new();
+
 		public static Cashier Create(BankYouBancruptDatabase context, CashierBindingModel model)
 		{
 			return new Cashier()