Zyzf/PIbd-22_KalyshevYV_DozorovaAA_FurnitureAssembly
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added migration + fixed errors

Browse Source
This commit is contained in:
Калышев Ян 2023-05-15 12:30:13 -07:00
parent 465606f054
commit 4f761b8a9b
8 changed files with 265 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
FurnitureAssembly/FurnitureAssembly/FurnitureAssembly.csproj
View File

@ -8,4 +8,15 @@
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\FurnitureAssemblyDatabaseImplement\FurnitureAssemblyDatabaseImplement.csproj" />
</ItemGroup>
</Project>

43
FurnitureAssembly/FurnitureAssemblyBusinessLogic/BusinessLogics/ReportLogic.cs
View File

@ -17,15 +17,17 @@ namespace FurnitureAssemblyBusinessLogic.BusinessLogics
{
private readonly IFurnitureModuleStorage _furnitureModuleStorage;
private readonly ISetStorage _setStorage;
private readonly IOrderInfoStorage _orderInfoStorage;
private readonly IOrderStorage _orderStorage;
private readonly AbstractSaveToExcel _saveToExcel;
private readonly AbstractSaveToWord _saveToWord;
private readonly AbstractSaveToPdf _saveToPdf;
public ReportLogic(ISetStorage setStorage, IFurnitureModuleStorage furnitureModuleStorage, IOrderStorage orderStorage,
AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf)
public ReportLogic(ISetStorage setStorage, IFurnitureModuleStorage furnitureModuleStorage, IOrderInfoStorage orderInfoStorage,
IOrderStorage orderStorage, AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf)
{
_setStorage = setStorage;
_furnitureModuleStorage = furnitureModuleStorage;
_orderInfoStorage = orderInfoStorage;
_orderStorage = orderStorage;
_saveToExcel = saveToExcel;
_saveToWord = saveToWord;
@ -69,22 +71,41 @@ namespace FurnitureAssemblyBusinessLogic.BusinessLogics
/// <returns></returns>
public List<ReportOrdersViewModel> GetOrders(ReportBindingModel model)
{
var orders = _orderStorage
.GetFilteredList(new OrderSearchModel { DateFrom = model.DateFrom, DateTo = model.DateTo });
var orderInfos = _orderInfoStorage
.GetFilteredList(new OrderInfoSearchModel { DateFrom = model.DateFrom, DateTo = model.DateTo });
List<int> orderInfoIds = new List<int>();
foreach (var orderInfo in orderInfos)
{
orderInfoIds.Add(orderInfo.Id);
}
var orders = _orderStorage.GetFilteredList(new OrderSearchModel { OrderInfoId = orderInfoIds });
var sets = _setStorage.GetFullList();
var furnitureModules = _furnitureModuleStorage.GetFullList();
var list = new List<ReportOrdersViewModel>();
foreach (var order in orders)
{
var record = new ReportOrdersViewModel
var record = new ReportOrdersViewModel
{
Id = order.Id,
SetName = order.SetName,
FurnitureModules = new List<(string, double)>(),
TotalCount = 0
};
foreach (var orderInfo in orderInfos)
{
Id = order.Id,
SetName = order.SetName,
DateCreate = order.DateCreate,
FurnitureModules = new List<(string, double)>(),
TotalCount = 0
};
if (orderInfo.Id == order.OrderInfoId)
{
record = new ReportOrdersViewModel
{
Id = order.Id,
SetName = order.SetName,
DateCreate = orderInfo.DateCreate,
FurnitureModules = new List<(string, double)>(),
TotalCount = 0
};
}
}
foreach (var set in sets)
{
if (set.Id == order.SetId)

2
FurnitureAssembly/FurnitureAssemblyContracts/SearchModels/OrderSearchModel.cs
View File

@ -10,6 +10,6 @@ namespace FurnitureAssemblyContracts.SearchModels
{
public int? Id { get; set; }
public int? SetId { get; set; }
public int? OrderInfoId { get; set; }
public List<int>? OrderInfoId { get; set; }
}
}

1
FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Implements/FurnitureStorage.cs
View File

@ -22,7 +22,6 @@ namespace FurnitureAssemblyDatabaseImplement.Implements
.Include(x => x.Materials)
.ThenInclude(x => x.Material).ToList()
.Select(x => x.GetViewModel).ToList();
return context.Furnitures.Include(x => x.FurnitureModules).ThenInclude(x => x.Component).ToList().Select(x => x.GetViewModel).ToList();
}
public List<FurnitureViewModel> GetFilteredList(FurnitureSearchModel model)
{

8
FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Implements/OrderStorage.cs
View File

@ -56,12 +56,12 @@ namespace FurnitureAssemblyDatabaseImplement.Implements
.Select(x => x.GetViewModel)
.ToList();
}
else if (model.SetId.HasValue && model.OrderInfoId.HasValue)
else if (model.SetId.HasValue && model.OrderInfoId != null && model.OrderInfoId.Count > 0)
{
return context.Orders
.Include(x => x.Set)
.Include(x => x.OrderInfoId)
.Where(x => x.SetId == model.SetId && x.OrderInfoId == model.OrderInfoId)
.Where(x => x.SetId == model.SetId && model.OrderInfoId.Contains(x.OrderInfoId))
.Select(x => x.GetViewModel)
.ToList();
}
@ -74,12 +74,12 @@ namespace FurnitureAssemblyDatabaseImplement.Implements
.Select(x => x.GetViewModel)
.ToList();
}
else if (model.OrderInfoId.HasValue)
else if (model.OrderInfoId != null && model.OrderInfoId.Count > 0)
{
return context.Orders
.Include(x => x.Set)
.Include(x => x.OrderInfoId)
.Where(x => x.OrderInfoId == model.OrderInfoId)
.Where(x => model.OrderInfoId.Contains(x.OrderInfoId))
.Select(x => x.GetViewModel)
.ToList();
}

145
FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Migrations/20230406130140_Init.Designer.cs → FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Migrations/20230515192754_Init.Designer.cs generated
View File

@ -1,6 +1,6 @@
// <auto-generated />
using System;
using FurnitureAssembly_WorkerDatabaseImplement;
using FurnitureAssemblyDatabaseImplement;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
@ -9,10 +9,10 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
#nullable disable
namespace FurnitureAssembly_WorkerDatabaseImplement.Migrations
namespace FurnitureAssemblyDatabaseImplement.Migrations
{
[DbContext(typeof(FurnitureAssemblyDatabase))]
[Migration("20230406130140_Init")]
[Migration("20230515192754_Init")]
partial class Init
{
/// <inheritdoc />
@ -20,12 +20,12 @@ namespace FurnitureAssembly_WorkerDatabaseImplement.Migrations
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "7.0.4")
.HasAnnotation("ProductVersion", "7.0.5")
.HasAnnotation("Relational:MaxIdentifierLength", 63);
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.Furniture", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Furniture", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
@ -53,7 +53,7 @@ namespace FurnitureAssembly_WorkerDatabaseImplement.Migrations
b.ToTable("Furnitures");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.FurnitureMaterial", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.FurnitureMaterial", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
@ -79,7 +79,7 @@ namespace FurnitureAssembly_WorkerDatabaseImplement.Migrations
b.ToTable("FurnitureMaterials");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.FurnitureModule", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.FurnitureModule", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
@ -107,7 +107,7 @@ namespace FurnitureAssembly_WorkerDatabaseImplement.Migrations
b.ToTable("FurnitureModules");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.FurnitureModuleFurniture", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.FurnitureModuleFurniture", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
@ -133,7 +133,7 @@ namespace FurnitureAssembly_WorkerDatabaseImplement.Migrations
b.ToTable("FurnitureModuleFurnitures");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.Material", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Material", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
@ -163,7 +163,36 @@ namespace FurnitureAssembly_WorkerDatabaseImplement.Migrations
b.ToTable("Materials");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.Role", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Order", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<int>("Count")
.HasColumnType("integer");
b.Property<int>("OrderInfoId")
.HasColumnType("integer");
b.Property<int>("SetId")
.HasColumnType("integer");
b.Property<int?>("UserId")
.HasColumnType("integer");
b.HasKey("Id");
b.HasIndex("SetId");
b.HasIndex("UserId");
b.ToTable("Orders");
});
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.OrderInfo", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
@ -181,9 +210,6 @@ namespace FurnitureAssembly_WorkerDatabaseImplement.Migrations
b.Property<int>("PaymentType")
.HasColumnType("integer");
b.Property<int>("SetId")
.HasColumnType("integer");
b.Property<double>("Sum")
.HasColumnType("double precision");
@ -192,14 +218,12 @@ namespace FurnitureAssembly_WorkerDatabaseImplement.Migrations
b.HasKey("Id");
b.HasIndex("SetId");
b.HasIndex("UserId");
b.ToTable("Roles");
b.ToTable("OrderInfos");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.Role", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Role", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
@ -216,7 +240,7 @@ namespace FurnitureAssembly_WorkerDatabaseImplement.Migrations
b.ToTable("Roles");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.Scope", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Scope", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
@ -233,7 +257,7 @@ namespace FurnitureAssembly_WorkerDatabaseImplement.Migrations
b.ToTable("Scopes");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.Set", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Set", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
@ -261,7 +285,7 @@ namespace FurnitureAssembly_WorkerDatabaseImplement.Migrations
b.ToTable("Sets");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.SetFurnitureModule", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.SetFurnitureModule", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
@ -287,7 +311,7 @@ namespace FurnitureAssembly_WorkerDatabaseImplement.Migrations
b.ToTable("SetFurnitureModules");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.User", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.User", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
@ -317,9 +341,9 @@ namespace FurnitureAssembly_WorkerDatabaseImplement.Migrations
b.ToTable("Users");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.Furniture", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Furniture", b =>
{
b.HasOne("FurnitureAssembly_WorkerDatabaseImplement.Models.User", "User")
b.HasOne("FurnitureAssemblyDatabaseImplement.Models.User", "User")
.WithMany("Furnitures")
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
@ -328,15 +352,15 @@ namespace FurnitureAssembly_WorkerDatabaseImplement.Migrations
b.Navigation("User");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.FurnitureMaterial", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.FurnitureMaterial", b =>
{
b.HasOne("FurnitureAssembly_WorkerDatabaseImplement.Models.Furniture", "Furniture")
b.HasOne("FurnitureAssemblyDatabaseImplement.Models.Furniture", "Furniture")
.WithMany("Materials")
.HasForeignKey("FurnitureId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("FurnitureAssembly_WorkerDatabaseImplement.Models.Material", "Material")
b.HasOne("FurnitureAssemblyDatabaseImplement.Models.Material", "Material")
.WithMany("FurnitureMaterials")
.HasForeignKey("MaterialId")
.OnDelete(DeleteBehavior.Cascade)
@ -347,9 +371,9 @@ namespace FurnitureAssembly_WorkerDatabaseImplement.Migrations
b.Navigation("Material");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.FurnitureModule", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.FurnitureModule", b =>
{
b.HasOne("FurnitureAssembly_WorkerDatabaseImplement.Models.User", "User")
b.HasOne("FurnitureAssemblyDatabaseImplement.Models.User", "User")
.WithMany("FurnitureModules")
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
@ -358,15 +382,15 @@ namespace FurnitureAssembly_WorkerDatabaseImplement.Migrations
b.Navigation("User");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.FurnitureModuleFurniture", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.FurnitureModuleFurniture", b =>
{
b.HasOne("FurnitureAssembly_WorkerDatabaseImplement.Models.Furniture", "Furniture")
b.HasOne("FurnitureAssemblyDatabaseImplement.Models.Furniture", "Furniture")
.WithMany()
.HasForeignKey("FurnitureId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("FurnitureAssembly_WorkerDatabaseImplement.Models.FurnitureModule", "FurnitureModule")
b.HasOne("FurnitureAssemblyDatabaseImplement.Models.FurnitureModule", "FurnitureModule")
.WithMany("Furnitures")
.HasForeignKey("FurnitureModuleId")
.OnDelete(DeleteBehavior.Cascade)
@ -377,15 +401,15 @@ namespace FurnitureAssembly_WorkerDatabaseImplement.Migrations
b.Navigation("FurnitureModule");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.Material", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Material", b =>
{
b.HasOne("FurnitureAssembly_WorkerDatabaseImplement.Models.Scope", "Scope")
b.HasOne("FurnitureAssemblyDatabaseImplement.Models.Scope", "Scope")
.WithMany("Materials")
.HasForeignKey("ScopeId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("FurnitureAssembly_WorkerDatabaseImplement.Models.User", "User")
b.HasOne("FurnitureAssemblyDatabaseImplement.Models.User", "User")
.WithMany("Materials")
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
@ -396,28 +420,35 @@ namespace FurnitureAssembly_WorkerDatabaseImplement.Migrations
b.Navigation("User");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.Role", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Order", b =>
{
b.HasOne("FurnitureAssembly_WorkerDatabaseImplement.Models.Set", "Set")
.WithMany("Roles")
b.HasOne("FurnitureAssemblyDatabaseImplement.Models.Set", "Set")
.WithMany("Orders")
.HasForeignKey("SetId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("FurnitureAssembly_WorkerDatabaseImplement.Models.User", "User")
.WithMany("Roles")
b.HasOne("FurnitureAssemblyDatabaseImplement.Models.User", null)
.WithMany("Orders")
.HasForeignKey("UserId");
b.Navigation("Set");
});
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.OrderInfo", b =>
{
b.HasOne("FurnitureAssemblyDatabaseImplement.Models.User", "User")
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("Set");
b.Navigation("User");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.Set", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Set", b =>
{
b.HasOne("FurnitureAssembly_WorkerDatabaseImplement.Models.User", "User")
b.HasOne("FurnitureAssemblyDatabaseImplement.Models.User", "User")
.WithMany("Sets")
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
@ -426,15 +457,15 @@ namespace FurnitureAssembly_WorkerDatabaseImplement.Migrations
b.Navigation("User");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.SetFurnitureModule", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.SetFurnitureModule", b =>
{
b.HasOne("FurnitureAssembly_WorkerDatabaseImplement.Models.FurnitureModule", "FurnitureModule")
b.HasOne("FurnitureAssemblyDatabaseImplement.Models.FurnitureModule", "FurnitureModule")
.WithMany("Sets")
.HasForeignKey("FurnitureModuleId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("FurnitureAssembly_WorkerDatabaseImplement.Models.Set", "Set")
b.HasOne("FurnitureAssemblyDatabaseImplement.Models.Set", "Set")
.WithMany("FurnitureModules")
.HasForeignKey("SetId")
.OnDelete(DeleteBehavior.Cascade)
@ -445,9 +476,9 @@ namespace FurnitureAssembly_WorkerDatabaseImplement.Migrations
b.Navigation("Set");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.User", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.User", b =>
{
b.HasOne("FurnitureAssembly_WorkerDatabaseImplement.Models.Role", "Role")
b.HasOne("FurnitureAssemblyDatabaseImplement.Models.Role", "Role")
.WithMany("Users")
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade)
@ -456,41 +487,41 @@ namespace FurnitureAssembly_WorkerDatabaseImplement.Migrations
b.Navigation("Role");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.Furniture", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Furniture", b =>
{
b.Navigation("Materials");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.FurnitureModule", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.FurnitureModule", b =>
{
b.Navigation("Furnitures");
b.Navigation("Sets");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.Material", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Material", b =>
{
b.Navigation("FurnitureMaterials");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.Role", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Role", b =>
{
b.Navigation("Users");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.Scope", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Scope", b =>
{
b.Navigation("Materials");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.Set", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Set", b =>
{
b.Navigation("FurnitureModules");
b.Navigation("Roles");
b.Navigation("Orders");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.User", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.User", b =>
{
b.Navigation("FurnitureModules");
@ -498,7 +529,7 @@ namespace FurnitureAssembly_WorkerDatabaseImplement.Migrations
b.Navigation("Materials");
b.Navigation("Roles");
b.Navigation("Orders");
b.Navigation("Sets");
});

60
FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Migrations/20230406130140_Init.cs → FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Migrations/20230515192754_Init.cs
View File

@ -132,6 +132,29 @@ namespace FurnitureAssemblyDatabaseImplement.Migrations
onDelete: ReferentialAction.Cascade);
});
migrationBuilder.CreateTable(
name: "OrderInfos",
columns: table => new
{
Id = table.Column<int>(type: "integer", nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
CustomerName = table.Column<string>(type: "text", nullable: false),
PaymentType = table.Column<int>(type: "integer", nullable: false),
DateCreate = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
Sum = table.Column<double>(type: "double precision", nullable: false),
UserId = table.Column<int>(type: "integer", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_OrderInfos", x => x.Id);
table.ForeignKey(
name: "FK_OrderInfos_Users_UserId",
column: x => x.UserId,
principalTable: "Users",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
});
migrationBuilder.CreateTable(
name: "Sets",
columns: table => new
@ -209,33 +232,30 @@ namespace FurnitureAssemblyDatabaseImplement.Migrations
});
migrationBuilder.CreateTable(
name: "Roles",
name: "Orders",
columns: table => new
{
Id = table.Column<int>(type: "integer", nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
CustomerName = table.Column<string>(type: "text", nullable: false),
PaymentType = table.Column<int>(type: "integer", nullable: false),
SetId = table.Column<int>(type: "integer", nullable: false),
DateCreate = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
Sum = table.Column<double>(type: "double precision", nullable: false),
UserId = table.Column<int>(type: "integer", nullable: false)
Count = table.Column<int>(type: "integer", nullable: false),
OrderInfoId = table.Column<int>(type: "integer", nullable: false),
UserId = table.Column<int>(type: "integer", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_Roles", x => x.Id);
table.PrimaryKey("PK_Orders", x => x.Id);
table.ForeignKey(
name: "FK_Roles_Sets_SetId",
name: "FK_Orders_Sets_SetId",
column: x => x.SetId,
principalTable: "Sets",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
table.ForeignKey(
name: "FK_Roles_Users_UserId",
name: "FK_Orders_Users_UserId",
column: x => x.UserId,
principalTable: "Users",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
principalColumn: "Id");
});
migrationBuilder.CreateTable(
@ -306,13 +326,18 @@ namespace FurnitureAssemblyDatabaseImplement.Migrations
column: "UserId");
migrationBuilder.CreateIndex(
name: "IX_Roles_SetId",
table: "Roles",
name: "IX_OrderInfos_UserId",
table: "OrderInfos",
column: "UserId");
migrationBuilder.CreateIndex(
name: "IX_Orders_SetId",
table: "Orders",
column: "SetId");
migrationBuilder.CreateIndex(
name: "IX_Roles_UserId",
table: "Roles",
name: "IX_Orders_UserId",
table: "Orders",
column: "UserId");
migrationBuilder.CreateIndex(
@ -346,7 +371,10 @@ namespace FurnitureAssemblyDatabaseImplement.Migrations
name: "FurnitureModuleFurnitures");
migrationBuilder.DropTable(
name: "Roles");
name: "OrderInfos");
migrationBuilder.DropTable(
name: "Orders");
migrationBuilder.DropTable(
name: "SetFurnitureModules");

139
FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Migrations/FurnitureAssemblyDatabaseModelSnapshot.cs
View File

@ -17,12 +17,12 @@ namespace FurnitureAssemblyDatabaseImplement.Migrations
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "7.0.4")
.HasAnnotation("ProductVersion", "7.0.5")
.HasAnnotation("Relational:MaxIdentifierLength", 63);
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.Furniture", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Furniture", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
@ -50,7 +50,7 @@ namespace FurnitureAssemblyDatabaseImplement.Migrations
b.ToTable("Furnitures");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.FurnitureMaterial", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.FurnitureMaterial", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
@ -76,7 +76,7 @@ namespace FurnitureAssemblyDatabaseImplement.Migrations
b.ToTable("FurnitureMaterials");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.FurnitureModule", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.FurnitureModule", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
@ -104,7 +104,7 @@ namespace FurnitureAssemblyDatabaseImplement.Migrations
b.ToTable("FurnitureModules");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.FurnitureModuleFurniture", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.FurnitureModuleFurniture", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
@ -130,7 +130,7 @@ namespace FurnitureAssemblyDatabaseImplement.Migrations
b.ToTable("FurnitureModuleFurnitures");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.Material", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Material", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
@ -160,7 +160,36 @@ namespace FurnitureAssemblyDatabaseImplement.Migrations
b.ToTable("Materials");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.Role", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Order", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<int>("Count")
.HasColumnType("integer");
b.Property<int>("OrderInfoId")
.HasColumnType("integer");
b.Property<int>("SetId")
.HasColumnType("integer");
b.Property<int?>("UserId")
.HasColumnType("integer");
b.HasKey("Id");
b.HasIndex("SetId");
b.HasIndex("UserId");
b.ToTable("Orders");
});
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.OrderInfo", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
@ -178,9 +207,6 @@ namespace FurnitureAssemblyDatabaseImplement.Migrations
b.Property<int>("PaymentType")
.HasColumnType("integer");
b.Property<int>("SetId")
.HasColumnType("integer");
b.Property<double>("Sum")
.HasColumnType("double precision");
@ -189,14 +215,12 @@ namespace FurnitureAssemblyDatabaseImplement.Migrations
b.HasKey("Id");
b.HasIndex("SetId");
b.HasIndex("UserId");
b.ToTable("Roles");
b.ToTable("OrderInfos");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.Role", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Role", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
@ -213,7 +237,7 @@ namespace FurnitureAssemblyDatabaseImplement.Migrations
b.ToTable("Roles");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.Scope", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Scope", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
@ -230,7 +254,7 @@ namespace FurnitureAssemblyDatabaseImplement.Migrations
b.ToTable("Scopes");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.Set", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Set", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
@ -258,7 +282,7 @@ namespace FurnitureAssemblyDatabaseImplement.Migrations
b.ToTable("Sets");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.SetFurnitureModule", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.SetFurnitureModule", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
@ -284,7 +308,7 @@ namespace FurnitureAssemblyDatabaseImplement.Migrations
b.ToTable("SetFurnitureModules");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.User", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.User", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
@ -314,9 +338,9 @@ namespace FurnitureAssemblyDatabaseImplement.Migrations
b.ToTable("Users");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.Furniture", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Furniture", b =>
{
b.HasOne("FurnitureAssembly_WorkerDatabaseImplement.Models.User", "User")
b.HasOne("FurnitureAssemblyDatabaseImplement.Models.User", "User")
.WithMany("Furnitures")
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
@ -325,15 +349,15 @@ namespace FurnitureAssemblyDatabaseImplement.Migrations
b.Navigation("User");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.FurnitureMaterial", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.FurnitureMaterial", b =>
{
b.HasOne("FurnitureAssembly_WorkerDatabaseImplement.Models.Furniture", "Furniture")
b.HasOne("FurnitureAssemblyDatabaseImplement.Models.Furniture", "Furniture")
.WithMany("Materials")
.HasForeignKey("FurnitureId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("FurnitureAssembly_WorkerDatabaseImplement.Models.Material", "Material")
b.HasOne("FurnitureAssemblyDatabaseImplement.Models.Material", "Material")
.WithMany("FurnitureMaterials")
.HasForeignKey("MaterialId")
.OnDelete(DeleteBehavior.Cascade)
@ -344,9 +368,9 @@ namespace FurnitureAssemblyDatabaseImplement.Migrations
b.Navigation("Material");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.FurnitureModule", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.FurnitureModule", b =>
{
b.HasOne("FurnitureAssembly_WorkerDatabaseImplement.Models.User", "User")
b.HasOne("FurnitureAssemblyDatabaseImplement.Models.User", "User")
.WithMany("FurnitureModules")
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
@ -355,15 +379,15 @@ namespace FurnitureAssemblyDatabaseImplement.Migrations
b.Navigation("User");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.FurnitureModuleFurniture", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.FurnitureModuleFurniture", b =>
{
b.HasOne("FurnitureAssembly_WorkerDatabaseImplement.Models.Furniture", "Furniture")
b.HasOne("FurnitureAssemblyDatabaseImplement.Models.Furniture", "Furniture")
.WithMany()
.HasForeignKey("FurnitureId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("FurnitureAssembly_WorkerDatabaseImplement.Models.FurnitureModule", "FurnitureModule")
b.HasOne("FurnitureAssemblyDatabaseImplement.Models.FurnitureModule", "FurnitureModule")
.WithMany("Furnitures")
.HasForeignKey("FurnitureModuleId")
.OnDelete(DeleteBehavior.Cascade)
@ -374,15 +398,15 @@ namespace FurnitureAssemblyDatabaseImplement.Migrations
b.Navigation("FurnitureModule");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.Material", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Material", b =>
{
b.HasOne("FurnitureAssembly_WorkerDatabaseImplement.Models.Scope", "Scope")
b.HasOne("FurnitureAssemblyDatabaseImplement.Models.Scope", "Scope")
.WithMany("Materials")
.HasForeignKey("ScopeId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("FurnitureAssembly_WorkerDatabaseImplement.Models.User", "User")
b.HasOne("FurnitureAssemblyDatabaseImplement.Models.User", "User")
.WithMany("Materials")
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
@ -393,28 +417,35 @@ namespace FurnitureAssemblyDatabaseImplement.Migrations
b.Navigation("User");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.Role", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Order", b =>
{
b.HasOne("FurnitureAssembly_WorkerDatabaseImplement.Models.Set", "Set")
.WithMany("Roles")
b.HasOne("FurnitureAssemblyDatabaseImplement.Models.Set", "Set")
.WithMany("Orders")
.HasForeignKey("SetId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("FurnitureAssembly_WorkerDatabaseImplement.Models.User", "User")
.WithMany("Roles")
b.HasOne("FurnitureAssemblyDatabaseImplement.Models.User", null)
.WithMany("Orders")
.HasForeignKey("UserId");
b.Navigation("Set");
});
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.OrderInfo", b =>
{
b.HasOne("FurnitureAssemblyDatabaseImplement.Models.User", "User")
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("Set");
b.Navigation("User");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.Set", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Set", b =>
{
b.HasOne("FurnitureAssembly_WorkerDatabaseImplement.Models.User", "User")
b.HasOne("FurnitureAssemblyDatabaseImplement.Models.User", "User")
.WithMany("Sets")
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
@ -423,15 +454,15 @@ namespace FurnitureAssemblyDatabaseImplement.Migrations
b.Navigation("User");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.SetFurnitureModule", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.SetFurnitureModule", b =>
{
b.HasOne("FurnitureAssembly_WorkerDatabaseImplement.Models.FurnitureModule", "FurnitureModule")
b.HasOne("FurnitureAssemblyDatabaseImplement.Models.FurnitureModule", "FurnitureModule")
.WithMany("Sets")
.HasForeignKey("FurnitureModuleId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("FurnitureAssembly_WorkerDatabaseImplement.Models.Set", "Set")
b.HasOne("FurnitureAssemblyDatabaseImplement.Models.Set", "Set")
.WithMany("FurnitureModules")
.HasForeignKey("SetId")
.OnDelete(DeleteBehavior.Cascade)
@ -442,9 +473,9 @@ namespace FurnitureAssemblyDatabaseImplement.Migrations
b.Navigation("Set");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.User", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.User", b =>
{
b.HasOne("FurnitureAssembly_WorkerDatabaseImplement.Models.Role", "Role")
b.HasOne("FurnitureAssemblyDatabaseImplement.Models.Role", "Role")
.WithMany("Users")
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade)
@ -453,41 +484,41 @@ namespace FurnitureAssemblyDatabaseImplement.Migrations
b.Navigation("Role");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.Furniture", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Furniture", b =>
{
b.Navigation("Materials");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.FurnitureModule", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.FurnitureModule", b =>
{
b.Navigation("Furnitures");
b.Navigation("Sets");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.Material", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Material", b =>
{
b.Navigation("FurnitureMaterials");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.Role", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Role", b =>
{
b.Navigation("Users");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.Scope", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Scope", b =>
{
b.Navigation("Materials");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.Set", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Set", b =>
{
b.Navigation("FurnitureModules");
b.Navigation("Roles");
b.Navigation("Orders");
});
modelBuilder.Entity("FurnitureAssembly_WorkerDatabaseImplement.Models.User", b =>
modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.User", b =>
{
b.Navigation("FurnitureModules");
@ -495,7 +526,7 @@ namespace FurnitureAssemblyDatabaseImplement.Migrations
b.Navigation("Materials");
b.Navigation("Roles");
b.Navigation("Orders");
b.Navigation("Sets");
});