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

Bank/BankContracts/SearchModels/OperationSearchModel.cs

@@ -9,7 +9,8 @@ namespace BankContracts.SearchModels
 	public class OperationSearchModel
 	{
 		public int? Id {  get; set; }
-		public DateTime? OperationTime { get; set; }
+		public DateTime? DateFrom { get; set; }
+		public DateTime? DateTo { get; set; }
 		public int? SenderCardId { get; set; }
 		public int? RecipientCardId { get; set; }
 	}

Bank/BankDatabaseImplement/BankDatabaseImplement.csproj

@@ -19,8 +19,4 @@
     <ProjectReference Include="..\BankContracts\BankContracts.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Implements\" />
-  </ItemGroup>
-
 </Project>

Bank/BankDatabaseImplement/Implements/CardStorage.cs

@@ -0,0 +1,84 @@
+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 CardStorage : ICardStorage
+	{
+		public List<CardViewModel> GetFullList()
+		{
+			using var context = new BankDatabase();
+			return context.Cards.Include(x => x.Client).Include(x => x.Account).Include(x => x.CardRequests)
+				.Include(x => x.SenderOperations).Include(x => x.RecipientOperations)
+				.Select(x => x.GetViewModel).ToList();
+		}
+		public List<CardViewModel> GetFilteredList(CardSearchModel model)
+		{
+			using var context = new BankDatabase();
+			return context.Cards.Include(x => x.Client).Include(x => x.Account).Include(x => x.CardRequests)
+				.Include(x => x.SenderOperations).Include(x => x.RecipientOperations)
+				.Where(x => (
+					(!model.Id.HasValue || x.Id == model.Id) &&
+					(!model.ClientId.HasValue || x.ClientId == model.ClientId) &&
+					(model.Number == null || x.Number == model.Number)
+				))
+			.Select(x => x.GetViewModel)
+			.ToList();
+		}
+		public CardViewModel? GetElement(CardSearchModel model)
+		{
+			using var context = new BankDatabase();
+			return context.Cards.Include(x => x.Client).Include(x => x.Account).Include(x => x.CardRequests)
+				.Include(x => x.SenderOperations).Include(x => x.RecipientOperations).FirstOrDefault(
+					x => (model.Number != null && x.Number == model.Number)
+				)?.GetViewModel;
+		}
+		public CardViewModel? Insert(CardBindingModel model)
+		{
+			var newCard = Card.Create(model);
+			if (newCard == null)
+			{
+				return null;
+			}
+			using var context = new BankDatabase();
+			context.Cards.Add(newCard);
+			context.SaveChanges();
+			return newCard.GetViewModel;
+		}
+		public CardViewModel? Update(CardBindingModel model)
+		{
+			using var context = new BankDatabase();
+			var card = context.Cards.Include(x => x.Client).Include(x => x.Account).Include(x => x.CardRequests)
+				.Include(x => x.SenderOperations).Include(x => x.RecipientOperations).FirstOrDefault(x => x.Id == model.Id);
+			if (card == null)
+			{
+				return null;
+			}
+			card.Update(model);
+			context.SaveChanges();
+			return card.GetViewModel;
+		}
+		public CardViewModel? Delete(CardBindingModel model)
+		{
+			using var context = new BankDatabase();
+			var card = context.Cards.Include(x => x.Client).Include(x => x.Account).Include(x => x.CardRequests)
+				.Include(x => x.SenderOperations).Include(x => x.RecipientOperations).FirstOrDefault(rec => rec.Id == model.Id);
+			if (card != null)
+			{
+				context.Cards.Remove(card);
+				context.SaveChanges();
+				return card.GetViewModel;
+			}
+			return null;
+		}
+	}
+}

Bank/BankDatabaseImplement/Implements/ClientStorage.cs

