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

feat(GeneratorTemplates): Переделал генератор шаблона под измененную таблицу Templates

Browse Source
This commit is contained in:
Mikhail Trubnikov
2023-10-03 14:56:01 +10:00
parent c32bc74a2c
commit e9b91330bf
5 changed files with 1921 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1848
PARR.DAL/Migrations/20231003044103_TblTemplateFixRobotLastStatusUpdated.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

37
PARR.DAL/Migrations/20231003044103_TblTemplateFixRobotLastStatusUpdated.cs Normal file
View File

@@ -0,0 +1,37 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace PARR.DAL.Migrations
{
/// <inheritdoc />
public partial class TblTemplateFixRobotLastStatusUpdated : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<DateTimeOffset>(
name: "RobotLastStatusUpdated",
table: "Templates",
type: "timestamp with time zone",
nullable: true,
oldClrType: typeof(DateTimeOffset),
oldType: "timestamp with time zone");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<DateTimeOffset>(
name: "RobotLastStatusUpdated",
table: "Templates",
type: "timestamp with time zone",
nullable: false,
defaultValue: new DateTimeOffset(new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), new TimeSpan(0, 0, 0, 0, 0)),
oldClrType: typeof(DateTimeOffset),
oldType: "timestamp with time zone",
oldNullable: true);
}
}
}

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

