перешли на int

backend/src/Tnsu.ApprovalRoute.Application/Common/Errors/ApiErrors.cs

@@ -2,7 +2,7 @@ using FluentResults;
 
 namespace Tnsu.ApprovalRoute.Application.Common.Errors;
 
-public sealed class NotFoundError(string entity, Guid id)
+public sealed class NotFoundError(string entity, object id)
     : Error($"{entity} с id {id} не найден.");
 
 public sealed class ValidationError(string message) : Error(message);

backend/src/Tnsu.ApprovalRoute.Application/RequestTypes/RequestTypeDto.cs

@@ -1,6 +1,6 @@
 namespace Tnsu.ApprovalRoute.Application.RequestTypes;
 
-public sealed record RequestTypeDto(Guid Id, string Name, string PageUrl);
+public sealed record RequestTypeDto(int Id, string Name, string PageUrl);
 
 public sealed record CreateRequestTypeRequest(string Name, string PageUrl);
 

backend/src/Tnsu.ApprovalRoute.Application/RequestTypes/RequestTypeService.cs

@@ -18,7 +18,7 @@ public sealed class RequestTypeService(ApprovalRouteDbContext db)
         return Result.Ok<IReadOnlyList<RequestTypeDto>>(items);
     }
 
-    public async Task<Result<RequestTypeDto>> GetAsync(Guid id, CancellationToken cancellationToken)
+    public async Task<Result<RequestTypeDto>> GetAsync(int id, CancellationToken cancellationToken)
     {
         var entity = await db.RequestTypes.AsNoTracking().FirstOrDefaultAsync(x => x.Id == id, cancellationToken);
 
@@ -36,7 +36,7 @@ public sealed class RequestTypeService(ApprovalRouteDbContext db)
         return Result.Ok(ToDto(entity));
     }
 
-    public async Task<Result<RequestTypeDto>> UpdateAsync(Guid id, UpdateRequestTypeRequest request, CancellationToken cancellationToken)
+    public async Task<Result<RequestTypeDto>> UpdateAsync(int id, UpdateRequestTypeRequest request, CancellationToken cancellationToken)
     {
         var entity = await db.RequestTypes.FirstOrDefaultAsync(x => x.Id == id, cancellationToken);
         if (entity is null)
@@ -49,7 +49,7 @@ public sealed class RequestTypeService(ApprovalRouteDbContext db)
         return Result.Ok(ToDto(entity));
     }
 
