Merge branch 'main' of https://git.is.ulstu.ru/Serxionaft/Coursach

Course/Contracts/BindingModels/ProductBindingModel.cs

@@ -8,6 +8,6 @@ namespace Contracts.BindingModels
         public int UserId { get; set; }
         public string Name { get; set; } = string.Empty;
         public double Cost { get; set; }
-        public Dictionary<int, (IDetailModel, int)> DetailProducts { get; set; } = new();
+        public Dictionary<int, (IDetailModel, int)> ProductDetails { get; set; } = new();
     }
 }

Course/Contracts/BindingModels/ProductionBindingModel.cs

@@ -8,7 +8,7 @@ namespace Contracts.BindingModels
         public int UserId { get; set; }
         public string Name { get; set; } = string.Empty;
         public double Cost { get; set; }
-        public Dictionary<int, IDetailModel> ProductionDetails { get; set; } = new();
+        public Dictionary<int, (IDetailModel, int)> ProductionDetails { get; set; } = new();
 
     }
 }

Course/Contracts/ViewModels/ProductViewModel.cs

@@ -16,5 +16,6 @@ namespace Contracts.ViewModels
 		[DisplayName("Цена изделия")]
 		public double Cost { get; set; }
 		public int UserId { get; set; }
+		public Dictionary<int, (IDetailModel, int)> DetailProducts { get; set; } = new();
 	}
 }

Course/Contracts/ViewModels/ProductionViewModel.cs

@@ -16,5 +16,6 @@ namespace Contracts.ViewModels
 		[DisplayName("Цена производства")]
 		public double Cost { get; set; }
 		public int UserId { get; set; }
+		public Dictionary<int, (IDetailModel, int)> DetailProductions { get; set; } = new();
 	}
 }

Course/DatabaseImplement/DatabaseImplement.csproj

@@ -6,10 +6,6 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Folder Include="Implements\" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.22" />
   </ItemGroup>

Course/DatabaseImplement/Implements/ImplementerStorage.cs

@@ -0,0 +1,72 @@
+using DatabaseImplement.Models;
+using Contracts.BindingModels;
+using Contracts.SearchModels;
+using Contracts.ViewModels;
+using Contracts.StoragesContracts;
+
+namespace DatabaseImplement.Implements
+{
+	public class ImplementerStorage : IImplementerStorage
+	{
+		public ImplementerViewModel? Delete(ImplementerBindingModel model)
+		{
+			using var context = new FactoryGoWorkDatabase();
+			var newImplementer = context.Implementers.FirstOrDefault(x => x.Id == model.Id);
+			if (newImplementer == null)
+				return null;
+			context.Implementers.Remove(newImplementer);
+			context.SaveChanges();
+			return newImplementer.GetViewModel;
+		}
+
+		public ImplementerViewModel? GetElement(ImplementerSearchModel model)
+		{
+			if (!model.Id.HasValue && string.IsNullOrEmpty(model.Login)) { return null; }
+			using var context = new FactoryGoWorkDatabase();
+			return context.Implementers.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id) || (!string.IsNullOrEmpty(model.Login) && x.Login.Equals(model.Login)))?.GetViewModel; ;
+		}
+
+		public List<ImplementerViewModel> GetFilteredList(ImplementerSearchModel model)
+		{
+			if (!model.Id.HasValue && string.IsNullOrEmpty(model.Login))
+				return new();
+			using var context = new FactoryGoWorkDatabase();
+			if (model.Id.HasValue)
+			{
+				return context.Implementers.Where(x => x.Id == model.Id).Select(x => x.GetViewModel).ToList();
+			}
+			else
+			{
+				return context.Implementers.Where(x => x.Login.Equals(model.Login)).Select(x => x.GetViewModel).ToList();
+			}
+		}
+
+		public List<ImplementerViewModel> GetFullList()
+		{
+			using var context = new FactoryGoWorkDatabase();
+			return context.Implementers.Select(x => x.GetViewModel).ToList();
+		}
+
+		public ImplementerViewModel? Insert(ImplementerBindingModel model)
+		{
+			using var context = new FactoryGoWorkDatabase();
+			var newImplementer = Implementer.Create(model);
+			if (newImplementer == null)
+				return null;
+			context.Implementers.Add(newImplementer);
+			context.SaveChanges();
+			return newImplementer.GetViewModel;
+		}
+
+		public ImplementerViewModel? Update(ImplementerBindingModel model)
+		{
+			using var context = new FactoryGoWorkDatabase();
+			var newImplementer = context.Implementers.FirstOrDefault(x => x.Id == model.Id);
+			if (newImplementer == null)
+				return null;
+			newImplementer.Update(model);
+			context.SaveChanges();
+			return newImplementer.GetViewModel;
+		}
+	}
+}

