Merge branch 'main' of https://git.is.ulstu.ru/Artyom_Yashin/PIbd-23_Yashin_A_Zakharov_R_CourseWork_Bank

Bank/Bank.sln

@@ -5,7 +5,9 @@ VisualStudioVersion = 17.9.34723.18
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BankDataModels", "BankDataModels\BankDataModels.csproj", "{B74F0734-6D5B-41D5-AF9B-23CF7535C52F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BankContracts", "BankContracts\BankContracts.csproj", "{59CDEA88-47C6-434D-84C6-40390E267858}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BankContracts", "BankContracts\BankContracts.csproj", "{59CDEA88-47C6-434D-84C6-40390E267858}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BankDatabaseImplement", "BankDatabaseImplement\BankDatabaseImplement.csproj", "{E038E32E-3601-4A3C-BB3D-301F9AE9B8E7}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -21,6 +23,10 @@ Global
 		{59CDEA88-47C6-434D-84C6-40390E267858}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{59CDEA88-47C6-434D-84C6-40390E267858}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{59CDEA88-47C6-434D-84C6-40390E267858}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E038E32E-3601-4A3C-BB3D-301F9AE9B8E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E038E32E-3601-4A3C-BB3D-301F9AE9B8E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E038E32E-3601-4A3C-BB3D-301F9AE9B8E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E038E32E-3601-4A3C-BB3D-301F9AE9B8E7}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Bank/BankContracts/BindingModels/RequestBindingModel.cs

@@ -13,5 +13,6 @@ namespace BankContracts.BindingModels
 		public int Sum { get; set; }
 		public DateTime RequestTime { get; set; }
 		public RequestStatus Status { get; set; }
+		public Dictionary<int, ICardModel> CardRequests { get; set; } = new();
 	}
 }

Bank/BankContracts/SearchModels/CardSearchModel.cs

@@ -11,5 +11,7 @@ namespace BankContracts.SearchModels
 		public int? Id { get; set; }
 		public string? Number { get; set; }
 		public int? ClientId { get; set; }
+		public DateOnly? ReleaseDate { get; set; }
+		public DateOnly? ExpirationDate { get; set; }
 	}
 }

Bank/BankContracts/SearchModels/OperationSearchModel.cs

@@ -10,6 +10,7 @@ namespace BankContracts.SearchModels
 	{
 		public int? Id {  get; set; }
 		public DateTime? OperationTime { get; set; }
+		public int? SenderCardId { get; set; }
 		public int? RecipientCardId { get; set; }
 	}
 }

Bank/BankContracts/SearchModels/RequestSearchModel.cs

@@ -12,5 +12,6 @@ namespace BankContracts.SearchModels
 		public int? Id { get; set; }
 		public DateTime? RequestTime { get; set; }
 		public string? CardNumber {  get; set; }
+		public RequestStatus? Status { get; set; }
 	}
 }

Bank/BankContracts/ViewModels/CardViewModel.cs

@@ -25,7 +25,7 @@ namespace BankContracts.ViewModels
 		[DisplayName("Держатель карты")]
 		public string ClientName { get; set; } = string.Empty;
 		public int? AccountId { get; set; }
-		[DisplayName("")]
+		[DisplayName("Номер счета")]
 		public string AccountNumber { get; set; } = string.Empty;
 	}
 }

Bank/BankContracts/ViewModels/ManagerViewModel.cs

@@ -16,7 +16,7 @@ namespace BankContracts.ViewModels
         [DisplayName("Email")]
 
         public string Email { get; set; } = string.Empty;
-
+        [DisplayName("Пароль")]
         public string Password { get; set; } = string.Empty;
     }
 }

Bank/BankContracts/ViewModels/OperationViewModel.cs

@@ -10,6 +10,7 @@ namespace BankContracts.ViewModels
 {
 	public class OperationViewModel : IOperationModel
 	{
+		[DisplayName("Номер")]
 		public int Id { get; set; }
 		[DisplayName("Сумма пополнения")]
 		public int Sum { get; set; }

Bank/BankContracts/ViewModels/RequestViewModel.cs

@@ -10,6 +10,7 @@ namespace BankContracts.ViewModels
 {
 	public class RequestViewModel : IRequestModel
 	{
+		[DisplayName("Номер")]
 		public int Id { get; set; }
 		[DisplayName("Сумма заявки")]
 		public int Sum { get; set; }
@@ -17,5 +18,7 @@ namespace BankContracts.ViewModels
 		public DateTime RequestTime { get; set; }
 		[DisplayName("Статус заявки")]
 		public RequestStatus Status { get; set; }
+		public Dictionary<int, ICardModel> CardRequests { get; set; } = new();
+
 	}
 }

Bank/BankDataModels/Models/IRequestModel.cs

@@ -11,5 +11,7 @@ namespace BankDataModels.Models
         int Sum { get; set; }
         DateTime RequestTime { get; set; }
         RequestStatus Status { get; set; }
-    }
+		Dictionary<int, ICardModel> CardRequests { get; }
+
+	}
 }