@@ -0,0 +1,85 @@
+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 ClientStorage : IClientStorage
+	{
+		public List<ClientViewModel> GetFullList()
+		{
+			using var context = new BankDatabase();
+			return context.Clients.Include(x => x.Cards).Select(x => x.GetViewModel).ToList();
+		}
+		public List<ClientViewModel> GetFilteredList(ClientSearchModel model)
+		{
+			if (string.IsNullOrEmpty(model.Fio) && string.IsNullOrEmpty(model.Email) && string.IsNullOrEmpty(model.Password))
+			{
+				return new();
+			}
+			using var context = new BankDatabase();
+			return context.Clients.Include(x => x.Cards)
+			.Where(x => string.IsNullOrEmpty(model.Fio) || x.Fio.Contains(model.Fio) &&
+						 (string.IsNullOrEmpty(model.Email) || x.Email.Contains(model.Email)) &&
+						 (string.IsNullOrEmpty(model.Password) || x.Password.Contains(model.Password)))
+		   .Select(x => x.GetViewModel).ToList();
+		}
+		public ClientViewModel? GetElement(ClientSearchModel model)
+		{
+			if (string.IsNullOrEmpty(model.Fio) && string.IsNullOrEmpty(model.Email) && !model.Id.HasValue)
+			{
+				return null;
+			}
+			using var context = new BankDatabase();
+			return context.Clients.Include(x => x.Cards)
+			.FirstOrDefault(x => (string.IsNullOrEmpty(model.Fio) || x.Fio == model.Fio) &&
+								 (!model.Id.HasValue || x.Id == model.Id) && (string.IsNullOrEmpty(model.Email) || x.Email == model.Email) &&
+								 (string.IsNullOrEmpty(model.Password) || x.Password == model.Password))
+			?.GetViewModel;
+		}
+		public ClientViewModel? Insert(ClientBindingModel model)
+		{
+			var newClient = Client.Create(model);
+			if (newClient == null)
+			{
+				return null;
+			}
+			using var context = new BankDatabase();
+			context.Clients.Add(newClient);
+			context.SaveChanges();
+			return newClient.GetViewModel;
+		}
+		public ClientViewModel? Update(ClientBindingModel model)
+		{
+			using var context = new BankDatabase();
+			var client = context.Clients.FirstOrDefault(x => x.Id == model.Id);
+			if (client == null)
+			{
+				return null;
+			}
+			client.Update(model);
+			context.SaveChanges();
+			return client.GetViewModel;
+		}
+		public ClientViewModel? Delete(ClientBindingModel model)
+		{
+			using var context = new BankDatabase();
+			var element = context.Clients.Include(x => x.Cards).FirstOrDefault(rec => rec.Id == model.Id);
+			if (element != null)
+			{
+				context.Clients.Remove(element);
+				context.SaveChanges();
+				return element.GetViewModel;
+			}
+			return null;
+		}
+	}
+}

Bank/BankDatabaseImplement/Implements/OperationStorage.cs

@@ -0,0 +1,78 @@
+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 OperationStorage : IOperationStorage
+	{
+		public List<OperationViewModel> GetFullList()
+		{
+			using var context = new BankDatabase();
+			return context.Operations.Include(x => x.SenderCard).Include(x => x.RecipientCard)
+				.Select(x => x.GetViewModel).ToList();
+		}
+		public List<OperationViewModel> GetFilteredList(OperationSearchModel model)
+		{
+			using var context = new BankDatabase();
+			return context.Operations.Include(x => x.SenderCard).Include(x => x.RecipientCard)
+				.Where(x => (
+					(!model.Id.HasValue || x.Id == model.Id) &&
+					(!model.DateFrom.HasValue || x.OperationTime >= model.DateFrom ) &&
+					(!model.DateTo.HasValue || x.OperationTime <= model.DateTo)
+				)).Select(x => x.GetViewModel).ToList();
+		}
+		public OperationViewModel? GetElement(OperationSearchModel model)
+		{
+			if (!model.Id.HasValue) return null;
+			using var context = new BankDatabase();
+			return context.Operations.Include(x => x.SenderCard).Include(x => x.RecipientCard)
+				.FirstOrDefault(x => ((model.Id.HasValue && x.Id == model.Id)
+				))?.GetViewModel;
+		}
+		public OperationViewModel? Insert(OperationBindingModel model)
+		{
+			var newOperation = Operation.Create(model);
+			if (newOperation == null)
+			{
+				return null;
+			}
+			using var context = new BankDatabase();
+			context.Operations.Add(newOperation);
+			context.SaveChanges();
+			return newOperation.GetViewModel;
+		}
+		public OperationViewModel? Update(OperationBindingModel model)
+		{
+			using var context = new BankDatabase();
+			var operation = context.Operations.Include(x => x.SenderCard).Include(x => x.RecipientCard).FirstOrDefault(x => x.Id == model.Id);
+			if (operation == null)
+			{
+				return null;
+			}
+			operation.Update(model);
+			context.SaveChanges();
+			return operation.GetViewModel;
+		}
+		public OperationViewModel? Delete(OperationBindingModel model)
+		{
+			using var context = new BankDatabase();
+			var operation = context.Operations.Include(x => x.SenderCard).Include(x => x.RecipientCard).FirstOrDefault(rec => rec.Id == model.Id);
+			if (operation != null)
+			{
+				context.Operations.Remove(operation);
+				context.SaveChanges();
+				return operation.GetViewModel;
+			}
+			return null;
+		}
+	}
+}

Bank/BankDatabaseImplement/Implements/RequestStorage.cs