Course/DatabaseImplement/Models/Detail.cs

@@ -17,6 +17,9 @@ namespace DatabaseImplement.Models
 		public int UserId { get; set; }
 		[ForeignKey("DetailId")]
 		public virtual List<DetailProduct> DetailProducts { get; set; } = new();
+		[ForeignKey("DetailId")]
+		public virtual List<DetailProduction> DetailProductions { get; set; } = new();
+		public virtual Implementer User { get; set; }
 		public static Detail? Create(DetailBindingModel model)
 		{
 			if (model == null)

Course/DatabaseImplement/Models/DetailProduction.cs

@@ -1,12 +1,23 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace DatabaseImplement.Models
 {
-	internal class DetailProduction
+	public class DetailProduction
 	{
+		public int Id { get; set; }
+		[Required]
+		public int DetailId { get; set; }
+		[Required]
+		public int ProductionId { get; set; }
+		[Required]
+		public int Count { get; set; }
+
+		public virtual Detail Detail { get; set; } = new();
+		public virtual Production Production { get; set; } = new();
 	}
 }

Course/DatabaseImplement/Models/Implementer.cs

@@ -1,12 +1,71 @@
-using System;
+using Contracts.BindingModels;
-using System.Collections.Generic;
+using Contracts.ViewModels;
-using System.Linq;
+using DataModels.Models;
-using System.Text;
+using System.ComponentModel.DataAnnotations;
-using System.Threading.Tasks;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DatabaseImplement.Models
 {
-	internal class Implementer
+	public class Implementer : IImplementerModel
 	{
+		public int Id { get; set; }
+		[Required]
+		public string Email { get; set; } = string.Empty;
+		[Required]
+		public string Name { get; set; } = string.Empty;
+		[Required]
+		public string Login { get; set; } = string.Empty;
+		[Required]
+		public string Password { get; set;} = string.Empty;
+		[ForeignKey("UserId")]
+		public virtual List<Detail> Details { get; set; } = new();
+		[ForeignKey("UserId")]
+		public virtual List<Product> Products { get; set; } = new();
+		[ForeignKey("UserId")]
+		public virtual List<Production> Productions { get; set; } = new();
+
+		public static Implementer? Create(ImplementerBindingModel model)
+		{
+			if (model == null)
+			{
+				return null;
+			}
+			return new Implementer
+			{
+				Id = model.Id,
+				Email = model.Email,
+				Name = model.Name,
+				Login = model.Login,
+				Password = model.Password
+			};
+		}
+		public static Implementer Create(ImplementerViewModel model)
+		{
+			return new Implementer
+			{
+				Id = model.Id,
+				Email = model.Email,
+				Name = model.Name,
+				Login = model.Login,
+				Password = model.Password
+			};
+		}
+		public void Update(ImplementerBindingModel model)
+		{
+			if (model == null)
+				return;
+			Email = model.Email;
+			Name = model.Name;
+			Password = model.Password;
+		}
+		public ImplementerViewModel GetViewModel => new()
+		{
+			Id = Id,
+			Email = Email,
+			Name = Name,
+			Login = Login,
+			Password = Password
+		};
+
 	}
 }

Course/DatabaseImplement/Models/Product.cs

@@ -15,6 +15,7 @@ namespace DatabaseImplement.Models
 		public double Cost { get; set; }
 		[Required]
 		public int UserId { get; set; }
+		public virtual Implementer User { get; set; }
 		private Dictionary<int, (IDetailModel, int)>? _detailProducts = null;
 		[NotMapped]
 		public Dictionary<int, (IDetailModel, int)> DetailProducts
@@ -31,7 +32,7 @@ namespace DatabaseImplement.Models
 
 		[ForeignKey("ProductId")]
 		public virtual List<DetailProduct> Details { get; set; } = new();
-		public static Product? Create(ProductBindingModel model)
+		public static Product? Create(FactoryGoWorkDatabase context, ProductBindingModel model)
 		{
 			if (model == null)
 			{
@@ -43,9 +44,10 @@ namespace DatabaseImplement.Models
 				Name = model.Name,
 				Cost = model.Cost,
 				UserId = model.UserId,
-				Details = model.DetailProducts.Select(x => new DetailProduct
+				Details = model.ProductDetails.Select(x => new DetailProduct
 				{
-					//Detail =
+					Detail = context.Details.First(y => y.Id == x.Key),
+					Count = x.Value.Item2
 				}).ToList()
 			};
 		}
@@ -71,7 +73,35 @@ namespace DatabaseImplement.Models
 			Id = Id,
 			Name = Name,
 			Cost = Cost,
-			UserId = UserId
+			UserId = UserId,
+			DetailProducts = DetailProducts
 		};
+		public void UpdateDetails(FactoryGoWorkDatabase context, ProductBindingModel model)
+		{
+			var productDetails = context.DetailProducts.Where(rec => rec.ProductId == model.Id).ToList();
+			if (productDetails != null && productDetails.Count > 0)
+			{
+				context.DetailProducts.RemoveRange(productDetails.Where(rec => !model.ProductDetails.ContainsKey(rec.DetailId)));
+				context.SaveChanges();
+				foreach (var upDetail in productDetails)
+				{
+					upDetail.Count = model.ProductDetails[upDetail.DetailId].Item2;
+					model.ProductDetails.Remove(upDetail.DetailId);
+				}
+				context.SaveChanges();
+			}
+			var product = context.Products.First(x => x.Id == model.Id);
+			foreach (var dp in model.ProductDetails)
+			{
+				context.DetailProducts.Add(new DetailProduct
+				{
+					Product = product,
+					Detail = context.Details.First(x => x.Id == dp.Key),
+					Count = dp.Value.Item2
+				});
+				context.SaveChanges();
+			}
+			_detailProducts = null;
+		}
 	}
 }