Bank/BankDatabaseImplement/BankDatabase.cs

@@ -0,0 +1,24 @@
+using BankDatabaseImplement.Models;
+using Microsoft.EntityFrameworkCore;
+
+namespace BankDatabaseImplement
+{
+	public class BankDatabase : DbContext
+	{
+		protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+		{
+			if (optionsBuilder.IsConfigured == false)
+			{
+				optionsBuilder.UseSqlServer(@"Data Source=localhost\SQLEXPRESS;Initial Catalog=BankDatabase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True"
+				);
+			}
+			base.OnConfiguring(optionsBuilder);
+		}
+
+		public virtual DbSet<Client> Clients { get; set; }
+		public virtual DbSet<Card> Cards { get; set; }
+		public virtual DbSet<Operation> Operations { get; set; }
+		public virtual DbSet<Request> Requests { get; set; }
+		public virtual DbSet<CardRequest> CardRequests { get; set; }
+	}
+}

Bank/BankDatabaseImplement/BankDatabaseImplement.csproj

@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.17" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.17" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.17">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\BankContracts\BankContracts.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Implements\" />
+  </ItemGroup>
+
+</Project>

Bank/BankDatabaseImplement/Models/Card.cs

@@ -0,0 +1,78 @@
+using BankContracts.BindingModels;
+using BankContracts.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 Card : ICardModel
+	{
+		public int Id { get; set; }
+		[Required]
+		public string Number { get; set; } = string.Empty;
+		[Required]
+		public string Cvv { get; set; } = string.Empty;
+		[Required]
+		public string Pin { get; set; } = string.Empty;
+		[Required]
+		public DateOnly ReleaseDate { get; set; }
+		[Required]
+		public DateOnly ExpirationDate { get; set; }
+		[Required]
+		public int ClientId { get; set; }
+		[Required]
+		public int? AccountId { get; set; } = null;
+		[ForeignKey("CardId")]
+		public virtual List<CardRequest> CardRequests { get; set; } = new();
+		[ForeignKey("SenderCardId")]
+		public virtual List<Operation> SenderOperations {  get; set; } = new();
+		[ForeignKey("RecipientCardId")]
+		public virtual List<Operation> RecipientOperations { get; set; } = new();
+
+		public static Card? Create(CardBindingModel model)
+		{
+			if (model == null) return null;
+			return new Card
+			{
+				Id = model.Id,
+				Number = model.Number,
+				Cvv = model.Cvv,
+				Pin = model.Pin,
+				ReleaseDate = model.ReleaseDate,
+				ExpirationDate = model.ExpirationDate,
+				ClientId = model.ClientId,
+				AccountId = model.AccountId,
+			};
+		}
+
+		public void Update(CardBindingModel model)
+		{
+			if (model == null) return;
+			Number = model.Number;
+			Cvv = model.Cvv;
+			Pin = model.Pin;
+			ReleaseDate = model.ReleaseDate;
+			ExpirationDate = model.ExpirationDate;
+			ClientId = model.ClientId;
+			AccountId = model.AccountId;
+		}
+
+		public CardViewModel GetViewModel => new()
+		{
+			Id = Id,
+			Number = Number,
+			Cvv = Cvv,
+			Pin = Pin,
+			ReleaseDate = ReleaseDate,
+			ExpirationDate = ExpirationDate,
+			ClientId = ClientId,
+			AccountId = AccountId,
+		};
+	}
+}

Bank/BankDatabaseImplement/Models/CardRequest.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BankDatabaseImplement.Models
+{
+	public class CardRequest
+	{
+		public int Id { get; set; }
+		[Required]
+		public int CardId { get; set; }
+		[Required]
+		public int RequestId {  get; set; }
+		public virtual Card Card { get; set; } = new();
+		public virtual Request Request { get; set; } = new();
+	}
+}

Bank/BankDatabaseImplement/Models/Client.cs

