mikhail/parr_api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(api): TemplateController адаптировал метод getAll под новую структуру

Browse Source
This commit is contained in:
Mikhail Trubnikov
2023-10-06 15:13:40 +10:00
parent f2329e9367
commit 7e55659a7c
11 changed files with 2066 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1934
PARR.DAL/Migrations/20231006044458_TblTemplatesUpd2.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

78
PARR.DAL/Migrations/20231006044458_TblTemplatesUpd2.cs Normal file
View File

@@ -0,0 +1,78 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace PARR.DAL.Migrations
{
/// <inheritdoc />
public partial class TblTemplatesUpd2 : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_Templates_RobotStatuses_RobotStatusCode",
table: "Templates");
migrationBuilder.DropForeignKey(
name: "FK_Templates_TaskStatuses_TaskStatusCode",
table: "Templates");
migrationBuilder.DropIndex(
name: "IX_Templates_RobotStatusCode",
table: "Templates");
migrationBuilder.DropIndex(
name: "IX_Templates_TaskStatusCode",
table: "Templates");
migrationBuilder.DropColumn(
name: "RobotStatusCode",
table: "Templates");
migrationBuilder.DropColumn(
name: "TaskStatusCode",
table: "Templates");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<int>(
name: "RobotStatusCode",
table: "Templates",
type: "integer",
nullable: true);
migrationBuilder.AddColumn<int>(
name: "TaskStatusCode",
table: "Templates",
type: "integer",
nullable: true);
migrationBuilder.CreateIndex(
name: "IX_Templates_RobotStatusCode",
table: "Templates",
column: "RobotStatusCode");
migrationBuilder.CreateIndex(
name: "IX_Templates_TaskStatusCode",
table: "Templates",
column: "TaskStatusCode");
migrationBuilder.AddForeignKey(
name: "FK_Templates_RobotStatuses_RobotStatusCode",
table: "Templates",
column: "RobotStatusCode",
principalTable: "RobotStatuses",
principalColumn: "Code");
migrationBuilder.AddForeignKey(
name: "FK_Templates_TaskStatuses_TaskStatusCode",
table: "Templates",
column: "TaskStatusCode",
principalTable: "TaskStatuses",
principalColumn: "Code");
}
}
}

34
PARR.DAL/Migrations/DataContextModelSnapshot.cs
View File

@@ -1100,12 +1100,6 @@ namespace PARR.DAL.Migrations
.IsRequired()
.HasColumnType("text");
b.Property<int?>("RobotStatusCode")
.HasColumnType("integer");
b.Property<int?>("TaskStatusCode")
.HasColumnType("integer");
b.HasKey("Id");
b.HasIndex("ApplicationInWorkId");
@@ -1115,10 +1109,6 @@ namespace PARR.DAL.Migrations
b.HasIndex("Name")
.IsUnique();
b.HasIndex("RobotStatusCode");
b.HasIndex("TaskStatusCode");
b.ToTable("Templates");
});
@@ -1604,13 +1594,13 @@ namespace PARR.DAL.Migrations
.IsRequired();
b.HasOne("PARR.DAL.Models.RobotStatus", "RobotStatus")
.WithMany()
.WithMany("RobotConfigurations")
.HasForeignKey("RobotStatusCode")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("PARR.DAL.Models.TaskStatus", "StatusTask")
.WithMany()
b.HasOne("PARR.DAL.Models.TaskStatus", "TaskStatus")
.WithMany("RobotConfigurations")
.HasForeignKey("TaskStatusCode")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
@@ -1625,7 +1615,7 @@ namespace PARR.DAL.Migrations
b.Navigation("RobotStatus");
b.Navigation("StatusTask");
b.Navigation("TaskStatus");
b.Navigation("Template");
});
@@ -1645,7 +1635,7 @@ namespace PARR.DAL.Migrations
.IsRequired();
b.HasOne("PARR.DAL.Models.TaskStatus", "StatusTask")
.WithMany()
.WithMany("RobotHistories")
.HasForeignKey("TaskStatusCode")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
@@ -1682,14 +1672,6 @@ namespace PARR.DAL.Migrations
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("PARR.DAL.Models.RobotStatus", null)
.WithMany("Templates")
.HasForeignKey("RobotStatusCode");
b.HasOne("PARR.DAL.Models.TaskStatus", null)
.WithMany("Templates")
.HasForeignKey("TaskStatusCode");
b.Navigation("ApplicationsInWork");
b.Navigation("Host");
@@ -1872,7 +1854,7 @@ namespace PARR.DAL.Migrations
modelBuilder.Entity("PARR.DAL.Models.RobotStatus", b =>
{
b.Navigation("Templates");
b.Navigation("RobotConfigurations");
});
modelBuilder.Entity("PARR.DAL.Models.Subprocess", b =>
@@ -1882,7 +1864,9 @@ namespace PARR.DAL.Migrations
modelBuilder.Entity("PARR.DAL.Models.TaskStatus", b =>
{
b.Navigation("Templates");
b.Navigation("RobotConfigurations");
b.Navigation("RobotHistories");
});
modelBuilder.Entity("PARR.DAL.Models.Template", b =>

2
PARR.DAL/Models/RobotConfiguration.cs
View File

@@ -51,7 +51,7 @@ namespace PARR.DAL.Models
public Robot? Robot { get; set; }
[ForeignKey(nameof(TaskStatusCode))]
public TaskStatus? StatusTask { get; set; }
public TaskStatus? TaskStatus { get; set; }
[ForeignKey(nameof(RobotStatusCode))]
public RobotStatus? RobotStatus { get; set; }

2
PARR.DAL/Models/RobotStatus.cs
View File

@@ -18,6 +18,6 @@ namespace PARR.DAL.Models
[Required]
public string Description { get; set; } = string.Empty;
public ICollection<Template> Templates { get; set; } = new HashSet<Template>();
public ICollection<RobotConfiguration> RobotConfigurations { get; set; } = new HashSet<RobotConfiguration>();
}
}

4
PARR.DAL/Models/TaskStatus.cs
View File

@@ -18,6 +18,8 @@ namespace PARR.DAL.Models
[Required]
public string Description { get; set; } = string.Empty;
public ICollection<Template> Templates { get; set; } = new HashSet<Template>();
public ICollection<RobotConfiguration> RobotConfigurations { get; set; } = new HashSet<RobotConfiguration>();
public ICollection<RobotHistory> RobotHistories { get; set; } = new HashSet<RobotHistory>();
}
}