From f6c9596f47dd023a8fa23f4df7082b4b14074cd1 Mon Sep 17 00:00:00 2001 From: Extrimal Date: Tue, 19 Mar 2024 22:42:14 +0400 Subject: [PATCH] =?UTF-8?q?=D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- GarmentFactory/GarmentFactory.sln | 18 ++-- .../GarmentFactoryDatabase.cs | 26 +++++ .../GarmentFactoryDatabaseImplement.csproj | 23 +++++ .../Models/Component.cs | 59 +++++++++++ .../Models/Order.cs | 78 +++++++++++++++ .../Models/Textile.cs | 99 +++++++++++++++++++ .../Models/TextileComponent.cs | 23 +++++ .../GarmentFactoryView.csproj | 4 + 8 files changed, 324 insertions(+), 6 deletions(-) create mode 100644 GarmentFactory/GarmentFactoryDatabaseImplement/GarmentFactoryDatabase.cs create mode 100644 GarmentFactory/GarmentFactoryDatabaseImplement/GarmentFactoryDatabaseImplement.csproj create mode 100644 GarmentFactory/GarmentFactoryDatabaseImplement/Models/Component.cs create mode 100644 GarmentFactory/GarmentFactoryDatabaseImplement/Models/Order.cs create mode 100644 GarmentFactory/GarmentFactoryDatabaseImplement/Models/Textile.cs create mode 100644 GarmentFactory/GarmentFactoryDatabaseImplement/Models/TextileComponent.cs diff --git a/GarmentFactory/GarmentFactory.sln b/GarmentFactory/GarmentFactory.sln index fd327f3..02e0af1 100644 --- a/GarmentFactory/GarmentFactory.sln +++ b/GarmentFactory/GarmentFactory.sln @@ -3,17 +3,19 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.9.34622.214 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GarmentFactoryView", "GarmentFactoryView\GarmentFactoryView.csproj", "{65042CBB-618A-473F-BA40-C698EFD4850E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GarmentFactoryView", "GarmentFactoryView\GarmentFactoryView.csproj", "{65042CBB-618A-473F-BA40-C698EFD4850E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GarmentFactoryBusinessLogic", "GarmentFactoryBusinessLogic\GarmentFactoryBusinessLogic.csproj", "{62F1E4D7-57A6-461E-90A3-92E41AB90207}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GarmentFactoryBusinessLogic", "GarmentFactoryBusinessLogic\GarmentFactoryBusinessLogic.csproj", "{62F1E4D7-57A6-461E-90A3-92E41AB90207}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GarmentFactoryContracts", "GarmentFactoryContracts\GarmentFactoryContracts.csproj", "{35B381E5-7C62-43F4-B1B0-608542B71E73}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GarmentFactoryContracts", "GarmentFactoryContracts\GarmentFactoryContracts.csproj", "{35B381E5-7C62-43F4-B1B0-608542B71E73}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GarmentFactoryDataModels", "GarmentFactoryDataModels\GarmentFactoryDataModels.csproj", "{40AF2900-9319-4957-AEE3-8FB3738805D4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GarmentFactoryDataModels", "GarmentFactoryDataModels\GarmentFactoryDataModels.csproj", "{40AF2900-9319-4957-AEE3-8FB3738805D4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GarmentFactoryListImplement", "GarmentFactoryListImplement\GarmentFactoryListImplement.csproj", "{AA691567-80A9-45EF-9916-C55FA3B53C47}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GarmentFactoryListImplement", "GarmentFactoryListImplement\GarmentFactoryListImplement.csproj", "{AA691567-80A9-45EF-9916-C55FA3B53C47}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GarmentFactoryFileImplement", "GarmentFactoryFileImplement\GarmentFactoryFileImplement.csproj", "{281A8DE2-A45A-4B4B-B4A6-DC13ECC0144E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GarmentFactoryFileImplement", "GarmentFactoryFileImplement\GarmentFactoryFileImplement.csproj", "{281A8DE2-A45A-4B4B-B4A6-DC13ECC0144E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GarmentFactoryDatabaseImplement", "GarmentFactoryDatabaseImplement\GarmentFactoryDatabaseImplement.csproj", "{0AD8F2A6-9B14-411A-A454-D1A33B170C27}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -45,6 +47,10 @@ Global {281A8DE2-A45A-4B4B-B4A6-DC13ECC0144E}.Debug|Any CPU.Build.0 = Debug|Any CPU {281A8DE2-A45A-4B4B-B4A6-DC13ECC0144E}.Release|Any CPU.ActiveCfg = Release|Any CPU {281A8DE2-A45A-4B4B-B4A6-DC13ECC0144E}.Release|Any CPU.Build.0 = Release|Any CPU + {0AD8F2A6-9B14-411A-A454-D1A33B170C27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0AD8F2A6-9B14-411A-A454-D1A33B170C27}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0AD8F2A6-9B14-411A-A454-D1A33B170C27}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0AD8F2A6-9B14-411A-A454-D1A33B170C27}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/GarmentFactory/GarmentFactoryDatabaseImplement/GarmentFactoryDatabase.cs b/GarmentFactory/GarmentFactoryDatabaseImplement/GarmentFactoryDatabase.cs new file mode 100644 index 0000000..ab8c246 --- /dev/null +++ b/GarmentFactory/GarmentFactoryDatabaseImplement/GarmentFactoryDatabase.cs @@ -0,0 +1,26 @@ +using Microsoft.EntityFrameworkCore; +using GarmentFactoryDatabaseImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace GarmentFactoryDatabaseImplement +{ + public class GarmentFactoryDatabase : DbContext + { + protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) + { + if (optionsBuilder.IsConfigured == false) + { + optionsBuilder.UseSqlServer(@"Data Source=Alexandr\SQLEXPRESS;Initial Catalog=GarmentFactoryDatabaseFull;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True"); + } + base.OnConfiguring(optionsBuilder); + } + public virtual DbSet Components { set; get; } + public virtual DbSet Textiles { set; get; } + public virtual DbSet TextileComponents { set; get; } + public virtual DbSet Orders { set; get; } + } +} diff --git a/GarmentFactory/GarmentFactoryDatabaseImplement/GarmentFactoryDatabaseImplement.csproj b/GarmentFactory/GarmentFactoryDatabaseImplement/GarmentFactoryDatabaseImplement.csproj new file mode 100644 index 0000000..9101f9a --- /dev/null +++ b/GarmentFactory/GarmentFactoryDatabaseImplement/GarmentFactoryDatabaseImplement.csproj @@ -0,0 +1,23 @@ + + + + net6.0 + enable + enable + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + diff --git a/GarmentFactory/GarmentFactoryDatabaseImplement/Models/Component.cs b/GarmentFactory/GarmentFactoryDatabaseImplement/Models/Component.cs new file mode 100644 index 0000000..de08622 --- /dev/null +++ b/GarmentFactory/GarmentFactoryDatabaseImplement/Models/Component.cs @@ -0,0 +1,59 @@ +using GarmentFactoryContracts.BindingModels; +using GarmentFactoryContracts.ViewModels; +using GarmentFactoryDataModels.Models; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; + + +namespace GarmentFactoryDatabaseImplement.Models +{ + public class Component : IComponentModel + { + public int Id { get; private set; } + [Required] + public string ComponentName { get; private set; } = string.Empty; + [Required] + public double Cost { get; set; } + [ForeignKey("ComponentId")] + public virtual List TextileComponents { get; set; } = + new(); + public static Component? Create(ComponentBindingModel model) + { + if (model == null) + { + return null; + } + return new Component() + { + Id = model.Id, + ComponentName = model.ComponentName, + Cost = model.Cost + }; + } + public static Component Create(ComponentViewModel model) + { + return new Component + { + Id = model.Id, + ComponentName = model.ComponentName, + Cost = model.Cost + }; + } + public void Update(ComponentBindingModel model) + { + if (model == null) + { + return; + } + ComponentName = model.ComponentName; + Cost = model.Cost; + } + public ComponentViewModel GetViewModel => new() + { + Id = Id, + ComponentName = ComponentName, + Cost = Cost + }; + + } +} diff --git a/GarmentFactory/GarmentFactoryDatabaseImplement/Models/Order.cs b/GarmentFactory/GarmentFactoryDatabaseImplement/Models/Order.cs new file mode 100644 index 0000000..93be327 --- /dev/null +++ b/GarmentFactory/GarmentFactoryDatabaseImplement/Models/Order.cs @@ -0,0 +1,78 @@ +using GarmentFactoryContracts.BindingModels; +using GarmentFactoryContracts.ViewModels; +using GarmentFactoryDataModels.Enums; +using GarmentFactoryDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace GarmentFactoryDatabaseImplement.Models +{ + public class Order : IOrderModel + { + public int Id { get; set; } + + [Required] + public int TextileId { get; set; } + + [Required] + public int Count { get; set; } + + [Required] + public double Sum { get; set; } + + [Required] + public OrderStatus Status { get; set; } + + [Required] + public DateTime DateCreate { get; set; } + + public DateTime? DateImplement { get; set; } + + public virtual Textile Textile { get; set; } + + public static Order? Create(OrderBindingModel? model) + { + if (model == null) + { + return null; + } + return new Order() + { + Id = model.Id, + TextileId = model.TextileId, + Count = model.Count, + Sum = model.Sum, + Status = model.Status, + DateCreate = model.DateCreate, + DateImplement = model.DateImplement + }; + } + + public void Update(OrderBindingModel? model) + { + if (model == null) + { + return; + } + Status = model.Status; + DateImplement = model.DateImplement; + } + + public OrderViewModel GetViewModel => new() + { + Id = Id, + TextileId = TextileId, + Count = Count, + Sum = Sum, + Status = Status, + DateCreate = DateCreate, + DateImplement = DateImplement, + TextileName = Textile.TextileName + }; + } +} + diff --git a/GarmentFactory/GarmentFactoryDatabaseImplement/Models/Textile.cs b/GarmentFactory/GarmentFactoryDatabaseImplement/Models/Textile.cs new file mode 100644 index 0000000..76aa3ce --- /dev/null +++ b/GarmentFactory/GarmentFactoryDatabaseImplement/Models/Textile.cs @@ -0,0 +1,99 @@ +using GarmentFactoryContracts.BindingModels; +using GarmentFactoryContracts.ViewModels; +using GarmentFactoryDataModels.Models; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; + + +namespace GarmentFactoryDatabaseImplement.Models +{ + public class Textile : ITextileModel + { + public int Id { get; set; } + [Required] + public string TextileName { get; set; } = string.Empty; + [Required] + public double Price { get; set; } + private Dictionary? _textileComponents = + null; + [NotMapped] + public Dictionary TextileComponents + { + get + { + if (_textileComponents == null) + { + _textileComponents = Components + .ToDictionary(recPC => recPC.ComponentId, recPC => + (recPC.Component as IComponentModel, recPC.Count)); + } + return _textileComponents; + } + } + [ForeignKey("TextileId")] + public virtual List Components { get; set; } = new(); + [ForeignKey("TextileId")] + public virtual List Orders { get; set; } = new(); + public static Textile Create(GarmentFactoryDatabase context, + TextileBindingModel model) + { + return new Textile() + { + Id = model.Id, + TextileName = model.TextileName, + Price = model.Price, + Components = model.TextileComponents.Select(x => new + TextileComponent + { + Component = context.Components.First(y => y.Id == x.Key), + Count = x.Value.Item2 + }).ToList() + }; + } + public void Update(TextileBindingModel model) + { + TextileName = model.TextileName; + Price = model.Price; + } + public TextileViewModel GetViewModel => new() + { + Id = Id, + TextileName = TextileName, + Price = Price, + TextileComponents = TextileComponents + }; + public void UpdateComponents(GarmentFactoryDatabase context, + TextileBindingModel model) + { + var textileComponents = context.TextileComponents.Where(rec => + rec.TextileId == model.Id).ToList(); + if (textileComponents != null && textileComponents.Count > 0) + { // удалили те, которых нет в модели + context.TextileComponents.RemoveRange(textileComponents.Where(rec + => !model.TextileComponents.ContainsKey(rec.ComponentId))); + context.SaveChanges(); + // обновили количество у существующих записей + foreach (var updateComponent in textileComponents) + { + updateComponent.Count = + model.TextileComponents[updateComponent.ComponentId].Item2; + model.TextileComponents.Remove(updateComponent.ComponentId); + } + context.SaveChanges(); + } + var textile = context.Textiles.First(x => x.Id == Id); + foreach (var tt in model.TextileComponents) + { + context.TextileComponents.Add(new TextileComponent + { + Textile = textile, + Component = context.Components.First(x => x.Id == tt.Key), + Count = tt.Value.Item2 + }); + context.SaveChanges(); + } + _textileComponents = null; + } + + } +} diff --git a/GarmentFactory/GarmentFactoryDatabaseImplement/Models/TextileComponent.cs b/GarmentFactory/GarmentFactoryDatabaseImplement/Models/TextileComponent.cs new file mode 100644 index 0000000..7dd8d72 --- /dev/null +++ b/GarmentFactory/GarmentFactoryDatabaseImplement/Models/TextileComponent.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + + +namespace GarmentFactoryDatabaseImplement.Models +{ + public class TextileComponent + { + public int Id { get; set; } + [Required] + public int TextileId { get; set; } + [Required] + public int ComponentId { get; set; } + [Required] + public int Count { get; set; } + public virtual Component Component { get; set; } = new(); + public virtual Textile Textile { get; set; } = new(); + } +} diff --git a/GarmentFactory/GarmentFactoryView/GarmentFactoryView.csproj b/GarmentFactory/GarmentFactoryView/GarmentFactoryView.csproj index 8175291..3d31abf 100644 --- a/GarmentFactory/GarmentFactoryView/GarmentFactoryView.csproj +++ b/GarmentFactory/GarmentFactoryView/GarmentFactoryView.csproj @@ -9,6 +9,10 @@ + + all + runtime; build; native; contentfiles; analyzers; buildtransitive +