@@ -0,0 +1,63 @@
+using BankContracts.BindingModels;
+using BankContracts.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 Fio { get; set; } = string.Empty;
+		[Required]
+		public string Email { get; set; } = string.Empty;
+		[Required]
+		public string Password { get; set; } = string.Empty;
+		[ForeignKey("ClientId")]
+		public virtual List<Card> Cards { get; set; } = new();
+
+		public static Client? Create(ClientBindingModel model)
+		{
+			if (model == null)
+				return null;
+			return new Client
+			{
+				Id = model.Id,
+				Fio = model.Fio,
+				Email = model.Email,
+				Password = model.Password,
+			};
+		}
+		public static Client Create(ClientViewModel model)
+		{
+			return new Client()
+			{
+				Id = model.Id,
+				Fio = model.Fio,
+				Email = model.Email,
+				Password = model.Password,
+			};
+		}
+		public void Update(ClientBindingModel model)
+		{
+			if (model == null) return;
+			Fio = model.Fio;
+			Email = model.Email;
+			Password = model.Password;
+		}
+		public ClientViewModel GetViewModel => new()
+		{
+			Id = Id,
+			Fio = Fio,
+			Email = Email,
+			Password = Password,
+		};
+	}
+}

Bank/BankDatabaseImplement/Models/Operation.cs

@@ -0,0 +1,57 @@
+using Azure;
+using BankContracts.BindingModels;
+using BankContracts.ViewModels;
+using BankDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BankDatabaseImplement.Models
+{
+	public class Operation : IOperationModel
+	{
+		public int Id { get; set; }
+		[Required]
+		public int Sum { get; set; }
+		[Required]
+		public DateTime OperationTime { get; set; }
+		[Required]
+		public int? SenderCardId { get; set; } = null;
+		[Required]
+		public int RecipientCardId { get; set; }
+
+		public static Operation? Create(OperationBindingModel model)
+		{
+			if (model == null) return null;
+			return new Operation
+			{
+				Id = model.Id,
+				Sum = model.Sum,
+				OperationTime = model.OperationTime,
+				SenderCardId = model.SenderCardId,
+				RecipientCardId = model.RecipientCardId,
+			};
+		}
+
+		public void Update(OperationBindingModel model)
+		{
+			if (model == null) return;
+			Sum = model.Sum;
+			OperationTime = model.OperationTime;
+			SenderCardId = model.SenderCardId;
+			RecipientCardId = model.RecipientCardId;
+		}
+
+		public OperationViewModel GetViewModel => new()
+		{
+			Id = Id,
+			Sum = Sum,
+			OperationTime = OperationTime,
+			SenderCardId = SenderCardId,
+			RecipientCardId = RecipientCardId,
+		};
+	}
+}

Bank/BankDatabaseImplement/Models/Request.cs

@@ -0,0 +1,90 @@
+using BankContracts.BindingModels;
+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 Request : IRequestModel
+	{
+		public int Id { get; set; }
+		[Required]
+		public int Sum { get; set; }
+		[Required]
+		public DateTime RequestTime { get; set; }
+		[Required]
+		public RequestStatus Status { get; set; }
+		[ForeignKey("RequestId")]
+		public virtual List<CardRequest> Cards { get; set; } = new();
+		private Dictionary<int, ICardModel>? _cardRequests { get; set; } = null;
+		[NotMapped]
+		public Dictionary<int, ICardModel> CardRequests
+		{
+			get
+			{
+				if (_cardRequests == null)
+				{
+					_cardRequests = Cards.ToDictionary(recPC => recPC.CardId, recPC => recPC.Card as ICardModel);
+				}
+				return _cardRequests;
+			}
+		}
+
+		public static Request Create(BankDatabase context, RequestBindingModel model)
+		{
+			return new Request
+			{
+				Id = model.Id,
+				Sum = model.Sum,
+				RequestTime = model.RequestTime,
+				Status = model.Status,
+				Cards = model.CardRequests.Select(x => new CardRequest
+				{
+					Card = context.Cards.First(y => y.Id == x.Key)
+				}).ToList()
+			};
+		}
+
+		public void Update(RequestBindingModel model)
+		{
+			Sum = model.Sum;
+			RequestTime = model.RequestTime;
+			Status = model.Status;
+		}
+
+		public RequestBindingModel GetViewModel => new()
+		{
+			Id = Id,
+			Sum = Sum,
+			RequestTime = RequestTime,
+			Status = Status,
+			CardRequests = CardRequests
+		};
+
+		public void UpdateCards(BankDatabase context, RequestBindingModel model)
+		{
+			var CardRequests = context.CardRequests.Where(rec => rec.RequestId == model.Id).ToList();
+			if (CardRequests != null && CardRequests.Count > 0)
+			{ // удалили те, которых нет в модели
+				context.CardRequests.RemoveRange(CardRequests.Where(rec => !model.CardRequests.ContainsKey(rec.CardId)));
+				context.SaveChanges();
+			}
+			var Request = context.Requests.First(x => x.Id == Id);
+			foreach (var request in model.CardRequests)
+			{
+				context.CardRequests.Add(new CardRequest
+				{
+					Request = Request,
+					Card = context.Cards.First(x => x.Id == request.Key),
+				});
+				context.SaveChanges();
+			}
+			_cardRequests = null;
+		}
+	}
+}