Course/DatabaseImplement/Models/Production.cs

@@ -1,12 +1,92 @@
-using System;
+using DataModels;
-using System.Collections.Generic;
+using DataModels.Models;
-using System.Linq;
+using Contracts.BindingModels;
-using System.Text;
+using Contracts.ViewModels;
-using System.Threading.Tasks;
+using Contracts.SearchModels;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DatabaseImplement.Models
 {
-	internal class Production
+	public class Production : IProductionModel
 	{
+		public int Id { get; set; }
+		[Required]
+		public string Name { get; set; } = string.Empty;
+		[Required]
+		public double Cost { get; set; }
+		[Required]
+		public int UserId {  get; set; }
+		private Dictionary<int, (IDetailModel, int)>? _detailProductions = null;
+		[NotMapped]
+		public Dictionary<int, (IDetailModel, int)>? DetailProductions
+		{
+			get
+			{
+				if (_detailProductions == null)
+				{
+					_detailProductions = Details.ToDictionary(recDP => recDP.DetailId, recDp => (recDp.Detail as IDetailModel, recDp.Count));
+				}
+				return _detailProductions;
+			}
+		}
+		[ForeignKey("ProductionId")]
+		public List<DetailProduction> Details { get; set; } = new();
+		public virtual Implementer User { get; set; }
+		
+		public static Production Create(FactoryGoWorkDatabase context, ProductionBindingModel model)
+		{
+			return new Production()
+			{
+				Id = model.Id,
+				Name = model.Name,
+				Cost = model.Cost,
+				UserId = model.UserId,
+				Details = model.ProductionDetails.Select(x => new DetailProduction
+				{
+					Detail = context.Details.First(y => y.Id == x.Key),
+				}).ToList(),
+			};
+		}
+		public void Update(ProductionBindingModel model)
+		{
+			Name = model.Name;
+			Cost = model.Cost;
+		}
+		public ProductionViewModel GetViewModel => new()
+		{
+			Id = Id,
+			Name = Name,
+			Cost = Cost,
+			UserId = UserId,
+			DetailProductions = DetailProductions
+		};
+		public void UpdateDetails(FactoryGoWorkDatabase context, ProductionBindingModel model)
+		{
+			var productionDetails = context.DetailProductions.Where(rec => rec.ProductionId == model.Id).ToList();
+			if (productionDetails != null && productionDetails.Count > 0) 
+			{
+				context.DetailProductions.RemoveRange(productionDetails.Where(rec => !model.ProductionDetails.ContainsKey(rec.DetailId)));
+				context.SaveChanges();
+				foreach(var upDetail in  productionDetails)
+				{
+					upDetail.Count = model.ProductionDetails[upDetail.DetailId].Item2;
+					model.ProductionDetails.Remove(upDetail.DetailId);
+				}
+				context.SaveChanges();
+			}
+			var production = context.Productions.First(x => x.Id == model.Id);
+			foreach (var dp in model.ProductionDetails)
+			{
+				context.DetailProductions.Add(new DetailProduction
+				{
+					Production = production,
+					Detail = context.Details.First(x => x.Id == dp.Key),
+					Count = dp.Value.Item2
+				});
+				context.SaveChanges();
+			}
+			_detailProductions = null;
+		}
 	}
 }