Merge branch 'main' of http://student.git.athene.tech/Andrey_Abazov/CourseWork_Bank

Bank/BankContracts/BindingModels/CreditProgramBindingModel.cs

@@ -16,5 +16,6 @@ namespace BankContracts.BindingModels
         public Dictionary<int, ICurrencyModel> CreditProgramCurrencies { get; set; } = new();
 
         public int Id { get; set; }
+        public int BankOperatorId { get; set; }
     }
 }

Bank/BankContracts/BindingModels/CurrencyBindingModel.cs

@@ -11,5 +11,6 @@ namespace BankContracts.BindingModels
     {
         public string Name { get; set; } = String.Empty;
         public int Id { get; set; }
+        public int BankOperatorId { get; set; }
     }
 }

Bank/BankContracts/SearchModels/CreditProgramSearchModel.cs

@@ -9,5 +9,6 @@ namespace BankContracts.SearchModels
     public class CreditProgramSearchModel
     {
         public int? Id { get; set; }
+        public int? BankOperatorId { get; set; }
     }
 }

Bank/BankContracts/SearchModels/CurrencyPurchaseSearchModel.cs

@@ -9,5 +9,6 @@ namespace BankContracts.SearchModels
     public class CurrencyPurchaseSearchModel
     {
         public int? Id { get; set; }
+        public int? BankOperatorId { get; set; }
     }
 }

Bank/BankContracts/SearchModels/CurrencySearchModel.cs

@@ -9,5 +9,6 @@ namespace BankContracts.SearchModels
     public class CurrencySearchModel
     {
         public int? Id { get; set; }
+        public int? BankOperatorId { get; set; }
     }
 }

Bank/BankContracts/ViewModels/CreditProgramViewModel.cs

@@ -11,11 +11,14 @@ namespace BankContracts.ViewModels
     public class CreditProgramViewModel : ICreditProgramModel
     {
         [DisplayName("Название кредитной программы")]
-        public string Name { get; set; } = String.Empty;
+        public string Name { get; set; } = string.Empty;
         [DisplayName("Процент кредитования")]
         public float Percent { get; set; }
         public Dictionary<int, ICurrencyModel> CreditProgramCurrencies { get; set; } = new();
         [DisplayName("Номер программы")]
         public int Id { get; set; }
+        public int BankOperatorId { get; set; }
+        [DisplayName("ФИО оператора")]
+        public string BankOperatorFIO { get; set; } = string.Empty;
     }
 }

Bank/BankContracts/ViewModels/CurrencyPurchaseViewModel.cs

@@ -16,11 +16,12 @@ namespace BankContracts.ViewModels
         public DateTime PurchaseDate { get; set; } = DateTime.Now.Date;
         public int BankOperatorId { get; set; }
         [DisplayName("ФИО оператора")]
-        public string BankOperatorName { get; set; }
+        public string BankOperatorName { get; set; } = string.Empty;
         public int CurrencyId { get; set; }
         [DisplayName("Название валюты")]
-        public string CurrencyName { get; set; }
+        public string CurrencyName { get; set; } = string.Empty;
         [DisplayName("Номер покупки")]
         public int Id { get; set; }
+
     }
 }

Bank/BankContracts/ViewModels/CurrencyViewModel.cs

@@ -11,8 +11,11 @@ namespace BankContracts.ViewModels
     public class CurrencyViewModel : ICurrencyModel
     {
         [DisplayName("Название валюты")]
-        public string Name { get; set; } = String.Empty;
+        public string Name { get; set; } = string.Empty;
         [DisplayName("Номер валюты")]
         public int Id { get; set; }
+        public int BankOperatorId { get; set; }
+        [DisplayName("ФИО оператора")]
+        public string BankOperatorName { get; set; } = string.Empty;
     }
 }

Bank/BankDataModels/Models/ICreditProgramModel.cs

@@ -10,6 +10,7 @@ namespace BankDataModels.Models
     {
         string Name { get;}
         float Percent { get;}
+        int BankOperatorId { get;}
         Dictionary<int, ICurrencyModel> CreditProgramCurrencies { get; }
     }
 }

Bank/BankDataModels/Models/ICurrencyModel.cs

@@ -9,5 +9,6 @@ namespace BankDataModels.Models
     public interface ICurrencyModel : IId
     {
         string Name { get; }
+        int BankOperatorId { get; }
     }
 }

Bank/BankDatabaseImplement/Implements/BankOperatorStorage.cs