@@ -0,0 +1,93 @@
+using BankContracts.BindingModels;
+using BankContracts.SearchModels;
+using BankContracts.StoragesContracts;
+using BankContracts.ViewModels;
+using BankDatabaseImplement.Models;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BankDatabaseImplement.Implements
+{
+	public class RequestStorage : IRequestStorage
+	{
+		public List<RequestViewModel> GetFullList()
+		{
+			using var context = new BankDatabase();
+			return context.Requests
+				.Include(x => x.Cards)
+				.ThenInclude(x => x.Card)
+				.ToList()
+				.Select(x => x.GetViewModel)
+				.ToList();
+		}
+		public List<RequestViewModel> GetFilteredList(RequestSearchModel model)
+		{
+			using var context = new BankDatabase();
+			return context.Requests.Include(x => x.Cards).ThenInclude(x => x.Card)
+				.Where(x => (model.Id.HasValue && x.Id == model.Id)).ToList()
+				.Select(x => x.GetViewModel).ToList();
+		}
+		public RequestViewModel? GetElement(RequestSearchModel model)
+		{
+			if (!model.Id.HasValue) return null;
+			using var context = new BankDatabase();
+			return context.Requests.Include(x => x.Cards).ThenInclude(x => x.Card)
+				.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
+		}
+		public RequestViewModel? Insert(RequestBindingModel model)
+		{
+			using var context = new BankDatabase();
+			var newRequest = Request.Create(context, model);
+			if (newRequest == null)
+			{
+				return null;
+			}
+			context.Requests.Add(newRequest);
+			context.SaveChanges();
+			return newRequest.GetViewModel;
+		}
+		public RequestViewModel? Update(RequestBindingModel model)
+		{
+			using var context = new BankDatabase();
+			using var transaction = context.Database.BeginTransaction();
+			try
+			{
+				var Request = context.Requests.FirstOrDefault(rec =>
+				rec.Id == model.Id);
+				if (Request == null)
+				{
+					return null;
+				}
+				Request.Update(model);
+				context.SaveChanges();
+				Request.UpdateCards(context, model);
+				transaction.Commit();
+				return Request.GetViewModel;
+			}
+			catch
+			{
+				transaction.Rollback();
+				throw;
+			}
+		}
+		public RequestViewModel? Delete(RequestBindingModel model)
+		{
+			using var context = new BankDatabase();
+			var element = context.Requests
+			.Include(x => x.Cards)
+			.FirstOrDefault(rec => rec.Id == model.Id);
+			if (element != null)
+			{
+				context.Requests.Remove(element);
+				context.SaveChanges();
+				return element.GetViewModel;
+			}
+			return null;
+		}
+	}
+}

Bank/BankDatabaseImplement/Models/Card.cs

@@ -13,6 +13,7 @@ namespace BankDatabaseImplement.Models
 {
 	public class Card : ICardModel
 	{
+		//убрать интерфейс
 		public int Id { get; set; }
 		[Required]
 		public string Number { get; set; } = string.Empty;
@@ -26,8 +27,10 @@ namespace BankDatabaseImplement.Models
 		public DateOnly ExpirationDate { get; set; }
 		[Required]
 		public int ClientId { get; set; }
+		public virtual Client? Client { get; private set; }
 		[Required]
 		public int? AccountId { get; set; } = null;
+		public virtual IAccountModel? Account { get; private set; }
 		[ForeignKey("CardId")]
 		public virtual List<CardRequest> CardRequests { get; set; } = new();
 		[ForeignKey("SenderCardId")]
@@ -73,6 +76,8 @@ namespace BankDatabaseImplement.Models
 			ExpirationDate = ExpirationDate,
 			ClientId = ClientId,
 			AccountId = AccountId,
+			ClientName = Client?.Fio ?? string.Empty,
+			AccountNumber = Account?.Number ?? string.Empty,
 		};
 	}
 }

Bank/BankDatabaseImplement/Models/Operation.cs

@@ -18,10 +18,11 @@ namespace BankDatabaseImplement.Models
 		public int Sum { get; set; }
 		[Required]
 		public DateTime OperationTime { get; set; }
-		[Required]
 		public int? SenderCardId { get; set; } = null;
+		public virtual Card? SenderCard { get; private set; } 
 		[Required]
 		public int RecipientCardId { get; set; }
+		public virtual Card? RecipientCard { get; private set; } 
 
 		public static Operation? Create(OperationBindingModel model)
 		{
@@ -52,6 +53,8 @@ namespace BankDatabaseImplement.Models
 			OperationTime = OperationTime,
 			SenderCardId = SenderCardId,
 			RecipientCardId = RecipientCardId,
+			SenderCardNumber = SenderCard?.Number ?? string.Empty,
+			RecipientCardNumber = RecipientCard?.Number ?? string.Empty,
 		};
 	}
 }

Bank/BankDatabaseImplement/Models/Request.cs

@@ -1,4 +1,5 @@
 using BankContracts.BindingModels;
+using BankContracts.ViewModels;
 using BankDataModels.Models;
 using System;
 using System.Collections.Generic;
@@ -57,7 +58,7 @@ namespace BankDatabaseImplement.Models
 			Status = model.Status;
 		}
 
-		public RequestBindingModel GetViewModel => new()
+		public RequestViewModel GetViewModel => new()
 		{
 			Id = Id,
 			Sum = Sum,