From e1017757cdb88117b0eb8e28c68f35b427e4b34a Mon Sep 17 00:00:00 2001 From: DyCTaTOR <125912249+DyCTaTOR@users.noreply.github.com> Date: Tue, 26 Mar 2024 20:40:27 +0400 Subject: [PATCH 1/2] =?UTF-8?q?=D0=9B=D0=B0=D0=B13?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PlumbingRepair/PlumbingRepair.sln | 8 +- .../PlumbingRepair/PlumbingRepairView.csproj | 9 + PlumbingRepair/PlumbingRepair/Program.cs | 2 +- .../BusinessLogics/OrderLogic.cs | 2 +- .../BindingModels/OrderBindingModel.cs | 2 +- .../Implements/ComponentStorage.cs | 97 ++++++++++ .../Implements/OrderStorage.cs | 97 ++++++++++ .../Implements/WorkStorage.cs | 125 +++++++++++++ .../20240326163755_Migration1.Designer.cs | 175 ++++++++++++++++++ .../Migrations/20240326163755_Migration1.cs | 127 +++++++++++++ .../PlumbingRepairDataBaseModelSnapshot.cs | 172 +++++++++++++++++ .../Models/Component.cs | 56 ++++++ .../Models/Order.cs | 81 ++++++++ .../Models/Work.cs | 101 ++++++++++ .../Models/WorkComponent.cs | 22 +++ .../PlumbingRepairDataBase.cs | 27 +++ .../PlumbingRepairDataBaseImplement.csproj | 24 +++ 17 files changed, 1123 insertions(+), 4 deletions(-) create mode 100644 PlumbingRepair/PlumbingRepairDataBaseImplement/Implements/ComponentStorage.cs create mode 100644 PlumbingRepair/PlumbingRepairDataBaseImplement/Implements/OrderStorage.cs create mode 100644 PlumbingRepair/PlumbingRepairDataBaseImplement/Implements/WorkStorage.cs create mode 100644 PlumbingRepair/PlumbingRepairDataBaseImplement/Migrations/20240326163755_Migration1.Designer.cs create mode 100644 PlumbingRepair/PlumbingRepairDataBaseImplement/Migrations/20240326163755_Migration1.cs create mode 100644 PlumbingRepair/PlumbingRepairDataBaseImplement/Migrations/PlumbingRepairDataBaseModelSnapshot.cs create mode 100644 PlumbingRepair/PlumbingRepairDataBaseImplement/Models/Component.cs create mode 100644 PlumbingRepair/PlumbingRepairDataBaseImplement/Models/Order.cs create mode 100644 PlumbingRepair/PlumbingRepairDataBaseImplement/Models/Work.cs create mode 100644 PlumbingRepair/PlumbingRepairDataBaseImplement/Models/WorkComponent.cs create mode 100644 PlumbingRepair/PlumbingRepairDataBaseImplement/PlumbingRepairDataBase.cs create mode 100644 PlumbingRepair/PlumbingRepairDataBaseImplement/PlumbingRepairDataBaseImplement.csproj diff --git a/PlumbingRepair/PlumbingRepair.sln b/PlumbingRepair/PlumbingRepair.sln index 9ede061..ddce14a 100644 --- a/PlumbingRepair/PlumbingRepair.sln +++ b/PlumbingRepair/PlumbingRepair.sln @@ -13,7 +13,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlumbingRepairBusinessLogic EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlumbingRepairListImplement", "PlumbingRepairListImplement\PlumbingRepairListImplement.csproj", "{E89CA82F-2FEA-4235-93A2-E5A412D0116F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlumbingRepairFileImplement", "PlumbingRepairFileImplement\PlumbingRepairFileImplement.csproj", "{CF58BB85-A6FB-4581-940D-BB7D1AB815CD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlumbingRepairFileImplement", "PlumbingRepairFileImplement\PlumbingRepairFileImplement.csproj", "{CF58BB85-A6FB-4581-940D-BB7D1AB815CD}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlumbingRepairDataBaseImplement", "PlumbingRepairDataBaseImplement\PlumbingRepairDataBaseImplement.csproj", "{C33166E1-3CA9-4CB8-AA74-1DFD66A1A91A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -45,6 +47,10 @@ Global {CF58BB85-A6FB-4581-940D-BB7D1AB815CD}.Debug|Any CPU.Build.0 = Debug|Any CPU {CF58BB85-A6FB-4581-940D-BB7D1AB815CD}.Release|Any CPU.ActiveCfg = Release|Any CPU {CF58BB85-A6FB-4581-940D-BB7D1AB815CD}.Release|Any CPU.Build.0 = Release|Any CPU + {C33166E1-3CA9-4CB8-AA74-1DFD66A1A91A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C33166E1-3CA9-4CB8-AA74-1DFD66A1A91A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C33166E1-3CA9-4CB8-AA74-1DFD66A1A91A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C33166E1-3CA9-4CB8-AA74-1DFD66A1A91A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/PlumbingRepair/PlumbingRepair/PlumbingRepairView.csproj b/PlumbingRepair/PlumbingRepair/PlumbingRepairView.csproj index e735055..dc71a89 100644 --- a/PlumbingRepair/PlumbingRepair/PlumbingRepairView.csproj +++ b/PlumbingRepair/PlumbingRepair/PlumbingRepairView.csproj @@ -9,12 +9,21 @@ + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + diff --git a/PlumbingRepair/PlumbingRepair/Program.cs b/PlumbingRepair/PlumbingRepair/Program.cs index 4f61236..2eeaf90 100644 --- a/PlumbingRepair/PlumbingRepair/Program.cs +++ b/PlumbingRepair/PlumbingRepair/Program.cs @@ -1,6 +1,6 @@ using PlumbingRepairContracts.BusinessLogicsContracts; using PlumbingRepairContracts.StoragesContracts; -using PlumbingRepairFileImplement.Implements; +using PlumbingRepairDataBaseImplement.Implements; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using NLog.Extensions.Logging; diff --git a/PlumbingRepair/PlumbingRepairBusinessLogic/BusinessLogics/OrderLogic.cs b/PlumbingRepair/PlumbingRepairBusinessLogic/BusinessLogics/OrderLogic.cs index 5fc5c55..5ab1599 100644 --- a/PlumbingRepair/PlumbingRepairBusinessLogic/BusinessLogics/OrderLogic.cs +++ b/PlumbingRepair/PlumbingRepairBusinessLogic/BusinessLogics/OrderLogic.cs @@ -84,7 +84,7 @@ namespace PlumbingRepairBusinessLogic.BusinessLogics model.Status = newStatus; if (model.Status == OrderStatus.Выдан) - model.DateImplement = DateTime.Now; + model.DateImplement = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc); if (_orderStorage.Update(model) == null) { diff --git a/PlumbingRepair/PlumbingRepairContracts/BindingModels/OrderBindingModel.cs b/PlumbingRepair/PlumbingRepairContracts/BindingModels/OrderBindingModel.cs index 42ed7cb..bd50674 100644 --- a/PlumbingRepair/PlumbingRepairContracts/BindingModels/OrderBindingModel.cs +++ b/PlumbingRepair/PlumbingRepairContracts/BindingModels/OrderBindingModel.cs @@ -16,7 +16,7 @@ namespace PlumbingRepairContracts.BindingModels public int Count { get; set; } public double Sum { get; set; } public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; - public DateTime DateCreate { get; set; } = DateTime.Now; + public DateTime DateCreate { get; set; } = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc); public DateTime? DateImplement { get; set; } } } \ No newline at end of file diff --git a/PlumbingRepair/PlumbingRepairDataBaseImplement/Implements/ComponentStorage.cs b/PlumbingRepair/PlumbingRepairDataBaseImplement/Implements/ComponentStorage.cs new file mode 100644 index 0000000..4e9415c --- /dev/null +++ b/PlumbingRepair/PlumbingRepairDataBaseImplement/Implements/ComponentStorage.cs @@ -0,0 +1,97 @@ +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.SearchModels; +using PlumbingRepairContracts.StoragesContracts; +using PlumbingRepairContracts.ViewModels; +using PlumbingRepairDataBaseImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace PlumbingRepairDataBaseImplement.Implements +{ + public class ComponentStorage : IComponentStorage + { + public List GetFullList() + { + using var context = new PlumbingRepairDataBase(); + + return context.Components.Select(x => x.GetViewModel).ToList(); + } + + public List GetFilteredList(ComponentSearchModel model) + { + if (string.IsNullOrEmpty(model.ComponentName)) + { + return new(); + } + + using var context = new PlumbingRepairDataBase(); + + return context.Components.Where(x => x.ComponentName.Contains(model.ComponentName)).Select(x => x.GetViewModel).ToList(); + } + + public ComponentViewModel? GetElement(ComponentSearchModel model) + { + if (string.IsNullOrEmpty(model.ComponentName) && !model.Id.HasValue) + { + return null; + } + + using var context = new PlumbingRepairDataBase(); + + return context.Components.FirstOrDefault(x => (!string.IsNullOrEmpty(model.ComponentName) && x.ComponentName == model.ComponentName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; + } + + public ComponentViewModel? Insert(ComponentBindingModel model) + { + var newComponent = Component.Create(model); + + if (newComponent == null) + { + return null; + } + + using var context = new PlumbingRepairDataBase(); + + context.Components.Add(newComponent); + context.SaveChanges(); + + return newComponent.GetViewModel; + } + + public ComponentViewModel? Update(ComponentBindingModel model) + { + using var context = new PlumbingRepairDataBase(); + + var component = context.Components.FirstOrDefault(x => x.Id == model.Id); + + if (component == null) + { + return null; + } + + component.Update(model); + context.SaveChanges(); + + return component.GetViewModel; + } + + public ComponentViewModel? Delete(ComponentBindingModel model) + { + using var context = new PlumbingRepairDataBase(); + + var element = context.Components.FirstOrDefault(rec => rec.Id == model.Id); + + if (element != null) + { + context.Components.Remove(element); + context.SaveChanges(); + return element.GetViewModel; + } + + return null; + } + } +} diff --git a/PlumbingRepair/PlumbingRepairDataBaseImplement/Implements/OrderStorage.cs b/PlumbingRepair/PlumbingRepairDataBaseImplement/Implements/OrderStorage.cs new file mode 100644 index 0000000..725c385 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairDataBaseImplement/Implements/OrderStorage.cs @@ -0,0 +1,97 @@ +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.SearchModels; +using PlumbingRepairContracts.StoragesContracts; +using PlumbingRepairContracts.ViewModels; +using PlumbingRepairDataBaseImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace PlumbingRepairDataBaseImplement.Implements +{ + public class OrderStorage : IOrderStorage + { + public List GetFullList() + { + using var context = new PlumbingRepairDataBase(); + + return context.Orders.Select(x => x.GetViewModel).ToList(); + } + + public List GetFilteredList(OrderSearchModel model) + { + if (!model.Id.HasValue) + { + return new(); + } + + using var context = new PlumbingRepairDataBase(); + + return context.Orders.Where(x => x.Id == model.Id).Select(x => x.GetViewModel).ToList(); + } + + public OrderViewModel? GetElement(OrderSearchModel model) + { + if (!model.Id.HasValue) + { + return null; + } + + using var context = new PlumbingRepairDataBase(); + + return context.Orders.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; + } + + public OrderViewModel? Insert(OrderBindingModel model) + { + var newOrder = Order.Create(model); + + if (newOrder == null) + { + return null; + } + + using var context = new PlumbingRepairDataBase(); + + context.Orders.Add(newOrder); + context.SaveChanges(); + + return newOrder.GetViewModel; + } + + public OrderViewModel? Update(OrderBindingModel model) + { + using var context = new PlumbingRepairDataBase(); + + var order = context.Orders.FirstOrDefault(x => x.Id == model.Id); + + if (order == null) + { + return null; + } + + order.Update(model); + context.SaveChanges(); + + return order.GetViewModel; + } + + public OrderViewModel? Delete(OrderBindingModel model) + { + using var context = new PlumbingRepairDataBase(); + + var element = context.Orders.FirstOrDefault(rec => rec.Id == model.Id); + + if (element != null) + { + context.Orders.Remove(element); + context.SaveChanges(); + + return element.GetViewModel; + } + return null; + } + } +} diff --git a/PlumbingRepair/PlumbingRepairDataBaseImplement/Implements/WorkStorage.cs b/PlumbingRepair/PlumbingRepairDataBaseImplement/Implements/WorkStorage.cs new file mode 100644 index 0000000..d905aaf --- /dev/null +++ b/PlumbingRepair/PlumbingRepairDataBaseImplement/Implements/WorkStorage.cs @@ -0,0 +1,125 @@ +using Microsoft.EntityFrameworkCore; +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.SearchModels; +using PlumbingRepairContracts.StoragesContracts; +using PlumbingRepairContracts.ViewModels; +using PlumbingRepairDataBaseImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace PlumbingRepairDataBaseImplement.Implements +{ + public class WorkStorage : IWorkStorage + { + public List GetFullList() + { + using var context = new PlumbingRepairDataBase(); + + return context.Works + .Include(x => x.Components) + .ThenInclude(x => x.Component) + .ToList() + .Select(x => x.GetViewModel) + .ToList(); + } + + public List GetFilteredList(WorkSearchModel model) + { + if (string.IsNullOrEmpty(model.WorkName)) + { + return new(); + } + + using var context = new PlumbingRepairDataBase(); + + return context.Works + .Include(x => x.Components) + .ThenInclude(x => x.Component) + .Where(x => x.WorkName.Contains(model.WorkName)) + .ToList() + .Select(x => x.GetViewModel) + .ToList(); + } + + public WorkViewModel? GetElement(WorkSearchModel model) + { + if (string.IsNullOrEmpty(model.WorkName) && !model.Id.HasValue) + { + return null; + } + + using var context = new PlumbingRepairDataBase(); + + return context.Works + .Include(x => x.Components) + .ThenInclude(x => x.Component) + .FirstOrDefault(x => (!string.IsNullOrEmpty(model.WorkName) && x.WorkName == model.WorkName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; + } + + public WorkViewModel? Insert(WorkBindingModel model) + { + using var context = new PlumbingRepairDataBase(); + + var newWork = Work.Create(context, model); + + if (newWork == null) + { + return null; + } + + context.Works.Add(newWork); + context.SaveChanges(); + + return newWork.GetViewModel; + } + + public WorkViewModel? Update(WorkBindingModel model) + { + using var context = new PlumbingRepairDataBase(); + + using var transaction = context.Database.BeginTransaction(); + + try + { + var package = context.Works.FirstOrDefault(rec => rec.Id == model.Id); + + if (package == null) + { + return null; + } + + package.Update(model); + context.SaveChanges(); + package.UpdateComponents(context, model); + transaction.Commit(); + + return package.GetViewModel; + } + catch + { + transaction.Rollback(); + + throw; + } + } + + public WorkViewModel? Delete(WorkBindingModel model) + { + using var context = new PlumbingRepairDataBase(); + + var element = context.Works.Include(x => x.Components).FirstOrDefault(rec => rec.Id == model.Id); + + if (element != null) + { + context.Works.Remove(element); + context.SaveChanges(); + return element.GetViewModel; + } + + return null; + } + } +} diff --git a/PlumbingRepair/PlumbingRepairDataBaseImplement/Migrations/20240326163755_Migration1.Designer.cs b/PlumbingRepair/PlumbingRepairDataBaseImplement/Migrations/20240326163755_Migration1.Designer.cs new file mode 100644 index 0000000..329c818 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairDataBaseImplement/Migrations/20240326163755_Migration1.Designer.cs @@ -0,0 +1,175 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; +using PlumbingRepairDataBaseImplement; + +#nullable disable + +namespace PlumbingRepairDataBaseImplement.Migrations +{ + [DbContext(typeof(PlumbingRepairDataBase))] + [Migration("20240326163755_Migration1")] + partial class Migration1 + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "7.0.17") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + + modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.Component", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ComponentName") + .IsRequired() + .HasColumnType("text"); + + b.Property("Cost") + .HasColumnType("double precision"); + + b.HasKey("Id"); + + b.ToTable("Components"); + }); + + modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.Order", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Count") + .HasColumnType("integer"); + + b.Property("DateCreate") + .HasColumnType("timestamp with time zone"); + + b.Property("DateImplement") + .HasColumnType("timestamp with time zone"); + + b.Property("Status") + .HasColumnType("integer"); + + b.Property("Sum") + .HasColumnType("double precision"); + + b.Property("WorkId") + .HasColumnType("integer"); + + b.Property("WorkName") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("WorkId"); + + b.ToTable("Orders"); + }); + + modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.Work", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Price") + .HasColumnType("double precision"); + + b.Property("WorkName") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("Id"); + + b.ToTable("Works"); + }); + + modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.WorkComponent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ComponentId") + .HasColumnType("integer"); + + b.Property("Count") + .HasColumnType("integer"); + + b.Property("WorkId") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("ComponentId"); + + b.HasIndex("WorkId"); + + b.ToTable("WorkComponents"); + }); + + modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.Order", b => + { + b.HasOne("PlumbingRepairDataBaseImplement.Models.Work", "Work") + .WithMany("Orders") + .HasForeignKey("WorkId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Work"); + }); + + modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.WorkComponent", b => + { + b.HasOne("PlumbingRepairDataBaseImplement.Models.Component", "Component") + .WithMany("WorkComponents") + .HasForeignKey("ComponentId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("PlumbingRepairDataBaseImplement.Models.Work", "Work") + .WithMany("Components") + .HasForeignKey("WorkId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Component"); + + b.Navigation("Work"); + }); + + modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.Component", b => + { + b.Navigation("WorkComponents"); + }); + + modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.Work", b => + { + b.Navigation("Components"); + + b.Navigation("Orders"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/PlumbingRepair/PlumbingRepairDataBaseImplement/Migrations/20240326163755_Migration1.cs b/PlumbingRepair/PlumbingRepairDataBaseImplement/Migrations/20240326163755_Migration1.cs new file mode 100644 index 0000000..62b3884 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairDataBaseImplement/Migrations/20240326163755_Migration1.cs @@ -0,0 +1,127 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; + +#nullable disable + +namespace PlumbingRepairDataBaseImplement.Migrations +{ + /// + public partial class Migration1 : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "Components", + columns: table => new + { + Id = table.Column(type: "integer", nullable: false) + .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), + ComponentName = table.Column(type: "text", nullable: false), + Cost = table.Column(type: "double precision", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Components", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "Works", + columns: table => new + { + Id = table.Column(type: "integer", nullable: false) + .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), + WorkName = table.Column(type: "text", nullable: false), + Price = table.Column(type: "double precision", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Works", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "Orders", + columns: table => new + { + Id = table.Column(type: "integer", nullable: false) + .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), + WorkId = table.Column(type: "integer", nullable: false), + WorkName = table.Column(type: "text", nullable: false), + Count = table.Column(type: "integer", nullable: false), + Sum = table.Column(type: "double precision", nullable: false), + Status = table.Column(type: "integer", nullable: false), + DateCreate = table.Column(type: "timestamp with time zone", nullable: false), + DateImplement = table.Column(type: "timestamp with time zone", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_Orders", x => x.Id); + table.ForeignKey( + name: "FK_Orders_Works_WorkId", + column: x => x.WorkId, + principalTable: "Works", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "WorkComponents", + columns: table => new + { + Id = table.Column(type: "integer", nullable: false) + .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), + WorkId = table.Column(type: "integer", nullable: false), + ComponentId = table.Column(type: "integer", nullable: false), + Count = table.Column(type: "integer", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_WorkComponents", x => x.Id); + table.ForeignKey( + name: "FK_WorkComponents_Components_ComponentId", + column: x => x.ComponentId, + principalTable: "Components", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_WorkComponents_Works_WorkId", + column: x => x.WorkId, + principalTable: "Works", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateIndex( + name: "IX_Orders_WorkId", + table: "Orders", + column: "WorkId"); + + migrationBuilder.CreateIndex( + name: "IX_WorkComponents_ComponentId", + table: "WorkComponents", + column: "ComponentId"); + + migrationBuilder.CreateIndex( + name: "IX_WorkComponents_WorkId", + table: "WorkComponents", + column: "WorkId"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "Orders"); + + migrationBuilder.DropTable( + name: "WorkComponents"); + + migrationBuilder.DropTable( + name: "Components"); + + migrationBuilder.DropTable( + name: "Works"); + } + } +} diff --git a/PlumbingRepair/PlumbingRepairDataBaseImplement/Migrations/PlumbingRepairDataBaseModelSnapshot.cs b/PlumbingRepair/PlumbingRepairDataBaseImplement/Migrations/PlumbingRepairDataBaseModelSnapshot.cs new file mode 100644 index 0000000..704e78d --- /dev/null +++ b/PlumbingRepair/PlumbingRepairDataBaseImplement/Migrations/PlumbingRepairDataBaseModelSnapshot.cs @@ -0,0 +1,172 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; +using PlumbingRepairDataBaseImplement; + +#nullable disable + +namespace PlumbingRepairDataBaseImplement.Migrations +{ + [DbContext(typeof(PlumbingRepairDataBase))] + partial class PlumbingRepairDataBaseModelSnapshot : ModelSnapshot + { + protected override void BuildModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "7.0.17") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + + modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.Component", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ComponentName") + .IsRequired() + .HasColumnType("text"); + + b.Property("Cost") + .HasColumnType("double precision"); + + b.HasKey("Id"); + + b.ToTable("Components"); + }); + + modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.Order", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Count") + .HasColumnType("integer"); + + b.Property("DateCreate") + .HasColumnType("timestamp with time zone"); + + b.Property("DateImplement") + .HasColumnType("timestamp with time zone"); + + b.Property("Status") + .HasColumnType("integer"); + + b.Property("Sum") + .HasColumnType("double precision"); + + b.Property("WorkId") + .HasColumnType("integer"); + + b.Property("WorkName") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("WorkId"); + + b.ToTable("Orders"); + }); + + modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.Work", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Price") + .HasColumnType("double precision"); + + b.Property("WorkName") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("Id"); + + b.ToTable("Works"); + }); + + modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.WorkComponent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ComponentId") + .HasColumnType("integer"); + + b.Property("Count") + .HasColumnType("integer"); + + b.Property("WorkId") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("ComponentId"); + + b.HasIndex("WorkId"); + + b.ToTable("WorkComponents"); + }); + + modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.Order", b => + { + b.HasOne("PlumbingRepairDataBaseImplement.Models.Work", "Work") + .WithMany("Orders") + .HasForeignKey("WorkId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Work"); + }); + + modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.WorkComponent", b => + { + b.HasOne("PlumbingRepairDataBaseImplement.Models.Component", "Component") + .WithMany("WorkComponents") + .HasForeignKey("ComponentId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("PlumbingRepairDataBaseImplement.Models.Work", "Work") + .WithMany("Components") + .HasForeignKey("WorkId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Component"); + + b.Navigation("Work"); + }); + + modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.Component", b => + { + b.Navigation("WorkComponents"); + }); + + modelBuilder.Entity("PlumbingRepairDataBaseImplement.Models.Work", b => + { + b.Navigation("Components"); + + b.Navigation("Orders"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/PlumbingRepair/PlumbingRepairDataBaseImplement/Models/Component.cs b/PlumbingRepair/PlumbingRepairDataBaseImplement/Models/Component.cs new file mode 100644 index 0000000..a4b22e0 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairDataBaseImplement/Models/Component.cs @@ -0,0 +1,56 @@ +using System.ComponentModel.DataAnnotations.Schema; +using System.ComponentModel.DataAnnotations; +using PlumbingRepairDataModels.Models; +using PlumbingRepairContracts.ViewModels; +using PlumbingRepairContracts.BindingModels; + +namespace PlumbingRepairDataBaseImplement.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 WorkComponents { 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 + }; + } +} \ No newline at end of file diff --git a/PlumbingRepair/PlumbingRepairDataBaseImplement/Models/Order.cs b/PlumbingRepair/PlumbingRepairDataBaseImplement/Models/Order.cs new file mode 100644 index 0000000..d4c2282 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairDataBaseImplement/Models/Order.cs @@ -0,0 +1,81 @@ +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.ViewModels; +using PlumbingRepairDataModels.Enums; +using PlumbingRepairDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace PlumbingRepairDataBaseImplement.Models +{ + public class Order : IOrderModel + { + public int Id { get; private set; } + + public int WorkId { get; private set; } + + public string WorkName { get; private set; } = string.Empty; + + [Required] + public int Count { get; private set; } + + [Required] + public double Sum { get; private set; } + + [Required] + public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; + + [Required] + public DateTime DateCreate { get; private set; } = DateTime.Now; + + public DateTime? DateImplement { get; private set; } + + public virtual Work Work { get; set; } + + public static Order? Create(OrderBindingModel? model) + { + if (model == null) + { + return null; + } + + return new Order() + { + Id = model.Id, + WorkId = model.WorkId, + WorkName = model.WorkName, + 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, + WorkId = WorkId, + WorkName = WorkName, + Count = Count, + Sum = Sum, + Status = Status, + DateCreate = DateCreate, + DateImplement = DateImplement + }; + } +} diff --git a/PlumbingRepair/PlumbingRepairDataBaseImplement/Models/Work.cs b/PlumbingRepair/PlumbingRepairDataBaseImplement/Models/Work.cs new file mode 100644 index 0000000..e9d145e --- /dev/null +++ b/PlumbingRepair/PlumbingRepairDataBaseImplement/Models/Work.cs @@ -0,0 +1,101 @@ +using PlumbingRepairDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.ViewModels; + +namespace PlumbingRepairDataBaseImplement.Models +{ + public class Work : IWorkModel + { + public int Id { get; set; } + [Required] + public string WorkName { get; set; } = string.Empty; + [Required] + public double Price { get; set; } + private Dictionary? _workComponents = + null; + [NotMapped] + public Dictionary WorkComponents + { + get + { + if (_workComponents == null) + { + _workComponents = Components + .ToDictionary(recPC => recPC.ComponentId, recPC => + (recPC.Component as IComponentModel, recPC.Count)); + } + return _workComponents; + } + } + [ForeignKey("WorkId")] + public virtual List Components { get; set; } = new(); + [ForeignKey("WorkId")] + public virtual List Orders { get; set; } = new(); + public static Work Create(PlumbingRepairDataBase context, + WorkBindingModel model) + { + return new Work() + { + Id = model.Id, + WorkName = model.WorkName, + Price = model.Price, + Components = model.WorkComponents.Select(x => new + WorkComponent + { + Component = context.Components.First(y => y.Id == x.Key), + Count = x.Value.Item2 + }).ToList() + }; + } + public void Update(WorkBindingModel model) + { + WorkName = model.WorkName; + Price = model.Price; + } + public WorkViewModel GetViewModel => new() + { + Id = Id, + WorkName = WorkName, + Price = Price, + WorkComponents = WorkComponents + }; + public void UpdateComponents(PlumbingRepairDataBase context, + WorkBindingModel model) + { + var workComponents = context.WorkComponents.Where(rec => + rec.WorkId == model.Id).ToList(); + if (workComponents != null && workComponents.Count > 0) + { // удалили те, которых нет в модели + context.WorkComponents.RemoveRange(workComponents.Where(rec + => !model.WorkComponents.ContainsKey(rec.ComponentId))); + context.SaveChanges(); + // обновили количество у существующих записей + foreach (var updateComponent in workComponents) + { + updateComponent.Count = model.WorkComponents[updateComponent.ComponentId].Item2; + model.WorkComponents.Remove(updateComponent.ComponentId); + } + context.SaveChanges(); + } + var work = context.Works.First(x => x.Id == Id); + foreach (var pc in model.WorkComponents) + { + context.WorkComponents.Add(new WorkComponent + { + Work = work, + Component = context.Components.First(x => x.Id == pc.Key), + Count = pc.Value.Item2 + }); + context.SaveChanges(); + } + _workComponents = null; + } + } +} diff --git a/PlumbingRepair/PlumbingRepairDataBaseImplement/Models/WorkComponent.cs b/PlumbingRepair/PlumbingRepairDataBaseImplement/Models/WorkComponent.cs new file mode 100644 index 0000000..b8cb109 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairDataBaseImplement/Models/WorkComponent.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace PlumbingRepairDataBaseImplement.Models +{ + public class WorkComponent + { + public int Id { get; set; } + [Required] + public int WorkId { get; set; } + [Required] + public int ComponentId { get; set; } + [Required] + public int Count { get; set; } + public virtual Component Component { get; set; } = new(); + public virtual Work Work { get; set; } = new(); + } +} diff --git a/PlumbingRepair/PlumbingRepairDataBaseImplement/PlumbingRepairDataBase.cs b/PlumbingRepair/PlumbingRepairDataBaseImplement/PlumbingRepairDataBase.cs new file mode 100644 index 0000000..5e6c904 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairDataBaseImplement/PlumbingRepairDataBase.cs @@ -0,0 +1,27 @@ +using Microsoft.EntityFrameworkCore; +using PlumbingRepairDataBaseImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace PlumbingRepairDataBaseImplement +{ + public class PlumbingRepairDataBase : DbContext + { + protected override void OnConfiguring(DbContextOptionsBuilder + optionsBuilder) + { + if (optionsBuilder.IsConfigured == false) + { + optionsBuilder.UseNpgsql(@"Host=localhost;Port=5432;Database=PlumbingRepairDatabaseFull;Username=postgres;"); + } + base.OnConfiguring(optionsBuilder); + } + public virtual DbSet Components { set; get; } + public virtual DbSet Works { set; get; } + public virtual DbSet WorkComponents { set; get; } + public virtual DbSet Orders { set; get; } + } +} diff --git a/PlumbingRepair/PlumbingRepairDataBaseImplement/PlumbingRepairDataBaseImplement.csproj b/PlumbingRepair/PlumbingRepairDataBaseImplement/PlumbingRepairDataBaseImplement.csproj new file mode 100644 index 0000000..d6c9891 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairDataBaseImplement/PlumbingRepairDataBaseImplement.csproj @@ -0,0 +1,24 @@ + + + + net6.0 + enable + enable + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + From 3a06293709362a5ef78144c5d2b2998f1147eb25 Mon Sep 17 00:00:00 2001 From: DyCTaTOR <125912249+DyCTaTOR@users.noreply.github.com> Date: Wed, 27 Mar 2024 09:30:44 +0400 Subject: [PATCH 2/2] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PlumbingRepairDataBaseImplement/PlumbingRepairDataBase.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PlumbingRepair/PlumbingRepairDataBaseImplement/PlumbingRepairDataBase.cs b/PlumbingRepair/PlumbingRepairDataBaseImplement/PlumbingRepairDataBase.cs index 5e6c904..0b82341 100644 --- a/PlumbingRepair/PlumbingRepairDataBaseImplement/PlumbingRepairDataBase.cs +++ b/PlumbingRepair/PlumbingRepairDataBaseImplement/PlumbingRepairDataBase.cs @@ -15,7 +15,7 @@ namespace PlumbingRepairDataBaseImplement { if (optionsBuilder.IsConfigured == false) { - optionsBuilder.UseNpgsql(@"Host=localhost;Port=5432;Database=PlumbingRepairDatabaseFull;Username=postgres;"); + optionsBuilder.UseNpgsql(@"Host=localhost;Port=5432;Database=PlumbingRepairDatabaseFull;Username=postgres;Password=postgres"); } base.OnConfiguring(optionsBuilder); }