diff --git a/HardwareShop/HardwareShopDatabaseImplement/HardwareShopDatabase.cs b/HardwareShop/HardwareShopDatabaseImplement/HardwareShopDatabase.cs
index 388217d..59867cc 100644
--- a/HardwareShop/HardwareShopDatabaseImplement/HardwareShopDatabase.cs
+++ b/HardwareShop/HardwareShopDatabaseImplement/HardwareShopDatabase.cs
@@ -1,6 +1,7 @@
using HardwareShopDatabaseImplement.Models;
-using HardwareShopDatabaseImplement.Models.ModelsManyToMany;
-using HardwareShopDatabaseImplement.Models.ModelsStorekeeper;
+using HardwareShopDatabaseImplement.Models.ManyToMany;
+using HardwareShopDatabaseImplement.Models.Storekeeper;
+using HardwareShopDatabaseImplement.Models.Worker;
using Microsoft.EntityFrameworkCore;
namespace HardwareShopDatabaseImplement
diff --git a/HardwareShop/HardwareShopDatabaseImplement/Migrations/20230401103551_init.Designer.cs b/HardwareShop/HardwareShopDatabaseImplement/Migrations/20230401124213_init1.Designer.cs
similarity index 77%
rename from HardwareShop/HardwareShopDatabaseImplement/Migrations/20230401103551_init.Designer.cs
rename to HardwareShop/HardwareShopDatabaseImplement/Migrations/20230401124213_init1.Designer.cs
index d00517d..50b9050 100644
--- a/HardwareShop/HardwareShopDatabaseImplement/Migrations/20230401103551_init.Designer.cs
+++ b/HardwareShop/HardwareShopDatabaseImplement/Migrations/20230401124213_init1.Designer.cs
@@ -12,8 +12,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace HardwareShopDatabaseImplement.Migrations
{
[DbContext(typeof(HardwareShopDatabase))]
- [Migration("20230401103551_init")]
- partial class init
+ [Migration("20230401124213_init1")]
+ partial class init1
{
///
protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -25,30 +25,7 @@ namespace HardwareShopDatabaseImplement.Migrations
SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
- modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Build", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("int");
-
- SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
-
- b.Property("BuildName")
- .IsRequired()
- .HasColumnType("nvarchar(max)");
-
- b.Property("Price")
- .HasColumnType("decimal(18,2)");
-
- b.Property("UserId")
- .HasColumnType("int");
-
- b.HasKey("Id");
-
- b.ToTable("Builds");
- });
-
- modelBuilder.Entity("HardwareShopDatabaseImplement.Models.BuildComponent", b =>
+ modelBuilder.Entity("HardwareShopDatabaseImplement.Models.ManyToMany.BuildComponent", b =>
{
b.Property("ComponentId")
.HasColumnType("int");
@@ -56,9 +33,6 @@ namespace HardwareShopDatabaseImplement.Migrations
b.Property("BuildId")
.HasColumnType("int");
- b.Property("BuildId")
- .HasColumnType("int");
-
b.Property("Count")
.HasColumnType("int");
@@ -66,102 +40,10 @@ namespace HardwareShopDatabaseImplement.Migrations
b.HasIndex("BuildId");
- b.ToTable("BuildComponent");
+ b.ToTable("BuildsComponents");
});
- modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Comment", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("int");
-
- SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
-
- b.Property("BuildId")
- .HasColumnType("int");
-
- b.Property("BuildName")
- .IsRequired()
- .HasColumnType("nvarchar(max)");
-
- b.Property("Text")
- .IsRequired()
- .HasColumnType("nvarchar(max)");
-
- b.HasKey("Id");
-
- b.HasIndex("BuildId");
-
- b.ToTable("Comments");
- });
-
- modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Component", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("int");
-
- SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
-
- b.HasKey("Id");
-
- b.ToTable("Components");
- });
-
- modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Good", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("int");
-
- SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
-
- b.HasKey("Id");
-
- b.ToTable("Goods");
- });
-
- modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Order", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("int");
-
- SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
-
- b.HasKey("Id");
-
- b.ToTable("Orders");
- });
-
- modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Purchase", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("int");
-
- SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
-
- b.Property("DatePurchase")
- .HasColumnType("datetime2");
-
- b.Property("PurchaseStatus")
- .HasColumnType("int");
-
- b.Property("Sum")
- .HasColumnType("decimal(18,2)");
-
- b.Property("UserId")
- .HasColumnType("int");
-
- b.HasKey("Id");
-
- b.HasIndex("UserId");
-
- b.ToTable("Purchase");
- });
-
- modelBuilder.Entity("HardwareShopDatabaseImplement.Models.PurchaseBuild", b =>
+ modelBuilder.Entity("HardwareShopDatabaseImplement.Models.ManyToMany.PurchaseBuild", b =>
{
b.Property("PurchaseId")
.HasColumnType("int");
@@ -169,25 +51,17 @@ namespace HardwareShopDatabaseImplement.Migrations
b.Property("BuildId")
.HasColumnType("int");
- b.Property("BuildId")
- .HasColumnType("int");
-
b.Property("Count")
.HasColumnType("int");
- b.Property("PurchaseId")
- .HasColumnType("int");
-
b.HasKey("PurchaseId", "BuildId");
b.HasIndex("BuildId");
- b.HasIndex("PurchaseId");
-
b.ToTable("PurchasesBuilds");
});
- modelBuilder.Entity("HardwareShopDatabaseImplement.Models.PurchaseGood", b =>
+ modelBuilder.Entity("HardwareShopDatabaseImplement.Models.ManyToMany.PurchaseGood", b =>
{
b.Property("PurchaseId")
.HasColumnType("int");
@@ -198,18 +72,67 @@ namespace HardwareShopDatabaseImplement.Migrations
b.Property("Count")
.HasColumnType("int");
- b.Property("PurchaseId")
- .HasColumnType("int");
-
b.HasKey("PurchaseId", "GoodId");
b.HasIndex("GoodId");
- b.HasIndex("PurchaseId");
-
b.ToTable("PurchasesGoods");
});
+ modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Storekeeper.Component", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
+
+ b.Property("UserId")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.HasIndex("UserId");
+
+ b.ToTable("Components");
+ });
+
+ modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Storekeeper.Good", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
+
+ b.Property("UserId")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.HasIndex("UserId");
+
+ b.ToTable("Goods");
+ });
+
+ modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Storekeeper.Order", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
+
+ b.Property("UserId")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.HasIndex("UserId");
+
+ b.ToTable("Orders");
+ });
+
modelBuilder.Entity("HardwareShopDatabaseImplement.Models.User", b =>
{
b.Property("Id")
@@ -238,15 +161,89 @@ namespace HardwareShopDatabaseImplement.Migrations
b.ToTable("Users");
});
- modelBuilder.Entity("HardwareShopDatabaseImplement.Models.BuildComponent", b =>
+ modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Worker.Build", b =>
{
- b.HasOne("HardwareShopDatabaseImplement.Models.Build", "Build")
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
+
+ b.Property("BuildName")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Price")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property("UserId")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.HasIndex("UserId");
+
+ b.ToTable("Builds");
+ });
+
+ modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Worker.Comment", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
+
+ b.Property("BuildId")
+ .HasColumnType("int");
+
+ b.Property("Text")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.HasKey("Id");
+
+ b.HasIndex("BuildId");
+
+ b.ToTable("Comments");
+ });
+
+ modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Worker.Purchase", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
+
+ b.Property("DatePurchase")
+ .HasColumnType("datetime2");
+
+ b.Property("PurchaseStatus")
+ .HasColumnType("int");
+
+ b.Property("Sum")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property("UserId")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.HasIndex("UserId");
+
+ b.ToTable("Purchases");
+ });
+
+ modelBuilder.Entity("HardwareShopDatabaseImplement.Models.ManyToMany.BuildComponent", b =>
+ {
+ b.HasOne("HardwareShopDatabaseImplement.Models.Worker.Build", "Build")
.WithMany("Components")
.HasForeignKey("BuildId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
- b.HasOne("HardwareShopDatabaseImplement.Models.Component", "Component")
+ b.HasOne("HardwareShopDatabaseImplement.Models.Storekeeper.Component", "Component")
.WithMany()
.HasForeignKey("ComponentId")
.OnDelete(DeleteBehavior.Cascade)
@@ -257,37 +254,15 @@ namespace HardwareShopDatabaseImplement.Migrations
b.Navigation("Component");
});
- modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Comment", b =>
+ modelBuilder.Entity("HardwareShopDatabaseImplement.Models.ManyToMany.PurchaseBuild", b =>
{
- b.HasOne("HardwareShopDatabaseImplement.Models.Build", "Build")
- .WithMany()
- .HasForeignKey("BuildId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
-
- b.Navigation("Build");
- });
-
- modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Purchase", b =>
- {
- b.HasOne("HardwareShopDatabaseImplement.Models.User", "User")
- .WithMany()
- .HasForeignKey("UserId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
-
- b.Navigation("User");
- });
-
- modelBuilder.Entity("HardwareShopDatabaseImplement.Models.PurchaseBuild", b =>
- {
- b.HasOne("HardwareShopDatabaseImplement.Models.Build", "Build")
+ b.HasOne("HardwareShopDatabaseImplement.Models.Worker.Build", "Build")
.WithMany("Purchases")
.HasForeignKey("BuildId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
- b.HasOne("HardwareShopDatabaseImplement.Models.Purchase", "Purchase")
+ b.HasOne("HardwareShopDatabaseImplement.Models.Worker.Purchase", "Purchase")
.WithMany("Builds")
.HasForeignKey("PurchaseId")
.OnDelete(DeleteBehavior.Cascade)
@@ -298,15 +273,15 @@ namespace HardwareShopDatabaseImplement.Migrations
b.Navigation("Purchase");
});
- modelBuilder.Entity("HardwareShopDatabaseImplement.Models.PurchaseGood", b =>
+ modelBuilder.Entity("HardwareShopDatabaseImplement.Models.ManyToMany.PurchaseGood", b =>
{
- b.HasOne("HardwareShopDatabaseImplement.Models.Good", "Good")
+ b.HasOne("HardwareShopDatabaseImplement.Models.Storekeeper.Good", "Good")
.WithMany()
.HasForeignKey("GoodId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
- b.HasOne("HardwareShopDatabaseImplement.Models.Purchase", "Purchase")
+ b.HasOne("HardwareShopDatabaseImplement.Models.Worker.Purchase", "Purchase")
.WithMany("Goods")
.HasForeignKey("PurchaseId")
.OnDelete(DeleteBehavior.Cascade)
@@ -317,14 +292,82 @@ namespace HardwareShopDatabaseImplement.Migrations
b.Navigation("Purchase");
});
- modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Build", b =>
+ modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Storekeeper.Component", b =>
{
+ b.HasOne("HardwareShopDatabaseImplement.Models.User", "User")
+ .WithMany()
+ .HasForeignKey("UserId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("User");
+ });
+
+ modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Storekeeper.Good", b =>
+ {
+ b.HasOne("HardwareShopDatabaseImplement.Models.User", "User")
+ .WithMany()
+ .HasForeignKey("UserId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("User");
+ });
+
+ modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Storekeeper.Order", b =>
+ {
+ b.HasOne("HardwareShopDatabaseImplement.Models.User", "User")
+ .WithMany()
+ .HasForeignKey("UserId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("User");
+ });
+
+ modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Worker.Build", b =>
+ {
+ b.HasOne("HardwareShopDatabaseImplement.Models.User", "User")
+ .WithMany()
+ .HasForeignKey("UserId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("User");
+ });
+
+ modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Worker.Comment", b =>
+ {
+ b.HasOne("HardwareShopDatabaseImplement.Models.Worker.Build", "Build")
+ .WithMany("Comments")
+ .HasForeignKey("BuildId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("Build");
+ });
+
+ modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Worker.Purchase", b =>
+ {
+ b.HasOne("HardwareShopDatabaseImplement.Models.User", "User")
+ .WithMany()
+ .HasForeignKey("UserId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("User");
+ });
+
+ modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Worker.Build", b =>
+ {
+ b.Navigation("Comments");
+
b.Navigation("Components");
b.Navigation("Purchases");
});
- modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Purchase", b =>
+ modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Worker.Purchase", b =>
{
b.Navigation("Builds");
diff --git a/HardwareShop/HardwareShopDatabaseImplement/Migrations/20230401103551_init.cs b/HardwareShop/HardwareShopDatabaseImplement/Migrations/20230401124213_init1.cs
similarity index 75%
rename from HardwareShop/HardwareShopDatabaseImplement/Migrations/20230401103551_init.cs
rename to HardwareShop/HardwareShopDatabaseImplement/Migrations/20230401124213_init1.cs
index 53c95ac..d03c65f 100644
--- a/HardwareShop/HardwareShopDatabaseImplement/Migrations/20230401103551_init.cs
+++ b/HardwareShop/HardwareShopDatabaseImplement/Migrations/20230401124213_init1.cs
@@ -6,62 +6,11 @@ using Microsoft.EntityFrameworkCore.Migrations;
namespace HardwareShopDatabaseImplement.Migrations
{
///
- public partial class init : Migration
+ public partial class init1 : Migration
{
///
protected override void Up(MigrationBuilder migrationBuilder)
{
- migrationBuilder.CreateTable(
- name: "Builds",
- columns: table => new
- {
- Id = table.Column(type: "int", nullable: false)
- .Annotation("SqlServer:Identity", "1, 1"),
- Price = table.Column(type: "decimal(18,2)", nullable: false),
- BuildName = table.Column(type: "nvarchar(max)", nullable: false),
- UserId = table.Column(type: "int", nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_Builds", x => x.Id);
- });
-
- migrationBuilder.CreateTable(
- name: "Components",
- columns: table => new
- {
- Id = table.Column(type: "int", nullable: false)
- .Annotation("SqlServer:Identity", "1, 1")
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_Components", x => x.Id);
- });
-
- migrationBuilder.CreateTable(
- name: "Goods",
- columns: table => new
- {
- Id = table.Column(type: "int", nullable: false)
- .Annotation("SqlServer:Identity", "1, 1")
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_Goods", x => x.Id);
- });
-
- migrationBuilder.CreateTable(
- name: "Orders",
- columns: table => new
- {
- Id = table.Column(type: "int", nullable: false)
- .Annotation("SqlServer:Identity", "1, 1")
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_Orders", x => x.Id);
- });
-
migrationBuilder.CreateTable(
name: "Users",
columns: table => new
@@ -78,6 +27,106 @@ namespace HardwareShopDatabaseImplement.Migrations
table.PrimaryKey("PK_Users", x => x.Id);
});
+ migrationBuilder.CreateTable(
+ name: "Builds",
+ columns: table => new
+ {
+ Id = table.Column(type: "int", nullable: false)
+ .Annotation("SqlServer:Identity", "1, 1"),
+ Price = table.Column(type: "decimal(18,2)", nullable: false),
+ BuildName = table.Column(type: "nvarchar(max)", nullable: false),
+ UserId = table.Column(type: "int", nullable: false)
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("PK_Builds", x => x.Id);
+ table.ForeignKey(
+ name: "FK_Builds_Users_UserId",
+ column: x => x.UserId,
+ principalTable: "Users",
+ principalColumn: "Id",
+ onDelete: ReferentialAction.Cascade);
+ });
+
+ migrationBuilder.CreateTable(
+ name: "Components",
+ columns: table => new
+ {
+ Id = table.Column(type: "int", nullable: false)
+ .Annotation("SqlServer:Identity", "1, 1"),
+ UserId = table.Column(type: "int", nullable: false)
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("PK_Components", x => x.Id);
+ table.ForeignKey(
+ name: "FK_Components_Users_UserId",
+ column: x => x.UserId,
+ principalTable: "Users",
+ principalColumn: "Id",
+ onDelete: ReferentialAction.Cascade);
+ });
+
+ migrationBuilder.CreateTable(
+ name: "Goods",
+ columns: table => new
+ {
+ Id = table.Column(type: "int", nullable: false)
+ .Annotation("SqlServer:Identity", "1, 1"),
+ UserId = table.Column(type: "int", nullable: false)
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("PK_Goods", x => x.Id);
+ table.ForeignKey(
+ name: "FK_Goods_Users_UserId",
+ column: x => x.UserId,
+ principalTable: "Users",
+ principalColumn: "Id",
+ onDelete: ReferentialAction.Cascade);
+ });
+
+ migrationBuilder.CreateTable(
+ name: "Orders",
+ columns: table => new
+ {
+ Id = table.Column(type: "int", nullable: false)
+ .Annotation("SqlServer:Identity", "1, 1"),
+ UserId = table.Column(type: "int", nullable: false)
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("PK_Orders", x => x.Id);
+ table.ForeignKey(
+ name: "FK_Orders_Users_UserId",
+ column: x => x.UserId,
+ principalTable: "Users",
+ principalColumn: "Id",
+ onDelete: ReferentialAction.Cascade);
+ });
+
+ migrationBuilder.CreateTable(
+ name: "Purchases",
+ columns: table => new
+ {
+ Id = table.Column(type: "int", nullable: false)
+ .Annotation("SqlServer:Identity", "1, 1"),
+ Sum = table.Column(type: "decimal(18,2)", nullable: false),
+ PurchaseStatus = table.Column(type: "int", nullable: false),
+ DatePurchase = table.Column(type: "datetime2", nullable: true),
+ UserId = table.Column(type: "int", nullable: false)
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("PK_Purchases", x => x.Id);
+ table.ForeignKey(
+ name: "FK_Purchases_Users_UserId",
+ column: x => x.UserId,
+ principalTable: "Users",
+ principalColumn: "Id",
+ onDelete: ReferentialAction.Cascade);
+ });
+
migrationBuilder.CreateTable(
name: "Comments",
columns: table => new
@@ -85,7 +134,6 @@ namespace HardwareShopDatabaseImplement.Migrations
Id = table.Column(type: "int", nullable: false)
.Annotation("SqlServer:Identity", "1, 1"),
Text = table.Column(type: "nvarchar(max)", nullable: false),
- BuildName = table.Column(type: "nvarchar(max)", nullable: false),
BuildId = table.Column(type: "int", nullable: false)
},
constraints: table =>
@@ -100,62 +148,37 @@ namespace HardwareShopDatabaseImplement.Migrations
});
migrationBuilder.CreateTable(
- name: "BuildComponent",
+ name: "BuildsComponents",
columns: table => new
{
BuildId = table.Column(type: "int", nullable: false),
ComponentId = table.Column(type: "int", nullable: false),
- Count = table.Column(type: "int", nullable: false),
- BuildId = table.Column(type: "int", nullable: false)
+ Count = table.Column(type: "int", nullable: false)
},
constraints: table =>
{
- table.PrimaryKey("PK_BuildComponent", x => new { x.ComponentId, x.BuildId });
+ table.PrimaryKey("PK_BuildsComponents", x => new { x.ComponentId, x.BuildId });
table.ForeignKey(
- name: "FK_BuildComponent_Builds_BuildId",
+ name: "FK_BuildsComponents_Builds_BuildId",
column: x => x.BuildId,
principalTable: "Builds",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
table.ForeignKey(
- name: "FK_BuildComponent_Components_ComponentId",
+ name: "FK_BuildsComponents_Components_ComponentId",
column: x => x.ComponentId,
principalTable: "Components",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
});
- migrationBuilder.CreateTable(
- name: "Purchase",
- columns: table => new
- {
- Id = table.Column(type: "int", nullable: false)
- .Annotation("SqlServer:Identity", "1, 1"),
- Sum = table.Column(type: "decimal(18,2)", nullable: false),
- PurchaseStatus = table.Column(type: "int", nullable: false),
- DatePurchase = table.Column(type: "datetime2", nullable: true),
- UserId = table.Column(type: "int", nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_Purchase", x => x.Id);
- table.ForeignKey(
- name: "FK_Purchase_Users_UserId",
- column: x => x.UserId,
- principalTable: "Users",
- principalColumn: "Id",
- onDelete: ReferentialAction.Cascade);
- });
-
migrationBuilder.CreateTable(
name: "PurchasesBuilds",
columns: table => new
{
BuildId = table.Column(type: "int", nullable: false),
PurchaseId = table.Column(type: "int", nullable: false),
- Count = table.Column(type: "int", nullable: false),
- BuildId = table.Column(type: "int", nullable: false),
- PurchaseId = table.Column(type: "int", nullable: false)
+ Count = table.Column(type: "int", nullable: false)
},
constraints: table =>
{
@@ -167,9 +190,9 @@ namespace HardwareShopDatabaseImplement.Migrations
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
table.ForeignKey(
- name: "FK_PurchasesBuilds_Purchase_PurchaseId",
+ name: "FK_PurchasesBuilds_Purchases_PurchaseId",
column: x => x.PurchaseId,
- principalTable: "Purchase",
+ principalTable: "Purchases",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
});
@@ -180,8 +203,7 @@ namespace HardwareShopDatabaseImplement.Migrations
{
PurchaseId = table.Column(type: "int", nullable: false),
GoodId = table.Column(type: "int", nullable: false),
- Count = table.Column(type: "int", nullable: false),
- PurchaseId = table.Column(type: "int", nullable: false)
+ Count = table.Column(type: "int", nullable: false)
},
constraints: table =>
{
@@ -193,16 +215,21 @@ namespace HardwareShopDatabaseImplement.Migrations
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
table.ForeignKey(
- name: "FK_PurchasesGoods_Purchase_PurchaseId",
+ name: "FK_PurchasesGoods_Purchases_PurchaseId",
column: x => x.PurchaseId,
- principalTable: "Purchase",
+ principalTable: "Purchases",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
});
migrationBuilder.CreateIndex(
- name: "IX_BuildComponent_BuildId",
- table: "BuildComponent",
+ name: "IX_Builds_UserId",
+ table: "Builds",
+ column: "UserId");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_BuildsComponents_BuildId",
+ table: "BuildsComponents",
column: "BuildId");
migrationBuilder.CreateIndex(
@@ -211,8 +238,23 @@ namespace HardwareShopDatabaseImplement.Migrations
column: "BuildId");
migrationBuilder.CreateIndex(
- name: "IX_Purchase_UserId",
- table: "Purchase",
+ name: "IX_Components_UserId",
+ table: "Components",
+ column: "UserId");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_Goods_UserId",
+ table: "Goods",
+ column: "UserId");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_Orders_UserId",
+ table: "Orders",
+ column: "UserId");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_Purchases_UserId",
+ table: "Purchases",
column: "UserId");
migrationBuilder.CreateIndex(
@@ -220,27 +262,17 @@ namespace HardwareShopDatabaseImplement.Migrations
table: "PurchasesBuilds",
column: "BuildId");
- migrationBuilder.CreateIndex(
- name: "IX_PurchasesBuilds_PurchaseId",
- table: "PurchasesBuilds",
- column: "PurchaseId");
-
migrationBuilder.CreateIndex(
name: "IX_PurchasesGoods_GoodId",
table: "PurchasesGoods",
column: "GoodId");
-
- migrationBuilder.CreateIndex(
- name: "IX_PurchasesGoods_PurchaseId",
- table: "PurchasesGoods",
- column: "PurchaseId");
}
///
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
- name: "BuildComponent");
+ name: "BuildsComponents");
migrationBuilder.DropTable(
name: "Comments");
@@ -264,7 +296,7 @@ namespace HardwareShopDatabaseImplement.Migrations
name: "Goods");
migrationBuilder.DropTable(
- name: "Purchase");
+ name: "Purchases");
migrationBuilder.DropTable(
name: "Users");
diff --git a/HardwareShop/HardwareShopDatabaseImplement/Migrations/HardwareShopDatabaseModelSnapshot.cs b/HardwareShop/HardwareShopDatabaseImplement/Migrations/HardwareShopDatabaseModelSnapshot.cs
index af9407c..bf9e625 100644
--- a/HardwareShop/HardwareShopDatabaseImplement/Migrations/HardwareShopDatabaseModelSnapshot.cs
+++ b/HardwareShop/HardwareShopDatabaseImplement/Migrations/HardwareShopDatabaseModelSnapshot.cs
@@ -22,30 +22,7 @@ namespace HardwareShopDatabaseImplement.Migrations
SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
- modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Build", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("int");
-
- SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
-
- b.Property("BuildName")
- .IsRequired()
- .HasColumnType("nvarchar(max)");
-
- b.Property("Price")
- .HasColumnType("decimal(18,2)");
-
- b.Property("UserId")
- .HasColumnType("int");
-
- b.HasKey("Id");
-
- b.ToTable("Builds");
- });
-
- modelBuilder.Entity("HardwareShopDatabaseImplement.Models.BuildComponent", b =>
+ modelBuilder.Entity("HardwareShopDatabaseImplement.Models.ManyToMany.BuildComponent", b =>
{
b.Property("ComponentId")
.HasColumnType("int");
@@ -53,9 +30,6 @@ namespace HardwareShopDatabaseImplement.Migrations
b.Property("BuildId")
.HasColumnType("int");
- b.Property("BuildId")
- .HasColumnType("int");
-
b.Property("Count")
.HasColumnType("int");
@@ -63,102 +37,10 @@ namespace HardwareShopDatabaseImplement.Migrations
b.HasIndex("BuildId");
- b.ToTable("BuildComponent");
+ b.ToTable("BuildsComponents");
});
- modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Comment", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("int");
-
- SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
-
- b.Property("BuildId")
- .HasColumnType("int");
-
- b.Property("BuildName")
- .IsRequired()
- .HasColumnType("nvarchar(max)");
-
- b.Property("Text")
- .IsRequired()
- .HasColumnType("nvarchar(max)");
-
- b.HasKey("Id");
-
- b.HasIndex("BuildId");
-
- b.ToTable("Comments");
- });
-
- modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Component", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("int");
-
- SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
-
- b.HasKey("Id");
-
- b.ToTable("Components");
- });
-
- modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Good", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("int");
-
- SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
-
- b.HasKey("Id");
-
- b.ToTable("Goods");
- });
-
- modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Order", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("int");
-
- SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
-
- b.HasKey("Id");
-
- b.ToTable("Orders");
- });
-
- modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Purchase", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("int");
-
- SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
-
- b.Property("DatePurchase")
- .HasColumnType("datetime2");
-
- b.Property("PurchaseStatus")
- .HasColumnType("int");
-
- b.Property("Sum")
- .HasColumnType("decimal(18,2)");
-
- b.Property("UserId")
- .HasColumnType("int");
-
- b.HasKey("Id");
-
- b.HasIndex("UserId");
-
- b.ToTable("Purchase");
- });
-
- modelBuilder.Entity("HardwareShopDatabaseImplement.Models.PurchaseBuild", b =>
+ modelBuilder.Entity("HardwareShopDatabaseImplement.Models.ManyToMany.PurchaseBuild", b =>
{
b.Property("PurchaseId")
.HasColumnType("int");
@@ -166,25 +48,17 @@ namespace HardwareShopDatabaseImplement.Migrations
b.Property("BuildId")
.HasColumnType("int");
- b.Property("BuildId")
- .HasColumnType("int");
-
b.Property("Count")
.HasColumnType("int");
- b.Property("PurchaseId")
- .HasColumnType("int");
-
b.HasKey("PurchaseId", "BuildId");
b.HasIndex("BuildId");
- b.HasIndex("PurchaseId");
-
b.ToTable("PurchasesBuilds");
});
- modelBuilder.Entity("HardwareShopDatabaseImplement.Models.PurchaseGood", b =>
+ modelBuilder.Entity("HardwareShopDatabaseImplement.Models.ManyToMany.PurchaseGood", b =>
{
b.Property("PurchaseId")
.HasColumnType("int");
@@ -195,18 +69,67 @@ namespace HardwareShopDatabaseImplement.Migrations
b.Property("Count")
.HasColumnType("int");
- b.Property("PurchaseId")
- .HasColumnType("int");
-
b.HasKey("PurchaseId", "GoodId");
b.HasIndex("GoodId");
- b.HasIndex("PurchaseId");
-
b.ToTable("PurchasesGoods");
});
+ modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Storekeeper.Component", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
+
+ b.Property("UserId")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.HasIndex("UserId");
+
+ b.ToTable("Components");
+ });
+
+ modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Storekeeper.Good", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
+
+ b.Property("UserId")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.HasIndex("UserId");
+
+ b.ToTable("Goods");
+ });
+
+ modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Storekeeper.Order", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
+
+ b.Property("UserId")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.HasIndex("UserId");
+
+ b.ToTable("Orders");
+ });
+
modelBuilder.Entity("HardwareShopDatabaseImplement.Models.User", b =>
{
b.Property("Id")
@@ -235,15 +158,89 @@ namespace HardwareShopDatabaseImplement.Migrations
b.ToTable("Users");
});
- modelBuilder.Entity("HardwareShopDatabaseImplement.Models.BuildComponent", b =>
+ modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Worker.Build", b =>
{
- b.HasOne("HardwareShopDatabaseImplement.Models.Build", "Build")
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
+
+ b.Property("BuildName")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Price")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property("UserId")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.HasIndex("UserId");
+
+ b.ToTable("Builds");
+ });
+
+ modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Worker.Comment", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
+
+ b.Property("BuildId")
+ .HasColumnType("int");
+
+ b.Property("Text")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.HasKey("Id");
+
+ b.HasIndex("BuildId");
+
+ b.ToTable("Comments");
+ });
+
+ modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Worker.Purchase", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
+
+ b.Property("DatePurchase")
+ .HasColumnType("datetime2");
+
+ b.Property("PurchaseStatus")
+ .HasColumnType("int");
+
+ b.Property("Sum")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property("UserId")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.HasIndex("UserId");
+
+ b.ToTable("Purchases");
+ });
+
+ modelBuilder.Entity("HardwareShopDatabaseImplement.Models.ManyToMany.BuildComponent", b =>
+ {
+ b.HasOne("HardwareShopDatabaseImplement.Models.Worker.Build", "Build")
.WithMany("Components")
.HasForeignKey("BuildId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
- b.HasOne("HardwareShopDatabaseImplement.Models.Component", "Component")
+ b.HasOne("HardwareShopDatabaseImplement.Models.Storekeeper.Component", "Component")
.WithMany()
.HasForeignKey("ComponentId")
.OnDelete(DeleteBehavior.Cascade)
@@ -254,37 +251,15 @@ namespace HardwareShopDatabaseImplement.Migrations
b.Navigation("Component");
});
- modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Comment", b =>
+ modelBuilder.Entity("HardwareShopDatabaseImplement.Models.ManyToMany.PurchaseBuild", b =>
{
- b.HasOne("HardwareShopDatabaseImplement.Models.Build", "Build")
- .WithMany()
- .HasForeignKey("BuildId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
-
- b.Navigation("Build");
- });
-
- modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Purchase", b =>
- {
- b.HasOne("HardwareShopDatabaseImplement.Models.User", "User")
- .WithMany()
- .HasForeignKey("UserId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
-
- b.Navigation("User");
- });
-
- modelBuilder.Entity("HardwareShopDatabaseImplement.Models.PurchaseBuild", b =>
- {
- b.HasOne("HardwareShopDatabaseImplement.Models.Build", "Build")
+ b.HasOne("HardwareShopDatabaseImplement.Models.Worker.Build", "Build")
.WithMany("Purchases")
.HasForeignKey("BuildId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
- b.HasOne("HardwareShopDatabaseImplement.Models.Purchase", "Purchase")
+ b.HasOne("HardwareShopDatabaseImplement.Models.Worker.Purchase", "Purchase")
.WithMany("Builds")
.HasForeignKey("PurchaseId")
.OnDelete(DeleteBehavior.Cascade)
@@ -295,15 +270,15 @@ namespace HardwareShopDatabaseImplement.Migrations
b.Navigation("Purchase");
});
- modelBuilder.Entity("HardwareShopDatabaseImplement.Models.PurchaseGood", b =>
+ modelBuilder.Entity("HardwareShopDatabaseImplement.Models.ManyToMany.PurchaseGood", b =>
{
- b.HasOne("HardwareShopDatabaseImplement.Models.Good", "Good")
+ b.HasOne("HardwareShopDatabaseImplement.Models.Storekeeper.Good", "Good")
.WithMany()
.HasForeignKey("GoodId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
- b.HasOne("HardwareShopDatabaseImplement.Models.Purchase", "Purchase")
+ b.HasOne("HardwareShopDatabaseImplement.Models.Worker.Purchase", "Purchase")
.WithMany("Goods")
.HasForeignKey("PurchaseId")
.OnDelete(DeleteBehavior.Cascade)
@@ -314,14 +289,82 @@ namespace HardwareShopDatabaseImplement.Migrations
b.Navigation("Purchase");
});
- modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Build", b =>
+ modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Storekeeper.Component", b =>
{
+ b.HasOne("HardwareShopDatabaseImplement.Models.User", "User")
+ .WithMany()
+ .HasForeignKey("UserId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("User");
+ });
+
+ modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Storekeeper.Good", b =>
+ {
+ b.HasOne("HardwareShopDatabaseImplement.Models.User", "User")
+ .WithMany()
+ .HasForeignKey("UserId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("User");
+ });
+
+ modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Storekeeper.Order", b =>
+ {
+ b.HasOne("HardwareShopDatabaseImplement.Models.User", "User")
+ .WithMany()
+ .HasForeignKey("UserId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("User");
+ });
+
+ modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Worker.Build", b =>
+ {
+ b.HasOne("HardwareShopDatabaseImplement.Models.User", "User")
+ .WithMany()
+ .HasForeignKey("UserId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("User");
+ });
+
+ modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Worker.Comment", b =>
+ {
+ b.HasOne("HardwareShopDatabaseImplement.Models.Worker.Build", "Build")
+ .WithMany("Comments")
+ .HasForeignKey("BuildId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("Build");
+ });
+
+ modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Worker.Purchase", b =>
+ {
+ b.HasOne("HardwareShopDatabaseImplement.Models.User", "User")
+ .WithMany()
+ .HasForeignKey("UserId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("User");
+ });
+
+ modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Worker.Build", b =>
+ {
+ b.Navigation("Comments");
+
b.Navigation("Components");
b.Navigation("Purchases");
});
- modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Purchase", b =>
+ modelBuilder.Entity("HardwareShopDatabaseImplement.Models.Worker.Purchase", b =>
{
b.Navigation("Builds");
diff --git a/HardwareShop/HardwareShopDatabaseImplement/Models/ModelsManyToMany/BuildComponent.cs b/HardwareShop/HardwareShopDatabaseImplement/Models/ManyToMany/BuildComponent.cs
similarity index 74%
rename from HardwareShop/HardwareShopDatabaseImplement/Models/ModelsManyToMany/BuildComponent.cs
rename to HardwareShop/HardwareShopDatabaseImplement/Models/ManyToMany/BuildComponent.cs
index 3c28cd6..371fc69 100644
--- a/HardwareShop/HardwareShopDatabaseImplement/Models/ModelsManyToMany/BuildComponent.cs
+++ b/HardwareShop/HardwareShopDatabaseImplement/Models/ManyToMany/BuildComponent.cs
@@ -1,13 +1,14 @@
-using System;
+using HardwareShopDatabaseImplement.Models.Storekeeper;
+using HardwareShopDatabaseImplement.Models.Worker;
+using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-using HardwareShopDatabaseImplement.Models.ModelsStorekeeper;
-namespace HardwareShopDatabaseImplement.Models.ModelsManyToMany
+namespace HardwareShopDatabaseImplement.Models.ManyToMany
{
public class BuildComponent
{
diff --git a/HardwareShop/HardwareShopDatabaseImplement/Models/ModelsManyToMany/PurchaseBuild.cs b/HardwareShop/HardwareShopDatabaseImplement/Models/ManyToMany/PurchaseBuild.cs
similarity index 80%
rename from HardwareShop/HardwareShopDatabaseImplement/Models/ModelsManyToMany/PurchaseBuild.cs
rename to HardwareShop/HardwareShopDatabaseImplement/Models/ManyToMany/PurchaseBuild.cs
index 6fd3692..248b4be 100644
--- a/HardwareShop/HardwareShopDatabaseImplement/Models/ModelsManyToMany/PurchaseBuild.cs
+++ b/HardwareShop/HardwareShopDatabaseImplement/Models/ManyToMany/PurchaseBuild.cs
@@ -1,4 +1,5 @@
-using System;
+using HardwareShopDatabaseImplement.Models.Worker;
+using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
@@ -6,7 +7,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace HardwareShopDatabaseImplement.Models.ModelsManyToMany
+namespace HardwareShopDatabaseImplement.Models.ManyToMany
{
public class PurchaseBuild
{
diff --git a/HardwareShop/HardwareShopDatabaseImplement/Models/ModelsManyToMany/PurchaseGood.cs b/HardwareShop/HardwareShopDatabaseImplement/Models/ManyToMany/PurchaseGood.cs
similarity index 73%
rename from HardwareShop/HardwareShopDatabaseImplement/Models/ModelsManyToMany/PurchaseGood.cs
rename to HardwareShop/HardwareShopDatabaseImplement/Models/ManyToMany/PurchaseGood.cs
index 6cb8aaf..dd11b99 100644
--- a/HardwareShop/HardwareShopDatabaseImplement/Models/ModelsManyToMany/PurchaseGood.cs
+++ b/HardwareShop/HardwareShopDatabaseImplement/Models/ManyToMany/PurchaseGood.cs
@@ -1,13 +1,14 @@
-using System;
+using HardwareShopDatabaseImplement.Models.Storekeeper;
+using HardwareShopDatabaseImplement.Models.Worker;
+using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-using HardwareShopDatabaseImplement.Models.ModelsStorekeeper;
-namespace HardwareShopDatabaseImplement.Models.ModelsManyToMany
+namespace HardwareShopDatabaseImplement.Models.ManyToMany
{
public class PurchaseGood
{
diff --git a/HardwareShop/HardwareShopDatabaseImplement/Models/ModelsStorekeeper/Component.cs b/HardwareShop/HardwareShopDatabaseImplement/Models/Storekeeper/Component.cs
similarity index 82%
rename from HardwareShop/HardwareShopDatabaseImplement/Models/ModelsStorekeeper/Component.cs
rename to HardwareShop/HardwareShopDatabaseImplement/Models/Storekeeper/Component.cs
index 10cdb6b..e930ffc 100644
--- a/HardwareShop/HardwareShopDatabaseImplement/Models/ModelsStorekeeper/Component.cs
+++ b/HardwareShop/HardwareShopDatabaseImplement/Models/Storekeeper/Component.cs
@@ -5,7 +5,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace HardwareShopDatabaseImplement.Models.ModelsStorekeeper
+namespace HardwareShopDatabaseImplement.Models.Storekeeper
{
public class Component : IComponentModel
{
diff --git a/HardwareShop/HardwareShopDatabaseImplement/Models/ModelsStorekeeper/Good.cs b/HardwareShop/HardwareShopDatabaseImplement/Models/Storekeeper/Good.cs
similarity index 83%
rename from HardwareShop/HardwareShopDatabaseImplement/Models/ModelsStorekeeper/Good.cs
rename to HardwareShop/HardwareShopDatabaseImplement/Models/Storekeeper/Good.cs
index 2d6ee18..2f95404 100644
--- a/HardwareShop/HardwareShopDatabaseImplement/Models/ModelsStorekeeper/Good.cs
+++ b/HardwareShop/HardwareShopDatabaseImplement/Models/Storekeeper/Good.cs
@@ -6,7 +6,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace HardwareShopDatabaseImplement.Models.ModelsStorekeeper
+namespace HardwareShopDatabaseImplement.Models.Storekeeper
{
public class Good : IGoodModel
{
diff --git a/HardwareShop/HardwareShopDatabaseImplement/Models/ModelsStorekeeper/Order.cs b/HardwareShop/HardwareShopDatabaseImplement/Models/Storekeeper/Order.cs
similarity index 81%
rename from HardwareShop/HardwareShopDatabaseImplement/Models/ModelsStorekeeper/Order.cs
rename to HardwareShop/HardwareShopDatabaseImplement/Models/Storekeeper/Order.cs
index 48946a8..2d35035 100644
--- a/HardwareShop/HardwareShopDatabaseImplement/Models/ModelsStorekeeper/Order.cs
+++ b/HardwareShop/HardwareShopDatabaseImplement/Models/Storekeeper/Order.cs
@@ -2,7 +2,7 @@
using HardwareShopDataModels.Models;
using HardwareShopDataModels.Models;
using System.ComponentModel;
-namespace HardwareShopDatabaseImplement.Models.ModelsStorekeeper
+namespace HardwareShopDatabaseImplement.Models.Storekeeper
{
public class Order : IOrderModel
{
diff --git a/HardwareShop/HardwareShopDatabaseImplement/Models/ModelsWorker/Build.cs b/HardwareShop/HardwareShopDatabaseImplement/Models/Worker/Build.cs
similarity index 93%
rename from HardwareShop/HardwareShopDatabaseImplement/Models/ModelsWorker/Build.cs
rename to HardwareShop/HardwareShopDatabaseImplement/Models/Worker/Build.cs
index 206657d..45e3ac5 100644
--- a/HardwareShop/HardwareShopDatabaseImplement/Models/ModelsWorker/Build.cs
+++ b/HardwareShop/HardwareShopDatabaseImplement/Models/Worker/Build.cs
@@ -1,11 +1,11 @@
using HardwareShopContracts.BindingModels;
using HardwareShopContracts.ViewModels;
-using HardwareShopDatabaseImplement.Models.ModelsManyToMany;
+using HardwareShopDatabaseImplement.Models.ManyToMany;
using HardwareShopDataModels.Models;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
-namespace HardwareShopDatabaseImplement.Models.ModelsWorker
+namespace HardwareShopDatabaseImplement.Models.Worker
{
public class Build : IBuildModel
{
@@ -18,7 +18,7 @@ namespace HardwareShopDatabaseImplement.Models.ModelsWorker
public string BuildName { get; set; } = string.Empty;
[Required]
- public int UserID { get; set; }
+ public int UserId { get; set; }
public virtual User User { get; set; }
@@ -55,7 +55,7 @@ namespace HardwareShopDatabaseImplement.Models.ModelsWorker
Id = model.Id,
Price = model.Price,
BuildName = model.BuildName,
- UserID = model.UserID,
+ UserId = model.UserId,
Components = model.BuildComponents.Select(x => new BuildComponent
{
Component = context.Components.First(y => y.Id == x.Key),
@@ -76,13 +76,13 @@ namespace HardwareShopDatabaseImplement.Models.ModelsWorker
BuildName = BuildName,
Price = Price,
UserEmail = User.Email,
- UserID = UserID,
+ UserId = UserId,
BuildComponents = BuildComponents
};
public void UpdateComponents(HardwareShopDatabase context, BuildBindingModel model)
{
- var buildComponents = context.BuildsComponents.Where(rec => rec.BuildID == model.Id).ToList();
+ var buildComponents = context.BuildsComponents.Where(rec => rec.BuildId == model.Id).ToList();
if (buildComponents != null && buildComponents.Count > 0)
{ // удалили те в бд, которых нет в модели
context.BuildsComponents.RemoveRange(buildComponents.Where(rec => !model.BuildComponents.ContainsKey(rec.ComponentId)));
diff --git a/HardwareShop/HardwareShopDatabaseImplement/Models/ModelsWorker/Comment.cs b/HardwareShop/HardwareShopDatabaseImplement/Models/Worker/Comment.cs
similarity index 86%
rename from HardwareShop/HardwareShopDatabaseImplement/Models/ModelsWorker/Comment.cs
rename to HardwareShop/HardwareShopDatabaseImplement/Models/Worker/Comment.cs
index 36bbe96..5306cbc 100644
--- a/HardwareShop/HardwareShopDatabaseImplement/Models/ModelsWorker/Comment.cs
+++ b/HardwareShop/HardwareShopDatabaseImplement/Models/Worker/Comment.cs
@@ -4,7 +4,7 @@ using HardwareShopDataModels.Models;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
-namespace HardwareShopDatabaseImplement.Models.ModelsWorker
+namespace HardwareShopDatabaseImplement.Models.Worker
{
public class Comment : ICommentModel
{
@@ -14,7 +14,7 @@ namespace HardwareShopDatabaseImplement.Models.ModelsWorker
public string Text { get; set; } = string.Empty;
[Required]
- public int BuildID { get; set; }
+ public int BuildId { get; set; }
public virtual Build Build { get; set; }
@@ -28,7 +28,7 @@ namespace HardwareShopDatabaseImplement.Models.ModelsWorker
{
Id = model.Id,
Text = model.Text,
- BuildID = model.BuildID
+ BuildId = model.BuildId
};
}
public void Update(CommentBindingModel? model)
@@ -43,7 +43,7 @@ namespace HardwareShopDatabaseImplement.Models.ModelsWorker
{
Id = Id,
Text = Text,
- BuildID = BuildID,
+ BuildId = BuildId,
BuildName = Build.BuildName
};
}
diff --git a/HardwareShop/HardwareShopDatabaseImplement/Models/ModelsWorker/Purchase.cs b/HardwareShop/HardwareShopDatabaseImplement/Models/Worker/Purchase.cs
similarity index 88%
rename from HardwareShop/HardwareShopDatabaseImplement/Models/ModelsWorker/Purchase.cs
rename to HardwareShop/HardwareShopDatabaseImplement/Models/Worker/Purchase.cs
index 6263bcb..7fd502c 100644
--- a/HardwareShop/HardwareShopDatabaseImplement/Models/ModelsWorker/Purchase.cs
+++ b/HardwareShop/HardwareShopDatabaseImplement/Models/Worker/Purchase.cs
@@ -1,12 +1,12 @@
using HardwareShopContracts.BindingModels;
using HardwareShopContracts.ViewModels;
-using HardwareShopDatabaseImplement.Models.ModelsManyToMany;
+using HardwareShopDatabaseImplement.Models.ManyToMany;
using HardwareShopDataModels.Enums;
using HardwareShopDataModels.Models;
using System.ComponentModel.DataAnnotations.Schema;
using System.Diagnostics;
-namespace HardwareShopDatabaseImplement.Models.ModelsWorker
+namespace HardwareShopDatabaseImplement.Models.Worker
{
public class Purchase : IPurchaseModel
{
@@ -18,7 +18,7 @@ namespace HardwareShopDatabaseImplement.Models.ModelsWorker
public DateTime? DatePurchase { get; set; }
- public int UserID { get; set; }
+ public int UserId { get; set; }
public virtual User User { get; set; }
@@ -34,7 +34,7 @@ namespace HardwareShopDatabaseImplement.Models.ModelsWorker
{
if (_purchaseBuilds == null)
{
- _purchaseBuilds = Builds.ToDictionary(recPB => recPB.BuildID, recPB => (recPB.Build as IBuildModel, recPB.Count));
+ _purchaseBuilds = Builds.ToDictionary(recPB => recPB.BuildId, recPB => (recPB.Build as IBuildModel, recPB.Count));
}
return _purchaseBuilds;
}
@@ -51,7 +51,7 @@ namespace HardwareShopDatabaseImplement.Models.ModelsWorker
{
if (_purchaseGoods == null)
{
- _purchaseGoods = Goods.ToDictionary(recPG => recPG.GoodID, recPG => (recPG.Good as IGoodModel, recPG.Count));
+ _purchaseGoods = Goods.ToDictionary(recPG => recPG.GoodId, recPG => (recPG.Good as IGoodModel, recPG.Count));
}
return _purchaseGoods;
}
@@ -65,7 +65,7 @@ namespace HardwareShopDatabaseImplement.Models.ModelsWorker
Sum = model.Sum,
PurchaseStatus = model.PurchaseStatus,
DatePurchase = model.DatePurchase,
- UserID = model.UserID,
+ UserId = model.UserId,
Builds = model.PurchaseBuilds.Select(x => new PurchaseBuild
{
Build = context.Builds.First(y => y.Id == x.Key),
@@ -91,7 +91,7 @@ namespace HardwareShopDatabaseImplement.Models.ModelsWorker
Sum = Sum,
PurchaseStatus = PurchaseStatus,
DatePurchase = DatePurchase,
- UserID = UserID,
+ UserId = UserId,
UserEmail = User.Email,
PurchaseBuilds = PurchaseBuilds,
PurchaseGoods = PurchaseGoods
@@ -99,15 +99,15 @@ namespace HardwareShopDatabaseImplement.Models.ModelsWorker
public void UpdateBuilds(HardwareShopDatabase context, PurchaseBindingModel model)
{
- var purchaseBuilds = context.PurchasesBuilds.Where(rec => rec.PurchaseID == model.Id).ToList();
+ var purchaseBuilds = context.PurchasesBuilds.Where(rec => rec.PurchaseId == model.Id).ToList();
if (purchaseBuilds != null && purchaseBuilds.Count > 0)
{
- context.PurchasesBuilds.RemoveRange(purchaseBuilds.Where(rec => !model.PurchaseBuilds.ContainsKey(rec.BuildID)));
+ context.PurchasesBuilds.RemoveRange(purchaseBuilds.Where(rec => !model.PurchaseBuilds.ContainsKey(rec.BuildId)));
context.SaveChanges();
foreach (var updateBuild in purchaseBuilds)
{
- updateBuild.Count = model.PurchaseBuilds[updateBuild.BuildID].Item2;
- model.PurchaseBuilds.Remove(updateBuild.BuildID);
+ updateBuild.Count = model.PurchaseBuilds[updateBuild.BuildId].Item2;
+ model.PurchaseBuilds.Remove(updateBuild.BuildId);
}
context.SaveChanges();
}
@@ -127,16 +127,16 @@ namespace HardwareShopDatabaseImplement.Models.ModelsWorker
public void UpdateGoods(HardwareShopDatabase context, PurchaseBindingModel model)
{
- var purchaseGoods = context.PurchasesGoods.Where(rec => rec.PurchaseID == model.Id).ToList();
+ var purchaseGoods = context.PurchasesGoods.Where(rec => rec.PurchaseId == model.Id).ToList();
if (purchaseGoods != null && purchaseGoods.Count > 0)
{ // удалили те в бд, которых нет в модели
- context.PurchasesGoods.RemoveRange(purchaseGoods.Where(rec => !model.PurchaseGoods.ContainsKey(rec.GoodID)));
+ context.PurchasesGoods.RemoveRange(purchaseGoods.Where(rec => !model.PurchaseGoods.ContainsKey(rec.GoodId)));
context.SaveChanges();
// обновили количество у существующих записей
foreach (var updateGood in purchaseGoods)
{
- updateGood.Count = model.PurchaseGoods[updateGood.GoodID].Item2;
- model.PurchaseGoods.Remove(updateGood.GoodID);
+ updateGood.Count = model.PurchaseGoods[updateGood.GoodId].Item2;
+ model.PurchaseGoods.Remove(updateGood.GoodId);
}
context.SaveChanges();
}