From ccba53cc94a690a62e285619ab9fe4fea5ae8256 Mon Sep 17 00:00:00 2001 From: "gorbenko.pavel" Date: Thu, 23 Jul 2026 12:36:56 +0500 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/Tnsu.ApprovalRoute.Domain/Entities/RequestType.cs | 2 +- .../Entities/{Route.cs => TemplateRoute.cs} | 4 ++-- .../Entities/{RouteStep.cs => TemplateRouteStep.cs} | 4 ++-- .../Persistence/ApprovalRouteDbContext.cs | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) rename backend/src/Tnsu.ApprovalRoute.Domain/Entities/{Route.cs => TemplateRoute.cs} (83%) rename backend/src/Tnsu.ApprovalRoute.Domain/Entities/{RouteStep.cs => TemplateRouteStep.cs} (89%) diff --git a/backend/src/Tnsu.ApprovalRoute.Domain/Entities/RequestType.cs b/backend/src/Tnsu.ApprovalRoute.Domain/Entities/RequestType.cs index 2cd90e7..df43cbb 100644 --- a/backend/src/Tnsu.ApprovalRoute.Domain/Entities/RequestType.cs +++ b/backend/src/Tnsu.ApprovalRoute.Domain/Entities/RequestType.cs @@ -9,5 +9,5 @@ public class RequestType public string Name { get; set; } = string.Empty; public string PageUrl { get; set; } = string.Empty; - public ICollection Routes { get; set; } = new List(); + public ICollection Routes { get; set; } = new List(); } diff --git a/backend/src/Tnsu.ApprovalRoute.Domain/Entities/Route.cs b/backend/src/Tnsu.ApprovalRoute.Domain/Entities/TemplateRoute.cs similarity index 83% rename from backend/src/Tnsu.ApprovalRoute.Domain/Entities/Route.cs rename to backend/src/Tnsu.ApprovalRoute.Domain/Entities/TemplateRoute.cs index 2df9be2..6d3d941 100644 --- a/backend/src/Tnsu.ApprovalRoute.Domain/Entities/Route.cs +++ b/backend/src/Tnsu.ApprovalRoute.Domain/Entities/TemplateRoute.cs @@ -2,7 +2,7 @@ using Tnsu.ApprovalRoute.Domain.Enums; namespace Tnsu.ApprovalRoute.Domain.Entities; -public class Route +public class TemplateRoute { public Guid Id { get; set; } = Guid.NewGuid(); public RouteType RouteType { get; set; } = RouteType.Sequential; @@ -16,5 +16,5 @@ public class Route public bool RequiresControl { get; set; } public RequestType? RequestType { get; set; } - public ICollection Steps { get; set; } = new List(); + public ICollection Steps { get; set; } = new List(); } diff --git a/backend/src/Tnsu.ApprovalRoute.Domain/Entities/RouteStep.cs b/backend/src/Tnsu.ApprovalRoute.Domain/Entities/TemplateRouteStep.cs similarity index 89% rename from backend/src/Tnsu.ApprovalRoute.Domain/Entities/RouteStep.cs rename to backend/src/Tnsu.ApprovalRoute.Domain/Entities/TemplateRouteStep.cs index a70ef8c..098ea8a 100644 --- a/backend/src/Tnsu.ApprovalRoute.Domain/Entities/RouteStep.cs +++ b/backend/src/Tnsu.ApprovalRoute.Domain/Entities/TemplateRouteStep.cs @@ -2,7 +2,7 @@ using Tnsu.ApprovalRoute.Domain.Enums; namespace Tnsu.ApprovalRoute.Domain.Entities; -public class RouteStep +public class TemplateRouteStep { public Guid Id { get; set; } = Guid.NewGuid(); public int OrderNo { get; set; } @@ -16,5 +16,5 @@ public class RouteStep public Guid RouteId { get; set; } public bool AllowReassignToOtherApprovers { get; set; } - public Route? Route { get; set; } + public TemplateRoute? Route { get; set; } } diff --git a/backend/src/Tnsu.ApprovalRoute.Infrastructure/Persistence/ApprovalRouteDbContext.cs b/backend/src/Tnsu.ApprovalRoute.Infrastructure/Persistence/ApprovalRouteDbContext.cs index 080ae1f..4b57367 100644 --- a/backend/src/Tnsu.ApprovalRoute.Infrastructure/Persistence/ApprovalRouteDbContext.cs +++ b/backend/src/Tnsu.ApprovalRoute.Infrastructure/Persistence/ApprovalRouteDbContext.cs @@ -6,8 +6,8 @@ namespace Tnsu.ApprovalRoute.Infrastructure.Persistence; public class ApprovalRouteDbContext(DbContextOptions options) : DbContext(options) { public DbSet RequestTypes => Set(); - public DbSet Routes => Set(); - public DbSet RouteSteps => Set(); + public DbSet Routes => Set(); + public DbSet RouteSteps => Set(); protected override void OnModelCreating(ModelBuilder modelBuilder) { @@ -18,14 +18,14 @@ public class ApprovalRouteDbContext(DbContextOptions opt e.Property(x => x.PageUrl).HasMaxLength(512).IsRequired(); }); - modelBuilder.Entity(e => + modelBuilder.Entity(e => { e.HasKey(x => x.Id); e.Property(x => x.RouteType).HasConversion().HasMaxLength(32).IsRequired(); e.HasOne(x => x.RequestType).WithMany(x => x.Routes).HasForeignKey(x => x.RequestTypeId); }); - modelBuilder.Entity(e => + modelBuilder.Entity(e => { e.HasKey(x => x.Id); e.Property(x => x.ExecutorEmail).HasMaxLength(256).IsRequired();