@@ -0,0 +1,88 @@
+using BankContracts.BindingModels;
+using BankContracts.SearchModels;
+using BankContracts.StoragesContracts;
+using BankContracts.ViewModels;
+using BankDatabaseImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BankDatabaseImplement.Implements
+{
+    public class BankOperatorStorage : IBankOperatorStorage
+    {
+        public BankOperatorViewModel? Delete(BankOperatorBindingModel model)
+        {
+            using var context = new BankDatabase();
+            var element = context.BankOperators.FirstOrDefault(rec => rec.Id == model.Id);
+            if (element != null)
+            {
+                context.BankOperators.Remove(element);
+                context.SaveChanges();
+                return element.GetViewModel;
+            }
+            return null;
+        }
+
+        public BankOperatorViewModel? GetElement(BankOperatorSearchModel model)
+        {
+            if (!model.Id.HasValue)
+            {
+                return null;
+            }
+            using var context = new BankDatabase();
+            return context.BankOperators
+            .FirstOrDefault(x => x.Id == model.Id)
+            ?.GetViewModel;
+        }
+
+        public List<BankOperatorViewModel> GetFilteredList(BankOperatorSearchModel model)
+        {
+            if (!model.Id.HasValue)
+            {
+                return new();
+            }
+            using var context = new BankDatabase();
+            return context.BankOperators
+            .Where(x => x.Id == model.Id)
+            .Select(x => x.GetViewModel)
+            .ToList();
+        }
+
+        public List<BankOperatorViewModel> GetFullList()
+        {
+            using var context = new BankDatabase();
+            return context.BankOperators
+            .Select(x => x.GetViewModel)
+            .ToList();
+        }
+
+        public BankOperatorViewModel? Insert(BankOperatorBindingModel model)
+        {
+            using var context = new BankDatabase();
+            var newBankOperator = BankOperator.Create(model);
+            if (newBankOperator == null)
+            {
+                return null;
+            }
+            context.BankOperators.Add(newBankOperator);
+            context.SaveChanges();
+            return newBankOperator.GetViewModel;
+        }
+
+        public BankOperatorViewModel? Update(BankOperatorBindingModel model)
+        {
+            using var context = new BankDatabase();
+            var bankOperator = context.BankOperators.FirstOrDefault(x => x.Id == model.Id);
+            if (bankOperator == null)
+            {
+                return null;
+            }
+            bankOperator.Update(model);
+            context.SaveChanges();
+            return bankOperator.GetViewModel;
+        }
+    }
+}

Bank/BankDatabaseImplement/Implements/CreditProgramStorage.cs

@@ -0,0 +1,101 @@
+using BankContracts.BindingModels;
+using BankContracts.SearchModels;
+using BankContracts.StoragesContracts;
+using BankContracts.ViewModels;
+using BankDatabaseImplement.Models;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BankDatabaseImplement.Implements
+{
+    public class CreditProgramStorage : ICreditProgramStorage
+    {
+        public CreditProgramViewModel? Delete(CreditProgramBindingModel model)
+        {
+            using var context = new BankDatabase();
+            var element = context.CreditPrograms.FirstOrDefault(rec => rec.Id == model.Id);
+            if (element != null)
+            {
+                context.CreditPrograms.Remove(element);
+                context.SaveChanges();
+                return element.GetViewModel;
+            }
+            return null;
+        }
+
+        public CreditProgramViewModel? GetElement(CreditProgramSearchModel model)
+        {
+            if (!model.Id.HasValue)
+            {
+                return null;
+            }
+            using var context = new BankDatabase();
+            return context.CreditPrograms.Include(x => x.BankOperator)
+            .FirstOrDefault(x => x.Id == model.Id)
+            ?.GetViewModel;
+        }
+
+        public List<CreditProgramViewModel> GetFilteredList(CreditProgramSearchModel model)
+        {
+            if (!model.Id.HasValue && !model.BankOperatorId.HasValue)
+            {
+                return new();
+            }
+            if (model.BankOperatorId.HasValue)
+            {
+                using var context = new BankDatabase();
+                return context.CreditPrograms.Include(x => x.BankOperator)
+                .Where(x => x.BankOperatorId == model.BankOperatorId)
+                .Select(x => x.GetViewModel)
+                .ToList();
+            }
+            else
+            {
+                using var context = new BankDatabase();
+                return context.CreditPrograms.Include(x => x.BankOperator)
+                .Where(x => x.Id == model.Id)
+                .Select(x => x.GetViewModel)
+                .ToList();
+            }
+        }
+
+        public List<CreditProgramViewModel> GetFullList()
+        {
+            using var context = new BankDatabase();
+            return context.CreditPrograms.Include(x => x.BankOperator)
+            .Select(x => x.GetViewModel)
+            .ToList();
+        }
+
+        public CreditProgramViewModel? Insert(CreditProgramBindingModel model)
+        {
+            using var context = new BankDatabase();
+            var newCreditProgram = CreditProgram.Create(context, model);
+            if (newCreditProgram == null)
+            {
+                return null;
+            }
+            context.CreditPrograms.Add(newCreditProgram);
+            context.SaveChanges();
+            return newCreditProgram.GetViewModel;
+        }
+
+        public CreditProgramViewModel? Update(CreditProgramBindingModel model)
+        {
+            using var context = new BankDatabase();
+            var creditProgram = context.CreditPrograms.FirstOrDefault(x => x.Id == model.Id);
+            if (creditProgram == null)
+            {
+                return null;
+            }
+            creditProgram.Update(model);
+            creditProgram.UpdateCurrencies(context, model);
+            context.SaveChanges();
+            return creditProgram.GetViewModel;
+        }
+    }
+}