-    public async Task<Result> DeleteAsync(Guid id, CancellationToken cancellationToken)
+    public async Task<Result> DeleteAsync(int id, CancellationToken cancellationToken)
     {
         var entity = await db.RequestTypes.FirstOrDefaultAsync(x => x.Id == id, cancellationToken);
         if (entity is null)

backend/src/Tnsu.ApprovalRoute.Application/TemplateRouteSteps/TemplateRouteStepDto.cs

@@ -3,14 +3,14 @@ using Tnsu.ApprovalRoute.Domain.Enums;
 namespace Tnsu.ApprovalRoute.Application.TemplateRouteSteps;
 
 public sealed record TemplateRouteStepDto(
-    Guid Id,
+    int Id,
     int OrderNo,
     string ExecutorEmail,
     string Position,
     ProjectRole ProjectRole,
     HeadType HeadType,
     RouteStepStatus Status,
-    Guid RouteId,
+    int RouteId,
     bool AllowReassignToOtherApprovers);
 
 public sealed record CreateTemplateRouteStepRequest(

backend/src/Tnsu.ApprovalRoute.Application/TemplateRouteSteps/TemplateRouteStepService.cs

@@ -9,7 +9,7 @@ namespace Tnsu.ApprovalRoute.Application.TemplateRouteSteps;
 
 public sealed class TemplateRouteStepService(ApprovalRouteDbContext db)
 {
-    public async Task<Result<IReadOnlyList<TemplateRouteStepDto>>> ListAsync(Guid routeId, CancellationToken cancellationToken)
+    public async Task<Result<IReadOnlyList<TemplateRouteStepDto>>> ListAsync(int routeId, CancellationToken cancellationToken)
     {
         var items = await db.TemplateRouteSteps.AsNoTracking()
             .Where(x => x.RouteId == routeId)
@@ -21,7 +21,7 @@ public sealed class TemplateRouteStepService(ApprovalRouteDbContext db)
         return Result.Ok<IReadOnlyList<TemplateRouteStepDto>>(items);
     }
 
-    public async Task<Result<TemplateRouteStepDto>> GetAsync(Guid routeId, Guid id, CancellationToken cancellationToken)
+    public async Task<Result<TemplateRouteStepDto>> GetAsync(int routeId, int id, CancellationToken cancellationToken)
     {
         var entity = await db.TemplateRouteSteps.AsNoTracking()
             .FirstOrDefaultAsync(x => x.Id == id && x.RouteId == routeId, cancellationToken);
@@ -31,7 +31,7 @@ public sealed class TemplateRouteStepService(ApprovalRouteDbContext db)
             : Result.Ok(ToDto(entity));
     }
 
-    public async Task<Result<TemplateRouteStepDto>> CreateAsync(Guid routeId, CreateTemplateRouteStepRequest r, CancellationToken cancellationToken)
+    public async Task<Result<TemplateRouteStepDto>> CreateAsync(int routeId, CreateTemplateRouteStepRequest r, CancellationToken cancellationToken)
     {
         var route = await db.TemplateRoutes.FirstOrDefaultAsync(x => x.Id == routeId, cancellationToken);
         if (route is null)
@@ -60,7 +60,7 @@ public sealed class TemplateRouteStepService(ApprovalRouteDbContext db)
     }
 
     public async Task<Result<TemplateRouteStepDto>> UpdateAsync(
-        Guid routeId, Guid id, UpdateTemplateRouteStepRequest r, CancellationToken cancellationToken)
+        int routeId, int id, UpdateTemplateRouteStepRequest r, CancellationToken cancellationToken)
     {
         var route = await db.TemplateRoutes.FirstOrDefaultAsync(x => x.Id == routeId, cancellationToken);
         if (route is null)
@@ -87,7 +87,7 @@ public sealed class TemplateRouteStepService(ApprovalRouteDbContext db)
         return await AppendMissingProjectRoleWarningAsync(route, result, cancellationToken);
     }
 
-    public async Task<Result> DeleteAsync(Guid routeId, Guid id, CancellationToken cancellationToken)
+    public async Task<Result> DeleteAsync(int routeId, int id, CancellationToken cancellationToken)
     {
         var entity = await db.TemplateRouteSteps.FirstOrDefaultAsync(x => x.Id == id && x.RouteId == routeId, cancellationToken);
         if (entity is null)

backend/src/Tnsu.ApprovalRoute.Application/TemplateRoutes/ResolveTemplateRouteDto.cs

@@ -3,7 +3,7 @@ using Tnsu.ApprovalRoute.Domain.Enums;
 namespace Tnsu.ApprovalRoute.Application.TemplateRoutes;
 
 public sealed record ResolvedRouteStepDto(
-    Guid Id,
+    int Id,
     int OrderNo,
     string ExecutorEmail,
     string Position,
@@ -13,13 +13,13 @@ public sealed record ResolvedRouteStepDto(
     bool AllowReassignToOtherApprovers);
 
 public sealed record ResolveTemplateRouteResultDto(
-    Guid RouteId,
+    int RouteId,
     RouteType RouteType,
     bool RequiresControl,
     IReadOnlyList<ResolvedRouteStepDto> Steps);
 
 public sealed record ResolveTemplateRouteRequest(
-    Guid RequestTypeId,
+    int RequestTypeId,
     string? UserEmail,
     Guid? ProjectId,
     RouteStepStatus Status);

backend/src/Tnsu.ApprovalRoute.Application/TemplateRoutes/TemplateRouteDto.cs

@@ -3,9 +3,9 @@ using Tnsu.ApprovalRoute.Domain.Enums;
 namespace Tnsu.ApprovalRoute.Application.TemplateRoutes;
 
 public sealed record TemplateRouteDto(
-    Guid Id,
+    int Id,
     RouteType RouteType,
-    Guid RequestTypeId,
+    int RequestTypeId,
     string? Department,
     string Company,
     bool ByProject,
@@ -13,7 +13,7 @@ public sealed record TemplateRouteDto(
 
 public sealed record CreateTemplateRouteRequest(
     RouteType RouteType,
-    Guid RequestTypeId,
+    int RequestTypeId,
     string? Department,
     string Company,
     bool ByProject,

backend/src/Tnsu.ApprovalRoute.Application/TemplateRoutes/TemplateRouteService.cs

@@ -14,7 +14,7 @@ public sealed class TemplateRouteService(
     ITnsuPortalClient portalClient,
     ICurrentUser currentUser)
 {
-    public async Task<Result<IReadOnlyList<TemplateRouteDto>>> ListAsync(Guid? requestTypeId, CancellationToken cancellationToken)
+    public async Task<Result<IReadOnlyList<TemplateRouteDto>>> ListAsync(int? requestTypeId, CancellationToken cancellationToken)
     {
         var query = db.TemplateRoutes.AsNoTracking().AsQueryable();
         if (requestTypeId is { } id)
@@ -28,7 +28,7 @@ public sealed class TemplateRouteService(
         return Result.Ok<IReadOnlyList<TemplateRouteDto>>(items);
     }
 
-    public async Task<Result<TemplateRouteDto>> GetAsync(Guid id, CancellationToken cancellationToken)
+    public async Task<Result<TemplateRouteDto>> GetAsync(int id, CancellationToken cancellationToken)
     {
         var entity = await db.TemplateRoutes.AsNoTracking().FirstOrDefaultAsync(x => x.Id == id, cancellationToken);
 
@@ -64,7 +64,7 @@ public sealed class TemplateRouteService(
         return Result.Ok(ToDto(entity));
     }
 
-    public async Task<Result<TemplateRouteDto>> UpdateAsync(Guid id, UpdateTemplateRouteRequest r, CancellationToken cancellationToken)
+    public async Task<Result<TemplateRouteDto>> UpdateAsync(int id, UpdateTemplateRouteRequest r, CancellationToken cancellationToken)
     {
         var entity = await db.TemplateRoutes.FirstOrDefaultAsync(x => x.Id == id, cancellationToken);
         if (entity is null)
@@ -86,7 +86,7 @@ public sealed class TemplateRouteService(
         return Result.Ok(ToDto(entity));
     }
 
-    public async Task<Result> DeleteAsync(Guid id, CancellationToken cancellationToken)
+    public async Task<Result> DeleteAsync(int id, CancellationToken cancellationToken)
     {
         var entity = await db.TemplateRoutes.FirstOrDefaultAsync(x => x.Id == id, cancellationToken);
         if (entity is null)
@@ -113,7 +113,7 @@ public sealed class TemplateRouteService(
         var employee = await portalClient.GetEmployeeByEmailAsync(email, cancellationToken);
         if (employee is null)
             return Result.Fail<ResolveTemplateRouteResultDto>(
-                new NotFoundError("Сотрудник по email в справочнике api.tnsu.kz не найден", Guid.Empty));
+                new NotFoundError("Сотрудник в справочнике api.tnsu.kz по email", email));
 
         var byProject = request.ProjectId is not null;
         var department = Normalize(employee.Department);
@@ -154,7 +154,7 @@ public sealed class TemplateRouteService(
     }
 
     private Task<bool> HasDuplicateAsync(
-        Guid requestTypeId, string? department, string company, bool byProject, Guid? excludeId, CancellationToken cancellationToken) =>
+        int requestTypeId, string? department, string company, bool byProject, int? excludeId, CancellationToken cancellationToken) =>
         db.TemplateRoutes.AnyAsync(x =>
             x.Id != excludeId &&
             x.RequestTypeId == requestTypeId &&