@@ -392,7 +392,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("ApplicationTypeId");
b.ToTable("Applications", (string)null);
b.ToTable("Applications");
});
modelBuilder.Entity("PARR.DAL.Models.ApplicationInHost", b =>
@@ -419,7 +419,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("HostId");
b.ToTable("ApplicationsInHost", (string)null);
b.ToTable("ApplicationsInHost");
});
modelBuilder.Entity("PARR.DAL.Models.ApplicationType", b =>
@@ -443,7 +443,7 @@ namespace PARR.DAL.Migrations
b.HasKey("Id");
b.ToTable("ApplicationTypes", (string)null);
b.ToTable("ApplicationTypes");
b.HasData(
new
@@ -510,7 +510,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("WorkId", "ApplicationId")
.IsUnique();
b.ToTable("ApplicationsInWorks", (string)null);
b.ToTable("ApplicationsInWorks");
});
modelBuilder.Entity("PARR.DAL.Models.EkStatus", b =>
@@ -527,7 +527,7 @@ namespace PARR.DAL.Migrations
b.HasKey("Code");
b.ToTable("EkStatuses", (string)null);
b.ToTable("EkStatuses");
b.HasData(
new
@@ -607,7 +607,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("ResponseAreaCode");
b.ToTable("Hosts", (string)null);
b.ToTable("Hosts");
});
modelBuilder.Entity("PARR.DAL.Models.Process", b =>
@@ -631,7 +631,7 @@ namespace PARR.DAL.Migrations
b.HasKey("Id");
b.ToTable("Processes", (string)null);
b.ToTable("Processes");
});
modelBuilder.Entity("PARR.DAL.Models.ResponseArea", b =>
@@ -648,7 +648,7 @@ namespace PARR.DAL.Migrations
b.HasKey("Code");
b.ToTable("ResponseAreas", (string)null);
b.ToTable("ResponseAreas");
b.HasData(
new
@@ -756,7 +756,7 @@ namespace PARR.DAL.Migrations
b.HasKey("Level");
b.ToTable("RobotHistoryLevels", (string)null);
b.ToTable("RobotHistoryLevels");
b.HasData(
new
@@ -809,7 +809,7 @@ namespace PARR.DAL.Migrations
b.HasKey("Code");
b.ToTable("RobotStatuses", (string)null);
b.ToTable("RobotStatuses");
b.HasData(
new
@@ -873,7 +873,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("TemplateStatusCode");
b.ToTable("RobotTemplateHistories", (string)null);
b.ToTable("RobotTemplateHistories");
});
modelBuilder.Entity("PARR.DAL.Models.Setting", b =>
@@ -891,7 +891,7 @@ namespace PARR.DAL.Migrations
b.HasKey("Name");
b.ToTable("Settings", (string)null);
b.ToTable("Settings");
b.HasData(
new
@@ -950,7 +950,7 @@ namespace PARR.DAL.Migrations
b.HasKey("Code");
b.ToTable("StatusTemplates", (string)null);
b.ToTable("StatusTemplates");
b.HasData(
new
@@ -999,7 +999,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("ProcessId");
b.ToTable("Subprocesses", (string)null);
b.ToTable("Subprocesses");
});
modelBuilder.Entity("PARR.DAL.Models.Template", b =>
@@ -1030,7 +1030,7 @@ namespace PARR.DAL.Migrations
b.Property<int>("RobotAttemptsNumber")
.HasColumnType("integer");
b.Property<DateTimeOffset>("RobotLastStatusUpdated")
b.Property<DateTimeOffset?>("RobotLastStatusUpdated")
.HasColumnType("timestamp with time zone");
b.Property<int>("RobotStatusCode")
@@ -1052,7 +1052,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("StatusCode");
b.ToTable("Templates", (string)null);
b.ToTable("Templates");
});
modelBuilder.Entity("PARR.DAL.Models.Tnk", b =>
@@ -1081,7 +1081,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("SubprocessId");
b.ToTable("Tnks", (string)null);
b.ToTable("Tnks");
});
modelBuilder.Entity("PARR.DAL.Models.V1.V1_Application", b =>
@@ -1107,7 +1107,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("ApplicationTypeId");
b.ToTable("V1_Applications", (string)null);
b.ToTable("V1_Applications");
});
modelBuilder.Entity("PARR.DAL.Models.V1.V1_ApplicationInHost", b =>
@@ -1139,7 +1139,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("V1_ApplicationId");
b.ToTable("V1_ApplicationsInHost", (string)null);
b.ToTable("V1_ApplicationsInHost");
});
modelBuilder.Entity("PARR.DAL.Models.V1.V1_ApplicationType", b =>
@@ -1168,7 +1168,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("V1_ApplicationTypeId");
b.ToTable("V1_ApplicationTypes", (string)null);
b.ToTable("V1_ApplicationTypes");
});
modelBuilder.Entity("PARR.DAL.Models.V1.V1_Host", b =>
@@ -1207,7 +1207,7 @@ namespace PARR.DAL.Migrations
b.HasKey("Id");
b.ToTable("V1_Hosts", (string)null);
b.ToTable("V1_Hosts");
});
modelBuilder.Entity("PARR.DAL.Models.V1.V1_Job", b =>
@@ -1261,7 +1261,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("JobTypeId");
b.ToTable("V1_Jobs", (string)null);
b.ToTable("V1_Jobs");
});
modelBuilder.Entity("PARR.DAL.Models.V1.V1_JobCategory", b =>
@@ -1285,7 +1285,7 @@ namespace PARR.DAL.Migrations
b.HasKey("Id");
b.ToTable("V1_JobCategorys", (string)null);
b.ToTable("V1_JobCategorys");
});
modelBuilder.Entity("PARR.DAL.Models.V1.V1_JobJournal", b =>
@@ -1329,7 +1329,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("JobStatusId");
b.ToTable("V1_JobJournals", (string)null);
b.ToTable("V1_JobJournals");
});
modelBuilder.Entity("PARR.DAL.Models.V1.V1_JobMode", b =>
@@ -1350,7 +1350,7 @@ namespace PARR.DAL.Migrations
b.HasKey("Id");
b.ToTable("V1_JobModes", (string)null);
b.ToTable("V1_JobModes");
b.HasData(
new
@@ -1388,7 +1388,7 @@ namespace PARR.DAL.Migrations
b.HasKey("Id");
b.ToTable("V1_JobStatuses", (string)null);
b.ToTable("V1_JobStatuses");
b.HasData(
new
@@ -1428,7 +1428,7 @@ namespace PARR.DAL.Migrations
b.HasKey("Id");
b.ToTable("V1_JobTypes", (string)null);
b.ToTable("V1_JobTypes");
});
modelBuilder.Entity("PARR.DAL.Models.Work", b =>
@@ -1457,7 +1457,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("TnkId");
b.ToTable("Works", (string)null);
b.ToTable("Works");
});
modelBuilder.Entity("PARR.DAL.Models.Application", b =>

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

@@ -38,7 +38,7 @@ namespace PARR.DAL.Models
/// <summary>
/// Последняя дата обновления статуса RobotStatusCode роботом
/// </summary>
public DateTimeOffset RobotLastStatusUpdated { get; set; }
public DateTimeOffset? RobotLastStatusUpdated { get; set; }
[ForeignKey(nameof(StatusCode))]

8
PARR.GeneratorTemplates/Services/TemplateManager.cs
View File

@@ -87,7 +87,10 @@ namespace PARR.GeneratorTemplates.Services
IsActive = true,
StatusCode = (int)StatusTemplateEnum.Creating,
ApplicationInWorkId = appInWork.Id,
HostId = host.Id
HostId = host.Id,
RobotAttemptsNumber = 0,
RobotLastStatusUpdated = null,
RobotStatusCode = (int)RobotStatusEnum.Wait
};
if (!await templateService.CreateAsync(template) || !await templateService.CommitAsync())
@@ -138,6 +141,9 @@ namespace PARR.GeneratorTemplates.Services
item.IsActive = false;
item.StatusCode = (int)StatusTemplateEnum.Updating;
item.DateModified = DateTimeOffset.UtcNow;
item.RobotAttemptsNumber = 0;
item.RobotLastStatusUpdated = null;
item.RobotStatusCode = (int)RobotStatusEnum.Wait;
});
if (await templateService.CommitAsync())