Bank/BankDatabaseImplement/Implements/CurrencyPurchaseStorage.cs

@@ -0,0 +1,89 @@
+using BankContracts.BindingModels;
+using BankContracts.SearchModels;
+using BankContracts.StoragesContracts;
+using BankContracts.ViewModels;
+using BankDatabaseImplement.Models;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BankDatabaseImplement.Implements
+{
+    public class CurrencyPurchaseStorage : ICurrencyPurchaseStorage
+    {
+        public CurrencyPurchaseViewModel? Delete(CurrencyPurchaseBindingModel model)
+        {
+            using var context = new BankDatabase();
+            var currencyPurchase = context.CurrencyPurchases.FirstOrDefault(x => x.Id == model.Id);
+            if (currencyPurchase == null)
+            {
+                return null;
+            }
+            currencyPurchase.Update(model);
+            context.SaveChanges();
+            return currencyPurchase.GetViewModel;
+        }
+
+        public CurrencyPurchaseViewModel? GetElement(CurrencyPurchaseSearchModel model)
+        {
+            if (!model.Id.HasValue)
+            {
+                return null;
+            }
+            using var context = new BankDatabase();
+            return context.CurrencyPurchases.Include(x => x.BankOperator).Include(x=>x.Currency)
+            .FirstOrDefault(x => x.Id == model.Id)
+            ?.GetViewModel;
+        }
+
+        public List<CurrencyPurchaseViewModel> GetFilteredList(CurrencyPurchaseSearchModel model)
+        {
+            if (!model.Id.HasValue)
+            {
+                return new();
+            }
+                using var context = new BankDatabase();
+                return context.CurrencyPurchases.Include(x => x.BankOperator).Include(x=>x.Currency)
+                .Where(x => x.Id == model.Id)
+                .Select(x => x.GetViewModel)
+                .ToList();
+        }
+
+        public List<CurrencyPurchaseViewModel> GetFullList()
+        {
+            using var context = new BankDatabase();
+            return context.CurrencyPurchases.Include(x => x.BankOperator).Include(x=> x.Currency)
+            .Select(x => x.GetViewModel)
+            .ToList();
+        }
+
+        public CurrencyPurchaseViewModel? Insert(CurrencyPurchaseBindingModel model)
+        {
+            using var context = new BankDatabase();
+            var newCurrencyPurchase = CurrencyPurchase.Create(context, model);
+            if (newCurrencyPurchase == null)
+            {
+                return null;
+            }
+            context.CurrencyPurchases.Add(newCurrencyPurchase);
+            context.SaveChanges();
+            return newCurrencyPurchase.GetViewModel;
+        }
+
+        public CurrencyPurchaseViewModel? Update(CurrencyPurchaseBindingModel model)
+        {
+            using var context = new BankDatabase();
+            var currencyPurchase = context.CurrencyPurchases.FirstOrDefault(x => x.Id == model.Id);
+            if (currencyPurchase == null)
+            {
+                return null;
+            }
+            currencyPurchase.Update(model);
+            context.SaveChanges();
+            return currencyPurchase.GetViewModel;
+        }
+    }
+}

Bank/BankDatabaseImplement/Implements/CurrencyStorage.cs

@@ -3,6 +3,7 @@ using BankContracts.SearchModels;
 using BankContracts.StoragesContracts;
 using BankContracts.ViewModels;
 using BankDatabaseImplement.Models;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -33,28 +34,39 @@ namespace BankDatabaseImplement.Implements
                 return null;
             }
             using var context = new BankDatabase();
