This commit is contained in:
Николай 2023-04-01 16:34:06 +04:00
parent 98151dc393
commit bda574f0fe
16 changed files with 74 additions and 74 deletions

View File

@ -11,7 +11,7 @@ namespace HardwareShopContracts.BindingModels
public string BuildName { get; set; } = string.Empty;
public int UserID { get; set; }
public int UserId { get; set; }
public Dictionary<int, (IComponentModel, int)>? BuildComponents { get; set; }
}

View File

@ -10,6 +10,6 @@ namespace HardwareShopContracts.BindingModels
public string Text { get; set; } = string.Empty;
public int BuildID { get; set; }
public int BuildId { get; set; }
}
}

View File

@ -14,7 +14,7 @@ namespace HardwareShopContracts.BindingModels
public DateTime? DatePurchase { get; set; }
public int UserID { get; set; }
public int UserId { get; set; }
public Dictionary<int, (IBuildModel, int)>? PurchaseBuilds { get; set; }

View File

@ -15,7 +15,7 @@ namespace HardwareShopContracts.ViewModels
[DisplayName("Клиент")]
public string UserEmail { get; set; } = string.Empty;
public int UserID { get; set; }
public int UserId { get; set; }
public Dictionary<int, (IComponentModel, int)>? BuildComponents { get; set; }
}

View File

@ -13,6 +13,6 @@ namespace HardwareShopContracts.ViewModels
[DisplayName("Название сборки")]
public string BuildName { get; set; } = string.Empty;
public int BuildID { get; set; }
public int BuildId { get; set; }
}
}

View File

@ -16,7 +16,7 @@ namespace HardwareShopContracts.ViewModels
[DisplayName("Дата оплаты")]
public DateTime? DatePurchase { get; set; }
public int UserID { get; set; }
public int UserId { get; set; }
[DisplayName("Email клиента")]
public string UserEmail { get; set; } = string.Empty;

View File

@ -13,7 +13,7 @@ namespace HardwareShopDataModels.Models
string BuildName { get; }
int UserID { get; }
int UserId { get; }
Dictionary<int, (IComponentModel, int)>? BuildComponents { get; }
}

View File

@ -10,6 +10,6 @@ namespace HardwareShopDataModels.Models
{
string Text { get; }
int BuildID { get; }
int BuildId { get; }
}
}

View File

@ -11,7 +11,7 @@ namespace HardwareShopDataModels.Models
//через "?" обозначается что поле может быть null
DateTime? DatePurchase { get; }
int UserID { get; }
int UserId { get; }
Dictionary<int, (IBuildModel, int)>? PurchaseBuilds { get; }

View File

@ -18,9 +18,9 @@ namespace HardwareShopDatabaseImplement
protected override void OnModelCreating(ModelBuilder modelBuilder)
{
modelBuilder.Entity<BuildComponent>().HasKey(x => new { x.ComponentId, x.BuildID });
modelBuilder.Entity<PurchaseBuild>().HasKey(x => new { x.PurchaseID, x.BuildID });
modelBuilder.Entity<PurchaseGood>().HasKey(x => new { x.PurchaseID, x.GoodID });
modelBuilder.Entity<BuildComponent>().HasKey(x => new { x.ComponentId, x.BuildId });
modelBuilder.Entity<PurchaseBuild>().HasKey(x => new { x.PurchaseId, x.BuildId });
modelBuilder.Entity<PurchaseGood>().HasKey(x => new { x.PurchaseId, x.GoodId });
}
public virtual DbSet<Build> Builds { set; get; }

View File

