diff --git a/PARR.API/Controllers/V1/RobotHistoryController.cs b/PARR.API/Controllers/V1/RobotHistoryController.cs index ce1a3090..9ff43aa8 100644 --- a/PARR.API/Controllers/V1/RobotHistoryController.cs +++ b/PARR.API/Controllers/V1/RobotHistoryController.cs @@ -14,7 +14,7 @@ using PARR.API.Services.Interfaces; using PARR.Core.Repositories.Interfaces; using PARR.Domain.Common.Pagination; using PARR.Domain.Common.Roles; -using PARR.Domain.Entities; +using PARR.Domain.Entities.RobotEntities; namespace PARR.API.Controllers.V1 { diff --git a/PARR.API/Controllers/V1/RobotTaskRobotStatusController.cs b/PARR.API/Controllers/V1/RobotTaskRobotStatusController.cs index 3d1246ff..91918a33 100644 --- a/PARR.API/Controllers/V1/RobotTaskRobotStatusController.cs +++ b/PARR.API/Controllers/V1/RobotTaskRobotStatusController.cs @@ -11,6 +11,7 @@ using PARR.API.Services.Interfaces; using PARR.Core.Repositories.Interfaces; using PARR.Domain.Common.Roles; using PARR.Domain.Entities; +using PARR.Domain.Entities.RobotEntities; using PARR.Domain.Enums; namespace PARR.API.Controllers.V1 diff --git a/PARR.API/Controllers/V1/Statistics/StatRobotHistoryController.cs b/PARR.API/Controllers/V1/Statistics/StatRobotHistoryController.cs index bdf07f33..34b11b1e 100644 --- a/PARR.API/Controllers/V1/Statistics/StatRobotHistoryController.cs +++ b/PARR.API/Controllers/V1/Statistics/StatRobotHistoryController.cs @@ -12,7 +12,7 @@ using PARR.API.Controllers.V1.Base; using PARR.API.Helpers; using PARR.Core.Repositories.Interfaces; using PARR.Domain.Common.Roles; -using PARR.Domain.Entities; +using PARR.Domain.Entities.RobotEntities; namespace PARR.API.Controllers.V1.Statistics { diff --git a/PARR.API/Infrastructure/Middleware/GlobalExceptionHandler.cs b/PARR.API/Infrastructure/Middleware/GlobalExceptionHandler.cs index 1b202511..91cc75c4 100644 --- a/PARR.API/Infrastructure/Middleware/GlobalExceptionHandler.cs +++ b/PARR.API/Infrastructure/Middleware/GlobalExceptionHandler.cs @@ -18,7 +18,7 @@ namespace PARR.API.Infrastructure.Middleware public async ValueTask TryHandleAsync(HttpContext httpContext, Exception exception, CancellationToken cancellationToken) { - logger.LogError(exception, "Ошибка во время запроса {TraceId}: {Message}", httpContext.TraceIdentifier, exception.Message); + logger.LogDebug(exception, "Ошибка во время запроса {TraceId}: {Message}", httpContext.TraceIdentifier, exception.Message); // определяем статус код, в зависимости от типа исключения diff --git a/PARR.API/MappingProfiles/DomainToResponseProfile.cs b/PARR.API/MappingProfiles/DomainToResponseProfile.cs index 604125c4..82b1d151 100644 --- a/PARR.API/MappingProfiles/DomainToResponseProfile.cs +++ b/PARR.API/MappingProfiles/DomainToResponseProfile.cs @@ -16,6 +16,7 @@ using PARR.Domain.Entities; using PARR.Domain.Entities.Base.History; using PARR.Domain.Entities.JobEntities; using PARR.Domain.Entities.JobGroupEntities; +using PARR.Domain.Entities.RobotEntities; using PARR.Domain.Entities.Schedule; using PARR.Domain.Entities.Unit; @@ -79,7 +80,7 @@ namespace PARR.API.MappingProfiles .ForMember(d => d.Script, o => o.MapFrom(s => s.AgentScript)) .ForMember(d => d.TimeOutSec, o => o.MapFrom(s => s.AgentTimeOutSec)); - CreateMap(); + CreateMap(); #region ScheduleResponseAreaTimeOffsetResponse @@ -255,7 +256,7 @@ namespace PARR.API.MappingProfiles CreateMap(); - CreateMap(); + CreateMap(); CreateMap() .ForMember(d => d.Robot, o => o.MapFrom(s => s.Robot)) diff --git a/PARR.Core/Repositories/Interfaces/IRobotHistoryLevelRepository.cs b/PARR.Core/Repositories/Interfaces/IRobotHistoryLevelRepository.cs index 7099934f..889159f1 100644 --- a/PARR.Core/Repositories/Interfaces/IRobotHistoryLevelRepository.cs +++ b/PARR.Core/Repositories/Interfaces/IRobotHistoryLevelRepository.cs @@ -1,4 +1,4 @@ -using PARR.Domain.Entities; +using PARR.Domain.Entities.RobotEntities; namespace PARR.Core.Repositories.Interfaces { diff --git a/PARR.Core/Repositories/Interfaces/IRobotHistoryRepository.cs b/PARR.Core/Repositories/Interfaces/IRobotHistoryRepository.cs index 755f501c..df718973 100644 --- a/PARR.Core/Repositories/Interfaces/IRobotHistoryRepository.cs +++ b/PARR.Core/Repositories/Interfaces/IRobotHistoryRepository.cs @@ -1,5 +1,5 @@ using PARR.Core.Repositories.Base; -using PARR.Domain.Entities; +using PARR.Domain.Entities.RobotEntities; namespace PARR.Core.Repositories.Interfaces { diff --git a/PARR.Core/Repositories/Interfaces/IRobotRepository.cs b/PARR.Core/Repositories/Interfaces/IRobotRepository.cs index be9fff60..d3a6f64d 100644 --- a/PARR.Core/Repositories/Interfaces/IRobotRepository.cs +++ b/PARR.Core/Repositories/Interfaces/IRobotRepository.cs @@ -1,4 +1,4 @@ -using PARR.Domain.Entities; +using PARR.Domain.Entities.RobotEntities; namespace PARR.Core.Repositories.Interfaces { diff --git a/PARR.Core/Repositories/Interfaces/IRobotStatusRepository.cs b/PARR.Core/Repositories/Interfaces/IRobotStatusRepository.cs index 921e7996..de80b5a6 100644 --- a/PARR.Core/Repositories/Interfaces/IRobotStatusRepository.cs +++ b/PARR.Core/Repositories/Interfaces/IRobotStatusRepository.cs @@ -1,4 +1,4 @@ -using PARR.Domain.Entities; +using PARR.Domain.Entities.RobotEntities; namespace PARR.Core.Repositories.Interfaces { diff --git a/PARR.Core/Repositories/Interfaces/IStatusTemplateRepository.cs b/PARR.Core/Repositories/Interfaces/IStatusTemplateRepository.cs index 0167027d..5742a0ce 100644 --- a/PARR.Core/Repositories/Interfaces/IStatusTemplateRepository.cs +++ b/PARR.Core/Repositories/Interfaces/IStatusTemplateRepository.cs @@ -2,6 +2,6 @@ { public interface IStatusTemplateRepository { - IQueryable Get(); + IQueryable Get(); } } diff --git a/PARR.Core/Repositories/Interfaces/ITaskStatusRepository.cs b/PARR.Core/Repositories/Interfaces/ITaskStatusRepository.cs index 43e73ff1..c8a64319 100644 --- a/PARR.Core/Repositories/Interfaces/ITaskStatusRepository.cs +++ b/PARR.Core/Repositories/Interfaces/ITaskStatusRepository.cs @@ -2,6 +2,6 @@ { public interface ITaskStatusRepository { - IQueryable Get(); + IQueryable Get(); } } diff --git a/PARR.Core/Services/RobotTask/Implementations/RobotTaskService.cs b/PARR.Core/Services/RobotTask/Implementations/RobotTaskService.cs index 6f0b9249..a10536b5 100644 --- a/PARR.Core/Services/RobotTask/Implementations/RobotTaskService.cs +++ b/PARR.Core/Services/RobotTask/Implementations/RobotTaskService.cs @@ -9,6 +9,7 @@ using PARR.Core.Services.Shortcodes; using PARR.Domain.DTOs.RobotTask; using PARR.Domain.Entities; using PARR.Domain.Entities.Base.History; +using PARR.Domain.Entities.RobotEntities; using PARR.Domain.Enums; using PARR.Domain.Exceptions; using PARR.Domain.Settings; diff --git a/PARR.DAL/Context/DataContext.cs b/PARR.DAL/Context/DataContext.cs index eb645f08..352e91ae 100644 --- a/PARR.DAL/Context/DataContext.cs +++ b/PARR.DAL/Context/DataContext.cs @@ -8,6 +8,7 @@ using PARR.Domain.Entities.JobGroupEntities; using PARR.Domain.Entities.RobotEntities; using PARR.Domain.Entities.Schedule; using PARR.Domain.Entities.TaskEntities; +using PARR.Domain.Entities.TemplateEntities; using PARR.Domain.Entities.Unit; using PARR.Domain.Enums; using PARR.Domain.Settings; @@ -18,34 +19,13 @@ namespace PARR.DAL.Context { public DataContext(DbContextOptions options) : base(options) { } - //public DbSet Hosts { get; set; } - //public DbSet WorkGroups { get; set; } - //public DbSet AppInWorkInWorkGroups { get; set; } - //public DbSet EkStatuses { get; set; } - //public DbSet ResponseAreas { get; set; } - //public DbSet Applications { get; set; } - //public DbSet ApplicationTypes { get; set; } - //public DbSet ApplicationsInHosts { get; set; } - - public DbSet