-            return context.Currencies
+            return context.Currencies.Include(x => x.BankOperator)
             .FirstOrDefault(x => x.Id == model.Id)
             ?.GetViewModel;
         }
 
         public List<CurrencyViewModel> GetFilteredList(CurrencySearchModel model)
         {
-            if (!model.Id.HasValue)
+            if (!model.Id.HasValue && !model.BankOperatorId.HasValue)
             {
                 return new();
             }
-            using var context = new BankDatabase();
+            if (model.BankOperatorId.HasValue)
-            return context.Currencies
+            {
-            .Where(x => x.Id == model.Id)
+                using var context = new BankDatabase();
-            .Select(x => x.GetViewModel)
+                return context.Currencies.Include(x => x.BankOperator)
-            .ToList();
+                .Where(x => x.BankOperatorId == model.BankOperatorId)
+                .Select(x => x.GetViewModel)
+                .ToList();
+            }
+            else
+            {
+                using var context = new BankDatabase();
+                return context.Currencies.Include(x => x.BankOperator)
+                .Where(x => x.Id == model.Id)
+                .Select(x => x.GetViewModel)
+                .ToList();
+            }
         }
 
         public List<CurrencyViewModel> GetFullList()
         {
             using var context = new BankDatabase();
-            return context.Currencies
+            return context.Currencies.Include(x => x.BankOperator)
             .Select(x => x.GetViewModel)
             .ToList();
         }

Bank/BankDatabaseImplement/Models/CreditProgram.cs

@@ -18,6 +18,8 @@ namespace BankDatabaseImplement.Models
         public float Percent { get; set; }
         [Required]
         public string Name { get; set; }
+        public int BankOperatorId { get; set; }
+        public virtual BankOperator BankOperator { get; set; } = new();
 
         private Dictionary<int, ICurrencyModel>? _creditProgramCurrencies = null;
         [NotMapped]
@@ -49,7 +51,9 @@ namespace BankDatabaseImplement.Models
                 Currencies = model.CreditProgramCurrencies.Select(x => new CreditProgramCurrency
                 {
                     Currency = context.Currencies.First(y => y.Id == x.Key)
-                }).ToList()
+                }).ToList(),
+                BankOperatorId = model.BankOperatorId,
+                BankOperator = context.BankOperators.First(x => x.Id == model.BankOperatorId),
             };
         }
         public void Update(CreditProgramBindingModel? model)
@@ -73,7 +77,7 @@ namespace BankDatabaseImplement.Models
             var creditProgramsCurrencies = context.CreditProgramCurrencies.Where(rec => rec.CreditProgramId == model.Id).ToList();
             if (creditProgramsCurrencies != null && creditProgramsCurrencies.Count > 0)
             {
-                context.CreditProgramCurrencies.RemoveRange(creditProgramsCurrencies.Where(rec => !model.CreditProgramCurrencies.ContainsKey(rec.DealId)));
+                context.CreditProgramCurrencies.RemoveRange(creditProgramsCurrencies.Where(rec => !model.CreditProgramCurrencies.ContainsKey(rec.CreditProgramId)));
                 context.SaveChanges();
                 var creditProgram = context.CreditPrograms.First(x => x.Id == Id);
                 foreach (var updateCurrency in creditProgramsCurrencies)

Bank/BankDatabaseImplement/Models/Currency.cs

@@ -16,6 +16,8 @@ namespace BankDatabaseImplement.Models
         public int Id { get; set; }
         [Required]
         public string Name { get; set; }
+        public int BankOperatorId { get; set; }
+        public virtual BankOperator BankOperator { get; set; } = new();
         public static Currency? Create(BankDatabase context, CurrencyBindingModel model)
         {
             if (model == null)
@@ -26,7 +28,10 @@ namespace BankDatabaseImplement.Models
             {
                 Id = model.Id,
                 Name = model.Name,
+                BankOperatorId = model.BankOperatorId,
+                BankOperator = context.BankOperators.First(x => x.Id == model.BankOperatorId),
             };
+
         }
         public static Currency? Create(BankDatabase context, CurrencyViewModel model)
         {
@@ -34,6 +39,8 @@ namespace BankDatabaseImplement.Models
             {
                 Id = model.Id,
                 Name = model.Name,
+                BankOperatorId = model.BankOperatorId,
+                BankOperator = context.BankOperators.First(x => x.Id == model.BankOperatorId),
             };
         }