@ -40,7 +40,7 @@ namespace HardwareShopDatabaseImplement.Migrations
b.Property<decimal>("Price")
.HasColumnType("decimal(18,2)");
b.Property<int>("UserID")
b.Property<int>("UserId")
.HasColumnType("int");
b.HasKey("Id");
@ -53,7 +53,7 @@ namespace HardwareShopDatabaseImplement.Migrations
b.Property<int>("ComponentId")
.HasColumnType("int");
b.Property<int>("BuildID")
b.Property<int>("BuildId")
.HasColumnType("int");
b.Property<int>("BuildId")
@ -62,7 +62,7 @@ namespace HardwareShopDatabaseImplement.Migrations
b.Property<int>("Count")
.HasColumnType("int");
b.HasKey("ComponentId", "BuildID");
b.HasKey("ComponentId", "BuildId");
b.HasIndex("BuildId");
@ -77,7 +77,7 @@ namespace HardwareShopDatabaseImplement.Migrations
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
b.Property<int>("BuildID")
b.Property<int>("BuildId")
.HasColumnType("int");
b.Property<string>("BuildName")
@ -90,7 +90,7 @@ namespace HardwareShopDatabaseImplement.Migrations
b.HasKey("Id");
b.HasIndex("BuildID");
b.HasIndex("BuildId");
b.ToTable("Comments");
});
@ -151,22 +151,22 @@ namespace HardwareShopDatabaseImplement.Migrations
b.Property<decimal>("Sum")
.HasColumnType("decimal(18,2)");
b.Property<int>("UserID")
b.Property<int>("UserId")
.HasColumnType("int");
b.HasKey("Id");
b.HasIndex("UserID");
b.HasIndex("UserId");
b.ToTable("Purchase");
});
modelBuilder.Entity("HardwareShopDatabaseImplement.Models.PurchaseBuild", b =>
{
b.Property<int>("PurchaseID")
b.Property<int>("PurchaseId")
.HasColumnType("int");
b.Property<int>("BuildID")
b.Property<int>("BuildId")
.HasColumnType("int");
b.Property<int>("BuildId")
@ -178,7 +178,7 @@ namespace HardwareShopDatabaseImplement.Migrations
b.Property<int>("PurchaseId")
.HasColumnType("int");
b.HasKey("PurchaseID", "BuildID");
b.HasKey("PurchaseId", "BuildId");
b.HasIndex("BuildId");
@ -189,10 +189,10 @@ namespace HardwareShopDatabaseImplement.Migrations
modelBuilder.Entity("HardwareShopDatabaseImplement.Models.PurchaseGood", b =>
{
b.Property<int>("PurchaseID")
b.Property<int>("PurchaseId")
.HasColumnType("int");
b.Property<int>("GoodID")
b.Property<int>("GoodId")
.HasColumnType("int");
b.Property<int>("Count")
@ -201,9 +201,9 @@ namespace HardwareShopDatabaseImplement.Migrations
b.Property<int>("PurchaseId")
.HasColumnType("int");
b.HasKey("PurchaseID", "GoodID");
b.HasKey("PurchaseId", "GoodId");
b.HasIndex("GoodID");
b.HasIndex("GoodId");
b.HasIndex("PurchaseId");
@ -261,7 +261,7 @@ namespace HardwareShopDatabaseImplement.Migrations
{
b.HasOne("HardwareShopDatabaseImplement.Models.Build", "Build")
.WithMany()
.HasForeignKey("BuildID")
.HasForeignKey("BuildId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
@ -272,7 +272,7 @@ namespace HardwareShopDatabaseImplement.Migrations
{
b.HasOne("HardwareShopDatabaseImplement.Models.User", "User")
.WithMany()
.HasForeignKey("UserID")
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
@ -302,7 +302,7 @@ namespace HardwareShopDatabaseImplement.Migrations
{
b.HasOne("HardwareShopDatabaseImplement.Models.Good", "Good")
.WithMany()
.HasForeignKey("GoodID")
.HasForeignKey("GoodId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();

View File

@ -19,7 +19,7 @@ namespace HardwareShopDatabaseImplement.Migrations
.Annotation("SqlServer:Identity", "1, 1"),
Price = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
BuildName = table.Column<string>(type: "nvarchar(max)", nullable: false),
UserID = table.Column<int>(type: "int", nullable: false)
UserId = table.Column<int>(type: "int", nullable: false)
},
constraints: table =>
{
@ -86,14 +86,14 @@ namespace HardwareShopDatabaseImplement.Migrations
.Annotation("SqlServer:Identity", "1, 1"),
Text = table.Column<string>(type: "nvarchar(max)", nullable: false),
BuildName = table.Column<string>(type: "nvarchar(max)", nullable: false),
BuildID = table.Column<int>(type: "int", nullable: false)
BuildId = table.Column<int>(type: "int", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_Comments", x => x.Id);
table.ForeignKey(
name: "FK_Comments_Builds_BuildID",
column: x => x.BuildID,
name: "FK_Comments_Builds_BuildId",
column: x => x.BuildId,
principalTable: "Builds",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
@ -103,14 +103,14 @@ namespace HardwareShopDatabaseImplement.Migrations
name: "BuildComponent",
columns: table => new
{
BuildID = table.Column<int>(type: "int", nullable: false),
BuildId = table.Column<int>(type: "int", nullable: false),
ComponentId = table.Column<int>(type: "int", nullable: false),
Count = table.Column<int>(type: "int", nullable: false),
BuildId = table.Column<int>(type: "int", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_BuildComponent", x => new { x.ComponentId, x.BuildID });
table.PrimaryKey("PK_BuildComponent", x => new { x.ComponentId, x.BuildId });
table.ForeignKey(
name: "FK_BuildComponent_Builds_BuildId",
column: x => x.BuildId,
@ -134,14 +134,14 @@ namespace HardwareShopDatabaseImplement.Migrations
Sum = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
PurchaseStatus = table.Column<int>(type: "int", nullable: false),
DatePurchase = table.Column<DateTime>(type: "datetime2", nullable: true),
UserID = table.Column<int>(type: "int", nullable: false)
UserId = table.Column<int>(type: "int", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_Purchase", x => x.Id);
table.ForeignKey(
name: "FK_Purchase_Users_UserID",
column: x => x.UserID,
name: "FK_Purchase_Users_UserId",
column: x => x.UserId,
principalTable: "Users",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
@ -151,15 +151,15 @@ namespace HardwareShopDatabaseImplement.Migrations
name: "PurchasesBuilds",
columns: table => new
{
BuildID = table.Column<int>(type: "int", nullable: false),
PurchaseID = table.Column<int>(type: "int", nullable: false),
BuildId = table.Column<int>(type: "int", nullable: false),
PurchaseId = table.Column<int>(type: "int", nullable: false),
Count = table.Column<int>(type: "int", nullable: false),
BuildId = table.Column<int>(type: "int", nullable: false),
PurchaseId = table.Column<int>(type: "int", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_PurchasesBuilds", x => new { x.PurchaseID, x.BuildID });
table.PrimaryKey("PK_PurchasesBuilds", x => new { x.PurchaseId, x.BuildId });
table.ForeignKey(
name: "FK_PurchasesBuilds_Builds_BuildId",
column: x => x.BuildId,
@ -178,17 +178,17 @@ namespace HardwareShopDatabaseImplement.Migrations
name: "PurchasesGoods",
columns: table => new
{
PurchaseID = table.Column<int>(type: "int", nullable: false),
GoodID = table.Column<int>(type: "int", nullable: false),
PurchaseId = table.Column<int>(type: "int", nullable: false),
GoodId = table.Column<int>(type: "int", nullable: false),
Count = table.Column<int>(type: "int", nullable: false),
PurchaseId = table.Column<int>(type: "int", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_PurchasesGoods", x => new { x.PurchaseID, x.GoodID });
table.PrimaryKey("PK_PurchasesGoods", x => new { x.PurchaseId, x.GoodId });
table.ForeignKey(
name: "FK_PurchasesGoods_Goods_GoodID",
column: x => x.GoodID,
name: "FK_PurchasesGoods_Goods_GoodId",
column: x => x.GoodId,
principalTable: "Goods",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
@ -206,14 +206,14 @@ namespace HardwareShopDatabaseImplement.Migrations
column: "BuildId");
migrationBuilder.CreateIndex(
name: "IX_Comments_BuildID",
name: "IX_Comments_BuildId",
table: "Comments",
column: "BuildID");
column: "BuildId");
migrationBuilder.CreateIndex(
name: "IX_Purchase_UserID",
name: "IX_Purchase_UserId",
table: "Purchase",
column: "UserID");
column: "UserId");
migrationBuilder.CreateIndex(
name: "IX_PurchasesBuilds_BuildId",
@ -226,9 +226,9 @@ namespace HardwareShopDatabaseImplement.Migrations
column: "PurchaseId");
migrationBuilder.CreateIndex(
name: "IX_PurchasesGoods_GoodID",
name: "IX_PurchasesGoods_GoodId",
table: "PurchasesGoods",
column: "GoodID");
column: "GoodId");
migrationBuilder.CreateIndex(
name: "IX_PurchasesGoods_PurchaseId",

View File

@ -37,7 +37,7 @@ namespace HardwareShopDatabaseImplement.Migrations
b.Property<decimal>("Price")
.HasColumnType("decimal(18,2)");
b.Property<int>("UserID")
b.Property<int>("UserId")
.HasColumnType("int");
b.HasKey("Id");
@ -50,7 +50,7 @@ namespace HardwareShopDatabaseImplement.Migrations
b.Property<int>("ComponentId")
.HasColumnType("int");
b.Property<int>("BuildID")
b.Property<int>("BuildId")
.HasColumnType("int");
b.Property<int>("BuildId")
@ -59,7 +59,7 @@ namespace HardwareShopDatabaseImplement.Migrations
b.Property<int>("Count")
.HasColumnType("int");
b.HasKey("ComponentId", "BuildID");
b.HasKey("ComponentId", "BuildId");
b.HasIndex("BuildId");
@ -74,7 +74,7 @@ namespace HardwareShopDatabaseImplement.Migrations
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
b.Property<int>("BuildID")
b.Property<int>("BuildId")
.HasColumnType("int");
b.Property<string>("BuildName")
@ -87,7 +87,7 @@ namespace HardwareShopDatabaseImplement.Migrations
b.HasKey("Id");
b.HasIndex("BuildID");
b.HasIndex("BuildId");
b.ToTable("Comments");
});
@ -148,22 +148,22 @@ namespace HardwareShopDatabaseImplement.Migrations
b.Property<decimal>("Sum")
.HasColumnType("decimal(18,2)");
b.Property<int>("UserID")
b.Property<int>("UserId")
.HasColumnType("int");
b.HasKey("Id");
b.HasIndex("UserID");
b.HasIndex("UserId");
b.ToTable("Purchase");
});
modelBuilder.Entity("HardwareShopDatabaseImplement.Models.PurchaseBuild", b =>
{
b.Property<int>("PurchaseID")
b.Property<int>("PurchaseId")
.HasColumnType("int");
b.Property<int>("BuildID")
b.Property<int>("BuildId")
.HasColumnType("int");
b.Property<int>("BuildId")
@ -175,7 +175,7 @@ namespace HardwareShopDatabaseImplement.Migrations
b.Property<int>("PurchaseId")
.HasColumnType("int");
b.HasKey("PurchaseID", "BuildID");
b.HasKey("PurchaseId", "BuildId");
b.HasIndex("BuildId");
@ -186,10 +186,10 @@ namespace HardwareShopDatabaseImplement.Migrations
modelBuilder.Entity("HardwareShopDatabaseImplement.Models.PurchaseGood", b =>
{
b.Property<int>("PurchaseID")
b.Property<int>("PurchaseId")
.HasColumnType("int");
b.Property<int>("GoodID")
b.Property<int>("GoodId")
.HasColumnType("int");
b.Property<int>("Count")
@ -198,9 +198,9 @@ namespace HardwareShopDatabaseImplement.Migrations
b.Property<int>("PurchaseId")
.HasColumnType("int");
b.HasKey("PurchaseID", "GoodID");
b.HasKey("PurchaseId", "GoodId");
b.HasIndex("GoodID");
b.HasIndex("GoodId");
b.HasIndex("PurchaseId");
@ -258,7 +258,7 @@ namespace HardwareShopDatabaseImplement.Migrations
{
b.HasOne("HardwareShopDatabaseImplement.Models.Build", "Build")
.WithMany()
.HasForeignKey("BuildID")
.HasForeignKey("BuildId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
@ -269,7 +269,7 @@ namespace HardwareShopDatabaseImplement.Migrations
{
b.HasOne("HardwareShopDatabaseImplement.Models.User", "User")
.WithMany()
.HasForeignKey("UserID")
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
@ -299,7 +299,7 @@ namespace HardwareShopDatabaseImplement.Migrations
{
b.HasOne("HardwareShopDatabaseImplement.Models.Good", "Good")
.WithMany()
.HasForeignKey("GoodID")
.HasForeignKey("GoodId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();

View File

@ -12,7 +12,7 @@ namespace HardwareShopDatabaseImplement.Models.ModelsManyToMany
public class BuildComponent
{
public int BuildID { get; set; }
public int BuildId { get; set; }
public int ComponentId { get; set; }

View File

@ -11,9 +11,9 @@ namespace HardwareShopDatabaseImplement.Models.ModelsManyToMany
public class PurchaseBuild
{
public int BuildID { get; set; }
public int BuildId { get; set; }
public int PurchaseID { get; set; }
public int PurchaseId { get; set; }
[Required]
public int Count { get; set; }

View File

@ -12,9 +12,9 @@ namespace HardwareShopDatabaseImplement.Models.ModelsManyToMany
public class PurchaseGood
{
public int PurchaseID { get; set; }
public int PurchaseId { get; set; }
public int GoodID { get; set; }
public int GoodId { get; set; }
[Required]
public int Count { get; set; }