From db07c95d36b33efb5ff1d3826ce86fb03dd69b60 Mon Sep 17 00:00:00 2001
From: Zakharov_Rostislav <r.z.8102.80@gmail.com>
Date: Sun, 28 Apr 2024 21:27:45 +0400
Subject: [PATCH] change IWithdrawalModel

---
 .../BindingModels/WithdrawalBindingModel.cs              | 3 +--
 Bank/BankContracts/ViewModels/WithdrawalViewModel.cs     | 2 +-
 Bank/BankDataModels/Models/IWithdrawalModel.cs           | 2 +-
 Bank/BankDatabaseImplement/Models/AccountWithdrawal.cs   | 2 ++
 Bank/BankDatabaseImplement/Models/Withdrawal.cs          | 9 ++++++---
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Bank/BankContracts/BindingModels/WithdrawalBindingModel.cs b/Bank/BankContracts/BindingModels/WithdrawalBindingModel.cs
index 076bda7..3c99359 100644
--- a/Bank/BankContracts/BindingModels/WithdrawalBindingModel.cs
+++ b/Bank/BankContracts/BindingModels/WithdrawalBindingModel.cs
@@ -12,7 +12,6 @@ namespace BankContracts.BindingModels
         public int Id { get; set; }
         public DateTime WithdrawalTime { get; set; } = DateTime.Now;
         public int? RequestId { get; set; }
-
-        public Dictionary<int, IAccountModel> WithdrawalAccounts = new Dictionary<int, IAccountModel>();
+        public Dictionary<int, (IAccountModel, int)> WithdrawalAccounts { get; set; } = new();
     }
 }
diff --git a/Bank/BankContracts/ViewModels/WithdrawalViewModel.cs b/Bank/BankContracts/ViewModels/WithdrawalViewModel.cs
index 1899a7c..037064f 100644
--- a/Bank/BankContracts/ViewModels/WithdrawalViewModel.cs
+++ b/Bank/BankContracts/ViewModels/WithdrawalViewModel.cs
@@ -16,6 +16,6 @@ namespace BankContracts.ViewModels
         public DateTime WithdrawalTime { get; set; } = DateTime.Now;
         [DisplayName("Номер заявки")]
         public int? RequestId { get; set; }
-        public Dictionary<int, IAccountModel> WithdrawalAccounts { get; set; } = new();
+        public Dictionary<int, (IAccountModel, int)> WithdrawalAccounts { get; set; } = new();
     }
 }
diff --git a/Bank/BankDataModels/Models/IWithdrawalModel.cs b/Bank/BankDataModels/Models/IWithdrawalModel.cs
index a8de01d..261f577 100644
--- a/Bank/BankDataModels/Models/IWithdrawalModel.cs
+++ b/Bank/BankDataModels/Models/IWithdrawalModel.cs
@@ -10,6 +10,6 @@ namespace BankDataModels.Models
     {
         DateTime WithdrawalTime { get; set; }
         int? RequestId { get; set; }
-        Dictionary<int, IAccountModel> WithdrawalAccounts { get; }
+        Dictionary<int, (IAccountModel, int)> WithdrawalAccounts { get; }
     }
 }
diff --git a/Bank/BankDatabaseImplement/Models/AccountWithdrawal.cs b/Bank/BankDatabaseImplement/Models/AccountWithdrawal.cs
index 448aaee..4a7dbad 100644
--- a/Bank/BankDatabaseImplement/Models/AccountWithdrawal.cs
+++ b/Bank/BankDatabaseImplement/Models/AccountWithdrawal.cs
@@ -14,6 +14,8 @@ namespace BankDatabaseImplement.Models
         public int AccountId { get; set; }
         [Required]
         public int WithdrawalId { get; set; }
+        [Required]
+        public int Sum { get; set; }
         public virtual Account Account { get; set; } = new();
         public virtual Withdrawal Withdrawal { get; set; } = new();
     }
diff --git a/Bank/BankDatabaseImplement/Models/Withdrawal.cs b/Bank/BankDatabaseImplement/Models/Withdrawal.cs
index 7641285..27146c7 100644
--- a/Bank/BankDatabaseImplement/Models/Withdrawal.cs
+++ b/Bank/BankDatabaseImplement/Models/Withdrawal.cs
@@ -21,15 +21,18 @@ namespace BankDatabaseImplement.Models
         public virtual Request? Request { get; set; } = null;
         [ForeignKey("WithdrawalId")]
         public virtual List<AccountWithdrawal> Accounts { get; set; } = new();
-        private Dictionary<int, IAccountModel>? _withdrawalAccounts { get; set; } = null;
+        private Dictionary<int, (IAccountModel, int)>? _withdrawalAccounts { get; set; } = null;
         [NotMapped]
-        public Dictionary<int, IAccountModel> WithdrawalAccounts
+        public Dictionary<int, (IAccountModel, int)> WithdrawalAccounts
         {
             get
             {
                 if (_withdrawalAccounts == null)
                 {
-                    _withdrawalAccounts = Accounts.ToDictionary(x => x.AccountId, x => x.Account as IAccountModel);
+                    _withdrawalAccounts = Accounts.ToDictionary(
+                        x => x.AccountId, 
+                        x => (x.Account as IAccountModel, x.Sum)
+                    );
                 }
                 return _withdrawalAccounts;
             }