From c54f78bdb0b18a92bb908a5eba2117fd443e2b9d Mon Sep 17 00:00:00 2001 From: "ityurner02@mail.ru" Date: Sat, 4 Mar 2023 20:23:01 +0400 Subject: [PATCH 1/4] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0?= =?UTF-8?q?=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PlumbingRepair/PlumbingRepair.sln | 8 +- .../PlumbingRepair/PlumbingRepair.csproj | 5 + PlumbingRepair/PlumbingRepair/Program.cs | 2 +- .../BusinessLogic/OrderLogic.cs | 2 +- .../BindingModels/OrderBindingModel.cs | 2 +- .../Implements/ComponentStorage.cs | 92 +++++++++ .../Implements/OrderStorage.cs | 93 ++++++++++ .../Implements/WorkStorage.cs | 120 ++++++++++++ .../20230304141419_InitMigration.Designer.cs | 175 ++++++++++++++++++ .../20230304141419_InitMigration.cs | 127 +++++++++++++ .../PlumbingRepairDataBaseModelSnapshot.cs | 172 +++++++++++++++++ .../Models/Component.cs | 60 ++++++ .../Models/Order.cs | 74 ++++++++ .../Models/Work.cs | 101 ++++++++++ .../Models/WorkComponent.cs | 21 +++ .../PlumbingRepairDataBase.cs | 21 +++ .../PlumbingRepairDatabaseImplement.csproj | 23 +++ 17 files changed, 1094 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/20230304141419_InitMigration.Designer.cs create mode 100644 PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/20230304141419_InitMigration.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 579e499..dba3f1c 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", "{9B17B17E-1201-4B23-ACCD-EF7F4495E4B7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlumbingRepairFileImplement", "PlumpingRepairFileImplement\PlumbingRepairFileImplement.csproj", "{BA7E2CE6-7797-42C7-931C-40C48EA521C7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlumbingRepairFileImplement", "PlumpingRepairFileImplement\PlumbingRepairFileImplement.csproj", "{BA7E2CE6-7797-42C7-931C-40C48EA521C7}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlumbingRepairDatabaseImplement", "PlumbingRepairDatabaseImplement\PlumbingRepairDatabaseImplement.csproj", "{1E4DDF78-14D2-498B-9A17-473F156DBE11}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -45,6 +47,10 @@ Global {BA7E2CE6-7797-42C7-931C-40C48EA521C7}.Debug|Any CPU.Build.0 = Debug|Any CPU {BA7E2CE6-7797-42C7-931C-40C48EA521C7}.Release|Any CPU.ActiveCfg = Release|Any CPU {BA7E2CE6-7797-42C7-931C-40C48EA521C7}.Release|Any CPU.Build.0 = Release|Any CPU + {1E4DDF78-14D2-498B-9A17-473F156DBE11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1E4DDF78-14D2-498B-9A17-473F156DBE11}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1E4DDF78-14D2-498B-9A17-473F156DBE11}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1E4DDF78-14D2-498B-9A17-473F156DBE11}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/PlumbingRepair/PlumbingRepair/PlumbingRepair.csproj b/PlumbingRepair/PlumbingRepair/PlumbingRepair.csproj index 55fd7eb..0b36aea 100644 --- a/PlumbingRepair/PlumbingRepair/PlumbingRepair.csproj +++ b/PlumbingRepair/PlumbingRepair/PlumbingRepair.csproj @@ -9,11 +9,16 @@ + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + diff --git a/PlumbingRepair/PlumbingRepair/Program.cs b/PlumbingRepair/PlumbingRepair/Program.cs index 106d4fb..542abeb 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/BusinessLogic/OrderLogic.cs b/PlumbingRepair/PlumbingRepairBusinessLogic/BusinessLogic/OrderLogic.cs index dbb06f3..a58a17a 100644 --- a/PlumbingRepair/PlumbingRepairBusinessLogic/BusinessLogic/OrderLogic.cs +++ b/PlumbingRepair/PlumbingRepairBusinessLogic/BusinessLogic/OrderLogic.cs @@ -54,7 +54,7 @@ namespace PlumbingRepairBusinessLogic.BusinessLogic 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 1a1ca0e..2450a64 100644 --- a/PlumbingRepair/PlumbingRepairContracts/BindingModels/OrderBindingModel.cs +++ b/PlumbingRepair/PlumbingRepairContracts/BindingModels/OrderBindingModel.cs @@ -10,7 +10,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; } public string WorkName { get; set; } = string.Empty; } diff --git a/PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/ComponentStorage.cs b/PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/ComponentStorage.cs new file mode 100644 index 0000000..15d2ca3 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/ComponentStorage.cs @@ -0,0 +1,92 @@ +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.SearchModels; +using PlumbingRepairContracts.StoragesContracts; +using PlumbingRepairContracts.ViewModels; +using PlumbingRepairDatabaseImplement.Models; + +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..0b0cfe0 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/OrderStorage.cs @@ -0,0 +1,93 @@ +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.SearchModels; +using PlumbingRepairContracts.StoragesContracts; +using PlumbingRepairContracts.ViewModels; +using PlumbingRepairDatabaseImplement.Models; + +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..8f88b12 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/WorkStorage.cs @@ -0,0 +1,120 @@ +using Microsoft.EntityFrameworkCore; +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.SearchModels; +using PlumbingRepairContracts.StoragesContracts; +using PlumbingRepairContracts.ViewModels; +using PlumbingRepairDatabaseImplement.Models; + +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/20230304141419_InitMigration.Designer.cs b/PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/20230304141419_InitMigration.Designer.cs new file mode 100644 index 0000000..00ad78c --- /dev/null +++ b/PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/20230304141419_InitMigration.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("20230304141419_InitMigration")] + partial class InitMigration + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "7.0.3") + .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/20230304141419_InitMigration.cs b/PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/20230304141419_InitMigration.cs new file mode 100644 index 0000000..371dcc9 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/20230304141419_InitMigration.cs @@ -0,0 +1,127 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; + +#nullable disable + +namespace PlumbingRepairDatabaseImplement.Migrations +{ + /// + public partial class InitMigration : 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..a8fcca6 --- /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.3") + .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..0e7f43c --- /dev/null +++ b/PlumbingRepair/PlumbingRepairDatabaseImplement/Models/Component.cs @@ -0,0 +1,60 @@ +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.ViewModels; +using PlumbingRepairDataModels.Models; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; + +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 + }; + } +} diff --git a/PlumbingRepair/PlumbingRepairDatabaseImplement/Models/Order.cs b/PlumbingRepair/PlumbingRepairDatabaseImplement/Models/Order.cs new file mode 100644 index 0000000..d8fc875 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairDatabaseImplement/Models/Order.cs @@ -0,0 +1,74 @@ +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.ViewModels; +using PlumbingRepairDataModels.Enums; +using PlumbingRepairDataModels.Models; +using System.ComponentModel.DataAnnotations; + +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 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..88f76c9 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairDatabaseImplement/Models/Work.cs @@ -0,0 +1,101 @@ +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.ViewModels; +using PlumbingRepairDataModels.Models; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; + +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..b029af2 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairDatabaseImplement/Models/WorkComponent.cs @@ -0,0 +1,21 @@ +using System.ComponentModel.DataAnnotations; + +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..76df650 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairDatabaseImplement/PlumbingRepairDataBase.cs @@ -0,0 +1,21 @@ +using Microsoft.EntityFrameworkCore; +using PlumbingRepairDatabaseImplement.Models; + +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;Password=186qazwsx"); + } + 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..ee7581f --- /dev/null +++ b/PlumbingRepair/PlumbingRepairDatabaseImplement/PlumbingRepairDatabaseImplement.csproj @@ -0,0 +1,23 @@ + + + + net6.0 + enable + enable + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + -- 2.25.1 From 2a1ce016e78bc81583ea667ae415129b3e21ff25 Mon Sep 17 00:00:00 2001 From: "ityurner02@mail.ru" Date: Tue, 7 Mar 2023 12:54:13 +0400 Subject: [PATCH 2/4] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PlumbingRepair/PlumbingRepairDatabaseImplement/Models/Order.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/PlumbingRepair/PlumbingRepairDatabaseImplement/Models/Order.cs b/PlumbingRepair/PlumbingRepairDatabaseImplement/Models/Order.cs index d8fc875..8e1821a 100644 --- a/PlumbingRepair/PlumbingRepairDatabaseImplement/Models/Order.cs +++ b/PlumbingRepair/PlumbingRepairDatabaseImplement/Models/Order.cs @@ -28,6 +28,8 @@ namespace PlumbingRepairDatabaseImplement.Models public DateTime? DateImplement { get; private set; } + public virtual Work Work { get; set; } + public static Order? Create(OrderBindingModel? model) { if (model == null) -- 2.25.1 From a150273330db7b40c365d4aee0d80a6da10f62ef Mon Sep 17 00:00:00 2001 From: "ityurner02@mail.ru" Date: Fri, 28 Apr 2023 19:50:16 +0400 Subject: [PATCH 3/4] =?UTF-8?q?=D0=BD=D0=B5=20=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D0=B0=D0=B5=D1=82=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BC=D0=B0=D0=B3=D0=B0=D0=B7=D0=B8?= =?UTF-8?q?=D0=BD=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessLogic/OrderLogic.cs | 235 +++++++++--------- .../BusinessLogic/StoreLogic.cs | 2 +- .../BindingModels/StoreBindingModel.cs | 2 +- .../Implements/ComponentStorage.cs | 124 ++++----- .../Implements/OrderStorage.cs | 126 +++++----- .../Implements/StoreStorage.cs | 163 ++++++++++++ .../Implements/WorkStorage.cs | 174 ++++++------- ...cs => 20230428142925_CreateDB.Designer.cs} | 81 +++++- ...igration.cs => 20230428142925_CreateDB.cs} | 61 ++++- .../PlumbingRepairDataBaseModelSnapshot.cs | 77 ++++++ .../Models/Store.cs | 105 ++++++++ .../Models/StoreWork.cs | 22 ++ .../PlumbingRepairDataBase.cs | 6 +- 13 files changed, 842 insertions(+), 336 deletions(-) create mode 100644 PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/StoreStorage.cs rename PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/{20230304141419_InitMigration.Designer.cs => 20230428142925_CreateDB.Designer.cs} (68%) rename PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/{20230304141419_InitMigration.cs => 20230428142925_CreateDB.cs} (66%) create mode 100644 PlumbingRepair/PlumbingRepairDatabaseImplement/Models/Store.cs create mode 100644 PlumbingRepair/PlumbingRepairDatabaseImplement/Models/StoreWork.cs diff --git a/PlumbingRepair/PlumbingRepairBusinessLogic/BusinessLogic/OrderLogic.cs b/PlumbingRepair/PlumbingRepairBusinessLogic/BusinessLogic/OrderLogic.cs index 9a1f8e2..d70fab5 100644 --- a/PlumbingRepair/PlumbingRepairBusinessLogic/BusinessLogic/OrderLogic.cs +++ b/PlumbingRepair/PlumbingRepairBusinessLogic/BusinessLogic/OrderLogic.cs @@ -8,151 +8,152 @@ using PlumbingRepairDataModels.Enums; namespace PlumbingRepairBusinessLogic.BusinessLogic { - public class OrderLogic : IOrderLogic - { - private readonly ILogger _logger; - private readonly IOrderStorage _orderStorage; - private readonly IStoreLogic _storeLogic; - private readonly IWorkStorage _workStorage; + public class OrderLogic : IOrderLogic + { + private readonly ILogger _logger; + private readonly IOrderStorage _orderStorage; + private readonly IStoreLogic _storeLogic; + private readonly IWorkStorage _workStorage; - public OrderLogic(ILogger logger, IOrderStorage orderStorage, IWorkStorage workStorage, IStoreLogic storeLogic) - { - _logger = logger; - _orderStorage = orderStorage; - _storeLogic = storeLogic; - _workStorage = workStorage; - } + public OrderLogic(ILogger logger, IOrderStorage orderStorage, IWorkStorage workStorage, IStoreLogic storeLogic) + { + _logger = logger; + _orderStorage = orderStorage; + _storeLogic = storeLogic; + _workStorage = workStorage; + } - public bool CreateOrder(OrderBindingModel model) - { - CheckModel(model); + public bool CreateOrder(OrderBindingModel model) + { + CheckModel(model); - if (model.Status != OrderStatus.Неизвестен) - { - _logger.LogWarning("Insert operation failed. Order status incorrect."); - return false; - } + if (model.Status != OrderStatus.Неизвестен) + { + _logger.LogWarning("Insert operation failed. Order status incorrect."); + return false; + } - model.Status = OrderStatus.Принят; + model.Status = OrderStatus.Принят; - if (_orderStorage.Insert(model) == null) - { - model.Status = OrderStatus.Неизвестен; - _logger.LogWarning("Insert operation failed"); - return false; - } + if (_orderStorage.Insert(model) == null) + { + model.Status = OrderStatus.Неизвестен; + _logger.LogWarning("Insert operation failed"); + return false; + } - return true; - } + return true; + } - public bool StatusUpdate(OrderBindingModel model, OrderStatus newStatus) - { - var viewModel = _orderStorage.GetElement(new OrderSearchModel { Id = model.Id }); + public bool StatusUpdate(OrderBindingModel model, OrderStatus newStatus) + { + var viewModel = _orderStorage.GetElement(new OrderSearchModel { Id = model.Id }); - if (viewModel == null) - { - throw new ArgumentNullException(nameof(model)); - } + if (viewModel == null) + { + throw new ArgumentNullException(nameof(model)); + } - if (viewModel.Status + 1 != newStatus) - { - _logger.LogWarning("Status update to " + newStatus.ToString() + " operation failed. Order status incorrect."); - return false; - } + if (viewModel.Status + 1 != newStatus) + { + _logger.LogWarning("Status update to " + newStatus.ToString() + " operation failed. Order status incorrect."); + return false; + } - model.Status = newStatus; + model.Status = newStatus; - if (model.Status == OrderStatus.Выдан) - model.DateImplement = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc); + if (model.Status == OrderStatus.Готов) + { + model.DateImplement = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc); - var work = _workStorage.GetElement(new() { Id = viewModel.WorkId }); + var work = _workStorage.GetElement(new() { Id = viewModel.WorkId }); - if (work == null) - { - throw new ArgumentNullException(nameof(work)); - } + if (work == null) + { + throw new ArgumentNullException(nameof(work)); + } - if (!_storeLogic.AddWork(work, viewModel.Count)) - { - throw new Exception($"AddWork operation failed. Store is full."); - } - } - else - { - model.DateImplement = viewModel.DateImplement; - } + if (!_storeLogic.AddWork(work, viewModel.Count)) + { + throw new Exception($"AddWork operation failed. Store is full."); + } + } + else + { + model.DateImplement = viewModel.DateImplement; + } - CheckModel(model, false); + CheckModel(model, false); - if (_orderStorage.Update(model) == null) - { - model.Status--; - _logger.LogWarning("Update operation failed"); - return false; - } + if (_orderStorage.Update(model) == null) + { + model.Status--; + _logger.LogWarning("Update operation failed"); + return false; + } - return true; - } + return true; + } - public bool TakeOrderInWork(OrderBindingModel model) - { - return StatusUpdate(model, OrderStatus.Выполняется); - } + public bool TakeOrderInWork(OrderBindingModel model) + { + return StatusUpdate(model, OrderStatus.Выполняется); + } - public bool DeliveryOrder(OrderBindingModel model) - { - return StatusUpdate(model, OrderStatus.Готов); - } + public bool DeliveryOrder(OrderBindingModel model) + { + return StatusUpdate(model, OrderStatus.Готов); + } - public bool FinishOrder(OrderBindingModel model) - { - return StatusUpdate(model, OrderStatus.Выдан); - } + public bool FinishOrder(OrderBindingModel model) + { + return StatusUpdate(model, OrderStatus.Выдан); + } - public List? ReadList(OrderSearchModel? model) - { - _logger.LogInformation("Order. OrderId:{Id}", model?.Id); + public List? ReadList(OrderSearchModel? model) + { + _logger.LogInformation("Order. OrderId:{Id}", model?.Id); - var list = model == null ? _orderStorage.GetFullList() : _orderStorage.GetFilteredList(model); + var list = model == null ? _orderStorage.GetFullList() : _orderStorage.GetFilteredList(model); - if (list == null) - { - _logger.LogWarning("ReadList return null list"); - return null; - } + if (list == null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } - _logger.LogInformation("ReadList. Count:{Count}", list.Count); - return list; - } + _logger.LogInformation("ReadList. Count:{Count}", list.Count); + return list; + } - private void CheckModel(OrderBindingModel model, bool withParams = true) - { - if (model == null) - { - throw new ArgumentNullException(nameof(model)); - } + private void CheckModel(OrderBindingModel model, bool withParams = true) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } - if (!withParams) - { - return; - } + if (!withParams) + { + return; + } - if (model.WorkId < 0) - { - throw new ArgumentNullException("Некорректный идентификатор изделия", nameof(model.WorkId)); - } + if (model.WorkId < 0) + { + throw new ArgumentNullException("Некорректный идентификатор изделия", nameof(model.WorkId)); + } - if (model.Count <= 0) - { - throw new ArgumentNullException("Количество изделий в заказе должно быть больше 0", nameof(model.Count)); - } + if (model.Count <= 0) + { + throw new ArgumentNullException("Количество изделий в заказе должно быть больше 0", nameof(model.Count)); + } - if (model.Sum <= 0) - { - throw new ArgumentNullException("Сумма заказа должна быть больше 0", nameof(model.Sum)); - } + if (model.Sum <= 0) + { + throw new ArgumentNullException("Сумма заказа должна быть больше 0", nameof(model.Sum)); + } - _logger.LogInformation("Order. OrderId:{Id}.Sum:{ Sum}. WorkId: { WorkId}", model.Id, model.Sum, model.WorkId); - } - } + _logger.LogInformation("Order. OrderId:{Id}.Sum:{ Sum}. WorkId: { WorkId}", model.Id, model.Sum, model.WorkId); + } + } } diff --git a/PlumbingRepair/PlumbingRepairBusinessLogic/BusinessLogic/StoreLogic.cs b/PlumbingRepair/PlumbingRepairBusinessLogic/BusinessLogic/StoreLogic.cs index 04d312b..3ceb6e4 100644 --- a/PlumbingRepair/PlumbingRepairBusinessLogic/BusinessLogic/StoreLogic.cs +++ b/PlumbingRepair/PlumbingRepairBusinessLogic/BusinessLogic/StoreLogic.cs @@ -53,7 +53,7 @@ namespace PlumbingRepairBusinessLogic.BusinessLogic else { element.StoreWorks[work.Id] = (work, quantity); - _logger.LogInformation("AddWork. Added {quantity} new package {package} to '{StoreName}' store", quantity, work.WorkName, element.StoreName); + _logger.LogInformation("AddWork. Added {quantity} new work {work} to '{StoreName}' store", quantity, work.WorkName, element.StoreName); } _storeStorage.Update(new() diff --git a/PlumbingRepair/PlumbingRepairContracts/BindingModels/StoreBindingModel.cs b/PlumbingRepair/PlumbingRepairContracts/BindingModels/StoreBindingModel.cs index 62d35e5..d2a7dce 100644 --- a/PlumbingRepair/PlumbingRepairContracts/BindingModels/StoreBindingModel.cs +++ b/PlumbingRepair/PlumbingRepairContracts/BindingModels/StoreBindingModel.cs @@ -7,7 +7,7 @@ namespace PlumbingRepairContracts.BindingModels public string StoreName { get; set; } = string.Empty; public string StoreAdress { get; set; } = string.Empty; - public DateTime OpeningDate { get; set; } = DateTime.Now; + public DateTime OpeningDate { get; set; } = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc); public Dictionary StoreWorks { get; set; } = new(); diff --git a/PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/ComponentStorage.cs b/PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/ComponentStorage.cs index 15d2ca3..f2d930e 100644 --- a/PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/ComponentStorage.cs +++ b/PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/ComponentStorage.cs @@ -6,87 +6,87 @@ using PlumbingRepairDatabaseImplement.Models; namespace PlumbingRepairDatabaseImplement.Implements { - public class ComponentStorage : IComponentStorage - { - public List GetFullList() - { - using var context = new PlumbingRepairDataBase(); + public class ComponentStorage : IComponentStorage + { + public List GetFullList() + { + using var context = new PlumbingRepairDataBase(); - return context.Components.Select(x => x.GetViewModel).ToList(); - } + return context.Components.Select(x => x.GetViewModel).ToList(); + } - public List GetFilteredList(ComponentSearchModel model) - { - if (string.IsNullOrEmpty(model.ComponentName)) - { - return new(); - } + public List GetFilteredList(ComponentSearchModel model) + { + if (string.IsNullOrEmpty(model.ComponentName)) + { + return new(); + } - using var context = new PlumbingRepairDataBase(); + using var context = new PlumbingRepairDataBase(); - return context.Components.Where(x => x.ComponentName.Contains(model.ComponentName)).Select(x => x.GetViewModel).ToList(); - } + 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; - } + public ComponentViewModel? GetElement(ComponentSearchModel model) + { + if (string.IsNullOrEmpty(model.ComponentName) && !model.Id.HasValue) + { + return null; + } - using var context = new PlumbingRepairDataBase(); + 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; - } + 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); + public ComponentViewModel? Insert(ComponentBindingModel model) + { + var newComponent = Component.Create(model); - if (newComponent == null) - { - return null; - } + if (newComponent == null) + { + return null; + } - using var context = new PlumbingRepairDataBase(); + using var context = new PlumbingRepairDataBase(); - context.Components.Add(newComponent); - context.SaveChanges(); + context.Components.Add(newComponent); + context.SaveChanges(); - return newComponent.GetViewModel; - } + return newComponent.GetViewModel; + } - public ComponentViewModel? Update(ComponentBindingModel model) - { - using var context = new PlumbingRepairDataBase(); + public ComponentViewModel? Update(ComponentBindingModel model) + { + using var context = new PlumbingRepairDataBase(); - var component = context.Components.FirstOrDefault(x => x.Id == model.Id); + var component = context.Components.FirstOrDefault(x => x.Id == model.Id); - if (component == null) - { - return null; - } + if (component == null) + { + return null; + } - component.Update(model); - context.SaveChanges(); + component.Update(model); + context.SaveChanges(); - return component.GetViewModel; - } + return component.GetViewModel; + } - public ComponentViewModel? Delete(ComponentBindingModel model) - { - using var context = new PlumbingRepairDataBase(); + public ComponentViewModel? Delete(ComponentBindingModel model) + { + using var context = new PlumbingRepairDataBase(); - var element = context.Components.FirstOrDefault(rec => rec.Id == model.Id); + var element = context.Components.FirstOrDefault(rec => rec.Id == model.Id); - if (element != null) - { - context.Components.Remove(element); - context.SaveChanges(); - return element.GetViewModel; - } + if (element != null) + { + context.Components.Remove(element); + context.SaveChanges(); + return element.GetViewModel; + } - return null; - } - } + return null; + } + } } diff --git a/PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/OrderStorage.cs b/PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/OrderStorage.cs index 0b0cfe0..0d7449a 100644 --- a/PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/OrderStorage.cs +++ b/PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/OrderStorage.cs @@ -6,88 +6,88 @@ using PlumbingRepairDatabaseImplement.Models; namespace PlumbingRepairDatabaseImplement.Implements { - public class OrderStorage : IOrderStorage - { - public List GetFullList() - { - using var context = new PlumbingRepairDataBase(); + public class OrderStorage : IOrderStorage + { + public List GetFullList() + { + using var context = new PlumbingRepairDataBase(); - return context.Orders.Select(x => x.GetViewModel).ToList(); - } + return context.Orders.Select(x => x.GetViewModel).ToList(); + } - public List GetFilteredList(OrderSearchModel model) - { - if (!model.Id.HasValue) - { - return new(); - } + public List GetFilteredList(OrderSearchModel model) + { + if (!model.Id.HasValue) + { + return new(); + } - using var context = new PlumbingRepairDataBase(); + using var context = new PlumbingRepairDataBase(); - return context.Orders.Where(x => x.Id == model.Id).Select(x => x.GetViewModel).ToList(); - } + 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; - } + public OrderViewModel? GetElement(OrderSearchModel model) + { + if (!model.Id.HasValue) + { + return null; + } - using var context = new PlumbingRepairDataBase(); + using var context = new PlumbingRepairDataBase(); - return context.Orders.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; - } + return context.Orders.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; + } - public OrderViewModel? Insert(OrderBindingModel model) - { - var newOrder = Order.Create(model); + public OrderViewModel? Insert(OrderBindingModel model) + { + var newOrder = Order.Create(model); - if (newOrder == null) - { - return null; - } + if (newOrder == null) + { + return null; + } - using var context = new PlumbingRepairDataBase(); + using var context = new PlumbingRepairDataBase(); - context.Orders.Add(newOrder); - context.SaveChanges(); + context.Orders.Add(newOrder); + context.SaveChanges(); - return newOrder.GetViewModel; - } + return newOrder.GetViewModel; + } - public OrderViewModel? Update(OrderBindingModel model) - { - using var context = new PlumbingRepairDataBase(); + public OrderViewModel? Update(OrderBindingModel model) + { + using var context = new PlumbingRepairDataBase(); - var order = context.Orders.FirstOrDefault(x => x.Id == model.Id); + var order = context.Orders.FirstOrDefault(x => x.Id == model.Id); - if (order == null) - { - return null; - } + if (order == null) + { + return null; + } - order.Update(model); - context.SaveChanges(); + order.Update(model); + context.SaveChanges(); - return order.GetViewModel; - } + return order.GetViewModel; + } - public OrderViewModel? Delete(OrderBindingModel model) - { - using var context = new PlumbingRepairDataBase(); + public OrderViewModel? Delete(OrderBindingModel model) + { + using var context = new PlumbingRepairDataBase(); - var element = context.Orders.FirstOrDefault(rec => rec.Id == model.Id); + var element = context.Orders.FirstOrDefault(rec => rec.Id == model.Id); - if (element != null) - { - context.Orders.Remove(element); - context.SaveChanges(); + if (element != null) + { + context.Orders.Remove(element); + context.SaveChanges(); - return element.GetViewModel; - } + return element.GetViewModel; + } - return null; - } - } -} + return null; + } + } +} \ No newline at end of file diff --git a/PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/StoreStorage.cs b/PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/StoreStorage.cs new file mode 100644 index 0000000..aad7384 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/StoreStorage.cs @@ -0,0 +1,163 @@ +using Microsoft.EntityFrameworkCore; +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.SearchModels; +using PlumbingRepairContracts.StoragesContracts; +using PlumbingRepairContracts.ViewModels; +using PlumbingRepairDatabaseImplement.Models; +using PlumbingRepairDataModels.Models; + +namespace PlumbingRepairDatabaseImplement.Implements +{ + public class StoreStorage : IStoreStorage + { + public StoreViewModel? Delete(StoreBindingModel model) + { + using var context = new PlumbingRepairDataBase(); + + var element = context.Stores + .Include(x => x.Works) + .FirstOrDefault(rec => rec.Id == model.Id); + + if (element != null) + { + context.Stores.Remove(element); + context.SaveChanges(); + + return element.GetViewModel; + } + + return null; + } + + public StoreViewModel? GetElement(StoreSearchModel model) + { + if (string.IsNullOrEmpty(model.StoreName) && !model.Id.HasValue) + { + return null; + } + + using var context = new PlumbingRepairDataBase(); + + return context.Stores + .Include(x => x.Works) + .ThenInclude(x => x.Work) + .FirstOrDefault(x => (!string.IsNullOrEmpty(model.StoreName) && x.StoreName == model.StoreName) || (model.Id.HasValue && x.Id == model.Id)) + ?.GetViewModel; + } + + public List GetFilteredList(StoreSearchModel model) + { + if (string.IsNullOrEmpty(model.StoreName)) + { + return new(); + } + + using var context = new PlumbingRepairDataBase(); + + return context.Stores + .Include(x => x.Works) + .ThenInclude(x => x.Work) + .Where(x => x.StoreName.Contains(model.StoreName)) + .ToList() + .Select(x => x.GetViewModel) + .ToList(); + } + + public List GetFullList() + { + using var context = new PlumbingRepairDataBase(); + return context.Stores + .Include(x => x.Works) + .ThenInclude(x => x.Work) + .ToList() + .Select(x => x.GetViewModel) + .ToList(); + } + + public StoreViewModel? Insert(StoreBindingModel model) + { + using var context = new PlumbingRepairDataBase(); + var newStore = Store.Create(context, model); + if (newStore == null) + { + return null; + } + context.Stores.Add(newStore); + context.SaveChanges(); + return newStore.GetViewModel; + } + + public bool SellWork(IWorkModel model, int quantity) + { + using var context = new PlumbingRepairDataBase(); + using var transaction = context.Database.BeginTransaction(); + try + { + foreach (var store in context.Stores + .Include(x => x.Works) + .ThenInclude(x => x.Work) + .ToList() + .Where(x => x.StoreWorks.ContainsKey(model.Id))) + { + int countInCurrentStore = store.StoreWorks[model.Id].Item2; + if (countInCurrentStore <= quantity) + { + var elem = context.StoreWorks + .Where(x => x.WorkId == model.Id) + .FirstOrDefault(x => x.StoreId == store.Id); + context.StoreWorks.Remove(elem); + store.StoreWorks.Remove(model.Id); + quantity -= countInCurrentStore; + } + else + { + store.StoreWorks[model.Id] = (store.StoreWorks[model.Id].Item1, countInCurrentStore - quantity); + quantity = 0; + store.UpdateWorks(context, new() + { + Id = store.Id, + StoreWorks = store.StoreWorks, + }); + } + if (quantity == 0) + { + context.SaveChanges(); + transaction.Commit(); + return true; + } + } + transaction.Rollback(); + return false; + } + catch + { + transaction.Rollback(); + throw; + } + } + + public StoreViewModel? Update(StoreBindingModel model) + { + using var context = new PlumbingRepairDataBase(); + using var transaction = context.Database.BeginTransaction(); + try + { + var store = context.Stores.FirstOrDefault(rec => rec.Id == model.Id); + if (store == null) + { + return null; + } + store.Update(model); + context.SaveChanges(); + store.UpdateWorks(context, model); + transaction.Commit(); + return store.GetViewModel; + } + catch + { + transaction.Rollback(); + throw; + } + } + } +} diff --git a/PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/WorkStorage.cs b/PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/WorkStorage.cs index 8f88b12..b8d8279 100644 --- a/PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/WorkStorage.cs +++ b/PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/WorkStorage.cs @@ -7,114 +7,114 @@ using PlumbingRepairDatabaseImplement.Models; namespace PlumbingRepairDatabaseImplement.Implements { - public class WorkStorage : IWorkStorage - { - public List GetFullList() - { - using var context = new PlumbingRepairDataBase(); + 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(); - } + 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(); - } + public List GetFilteredList(WorkSearchModel model) + { + if (string.IsNullOrEmpty(model.WorkName)) + { + return new(); + } - using var context = new PlumbingRepairDataBase(); + 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(); - } + 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; - } + public WorkViewModel? GetElement(WorkSearchModel model) + { + if (string.IsNullOrEmpty(model.WorkName) && !model.Id.HasValue) + { + return null; + } - using var context = new PlumbingRepairDataBase(); + 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; - } + 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(); + public WorkViewModel? Insert(WorkBindingModel model) + { + using var context = new PlumbingRepairDataBase(); - var newWork = Work.Create(context, model); + var newWork = Work.Create(context, model); - if (newWork == null) - { - return null; - } + if (newWork == null) + { + return null; + } - context.Works.Add(newWork); - context.SaveChanges(); + context.Works.Add(newWork); + context.SaveChanges(); - return newWork.GetViewModel; - } + return newWork.GetViewModel; + } - public WorkViewModel? Update(WorkBindingModel model) - { - using var context = new PlumbingRepairDataBase(); + public WorkViewModel? Update(WorkBindingModel model) + { + using var context = new PlumbingRepairDataBase(); - using var transaction = context.Database.BeginTransaction(); + using var transaction = context.Database.BeginTransaction(); - try - { - var package = context.Works.FirstOrDefault(rec => rec.Id == model.Id); + try + { + var package = context.Works.FirstOrDefault(rec => rec.Id == model.Id); - if (package == null) - { - return null; - } + if (package == null) + { + return null; + } - package.Update(model); - context.SaveChanges(); - package.UpdateComponents(context, model); - transaction.Commit(); + package.Update(model); + context.SaveChanges(); + package.UpdateComponents(context, model); + transaction.Commit(); - return package.GetViewModel; - } - catch - { - transaction.Rollback(); + return package.GetViewModel; + } + catch + { + transaction.Rollback(); - throw; - } - } + throw; + } + } - public WorkViewModel? Delete(WorkBindingModel model) - { - using var context = new PlumbingRepairDataBase(); + public WorkViewModel? Delete(WorkBindingModel model) + { + using var context = new PlumbingRepairDataBase(); - var element = context.Works.Include(x => x.Components).FirstOrDefault(rec => rec.Id == model.Id); + 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; - } + if (element != null) + { + context.Works.Remove(element); + context.SaveChanges(); + return element.GetViewModel; + } - return null; - } - } + return null; + } + } } diff --git a/PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/20230304141419_InitMigration.Designer.cs b/PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/20230428142925_CreateDB.Designer.cs similarity index 68% rename from PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/20230304141419_InitMigration.Designer.cs rename to PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/20230428142925_CreateDB.Designer.cs index 00ad78c..732496a 100644 --- a/PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/20230304141419_InitMigration.Designer.cs +++ b/PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/20230428142925_CreateDB.Designer.cs @@ -12,8 +12,8 @@ using PlumbingRepairDatabaseImplement; namespace PlumbingRepairDatabaseImplement.Migrations { [DbContext(typeof(PlumbingRepairDataBase))] - [Migration("20230304141419_InitMigration")] - partial class InitMigration + [Migration("20230428142925_CreateDB")] + partial class CreateDB { /// protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -82,6 +82,59 @@ namespace PlumbingRepairDatabaseImplement.Migrations b.ToTable("Orders"); }); + modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.Store", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("OpeningDate") + .HasColumnType("timestamp with time zone"); + + b.Property("StoreAdress") + .IsRequired() + .HasColumnType("text"); + + b.Property("StoreName") + .IsRequired() + .HasColumnType("text"); + + b.Property("WorkMaxCount") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.ToTable("Stores"); + }); + + modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.StoreWork", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Count") + .HasColumnType("integer"); + + b.Property("StoreId") + .HasColumnType("integer"); + + b.Property("WorkId") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("StoreId"); + + b.HasIndex("WorkId"); + + b.ToTable("StoreWorks"); + }); + modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.Work", b => { b.Property("Id") @@ -139,6 +192,25 @@ namespace PlumbingRepairDatabaseImplement.Migrations b.Navigation("Work"); }); + modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.StoreWork", b => + { + b.HasOne("PlumbingRepairDatabaseImplement.Models.Store", "Store") + .WithMany("Works") + .HasForeignKey("StoreId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("PlumbingRepairDatabaseImplement.Models.Work", "Work") + .WithMany() + .HasForeignKey("WorkId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Store"); + + b.Navigation("Work"); + }); + modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.WorkComponent", b => { b.HasOne("PlumbingRepairDatabaseImplement.Models.Component", "Component") @@ -163,6 +235,11 @@ namespace PlumbingRepairDatabaseImplement.Migrations b.Navigation("WorkComponents"); }); + modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.Store", b => + { + b.Navigation("Works"); + }); + modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.Work", b => { b.Navigation("Components"); diff --git a/PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/20230304141419_InitMigration.cs b/PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/20230428142925_CreateDB.cs similarity index 66% rename from PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/20230304141419_InitMigration.cs rename to PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/20230428142925_CreateDB.cs index 371dcc9..d8f2687 100644 --- a/PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/20230304141419_InitMigration.cs +++ b/PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/20230428142925_CreateDB.cs @@ -7,7 +7,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; namespace PlumbingRepairDatabaseImplement.Migrations { /// - public partial class InitMigration : Migration + public partial class CreateDB : Migration { /// protected override void Up(MigrationBuilder migrationBuilder) @@ -26,6 +26,22 @@ namespace PlumbingRepairDatabaseImplement.Migrations table.PrimaryKey("PK_Components", x => x.Id); }); + migrationBuilder.CreateTable( + name: "Stores", + columns: table => new + { + Id = table.Column(type: "integer", nullable: false) + .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), + StoreName = table.Column(type: "text", nullable: false), + StoreAdress = table.Column(type: "text", nullable: false), + OpeningDate = table.Column(type: "timestamp with time zone", nullable: false), + WorkMaxCount = table.Column(type: "integer", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Stores", x => x.Id); + }); + migrationBuilder.CreateTable( name: "Works", columns: table => new @@ -65,6 +81,33 @@ namespace PlumbingRepairDatabaseImplement.Migrations onDelete: ReferentialAction.Cascade); }); + migrationBuilder.CreateTable( + name: "StoreWorks", + columns: table => new + { + Id = table.Column(type: "integer", nullable: false) + .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), + WorkId = table.Column(type: "integer", nullable: false), + StoreId = table.Column(type: "integer", nullable: false), + Count = table.Column(type: "integer", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_StoreWorks", x => x.Id); + table.ForeignKey( + name: "FK_StoreWorks_Stores_StoreId", + column: x => x.StoreId, + principalTable: "Stores", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_StoreWorks_Works_WorkId", + column: x => x.WorkId, + principalTable: "Works", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + migrationBuilder.CreateTable( name: "WorkComponents", columns: table => new @@ -97,6 +140,16 @@ namespace PlumbingRepairDatabaseImplement.Migrations table: "Orders", column: "WorkId"); + migrationBuilder.CreateIndex( + name: "IX_StoreWorks_StoreId", + table: "StoreWorks", + column: "StoreId"); + + migrationBuilder.CreateIndex( + name: "IX_StoreWorks_WorkId", + table: "StoreWorks", + column: "WorkId"); + migrationBuilder.CreateIndex( name: "IX_WorkComponents_ComponentId", table: "WorkComponents", @@ -114,9 +167,15 @@ namespace PlumbingRepairDatabaseImplement.Migrations migrationBuilder.DropTable( name: "Orders"); + migrationBuilder.DropTable( + name: "StoreWorks"); + migrationBuilder.DropTable( name: "WorkComponents"); + migrationBuilder.DropTable( + name: "Stores"); + migrationBuilder.DropTable( name: "Components"); diff --git a/PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/PlumbingRepairDataBaseModelSnapshot.cs b/PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/PlumbingRepairDataBaseModelSnapshot.cs index a8fcca6..7696203 100644 --- a/PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/PlumbingRepairDataBaseModelSnapshot.cs +++ b/PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/PlumbingRepairDataBaseModelSnapshot.cs @@ -79,6 +79,59 @@ namespace PlumbingRepairDatabaseImplement.Migrations b.ToTable("Orders"); }); + modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.Store", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("OpeningDate") + .HasColumnType("timestamp with time zone"); + + b.Property("StoreAdress") + .IsRequired() + .HasColumnType("text"); + + b.Property("StoreName") + .IsRequired() + .HasColumnType("text"); + + b.Property("WorkMaxCount") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.ToTable("Stores"); + }); + + modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.StoreWork", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Count") + .HasColumnType("integer"); + + b.Property("StoreId") + .HasColumnType("integer"); + + b.Property("WorkId") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("StoreId"); + + b.HasIndex("WorkId"); + + b.ToTable("StoreWorks"); + }); + modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.Work", b => { b.Property("Id") @@ -136,6 +189,25 @@ namespace PlumbingRepairDatabaseImplement.Migrations b.Navigation("Work"); }); + modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.StoreWork", b => + { + b.HasOne("PlumbingRepairDatabaseImplement.Models.Store", "Store") + .WithMany("Works") + .HasForeignKey("StoreId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("PlumbingRepairDatabaseImplement.Models.Work", "Work") + .WithMany() + .HasForeignKey("WorkId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Store"); + + b.Navigation("Work"); + }); + modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.WorkComponent", b => { b.HasOne("PlumbingRepairDatabaseImplement.Models.Component", "Component") @@ -160,6 +232,11 @@ namespace PlumbingRepairDatabaseImplement.Migrations b.Navigation("WorkComponents"); }); + modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.Store", b => + { + b.Navigation("Works"); + }); + modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.Work", b => { b.Navigation("Components"); diff --git a/PlumbingRepair/PlumbingRepairDatabaseImplement/Models/Store.cs b/PlumbingRepair/PlumbingRepairDatabaseImplement/Models/Store.cs new file mode 100644 index 0000000..b3f3f8d --- /dev/null +++ b/PlumbingRepair/PlumbingRepairDatabaseImplement/Models/Store.cs @@ -0,0 +1,105 @@ +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.ViewModels; +using PlumbingRepairDataModels.Models; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; + +namespace PlumbingRepairDatabaseImplement.Models +{ + public class Store : IStoreModel + { + [Required] + public string StoreName { get; private set; } = string.Empty; + [Required] + public string StoreAdress { get; private set; } = string.Empty; + [Required] + public DateTime OpeningDate { get; private set; } + [Required] + public int WorkMaxCount { get; private set; } + + public int Id { get; private set; } + + + private Dictionary _storeWorks = null; + [NotMapped] + public Dictionary StoreWorks + { + get + { + if (_storeWorks == null) + { + _storeWorks = Works + .ToDictionary(recPC => recPC.WorkId, recPC => (recPC.Work as IWorkModel, recPC.Count)); + } + return _storeWorks; + } + } + + [ForeignKey("StoreId")] + public virtual List Works { get; set; } = new(); + + public static Store Create(PlumbingRepairDataBase context, StoreBindingModel model) + { + return new Store() + { + Id = model.Id, + StoreName = model.StoreName, + StoreAdress = model.StoreAdress, + OpeningDate = model.OpeningDate, + WorkMaxCount = model.WorkMaxCount, + Works = model.StoreWorks.Select(x => new StoreWork + { + Work = context.Works.First(y => y.Id == x.Key), + Count = x.Value.Item2 + }).ToList() + }; + } + + public void Update(StoreBindingModel model) + { + StoreName = model.StoreName; + StoreAdress = model.StoreAdress; + OpeningDate = model.OpeningDate; + WorkMaxCount = model.WorkMaxCount; + } + + public StoreViewModel GetViewModel => new() + { + Id = Id, + StoreName = StoreName, + StoreAdress = StoreAdress, + OpeningDate = OpeningDate, + WorkMaxCount = WorkMaxCount, + StoreWorks = StoreWorks + }; + + public void UpdateWorks(PlumbingRepairDataBase context, StoreBindingModel model) + { + var storeWorks = context.StoreWorks.Where(rec => rec.StoreId == model.Id).ToList(); + if (storeWorks != null && storeWorks.Count > 0) + { // удалили те, которых нет в модели + context.StoreWorks.RemoveRange(storeWorks.Where(rec => !model.StoreWorks.ContainsKey(rec.WorkId))); + context.SaveChanges(); + // обновили количество у существующих записей + foreach (var updateWork in storeWorks) + { + updateWork.Count = model.StoreWorks[updateWork.WorkId].Item2; + model.StoreWorks.Remove(updateWork.WorkId); + } + context.SaveChanges(); + } + var store = context.Stores.First(x => x.Id == Id); + foreach (var sw in model.StoreWorks) + { + context.StoreWorks.Add(new StoreWork + { + Store = store, + Work = context.Works.First(x => x.Id == sw.Key), + Count = sw.Value.Item2 + }); + context.SaveChanges(); + } + _storeWorks = null; + } + } +} diff --git a/PlumbingRepair/PlumbingRepairDatabaseImplement/Models/StoreWork.cs b/PlumbingRepair/PlumbingRepairDatabaseImplement/Models/StoreWork.cs new file mode 100644 index 0000000..1940d74 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairDatabaseImplement/Models/StoreWork.cs @@ -0,0 +1,22 @@ +using System.ComponentModel.DataAnnotations; + +namespace PlumbingRepairDatabaseImplement.Models +{ + public class StoreWork + { + public int Id { get; set; } + + [Required] + public int WorkId { get; set; } + + [Required] + public int StoreId { get; set; } + + [Required] + public int Count { get; set; } + + public virtual Store Store { get; set; } = new(); + + public virtual Work Work { get; set; } = new(); + } +} diff --git a/PlumbingRepair/PlumbingRepairDatabaseImplement/PlumbingRepairDataBase.cs b/PlumbingRepair/PlumbingRepairDatabaseImplement/PlumbingRepairDataBase.cs index 76df650..950455a 100644 --- a/PlumbingRepair/PlumbingRepairDatabaseImplement/PlumbingRepairDataBase.cs +++ b/PlumbingRepair/PlumbingRepairDatabaseImplement/PlumbingRepairDataBase.cs @@ -9,7 +9,7 @@ namespace PlumbingRepairDatabaseImplement { if (optionsBuilder.IsConfigured == false) { - optionsBuilder.UseNpgsql(@"Host=localhost;Port=5432;Database=PlumbingRepairDatabaseFull;Username=postgres;Password=186qazwsx"); + optionsBuilder.UseNpgsql(@"Host=localhost;Port=5432;Database=PlumbingRepairDatabaseHardFull;Username=postgres;Password=186qazwsx"); } base.OnConfiguring(optionsBuilder); } @@ -17,5 +17,7 @@ namespace PlumbingRepairDatabaseImplement public virtual DbSet Works { set; get; } public virtual DbSet WorkComponents { set; get; } public virtual DbSet Orders { set; get; } - } + public virtual DbSet Stores { set; get; } + public virtual DbSet StoreWorks { set; get; } + } } -- 2.25.1 From f19965f37beb8aad1d9cf572d98011e430fbd1b7 Mon Sep 17 00:00:00 2001 From: "ityurner02@mail.ru" Date: Fri, 28 Apr 2023 21:47:01 +0400 Subject: [PATCH 4/4] =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D0=B5?= =?UTF-8?q?=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PlumbingRepair/PlumbingRepair/FormStore.cs | 2 +- PlumbingRepair/PlumbingRepair/Program.cs | 2 +- .../PlumbingRepairContracts/BindingModels/StoreBindingModel.cs | 2 +- .../PlumbingRepairContracts/ViewModels/StoreViewModel.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/PlumbingRepair/PlumbingRepair/FormStore.cs b/PlumbingRepair/PlumbingRepair/FormStore.cs index 5a83df6..fdba163 100644 --- a/PlumbingRepair/PlumbingRepair/FormStore.cs +++ b/PlumbingRepair/PlumbingRepair/FormStore.cs @@ -45,7 +45,7 @@ namespace PlumbingRepair Id = _id ?? 0, StoreName = NameTextBox.Text, StoreAdress = AdressTextBox.Text, - OpeningDate = OpeningDatePicker.Value.Date, + OpeningDate = DateTime.SpecifyKind(OpeningDatePicker.Value.Date, DateTimeKind.Utc), WorkMaxCount = (int)VolumeNumericUpDown.Value, StoreWorks = _listStores }; diff --git a/PlumbingRepair/PlumbingRepair/Program.cs b/PlumbingRepair/PlumbingRepair/Program.cs index c623f99..288ed75 100644 --- a/PlumbingRepair/PlumbingRepair/Program.cs +++ b/PlumbingRepair/PlumbingRepair/Program.cs @@ -24,7 +24,7 @@ namespace PlumbingRepair ApplicationConfiguration.Initialize(); var services = new ServiceCollection(); ConfigureServices(services); - _serviceProvider = services.BuildServiceProvider(); + _serviceProvider = services.BuildServiceProvider(); Application.Run(_serviceProvider.GetRequiredService()); } private static void ConfigureServices(ServiceCollection services) diff --git a/PlumbingRepair/PlumbingRepairContracts/BindingModels/StoreBindingModel.cs b/PlumbingRepair/PlumbingRepairContracts/BindingModels/StoreBindingModel.cs index d2a7dce..5c6c3c4 100644 --- a/PlumbingRepair/PlumbingRepairContracts/BindingModels/StoreBindingModel.cs +++ b/PlumbingRepair/PlumbingRepairContracts/BindingModels/StoreBindingModel.cs @@ -7,7 +7,7 @@ namespace PlumbingRepairContracts.BindingModels public string StoreName { get; set; } = string.Empty; public string StoreAdress { get; set; } = string.Empty; - public DateTime OpeningDate { get; set; } = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc); + public DateTime OpeningDate { get; set; } public Dictionary StoreWorks { get; set; } = new(); diff --git a/PlumbingRepair/PlumbingRepairContracts/ViewModels/StoreViewModel.cs b/PlumbingRepair/PlumbingRepairContracts/ViewModels/StoreViewModel.cs index cccca84..25fa935 100644 --- a/PlumbingRepair/PlumbingRepairContracts/ViewModels/StoreViewModel.cs +++ b/PlumbingRepair/PlumbingRepairContracts/ViewModels/StoreViewModel.cs @@ -13,7 +13,7 @@ namespace PlumbingRepairContracts.ViewModels [DisplayName("Адрес магазина")] public string StoreAdress { get; set; } = string.Empty; [DisplayName("Дата открытия")] - public DateTime OpeningDate { get; set; } = DateTime.Now; + public DateTime OpeningDate { get; set; } [DisplayName("Вместимость магазина")] public int WorkMaxCount { get; set; } } -- 2.25.1